doit 0.3.2 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3bc140e881b43c004f6a23f5b200d098dc7e4359
-  data.tar.gz: 9475f4ed399cd3ebf2dfd227b436da2a434ae7a3
+SHA256:
+  metadata.gz: ab3e45ae5cd8368470a2f596274de76dace66dcbdf5179a36e72f0829593b7f6
+  data.tar.gz: 7639c595a1c200e7d6dcbae89272cbde935f1c391082a0cf2256329b724b3e46
 SHA512:
-  metadata.gz: 13bfdfd39a32bf91c75c033bd472634a4df85b469429b20e21294cce80b1021ebec9837fe48bd4679a0c5174409b7accdd74cec8d781598a5a8dd42c5bc0db70
-  data.tar.gz: ca8a31bc0293c45becb74cbd990aac41c5c67d910042f99bc18ec090dcd2096a6a4a2b5bf29b2713649f39d85066edd9c2e074e48505e847237867c1fe6fb0e1
+  metadata.gz: 4469bb7cb6e1ed2d38830da1ea11570f90a398f04a4a9ad11d8c42a443cc9e3d2d3b9b71643a0964836a8d5def2781203255ffa36e16d0db9eef1e101144e529
+  data.tar.gz: 5440ec7f1a51ae549dac16cde73dc968b5488dbb0a2cc28a64969b092c86016cba03e90b9e16a1cde15dfc582a1fba3c3b5bad1009128bc1c56b563470790873

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+tmp/

data/.rubocop.yml

@@ -0,0 +1,74 @@
+# inherit_from: .rubocop_todo.yml
+
+# inherit_from: .rubocop_todo.yml
+
+# rubocop --auto-gen-config
+# rubocop
+# rubocop:disable all
+
+#inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Include:
+#    - 'app/**/*.rb'
+#    - 'bin/**/*.rb'
+#    - 'config/**/*.rb'
+#    - 'db/**/*.rb'
+    - 'lib/**/*.rb'
+#    - 'test/**/*.rb'
+    - '**/*.gemfile'
+#    - '**/*.gemspec'
+#    - '**/*.rake'
+#    - '**/*.ru'
+#    - '**/Gemfile'
+#    - '**/Rakefile'
+
+#AllCops:
+#  Exclude:
+#    - 'db/**/*'
+#    - 'config/**/*'
+#    - 'script/**/*'
+#    - 'bin/{rails,rake}'
+#    - 'spec/**/*'
+#    - !ruby/regexp /old_and_unused\.rb$/
+
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
+Layout/AccessModifierIndentation:
+  Enabled: false
+Layout/AlignArray:
+  Enabled: false
+Layout/CommentIndentation:
+  Enabled: false
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: false
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+Layout/ExtraSpacing:
+  Enabled: false
+Layout/IndentArray:
+  Enabled: false
+Layout/IndentationWidth:
+  Enabled: false
+Layout/Tab:
+  Enabled: false
+
+Security/YAMLLoad:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'test/**/*.rb'
+Style/WhenThen:
+  Exclude:
+    - '.watchr'
+
+
+
+

data/.ruby-gemset

@@ -1 +1 @@
-rails-5.1
+rails-5.2

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.0
+ruby-2.6.1

data/.travis.yml

@@ -1,10 +1,15 @@
 language: ruby
 sudo: false
 
+bundler_args: --without production
+script: "bundle exec rake test"
+
 rvm:
-  - 2.5.0
-  - 2.4.1
-  - 2.3.0
+  - 2.6.1
+#  - 2.5.1
+#  - 2.5.0
+#  - 2.4.1
+#  - 2.3.0  # tested; no longer in CI
 #  - 2.2.3  # tested; no longer in CI
 #  - 2.0.0  # tested; no longer in CI
 

data/.watchr

@@ -16,7 +16,8 @@ end
 
 def run_it(type, file)
   case type
