doit 0.3.6 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab3e45ae5cd8368470a2f596274de76dace66dcbdf5179a36e72f0829593b7f6
-  data.tar.gz: 7639c595a1c200e7d6dcbae89272cbde935f1c391082a0cf2256329b724b3e46
+  metadata.gz: 3b8c68afcf5f77a8417f547416d04bdc90c38f0cda47ec2614cb83367c472d31
+  data.tar.gz: ffad2c5f2b2e7ba683bf881d0214832ac61ac0c4a32c0136a0fde6ee24bb9de0
 SHA512:
-  metadata.gz: 4469bb7cb6e1ed2d38830da1ea11570f90a398f04a4a9ad11d8c42a443cc9e3d2d3b9b71643a0964836a8d5def2781203255ffa36e16d0db9eef1e101144e529
-  data.tar.gz: 5440ec7f1a51ae549dac16cde73dc968b5488dbb0a2cc28a64969b092c86016cba03e90b9e16a1cde15dfc582a1fba3c3b5bad1009128bc1c56b563470790873
+  metadata.gz: 46c1dbc104ca4cfbf6b4045fd32ca1fb7709d74a4c4d5fe5c7bbeaa51d4ee3e13239a3b9bf69ac265e3bab24ec20b07140b340fe5f0495713213d875ef348d37
+  data.tar.gz: 67253a363b7fe882dd385c2cbd1738b5335c79c9332a882cc44be8ff870c223aa22acd4820c15973e5522c0a467da20cc6597223c17bd88402adc2f5c8f23a5f

data/.rubocop.yml

@@ -1,74 +1,10 @@
-# inherit_from: .rubocop_todo.yml
-
-# inherit_from: .rubocop_todo.yml
-
-# rubocop --auto-gen-config
-# rubocop
-# rubocop:disable all
-
-#inherit_from: .rubocop_todo.yml
+inherit_from:
+  - ~/configs/.rubocop.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'
-
-
-
-
+    - 'bin/**/*'
+    - 'test/**/*'

data/.ruby-gemset

@@ -1 +1 @@
-rails-5.2
+rails-6.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.1
+ruby-2.6.6

data/.travis.yml

@@ -5,7 +5,11 @@ bundler_args: --without production
 script: "bundle exec rake test"
 
 rvm:
-  - 2.6.1
+  - 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

data/.watchr

@@ -16,33 +16,38 @@ 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"  #{file}}
-  when 'spec';  run %Q{spring rspec -X #{file}}
+  when 'test';  run %Q(ruby -I"lib:test" -r rubygems #{file})
+#  when 'test';  run %(rails test #{file})
+  when 'spec';  run %(spring rspec -X #{file})
   else;         puts "#{H} unknown type: #{type}, file: #{file}"
   end
 end
 
 def run_all_tests
   puts "\n#{HH} Running all tests #{HH}\n"
-  %w{test}.each { |dir| run "rake #{dir}"  if  File.exists?(dir) }
+  system "spring stop"
+  %w[test].each { |dir| run "rails #{dir}"  if  File.exist?(dir) }
 end
 
 def run_matching_files(base)
   base = base.split('_').first
-  %w{test spec}.each { |type|
+  %w[test spec].each { |type|
     files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
     run_it type, files.join(' ')  unless files.empty?
   }
 end
 
-%w{test spec}.each { |type|
+%w[test spec].each { |type|
   watch("#{type}/#{type}_helper\.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(".*/.*\.#{type}") { |m|
-    run_matching_files("#{m[0].split('/').last.split('.').first}")
+%w[rb erb haml slim].each { |type|
+  watch("app/.*/(.*)\.#{type}") { |match|
+    run_matching_files(match[1])
   }
 }
 

data/Gemfile

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

data/Gemfile.lock

@@ -1,33 +1,54 @@
 PATH
   remote: .
   specs:
-    doit (0.3.5)
+    doit (0.3.9)
       micro-optparse (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    docile (1.3.1)
-    json (2.2.0)
+    ast (2.4.1)
+    docile (1.3.2)
     micro-optparse (1.2.1)
-    minitest (5.11.3)
-    rake (12.3.2)
-    simplecov (0.16.1)
+    minitest (5.14.1)
+    observr (1.0.5)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rubocop (0.88.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (~> 2)
   doit!
   micro-optparse (~> 1)
-  minitest
-  rake
+  minitest (~> 5)
+  observr
+  rake (~> 13)
+  rubocop
   simplecov
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2019 Dittmar Krall
+Copyright (c) 2014-2020 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

@@ -36,7 +36,7 @@ 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/deploy
+    $PROJ/.doit/push        # chmod +x .doit/push
     $PROJ/.doit/push.yml
 
 $PROJ/.doit/push

data/bin/doit

@@ -10,15 +10,15 @@ require 'globals'
 require 'what'
 
 options = Parser.new do |p|
-   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.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'
 end.process!
 
 Doit.start(options)

data/doit.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |s|
                     .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 'bundler', '~> 2'
+  s.add_development_dependency 'rake', '~> 13'
 
   s.add_development_dependency 'micro-optparse', '~> 1'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'minitest', '~> 5'
 end

data/lib/doit.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# rubocop: disable all
 
 require 'my'
 require 'run'

data/lib/globals.rb

@@ -1,8 +1,11 @@
-# frozen_string_literal: true
+# rubocop: disable all
 
 module Globals
-  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 = '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,4 +1,4 @@
-# frozen_string_literal: true
+# rubocop: disable all
 
 require 'pathname'
 require 'erb'

data/lib/my.rb

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

data/lib/run.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# rubocop: disable all
 
 Run = Object.new
 class << Run

data/lib/what.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# rubocop: disable all
 
 require 'yaml'
 require 'doit'
@@ -26,7 +26,7 @@ class << What
 
     build_matrix
     @matrix ||= []
-    @matrix = [@matrix]  unless Array === @matrix.first
+    @matrix = [@matrix]  unless @matrix.first.is_a?(Array)
     @matrix.map! { |m| m.flatten.inject({}) { |hsh, h| hsh.merge(h) } }
     info
   end
@@ -55,7 +55,7 @@ class << What
   end
 
   def add_to_matrix(key, val)
-    arr = Array === val ?
+    arr = val.is_a?(Array) ?
       val.collect { |v| [{ key => v }] } :
       [{ key => val }]
     @matrix = @matrix ? @matrix.product(arr) : arr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doit
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.9
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micro-optparse
@@ -28,30 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: micro-optparse
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 description: Run good old shell/bash scripts locally or remotely(ssh).
 email: dittmar.krall@matique.de
 executables:
@@ -147,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Simple local & remote script executor