doit 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb0f0645c47b1d209a75de9fcc49d0b99752769764599b0fac889b3ad6423f0
-  data.tar.gz: 726b353579f963e6655bf56fdf49dfcd60004826ee838e3bd7f5a6c168e48bd7
+  metadata.gz: 17ec5f7c6ea5812774bd8faad346d5915048b82ed028ce67abb70ead569ac4b8
+  data.tar.gz: 1712f99581e701145e7d10149766560c1dd521b25eabc0906c6503b2f2788858
 SHA512:
-  metadata.gz: 6234c4eeb92cc4a76c59836f7292e1c806526909e0a74d7dfa5a7a21631c56af1f041d7a149878013def8a9d6ceebd74b2f848d27a4caaec69702742a7807a74
-  data.tar.gz: d825858a3dd19251ee4dfaaddaef4aef8e338dfc9d6219be66119a298fc149ff3a7db2fc400051ee699a7d30bc6e11b8152597b55b2fa9963b82f1456e500190
+  metadata.gz: c6ff47d3b1b4a128d3c50242bcb84410af5832041881258c5403dab219504796c7d603e7da7d0647f2bde1d4a9324c8acb88fa4aa8d58d6d275b7f2c876876d1
+  data.tar.gz: 35ae5b62523e898090932b2c2a3356f7e7e17136e1d1472ee14347c3940fcddc3c3856eca4ee6316b979fdc678eca2738538163fadc11242a65bd9bafcb707ab

data/.github/workflows/rake.yml

@@ -1,7 +1,6 @@
 # see also https://github.com/whitequark/parser/blob/master/.github/workflows/test.yml
 name: Rake
 
-#on: [push, pull_request]
 on: [push]
 
 jobs:
@@ -9,16 +8,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-#        os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-#        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby, jruby-head, truffleruby, truffleruby-head]
-        ruby: ["2.7.2", "2.7.3", "3.0.1"]
+        ruby: ["2.7", "3.0", "3.2", head]
         test_command: ["bundle exec rake test"]
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.gitignore

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

data/.ruby-gemset

@@ -1 +1 @@
-rails-6.1
+rails-7.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.2
+ruby-3.2.2

data/.watchr

@@ -0,0 +1 @@
+/home/dk/shared/.watchr-gem

data/Gemfile

@@ -1,9 +1,10 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 group :test do
-  gem 'observr'
-  gem 'rubocop', require: false
-  gem 'simplecov', require: false
+  gem "observr"
+  gem "ricecream"
+  gem "standard", require: false
+  gem "simplecov", require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doit (1.0.2)
+    doit (1.0.3)
       micro-optparse (~> 1)
 
 GEM
@@ -9,48 +9,67 @@ GEM
   specs:
     ast (2.4.2)
     docile (1.4.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.0.0)
     micro-optparse (1.2.1)
-    minitest (5.14.4)
+    minitest (5.18.0)
     observr (1.0.5)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
-    rubocop (1.17.0)
+    ricecream (0.2.1)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.16.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    unicode-display_width (2.0.0)
+    simplecov_json_formatter (0.1.4)
+    standard (1.28.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50.2)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.0.1)
+    standard-custom (1.0.0)
+      lint_roller (~> 1.0)
+    standard-performance (1.0.1)
+      lint_roller (~> 1.0)
+      rubocop-performance (~> 1.16.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2)
   doit!
   micro-optparse (~> 1)
   minitest (~> 5)
   observr
   rake (~> 13)
-  rubocop
+  ricecream
   simplecov
+  standard
 
 BUNDLED WITH
-   2.2.17
+   2.4.10

data/LICENSE

@@ -1,18 +1,22 @@
-Copyright (c) 2014-2020 Dittmar Krall
+The MIT License (MIT)
 