-  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
+#  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
+  when 'test';  run %Q{ruby -I"lib:test"  #{file}}
   when 'spec';  run %Q{spring rspec -X #{file}}
   else;         puts "#{H} unknown type: #{type}, file: #{file}"
   end

data/Gemfile

@@ -1,16 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-#gem 'micro-optparse'
-#
-#group :test do
-#  gem 'simplecov', require: false
-#end
-#
-#group :test, :development do
-#  gem 'rake'
-#  gem 'observr'
-#  gem 'minitest'
-#end
-

data/Gemfile.lock

@@ -1,27 +1,22 @@
 PATH
   remote: .
   specs:
-    doit (0.3.2)
+    doit (0.3.5)
       micro-optparse (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    docile (1.1.5)
-    json (2.1.0)
+    docile (1.3.1)
+    json (2.2.0)
     micro-optparse (1.2.1)
     minitest (5.11.3)
-    rake (12.3.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    rake (12.3.2)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    slim (3.0.9)
-      temple (>= 0.7.6, < 0.9)
-      tilt (>= 1.3.3, < 2.1)
-    temple (0.8.0)
-    tilt (2.0.8)
 
 PLATFORMS
   ruby
@@ -29,10 +24,10 @@ PLATFORMS
 DEPENDENCIES
   bundler
   doit!
+  micro-optparse (~> 1)
   minitest
   rake
   simplecov
-  slim
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2017 Dittmar Krall
+Copyright (c) 2014-2019 Dittmar Krall
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 

data/README.md

@@ -75,4 +75,4 @@ $PROJ/.doit/push
       - bob@sample.com
       - alice@customer.com
 
-Copyright (c) 2014-2017 [Dittmar Krall], released under the MIT license
+Copyright (c) 2014-2019 [Dittmar Krall], released under the MIT license.

data/bin/doit

@@ -1,7 +1,8 @@
-#!/usr/bin/env ruby
+#! /usr/bin/env ruby
 
-lib = File.expand_path('../../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+lib = File.expand_path('../lib/', __dir__)
+# $:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'doit'
 require 'micro-optparse'
@@ -9,11 +10,12 @@ require 'globals'
 require 'what'
 
 options = Parser.new do |p|
-   p.banner = "Usage: doit script... [options] # execute locally or remotely"
+   p.banner = 'Usage: doit script... [options] # execute locally or remotely'
    p.version = "doit #{Globals::VERSION}"
    p.option :list, 'Lists available scripts'
    p.option :each, 'Lists each remote command (no execution)'
-   p.option :remote, 'Remote host or comma separated hosts', default: '...', optional: true
+   p.option :remote, 'Remote host or comma separated hosts',
+            default: '...', optional: true
    p.option :silent, 'Run silently; suppress output'
    p.option :verbose, 'Enable verbose output'
    p.option :noop, 'Suppress execution of commannds'

data/doit.gemspec

@@ -1,11 +1,11 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'globals'
 
 Gem::Specification.new do |s|
   s.name    = 'doit'
   s.version = Globals::VERSION
-  s.summary = "Simple local & remote script executor"
-  s.description = "Run good old shell/bash scripts locally or remotely(ssh)."
+  s.summary = 'Simple local & remote script executor'
+  s.description = 'Run good old shell/bash scripts locally or remotely(ssh).'
 
   s.authors  = ['Dittmar Krall']
   s.email    = 'dittmar.krall@matique.de'
@@ -16,14 +16,14 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`
+                    .split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'slim'
 
-#  s.add_development_dependency 'micro-optparse', '~> 1'
+  s.add_development_dependency 'micro-optparse', '~> 1'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'simplecov'
 end

data/lib/doit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'my'
 require 'run'
 require 'import'
@@ -25,10 +27,12 @@ class << Doit
     hsh.sort.each { |abb, long|
       puts "#{abb}\t- #{long}"
       next  unless options[:verbose]
+
       lines = `grep -i 'usage\\|summary' #{long} | grep '^#'`.split("\n")
       lines.each { |line|
 	next  unless line
 	next  if line.empty?
+
 	puts "\t  #{line}"
       }
     }
@@ -40,11 +44,9 @@ class << Doit
       puts "doit: script '#{name}' not found"
       return
     end
-    What.init(Import.script, Import.config)
+    What.init(Import.config)
 
-    What.where.each { |w|
-      puts "doit #{name} -r #{w}"
-    }  if options[:each]
+    What.where.each { |w| puts "doit #{name} -r #{w}" } if options[:each]
 
     where_loop  unless options[:each]
   end
@@ -56,18 +58,18 @@ class << Doit
     }
   end
 
-  def matrix_loop(w)
+  def matrix_loop(where)
     What.matrix.each { |mm|
       prefix = mm.empty? ? '' : "#{What.to_env(mm)}\n"
 
       What.env.each { |en|
-	prefix2 = en.empty? ? '' : "#{en}\n"
+        prefix2 = en.empty? ? '' : "#{en}\n"
 
-	cmds = Import.script
-	cmds = @argv + prefix + prefix2 + cmds
-	Run.init cmds, w
-	Run.info  if options[:verbose]
-	Run.run
+        cmds = Import.script
+        cmds = @argv + prefix + prefix2 + cmds
+        Run.init cmds, where
+        Run.info  if options[:verbose]
+        Run.run
       }
     }
   end

data/lib/globals.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
 module Globals
-  VERSION = '0.3.2'
+  VERSION = '0.3.6'     # 2019-03-06
+#  VERSION = '0.3.5'     # 2018-09-11
+#  VERSION = '0.3.4'     # 2018-08-19
+#  VERSION = '0.3.3'
 end

data/lib/import.rb

@@ -1,11 +1,20 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'erb'
 
 Import = Object.new
 class << Import
 
-  def script;  @script ||= nil; @script;  end
-  def config;  @config ||= nil; @config;  end
+  def script
+    @script ||= nil
+    @script
+  end
+
+  def config
+    @config ||= nil
+    @config
+  end
 
   def init(name)
     @script  = read(name)
@@ -21,11 +30,10 @@ class << Import
   def info
     return  unless Doit.options[:verbose]
 
-    My.verbose "SCRIPT", @script
-    My.verbose "CONFIG(yml)", @config
+    My.verbose 'SCRIPT', @script
+    My.verbose 'CONFIG(yml)', @config
   end
 
-
  private
   def list2
     res = {}

data/lib/my.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 My = Object.new
 class << My
 
   def verbose(what, txt)
-    marker = '*'*4
+    marker = '*' * 4
     arr = txt
     arr = txt ? txt.split("\n") : ''  unless Array === txt
     if arr.length > 1

data/lib/run.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 Run = Object.new
 class << Run
 
-  def ssh; @ssh; end
+  attr_reader :ssh
 
   def init(cmds, where)
-    aster = '*'*24
+    aster = '*' * 24
     puts "#{aster} #{where} #{aster}"
     @ssh = nil
     @cmds = cmds
@@ -18,7 +20,7 @@ class << Run
       dir = where
     end
 
-    @cmds = "cd; cd #{dir}\n" + @cmds  unless dir && dir.empty?
+    @cmds = "cd; cd #{dir}\n" + @cmds  unless dir&.empty?
     @ssh = "ssh #{host}"  if host
   end
 
@@ -33,10 +35,10 @@ class << Run
     cmd = "cat <<'#{here}\' | #{@ssh} bash -i -l #{silent} 2>&1"
     cmds = "#{cmd}\n#{@cmds}#{here}\n"
 
-    unless Doit.options[:noop]
-      IO.popen(cmds) { |p| p.each { |f| puts f } }
-    else
+    if Doit.options[:noop]
       My.verbose('noop', cmds)
+    else
+      IO.popen(cmds) { |p| p.each { |f| puts f } }
     end
   end
 

data/lib/what.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'doit'
 
 What = Object.new
 class << What
 
-  def matrix;  @matrix;  end
-  def where;   @where;   end
-  def env;     @env;     end
+  attr_reader :matrix
+  attr_reader :where
+  attr_reader :env
 
-  def init(script, config)
+  def init(config)
     @matrix = nil
     @yml   = (config && YAML.load(config)) || {}
 
@@ -37,24 +39,25 @@ class << What
   def info
     return  unless Doit.options[:verbose]
 
-    My.verbose "where",  @where
-    My.verbose "matrix", @matrix
-    My.verbose "env",    @env
+    My.verbose 'where',  @where
+    My.verbose 'matrix', @matrix
+    My.verbose 'env',    @env
   end
 
-
  private
   def build_matrix
-    unless @yml.empty?
-      key, value = @yml.first
-      @yml.delete(key)
-      add_to_matrix(key, value)
-      build_matrix
-    end
+    return  if @yml.empty?
+
+    key, value = @yml.first
+    @yml.delete(key)
+    add_to_matrix(key, value)
+    build_matrix
   end
 
   def add_to_matrix(key, val)
-    arr = Array === val ? val.collect {|v| [{key => v}] } : [{key => val}]
+    arr = Array === val ?
+      val.collect { |v| [{ key => v }] } :
+      [{ key => val }]
     @matrix = @matrix ? @matrix.product(arr) : arr
   end
 

data/test/doit_test.rb

@@ -6,46 +6,46 @@ describe Doit do
     Doit.start({})
   end
 
-  it "start" do
-    out = noop { }
+  it 'start' do
+    out = noop {}
     assert_equal '', out
   end
 
-  it "options" do
+  it 'options' do
     assert_equal({}, Doit.options)
   end
 
-  it "list" do
+  it 'list' do
     out = noop {
       Doit.list
     }
     assert_match(/\/\.doit/, out)
   end
 
-  it "execute" do
+  it 'execute' do
     out, _err = capture_io do
       Doit.execute('hello')
     end
     assert_match(/\nHello\n/, out)
   end
 
-  it "execute with unknown script" do
+  it 'execute with unknown script' do
     out, _err = capture_io do
       Doit.execute('______unknown______')
     end
     assert_match(/not found/, out)
   end
 
-  it "tests option --each" do
-    out = noop({each: true}) {
+  it 'tests option --each' do
+    out = noop(each: true) {
       Doit.execute('hello')
     }
     assert_match(/doit hello -r/, out)
   end
 
-  it "coverage: list; option -lv" do
-    out = noop({verbose: true, list: true}) {
-      Doit.start({verbose: true, list: true})
+  it 'coverage: list; option -lv' do
+    out = noop(verbose: true, list: true) {
+      Doit.start(verbose: true, list: true)
     }
     assert_match(/just a test\n/, out)
   end

data/test/import_test.rb

@@ -5,21 +5,21 @@ require 'my'
 
 describe Import do
 
-  it "init fails with empty" do
+  it 'init fails with empty' do
     assert_raises(Errno::EISDIR) { Import.init('') }
   end
 
-  it "init" do
+  it 'init' do
     Import.init('hello')
   end
 
-  it "list" do
+  it 'list' do
     Import.init('hello')
     assert_match(/\/\.doit\/hello$/, Import.list['hello'])
   end
 
-  it "info" do
-    out = noop({verbose: true}) {
+  it 'info' do
+    out = noop(verbose: true) {
 	Import.init('hello')
 	Import.info
     }
@@ -27,11 +27,11 @@ describe Import do
     assert_match(/CONFIG/, out)
   end
 
-  it "coverage: script" do
+  it 'coverage: script' do
     Import.script
   end
 
-  it "coverage: config" do
+  it 'coverage: config' do
     Import.config
   end
 

data/test/my_test.rb

@@ -3,20 +3,20 @@ require 'my'
 
 describe My do
 
-  it "verbose" do
+  it 'verbose' do
     h = 'hello'
-    _out, _err = capture_io do
+    out, _err = capture_io do
       My.verbose('a', h)
     end
-    assert_match(/#{h}/, _out)
+    assert_match(/#{h}/, out)
   end
 
-  it "verbose text" do
+  it 'verbose text' do
     h = 'hello'
-    _out, _err = capture_io do
+    out, _err = capture_io do
       My.verbose('a', "#{h}\nx\n")
     end
-    assert_match(/#{h}/, _out)
+    assert_match(/#{h}/, out)
   end
 
 end

data/test/run_test.rb

@@ -5,7 +5,7 @@ require 'doit'
 
 describe Run do
 
-  it "coverage #info" do
+  it 'coverage #info' do
     _out, _err = capture_io do
       Run.init('', '')
       Run.info
@@ -40,14 +40,14 @@ describe Run do
     end
   end
 
-  it "coverage #run" do
+  it 'coverage #run' do
     _out, _err = capture_io do
       Run.init('', '')
       Run.run
     end
   end
 
-  it "coverage #run noop" do
+  it 'coverage #run noop' do
     out = noop {
 	Run.init('', '')
 	Run.run

data/test/test_helper.rb

@@ -8,13 +8,13 @@ require 'what'
 
 require 'minitest/autorun'
 
-def noop(options = {noop: true}, &block)
+def noop(options = { noop: true }, &block)
   return 'noop: missing block' unless block
 
   out = '---'
   Doit.stub :options, options do
     out, _err = capture_io do
-      block.call
+      yield
     end
   end
   out

data/test/what_test.rb

@@ -3,8 +3,8 @@ require 'my'
 
 describe What do
 
-  it "is robust against empty params" do
-    What.init('', '')
+  it 'is robust against empty params' do
+    What.init('')
     assert_equal [Dir.pwd], What.where
     assert_equal [{}], What.matrix
   end
@@ -13,32 +13,32 @@ describe What do
     assert_equal '', What.to_env({})
   end
 
-  it "to_env converts variable to uppercase" do
-    assert_equal 'A=1', What.to_env({a: 1})
+  it 'to_env converts variable to uppercase' do
+    assert_equal 'A=1', What.to_env(a: 1)
   end
 
-  it "coverage: #info" do
-    Doit.stub :options, {verbose: true} do
+  it 'coverage: #info' do
+    Doit.stub :options, verbose: true do
       _out, _err = capture_io do
-	What.init('', '')
-	What.info
+        What.init('')
+        What.info
       end
     end
   end
 
-  it "builds simple matrix" do
-    What.init('', "a: 1\n")
-    assert_equal [{"a"=>1}], What.matrix
+  it 'builds simple matrix' do
+    What.init("a: 1\n")
+    assert_equal [{ 'a' => 1 }], What.matrix
   end
 
-  it "builds matrix" do
-    What.init('', "a:\n - 1\n - 2\n")
-    assert_equal [{"a"=>1}, {"a"=>2}], What.matrix
+  it 'builds matrix' do
+    What.init("a:\n - 1\n - 2\n")
+    assert_equal [{ 'a' => 1 }, { 'a' => 2 }], What.matrix
   end
 
-  it "builds product matrix" do
-    What.init('', "a:\n - 1\nb:\n - 3\n - 4\n")
-    assert_equal [{"a"=>1, "b"=>3}, {"a"=>1, "b"=>4}], What.matrix
+  it 'builds product matrix' do
+    What.init("a:\n - 1\nb:\n - 3\n - 4\n")
+    assert_equal [{ 'a' => 1, 'b' => 3 }, { 'a' => 1, 'b' => 4 }], What.matrix
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.6
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micro-optparse
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: micro-optparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - ".doit/hello"
 - ".doit/hello.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -146,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Simple local & remote script executor