doit 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3e55b5782a334d1ace53286a138bdd935a4d09
-  data.tar.gz: 4fa3b68d8f34263279ae3dff8e1d87a1c7dfbfa0
+  metadata.gz: 3bc140e881b43c004f6a23f5b200d098dc7e4359
+  data.tar.gz: 9475f4ed399cd3ebf2dfd227b436da2a434ae7a3
 SHA512:
-  metadata.gz: ded0af93c825b472874ea32daae00c5e0821ad0132c474fc308d6354e174ed782a1d28a6e5f6548de84cd5e9d7d3f6500104a800970a12a84502d6c72e0bfb39
-  data.tar.gz: 59310dd1e3791d555998cd37e042247a6c558c79699b3e0c7c8ee308c9536e9640085daa3e4df19465076aab2ea0a4532a06e6844baf1bc9943e662454355216
+  metadata.gz: 13bfdfd39a32bf91c75c033bd472634a4df85b469429b20e21294cce80b1021ebec9837fe48bd4679a0c5174409b7accdd74cec8d781598a5a8dd42c5bc0db70
+  data.tar.gz: ca8a31bc0293c45becb74cbd990aac41c5c67d910042f99bc18ec090dcd2096a6a4a2b5bf29b2713649f39d85066edd9c2e074e48505e847237867c1fe6fb0e1

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/.ruby-gemset

@@ -0,0 +1 @@
+rails-5.1

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.0
+ruby-2.5.0

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 sudo: false
+
 rvm:
-  - 2.0.0
-  - 2.2.3
+  - 2.5.0
+  - 2.4.1
+  - 2.3.0
+#  - 2.2.3  # tested; no longer in CI
+#  - 2.0.0  # tested; no longer in CI
 
 notifications:
   email: false

data/Gemfile

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

data/Gemfile.lock

@@ -1,31 +1,38 @@
 PATH
   remote: .
   specs:
-    doit (0.3.0)
+    doit (0.3.2)
       micro-optparse (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     docile (1.1.5)
-    json (1.8.3)
-    micro-optparse (1.2.0)
-    minitest (5.8.4)
-    observr (1.0.5)
-    rake (10.5.0)
-    simplecov (0.11.1)
+    json (2.1.0)
+    micro-optparse (1.2.1)
+    minitest (5.11.3)
+    rake (12.3.0)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    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
 
 DEPENDENCIES
+  bundler
   doit!
-  micro-optparse
   minitest
-  observr
   rake
   simplecov
+  slim
+
+BUNDLED WITH
+   1.16.1

data/LICENSE

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

@@ -23,12 +23,14 @@ 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)
     -s, --[no-]silent        run silently; suppress output
     -v, --[no-]verbose       Enable verbose output
     -n, --[no-]noop          Suppress execution of commannds
     -h, --help               Show this message
     -V, --version            Print version
 
+
 File Structure
 --------------
     ~/.doit/deploy          # chmod +x .doit/deploy
@@ -73,4 +75,4 @@ $PROJ/.doit/push
       - bob@sample.com
       - alice@customer.com
 
-Copyright (c) 2014-2016 [Dittmar Krall], released under the MIT license
+Copyright (c) 2014-2017 [Dittmar Krall], released under the MIT license

data/bin/doit

@@ -6,6 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 require 'doit'
 require 'micro-optparse'
 require 'globals'
+require 'what'
 
 options = Parser.new do |p|
    p.banner = "Usage: doit script... [options] # execute locally or remotely"

data/doit.gemspec

@@ -1,22 +1,29 @@
 $:.push File.expand_path("../lib", __FILE__)
 require 'globals'
 
-Gem::Specification.new do |gem|
-  gem.name    = 'doit'
-  gem.version = Globals::VERSION
-  gem.summary = "Simple local & remote script executor"
-  gem.description = "Run good old shell/bash scripts locally or remotely(ssh)."
+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)."
 
-  gem.authors  = ['Dittmar Krall']
-  gem.email    = 'dittmar.krall@matique.de'
-  gem.homepage = 'http://www.matique.de'
-  gem.license  = 'MIT'
+  s.authors  = ['Dittmar Krall']
+  s.email    = 'dittmar.krall@matique.de'
+  s.homepage = 'http://www.matique.de'
+  s.license  = 'MIT'
 
