doit 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d9aef9f7bf2563d6dbaf3125b06bb63f2c51c8
-  data.tar.gz: 927348c96fa1346a51c3f5ee19c0ca23db64698b
+  metadata.gz: 7e3e55b5782a334d1ace53286a138bdd935a4d09
+  data.tar.gz: 4fa3b68d8f34263279ae3dff8e1d87a1c7dfbfa0
 SHA512:
-  metadata.gz: 9d68dd4dec5bb8d71ba463b80fd99e545e531331dd275a277026377675a61b540e38dadc197177a298bd070985d4f613a02fcfd3259feb577c4b0574ee59a1b6
-  data.tar.gz: 52df7f1d400a16564168e1fb253020a17bf015877915fe3b7b22a5897ed69683d44745231cead599c5dd732b1f390248b537c3c57f0e580a71c40049e3b8f2c9
+  metadata.gz: ded0af93c825b472874ea32daae00c5e0821ad0132c474fc308d6354e174ed782a1d28a6e5f6548de84cd5e9d7d3f6500104a800970a12a84502d6c72e0bfb39
+  data.tar.gz: 59310dd1e3791d555998cd37e042247a6c558c79699b3e0c7c8ee308c9536e9640085daa3e4df19465076aab2ea0a4532a06e6844baf1bc9943e662454355216

data/.doit/hello

@@ -1,2 +1,3 @@
+# usage just a test
 echo Hello
 pwd

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.3
+ruby-2.2.0

data/.watchr

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doit (0.2.8)
+    doit (0.3.0)
       micro-optparse (~> 1)
 
 GEM
@@ -10,9 +10,9 @@ GEM
     docile (1.1.5)
     json (1.8.3)
     micro-optparse (1.2.0)
-    minitest (5.8.3)
+    minitest (5.8.4)
     observr (1.0.5)
-    rake (10.4.2)
+    rake (10.5.0)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -29,6 +29,3 @@ DEPENDENCIES
   observr
   rake
   simplecov
-
-BUNDLED WITH
-   1.10.6

data/README.md

@@ -5,6 +5,10 @@ Executes good old shell/bash scripts locally as well as remotely.
 The environment is set by a ".yml" configuration file.
 An array environment variable triggers multiple calls of the script.
 
+The "where" in the configuration indicates where to run the script.
+
+See examples below.
+
 Installation
 ------------
   gem install doit
@@ -29,12 +33,13 @@ File Structure
 --------------
     ~/.doit/deploy          # chmod +x .doit/deploy
     ~/.doit/deploy.yml
-    $PROJ/.doit/deploy.yml  # overwrites
+    $PROJ/.doit/deploy.yml  # overwrites $HOME(~/) script/configuration
     $PROJ/.doit/push        # chmod +x .doit/deploy
     $PROJ/.doit/push.yml
 
 $PROJ/.doit/push
 ----------------
+    #! /bin/sh
     if ! (git status | grep 'nothing to commit'); then
       echo "push: commits are pending"
       exit 1
@@ -68,4 +73,4 @@ $PROJ/.doit/push
       - bob@sample.com
       - alice@customer.com
 
-Copyright (c) 2014 [Dittmar Krall], released under the MIT license
+Copyright (c) 2014-2016 [Dittmar Krall], released under the MIT license

data/bin/doit

@@ -11,7 +11,8 @@ 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 :remote, 'Remote host or comma separated hosts', default: '---', optional: true
+   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'

data/lib/doit.rb

@@ -3,9 +3,10 @@ require 'run'
 require 'import'
 require 'what'
 
-class Doit
+Doit = Object.new
+class << Doit
 
-  def self.start(options)
+  def start(options)
     @options = options
     list  if options[:list]
 
@@ -15,11 +16,11 @@ class Doit
     execute(script)  if script
   end
 
-  def self.options
+  def options
     @options || {}
   end
 
-  def self.list
+  def list
     hsh = Import.list
     hsh.sort.each { |abb, long|
       puts "#{abb}\t- #{long}"
@@ -33,7 +34,7 @@ class Doit
     }
   end
 
-  def self.execute(name)
+  def execute(name)
     Import.init(name)
     unless Import.script
       puts "doit: script '#{name}' not found"
@@ -41,17 +42,21 @@ class Doit
     end
     What.init(Import.script, Import.config)
 
-    where_loop
+    What.where.each { |w|
+      puts "doit #{name} -r #{w}"
+    }  if options[:each]
+
+    where_loop  unless options[:each]
   end
 
  private
-  def self.where_loop
+  def where_loop
     What.where.each { |w|
       matrix_loop(w)
     }
   end
 