-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 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
-the Software, and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
+Copyright (c) 2022-2023 Dittmar Krall (www.matiq.com)
 
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
+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 the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,5 +1,6 @@
-Doit
-====
+# Doit
+
+[![Gem Version](https://badge.fury.io/rb/doit.png)](http://badge.fury.io/rb/doit)
 
 Executes good old shell/bash scripts locally as well as remotely.
 The environment is set by a ".yml" configuration file.
@@ -9,18 +10,18 @@ The "where" in the configuration indicates where to run the script.
 
 See examples below.
 
-Installation
-------------
+## Installation
+
   gem install doit
 
-Usage
------
+## Usage
+
     doit script... [options]
     doit push
     doit deploy tag
 
-Options
--------
+## Options
+
     -l, --[no-]list          Lists available scripts
     -r, --remote ["host"]    remote host or comma separated hosts
     -e, --[no-]each          Lists each remote command (no execution)
@@ -31,16 +32,16 @@ Options
     -V, --version            Print version
 
 
-File Structure
---------------
+## File Structure
+
     ~/.doit/deploy          # chmod +x .doit/deploy
     ~/.doit/deploy.yml
     $PROJ/.doit/deploy.yml  # overwrites $HOME(~/) script/configuration
     $PROJ/.doit/push        # chmod +x .doit/push
     $PROJ/.doit/push.yml
 
-$PROJ/.doit/push
-----------------
+## $PROJ/.doit/push
+
     #! /bin/sh
     if ! (git status | grep 'nothing to commit'); then
       echo "push: commits are pending"
@@ -61,13 +62,13 @@ $PROJ/.doit/push
       ;;
     esac
 
-~/.doit/deploy
---------------
+## ~/.doit/deploy
+
     uname -a
     git status
 
-~/.doit/deploy.yml
-------------------
+## ~/.doit/deploy.yml
+
     env:
       - DIR=tmp OPTION=run
       - DIR=proj OPTION=list
@@ -75,4 +76,9 @@ $PROJ/.doit/push
       - bob@sample.com
       - alice@customer.com
 
-Copyright (c) 2014-2019 [Dittmar Krall], released under the MIT license.
+## Miscellaneous
+
+Copyright (c) 2014-2023 Dittmar Krall (www.matiq.com),
+released under the MIT license:
+
+* https://opensource.org/licenses/MIT

data/Rakefile

@@ -1,11 +1,11 @@
-require 'rake'
-require 'rake/testtask'
-require 'bundler/gem_tasks'
+require "rake"
+require "rake/testtask"
+require "bundler/gem_tasks"
 
 Rake::TestTask.new do |t|
-  t.libs.push 'test'
-  t.pattern = 'test/*_test.rb'
+  t.libs.push "test"
+  t.pattern = "test/*_test.rb"
 end
 
-desc 'Default: run unit tests.'
-task :default => :test
+desc "Default: run unit tests."
+task default: :test

data/bin/doit

@@ -1,24 +1,24 @@
 #! /usr/bin/env ruby
 
-lib = File.expand_path('../lib/', __dir__)
+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'
-require 'globals'
-require 'what'
+require "doit"
+require "micro-optparse"
+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 :silent, 'Run silently; suppress output'
-  p.option :verbose, 'Enable verbose output'
-  p.option :noop, 'Suppress execution of commannds'
+  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 :silent, "Run silently; suppress output"
+  p.option :verbose, "Enable verbose output"
+  p.option :noop, "Suppress execution of commannds"
 end.process!
 
 Doit.start(options)

data/doit.gemspec

@@ -1,28 +1,26 @@
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-require 'globals'
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+require "globals"
 
 Gem::Specification.new do |s|
-  s.name    = 'doit'
+  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'
-  s.homepage = 'http://www.matique.de'
-  s.license  = 'MIT'
+  s.authors = ["Dittmar Krall"]
+  s.email = "dittmar.krall@matiq.de"
+  s.homepage = "http://www.matiq.de"
+  s.metadata["source_code_uri"] = "https://github.com/matique/doit"
+  s.license = "MIT"
 
-  s.add_dependency 'micro-optparse', '~> 1'
+  s.add_dependency "micro-optparse", "~> 1"
 
-  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.files = `git ls-files`.split("\n")
+  s.executables = `git ls-files -- bin/*`
+    .split("\n").map { |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-  s.add_development_dependency 'bundler', '~> 2'
-  s.add_development_dependency 'rake', '~> 13'
-
-  s.add_development_dependency 'micro-optparse', '~> 1'
-  s.add_development_dependency 'minitest', '~> 5'
+  s.add_development_dependency "rake", "~> 13"
+  s.add_development_dependency "micro-optparse", "~> 1"
+  s.add_development_dependency "minitest", "~> 5"
 end

data/lib/doit.rb

@@ -1,20 +1,18 @@
-# rubocop: disable all
-
-require 'my'
-require 'run'
-require 'import'
+require "my"
+require "run"
+require "import"
+require "ricecream"
 
 Doit = Object.new
 class << Doit
-
   def start(options)
     @options = options
-    list  if options[:list]
+    list if options[:list]
 
     script = ARGV.shift
-    str = ARGV.map { |x| "\"#{x}\"" }.join(' ')
-    @argv = str.empty? ? '' : "set #{str}\n"
-    execute(script)  if script
+    str = ARGV.map { |x| "\"#{x}\"" }.join(" ")
+    @argv = str.empty? ? "" : "set #{str}\n"
+    execute(script) if script
   end
 
   def options
@@ -26,14 +24,14 @@ class << Doit
     hsh = Import.list
     hsh.sort.each { |abb, long|
       puts "#{abb}\t- #{long}"
-      next  unless options[:verbose]
+      next unless options[:verbose]
 
-      lines = `grep -i 'usage\\|summary' #{long} | grep '^#'`.split("\n")
+      lines = `grep -i "usage\\|summary" #{long} | grep "^#"`.split("\n")
       lines.each { |line|
-	next  unless line
-	next  if line.empty?
+        next unless line
+        next if line.empty?
 
-	puts "\t  #{line}"
+        puts "\t  #{line}"
       }
     }
   end
@@ -48,10 +46,11 @@ class << Doit
 
     What.where.each { |w| puts "doit #{name} -r #{w}" } if options[:each]
 
-    where_loop  unless options[:each]
+    where_loop unless options[:each]
   end
 
- private
+  private
+
   def where_loop
     What.where.each { |w|
       matrix_loop(w)
@@ -60,18 +59,17 @@ class << Doit
 
   def matrix_loop(where)
     What.matrix.each { |mm|
-      prefix = mm.empty? ? '' : "#{What.to_env(mm)}\n"
+      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, where
-        Run.info  if options[:verbose]
+        Run.info if options[:verbose]
         Run.run
       }
     }
   end
-
 end

data/lib/globals.rb

@@ -1,14 +1,14 @@
-# rubocop: disable all
-
 module Globals
-  VERSION = '1.0.2'     # 2021-06-26
-# VERSION = '1.0.1'     # 2021-04-21
-# VERSION = '1.0.0'     # 2020-10-26
-# VERSION = '0.3.9'     # 2020-07-17
-# VERSION = '0.3.8'     # 2020-02-26
-# VERSION = '0.3.7'     # 2019-10-15
-# 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'
+  VERSION = "1.0.4" # 2023-04-28
+  # VERSION = "1.0.3" # 2023-04-27
+  # VERSION = "1.0.2" # 2021-06-26
+  # VERSION = "1.0.1" # 2021-04-21
+  # VERSION = "1.0.0" # 2020-10-26
+  # VERSION = "0.3.9" # 2020-07-17
+  # VERSION = "0.3.8" # 2020-02-26
+  # VERSION = "0.3.7" # 2019-10-15
+  # 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,8 @@
-# rubocop: disable all
-
-require 'pathname'
-require 'erb'
+require "pathname"
+require "erb"
 
 Import = Object.new
 class << Import
-
   def script
     @script ||= nil
     @script
@@ -17,40 +14,41 @@ class << Import
   end
 
   def init(name)
-    @script  = read(name)
-    @config  = ERB.new(read("#{name}.yml") || '').result
+    @script = read(name)
+    @config = ERB.new(read("#{name}.yml") || "").result
     info
   end
 
-# returns Hash { 'pull' => '/home/dk/.doit/pull', ... }
+  # returns Hash { "pull" => "/home/dk/.doit/pull", ... }
   def list
     @list ||= list2
   end
 
   def info
-    return  unless Doit.options[:verbose]
+    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
+  private
+
   def list2
     res = {}
     Pathname.pwd.descend { |dir|
-      doit_dir = dir + '.doit'
-      next  unless File.directory?(doit_dir)
+      doit_dir = dir + ".doit"
+      next unless File.directory?(doit_dir)
 
       lst = []
       Dir.entries(doit_dir).each { |name|
-	name = File.join(doit_dir, name)
+        name = File.join(doit_dir, name)
 
-	next  unless File.executable?(name)
-	next  if     File.directory?(name)
+        next unless File.executable?(name)
+        next if File.directory?(name)
 
-	lst << name
+        lst << name
       }
-      lst.each { |itm|  res[File.basename(itm)] = itm }
+      lst.each { |itm| res[File.basename(itm)] = itm }
     }
     res
   end
@@ -62,9 +60,8 @@ class << Import
   def try_ascend(filename)
     Pathname.pwd.ascend { |dir|
       str = dir + filename
-      return File.read(str)  if File.exist?(str)
+      return File.read(str) if File.exist?(str)
     }
     nil
   end
-
 end

data/lib/my.rb

@@ -4,9 +4,9 @@ My = Object.new
 
 class << My
   def verbose(what, txt)
-    marker = '*' * 4
+    marker = "*" * 4
     arr = txt
-    arr = txt ? txt.split("\n") : '' unless txt.is_a?(Array)
+    arr = txt ? txt.split("\n") : "" unless txt.is_a?(Array)
     if arr.length > 1
       puts "#{marker} #{what} #{marker}"
       puts txt

data/lib/run.rb

@@ -1,45 +1,41 @@
-# rubocop: disable all
-
 Run = Object.new
 class << Run
-
   attr_reader :ssh
 
   def init(cmds, where)
-    aster = '*' * 24
+    aster = "*" * 24
     puts "#{aster} #{where} #{aster}"
     @ssh = nil
     @cmds = cmds
 
-    if where.include?('@')
-      arr = where.split(':')
+    if where.include?("@")
+      arr = where.split(":")
       host = arr.first
-      dir = arr.length > 1 ? arr.last : nil
+      dir = (arr.length > 1) ? arr.last : nil
     else
       host = nil
       dir = where
     end
 
-    @cmds = "cd; cd #{dir}\n" + @cmds  unless dir&.empty?
-    @ssh = "ssh #{host}"  if host
+    @cmds = "cd; cd #{dir}\n" + @cmds unless dir&.empty?
+    @ssh = "ssh #{host}" if host
   end
 
   def info
-    My.verbose('SSH', @ssh)
-    My.verbose('cmds', @cmds)
+    My.verbose("SSH", @ssh)
+    My.verbose("cmds", @cmds)
   end
 
   def run
-    here = '___EOS___'
-    silent = Doit.options[:silent] ? '>/dev/null' : ''
-    cmd = "cat <<'#{here}\' | #{@ssh} bash -i -l #{silent} 2>&1"
+    here = "___EOS___"
+    silent = Doit.options[:silent] ? ">/dev/null" : ""
+    cmd = "cat <<'#{here}' | #{@ssh} bash -i -l #{silent} 2>&1"
     cmds = "#{cmd}\n#{@cmds}#{here}\n"
 
     if Doit.options[:noop]
-      My.verbose('noop', cmds)
+      My.verbose("noop", cmds)
     else
       IO.popen(cmds) { |p| p.each { |f| puts f } }
     end
   end
-
 end

data/lib/what.rb

@@ -1,52 +1,50 @@
-# rubocop: disable all
-
-require 'yaml'
-require 'doit'
+require "yaml"
+require "doit"
 
 What = Object.new
 class << What
-
   attr_reader :matrix
   attr_reader :where
   attr_reader :env
 
   def init(config)
     @matrix = nil
-    @yml   = (config && YAML.load(config)) || {}
+    @yml = (config && YAML.load(config)) || {}
 
-    @where = @yml.delete('where')
-    @env   = @yml.delete('env')
-    @env ||= ['']
-    @env   = [@env].flatten.compact
+    @where = @yml.delete("where")
+    @env = @yml.delete("env")
+    @env ||= [""]
+    @env = [@env].flatten.compact
 
     remote = Doit.options[:remote]
-    @where   = remote  if remote && remote != '---'
-    @where ||= Dir.pwd   # default is current directory
-    @where   = [@where].flatten.compact
+    @where = remote if remote && remote != "---"
+    @where ||= Dir.pwd # default is current directory
+    @where = [@where].flatten.compact
 
     build_matrix
     @matrix ||= []
-    @matrix = [@matrix]  unless @matrix.first.is_a?(Array)
+    @matrix = [@matrix] unless @matrix.first.is_a?(Array)
     @matrix.map! { |m| m.flatten.inject({}) { |hsh, h| hsh.merge(h) } }
     info
   end
 
   def to_env(hsh)
     arr = hsh.collect { |key, value| "#{key.to_s.upcase}=#{value}" }
-    arr.join ' '
+    arr.join " "
   end
 
   def info
-    return  unless Doit.options[:verbose]
+    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
+  private
+
   def build_matrix
-    return  if @yml.empty?
+    return if @yml.empty?
 
     key, value = @yml.first
     @yml.delete(key)
@@ -56,9 +54,8 @@ class << What
 
   def add_to_matrix(key, val)
     arr = val.is_a?(Array) ?
-      val.collect { |v| [{ key => v }] } :
-      [{ key => val }]
+      val.collect { |v| [{key => v}] } :
+      [{key => val}]
     @matrix = @matrix ? @matrix.product(arr) : arr
   end
-
 end

data/test/doit_test.rb

@@ -1,53 +1,51 @@
-require 'test_helper'
+require "test_helper"
 
 describe Doit do
-
   before do
     Doit.start({})
   end
 
-  it 'start' do
+  it "start" do
     out = noop {}
-    assert_equal '', out
+    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')
+      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______')
+      Doit.execute("______unknown______")
     end
     assert_match(/not found/, out)
   end
 
-  it 'tests option --each' do
+  it "tests option --each" do
     out = noop(each: true) {
-      Doit.execute('hello')
+      Doit.execute("hello")
     }
     assert_match(/doit hello -r/, out)
   end
 
-  it 'coverage: list; option -lv' do
+  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
-
 end

data/test/import_test.rb

@@ -1,38 +1,36 @@
-require 'test_helper'
-require 'import'
-require 'doit'
-require 'my'
+require "test_helper"
+require "import"
+require "doit"
+require "my"
 
 describe Import do
-
-  it 'init fails with empty' do
-    assert_raises(Errno::EISDIR) { Import.init('') }
+  it "init fails with empty" do
+    assert_raises(Errno::EISDIR) { Import.init("") }
   end
 
-  it 'init' do
-    Import.init('hello')
+  it "init" do
+    Import.init("hello")
   end
 
-  it 'list' do
-    Import.init('hello')
-    assert_match(/\/\.doit\/hello$/, Import.list['hello'])
+  it "list" do
+    Import.init("hello")
+    assert_match(/\/\.doit\/hello$/, Import.list["hello"])
   end
 
-  it 'info' do
+  it "info" do
     out = noop(verbose: true) {
-	Import.init('hello')
-	Import.info
+      Import.init("hello")
+      Import.info
     }
     assert_match(/SCRIPT/, out)
     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
-
 end

data/test/my_test.rb

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

data/test/run_test.rb

@@ -1,58 +1,56 @@
-require 'test_helper'
-require 'run'
-require 'my'
-require 'doit'
+require "test_helper"
+require "run"
+require "my"
+require "doit"
 
 describe Run do
-
-  it 'coverage #info' do
+  it "coverage #info" do
     _out, _err = capture_io do
-      Run.init('', '')
+      Run.init("", "")
       Run.info
     end
   end
 
   it "where '' returns nil" do
     _out, _err = capture_io do
-      Run.init('', '')
+      Run.init("", "")
       assert_equal nil, Run.ssh
     end
   end
 
   it "where 'a' returns nil" do
     _out, _err = capture_io do
-      Run.init('', 'a')
+      Run.init("", "a")
       assert_equal nil, Run.ssh
     end
   end
 
   it "where 'a@b' returns 'ssh a@b'" do
     _out, _err = capture_io do
-      Run.init('', 'a@b')
-      assert_equal 'ssh a@b', Run.ssh
+      Run.init("", "a@b")
+      assert_equal "ssh a@b", Run.ssh
     end
   end
 
   it "where 'a@b:c' returns 'ssh a@b'" do
     _out, _err = capture_io do
-      Run.init('', 'a@b:c')
-      assert_equal 'ssh a@b', Run.ssh
+      Run.init("", "a@b:c")
+      assert_equal "ssh a@b", Run.ssh
     end
   end
 
-  it 'coverage #run' do
+  it "coverage #run" do
     _out, _err = capture_io do
-      Run.init('', '')
+      Run.init("", "")
       Run.run
     end
   end
 
-  it 'coverage #run noop' do
+  it "coverage #run noop" do
     out = noop {
-	Run.init('', '')
-	Run.run
+      Run.init("", "")
+      Run.run
     }
     assert_match(/EOS/, out)
   end
-
 end

data/test/test_helper.rb

@@ -1,18 +1,18 @@
-if ENV['COVERAGE']
-  require 'simplecov'
+if ENV["COVERAGE"]
+  require "simplecov"
   SimpleCov.start do
-    add_filter '/test/'
+    add_filter "/test/"
   end
 end
 
-require 'what'
+require "what"
 
-require 'minitest/autorun'
+require "minitest/autorun"
 
-def noop(options = { noop: true }, &block)
-  return 'noop: missing block' unless block
+def noop(options = {noop: true}, &block)
+  return "noop: missing block" unless block
 
-  out = '---'
+  out = "---"
   Doit.stub :options, options do
     out, _err = capture_io do
       yield

data/test/what_test.rb

@@ -1,44 +1,42 @@
-require 'test_helper'
-require 'my'
+require "test_helper"
+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
 
   it "#to_env({}) must be ''" do
-    assert_equal '', What.to_env({})
+    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.init("")
         What.info
       end
     end
   end
 
-  it 'builds simple matrix' do
+  it "builds simple matrix" do
     What.init("a: 1\n")
-    assert_equal [{ 'a' => 1 }], What.matrix
+    assert_equal [{"a" => 1}], What.matrix
   end
 
-  it 'builds matrix' do
+  it "builds matrix" do
     What.init("a:\n - 1\n - 2\n")
-    assert_equal [{ 'a' => 1 }, { 'a' => 2 }], What.matrix
+    assert_equal [{"a" => 1}, {"a" => 2}], What.matrix
   end
 
-  it 'builds product matrix' do
+  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
+    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: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-26 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micro-optparse
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 description: Run good old shell/bash scripts locally or remotely(ssh).
-email: dittmar.krall@matique.de
+email: dittmar.krall@matiq.de
 executables:
 - doit
 extensions: []
@@ -91,10 +77,8 @@ files:
 - ".doit/hello.yml"
 - ".github/workflows/rake.yml"
 - ".gitignore"
-- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - ".watchr"
 - Gemfile
 - Gemfile.lock
@@ -115,10 +99,11 @@ files:
 - test/run_test.rb
 - test/test_helper.rb
 - test/what_test.rb
-homepage: http://www.matique.de
+homepage: http://www.matiq.de
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/matique/doit
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -134,14 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Simple local & remote script executor
-test_files:
-- test/doit_test.rb
-- test/import_test.rb
-- test/my_test.rb
-- test/run_test.rb
-- test/test_helper.rb
-- test/what_test.rb
+test_files: []

data/.rubocop.yml

@@ -1,11 +0,0 @@
-inherit_from:
-  - ~/configs/.rubocop.yml
-
-AllCops:
-  NewCops: enable
-  Include:
-    - 'lib/**/*.rb'
-
-  Exclude:
-    - 'bin/**/*'
-    - 'test/**/*'

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-
-#bundler_args: --without production
-bundle config set without production
-script: "bundle exec rake test"
-
-rvm:
-   - 2.7.2  # 2020-10-26
-#  - 2.6.6  # 2020-07-17
-#  - 2.6.5  # 2019-10-29
-#  - 2.6.4  # 2019-10-15
-#  - 2.6.3  # 2019-06-21
-#  - 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
-
-notifications:
-  email: false

data/.watchr

@@ -1,58 +0,0 @@
-TESTING = %w[test]
-HH = '#' * 22  unless defined?(HH)
-H = '#' * 5    unless defined?(H)
-
-def usage
-  puts <<-EOS
-  Ctrl-\\ or ctrl-4   Running all tests
-  Ctrl-C             Exit
-  EOS
-end
-
-def run(cmd)
-  puts "#{HH} #{Time.now} #{HH}"
-  puts "#{H} #{cmd}"
-  system "/usr/bin/time --format '#{HH} Elapsed time %E' #{cmd}"
-end
-
-def run_it(type, file)
-  case type
-  when 'test';  run %(bundle exec ruby -I test #{file})
-  else;         puts "#{H} unknown type: #{type}, file: #{file}"
-  end
-end
-
-def run_all_tests
-  puts "\n#{HH} Running all tests #{HH}\n"
-  TESTING.each { |dir| run "bundle exec rake #{dir}" if  File.exist?(dir) }
-end
-
-def run_matching_files(base)
-  base = base.split('_').first
-  TESTING.each { |type|
-    files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
-    run_it type, files.join(' ')  unless files.empty?
-  }
-end
-
-TESTING.each { |type|
-  watch("#{type}/#{type}_helper\.rb") { run_all_tests }
-  watch('lib/.*\.rb')                 { run_all_tests }
-  watch("#{type}/.*/*_#{type}\.rb")   { |match| run_it type, match[0] }
-  watch("#{type}/data/(.*)\.rb") { |match|
-    m1 = match[1]
-    run_matching_files("#{type}/#{m1}/#{m1}_#{type}.rb")
-  }
-}
-
-%w[rb erb haml slim].each { |type|
-  watch("app/.*/(.*)\.#{type}") { |match|
-    run_matching_files(match[1])
-  }
-}
-
-# Ctrl-\ or ctrl-4
-    Signal.trap('QUIT') { run_all_tests }
-# Ctrl-C
-    Signal.trap('INT')  { abort("Interrupted\n") }
-usage