-  gem.add_dependency 'micro-optparse', '~> 1'
+  s.add_dependency 'micro-optparse', '~> 1'
 
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- test`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.require_paths = ["lib"]
+  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.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 'minitest'
+  s.add_development_dependency 'simplecov'
 end

data/lib/doit.rb

@@ -1,7 +1,6 @@
 require 'my'
 require 'run'
 require 'import'
-require 'what'
 
 Doit = Object.new
 class << Doit
@@ -17,7 +16,8 @@ class << Doit
   end
 
   def options
-    @options || {}
+    @options ||= {}
+    @options
   end
 
   def list

data/lib/globals.rb

@@ -1,3 +1,3 @@
 module Globals
-  VERSION = '0.3.0'
+  VERSION = '0.3.2'
 end

data/lib/import.rb

@@ -4,8 +4,8 @@ require 'erb'
 Import = Object.new
 class << Import
 
-  def script;  @script;  end
-  def config;  @config;  end
+  def script;  @script ||= nil; @script;  end
+  def config;  @config ||= nil; @config;  end
 
   def init(name)
     @script  = read(name)
@@ -54,7 +54,7 @@ class << Import
   def try_ascend(filename)
     Pathname.pwd.ascend { |dir|
       str = dir + filename
-      return File.read(str)  if File.exists?(str)
+      return File.read(str)  if File.exist?(str)
     }
     nil
   end

data/test/doit_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'doit'
 
 describe Doit do
 
@@ -20,35 +19,35 @@ describe Doit do
     out = noop {
       Doit.list
     }
-    assert_match /\/\.doit/, out
+    assert_match(/\/\.doit/, out)
   end
 
   it "execute" do
-    out, err = capture_io do
+    out, _err = capture_io do
       Doit.execute('hello')
     end
-    assert_match /\nHello\n/, out
+    assert_match(/\nHello\n/, out)
   end
 
   it "execute with unknown script" do
-    out, err = capture_io do
+    out, _err = capture_io do
       Doit.execute('______unknown______')
     end
-    assert_match /not found/, out
+    assert_match(/not found/, out)
   end
 
   it "tests option --each" do
     out = noop({each: true}) {
       Doit.execute('hello')
     }
-    assert_match /doit hello -r/, out
+    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})
     }
-    assert_match /just a test\n/, out
+    assert_match(/just a test\n/, out)
   end
 
 end

data/test/import_test.rb

@@ -15,7 +15,7 @@ describe Import do
 
   it "list" do
     Import.init('hello')
-    assert_match /\/\.doit\/hello$/, Import.list['hello']
+    assert_match(/\/\.doit\/hello$/, Import.list['hello'])
   end
 
   it "info" do
@@ -23,8 +23,8 @@ describe Import do
 	Import.init('hello')
 	Import.info
     }
-    assert_match /SCRIPT/, out
-    assert_match /CONFIG/, out
+    assert_match(/SCRIPT/, out)
+    assert_match(/CONFIG/, out)
   end
 
   it "coverage: script" do

data/test/my_test.rb

@@ -5,18 +5,18 @@ describe My 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
     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

@@ -6,42 +6,42 @@ require 'doit'
 describe Run do
 
   it "coverage #info" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       Run.init('', '')
       Run.info
     end
   end
 
   it "where '' returns nil" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       Run.init('', '')
       assert_equal nil, Run.ssh
     end
   end
 
   it "where 'a' returns nil" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       Run.init('', 'a')
       assert_equal nil, Run.ssh
     end
   end
 
   it "where 'a@b' returns 'ssh a@b'" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       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
+    _out, _err = capture_io do
       Run.init('', 'a@b:c')
       assert_equal 'ssh a@b', Run.ssh
     end
   end
 
   it "coverage #run" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       Run.init('', '')
       Run.run
     end
@@ -52,7 +52,7 @@ describe Run do
 	Run.init('', '')
 	Run.run
     }
-    assert_match /EOS/, out
+    assert_match(/EOS/, out)
   end
 
 end

data/test/test_helper.rb

@@ -4,6 +4,8 @@ SimpleCov.start do
   command_name 'Minitest'
 end
 
+require 'what'
+
 require 'minitest/autorun'
 
 def noop(options = {noop: true}, &block)
@@ -11,7 +13,7 @@ def noop(options = {noop: true}, &block)
 
   out = '---'
   Doit.stub :options, options do
-    out, err = capture_io do
+    out, _err = capture_io do
       block.call
     end
   end

data/test/what_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'what'
 require 'my'
 
 describe What do
@@ -20,7 +19,7 @@ describe What do
 
   it "coverage: #info" do
     Doit.stub :options, {verbose: true} do
-      out, err = capture_io do
+      _out, _err = capture_io do
 	What.init('', '')
 	What.info
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micro-optparse
@@ -24,6 +24,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: rake
+  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: slim
+  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: 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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Run good old shell/bash scripts locally or remotely(ssh).
 email: dittmar.krall@matique.de
 executables:
@@ -33,6 +103,8 @@ extra_rdoc_files: []
 files:
 - ".doit/hello"
 - ".doit/hello.yml"
+- ".gitignore"
+- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - ".watchr"
@@ -75,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Simple local & remote script executor