-  def self.matrix_loop(w)
+  def matrix_loop(w)
     What.matrix.each { |mm|
       prefix = mm.empty? ? '' : "#{What.to_env(mm)}\n"
 

data/lib/globals.rb

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

data/lib/import.rb

@@ -1,23 +1,24 @@
 require 'pathname'
 require 'erb'
 
-class Import
+Import = Object.new
+class << Import
 
-  def self.script;  @script;  end
-  def self.config;  @config;  end
+  def script;  @script;  end
+  def config;  @config;  end
 
-  def self.init(name)
+  def init(name)
     @script  = read(name)
     @config  = ERB.new(read("#{name}.yml") || '').result
     info
   end
 
 # returns Hash { 'pull' => '/home/dk/.doit/pull', ... }
-  def self.list
+  def list
     @list ||= list2
   end
 
-  def self.info
+  def info
     return  unless Doit.options[:verbose]
 
     My.verbose "SCRIPT", @script
@@ -26,7 +27,7 @@ class Import
 
 
  private
-  def self.list2
+  def list2
     res = {}
     Pathname.pwd.descend { |dir|
       doit_dir = dir + '.doit'
@@ -46,11 +47,11 @@ class Import
     res
   end
 
-  def self.read(name)
+  def read(name)
     try_ascend(".doit/#{name}")
   end
 
-  def self.try_ascend(filename)
+  def try_ascend(filename)
     Pathname.pwd.ascend { |dir|
       str = dir + filename
       return File.read(str)  if File.exists?(str)

data/lib/my.rb

@@ -1,6 +1,7 @@
-class My
+My = Object.new
+class << My
 
-  def self.verbose(what, txt)
+  def verbose(what, txt)
     marker = '*'*4
     arr = txt
     arr = txt ? txt.split("\n") : ''  unless Array === txt

data/lib/run.rb

@@ -1,8 +1,9 @@
-class Run
+Run = Object.new
+class << Run
 
-  def self.ssh; @ssh; end
+  def ssh; @ssh; end
 
-  def self.init(cmds, where)
+  def init(cmds, where)
     aster = '*'*24
     puts "#{aster} #{where} #{aster}"
     @ssh = nil
@@ -21,12 +22,12 @@ class Run
     @ssh = "ssh #{host}"  if host
   end
 
-  def self.info
+  def info
     My.verbose('SSH', @ssh)
     My.verbose('cmds', @cmds)
   end
 
-  def self.run
+  def run
     here = '___EOS___'
     silent = Doit.options[:silent] ? '>/dev/null' : ''
     cmd = "cat <<'#{here}\' | #{@ssh} bash -i -l #{silent} 2>&1"

data/lib/what.rb

@@ -1,13 +1,14 @@
 require 'yaml'
 require 'doit'
 
-class What
+What = Object.new
+class << What
 
-  def self.matrix;  @matrix;  end
-  def self.where;   @where;   end
-  def self.env;     @env;     end
+  def matrix;  @matrix;  end
+  def where;   @where;   end
+  def env;     @env;     end
 
-  def self.init(script, config)
+  def init(script, config)
     @matrix = nil
     @yml   = (config && YAML.load(config)) || {}
 
@@ -28,12 +29,12 @@ class What
     info
   end
 
-  def self.to_env(hsh)
+  def to_env(hsh)
     arr = hsh.collect { |key, value| "#{key.to_s.upcase}=#{value}" }
     arr.join ' '
   end
 
-  def self.info
+  def info
     return  unless Doit.options[:verbose]
 
     My.verbose "where",  @where
@@ -43,7 +44,7 @@ class What
 
 
  private
-  def self.build_matrix
+  def build_matrix
     unless @yml.empty?
       key, value = @yml.first
       @yml.delete(key)
@@ -52,7 +53,7 @@ class What
     end
   end
 
-  def self.add_to_matrix(key, val)
+  def add_to_matrix(key, val)
     arr = Array === val ? val.collect {|v| [{key => v}] } : [{key => val}]
     @matrix = @matrix ? @matrix.product(arr) : arr
   end

data/test/doit_test.rb

@@ -37,4 +37,18 @@ describe Doit do
     assert_match /not found/, out
   end
 
+  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})
+    }
+    assert_match /just a test\n/, out
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doit
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micro-optparse
@@ -33,7 +33,6 @@ extra_rdoc_files: []
 files:
 - ".doit/hello"
 - ".doit/hello.yml"
-- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - ".watchr"
@@ -76,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple local & remote script executor

data/.ruby-gemset

@@ -1 +0,0 @@
-rails-4.2