blower 3.3 → 3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d43f77f4efc9572fa69117d03e7793d8c869d4b3
-  data.tar.gz: 05327fae8c7b571f9772cc562e75374a62aa9503
+  metadata.gz: e2038dcb8532a933ded5b0e986f5c219a4d5749b
+  data.tar.gz: cf04e56b0a72200cfeceefeecbd4b2688e0f8b17
 SHA512:
-  metadata.gz: 7eaa7613ca255291f565ad486bed17bf9196be643ffbe82fd80f11b6267c96acab444947c1d56002c7b07a3b80ab51fca7f55bc91b25e35f0261ca38313cd715
-  data.tar.gz: be057592658bb8120745c9690e777c7a4652723b06b97ed555c9123a053f948881c526b77bf0c2a3e54d4f31b2dccef4323d1c9b3dcd8ca912077eec3307b52c
+  metadata.gz: 1de9c6423f7b5e3692c46b49ea69801a080ff8c770a49d5add4b447c1cee61fdb8a49f35ee1357651dd07ba524d8795898bc37a3c1b44fac33c5ed523569991d
+  data.tar.gz: a4bd0455c23e6ae2024d92e02f8ca958a139f1c2965b5f5dc8c66135ff72b23abdae682f0a113ee4c6c7f30e4fb265853c53b10e72c32dfa73cc3c721c9f88c5

data/bin/blow

@@ -7,11 +7,18 @@ $LOGLEVEL = :info
 
 OptionParser.new do |opts|
   opts.banner = "Usage: blow [options] task..."
-  opts.on "-d DIR", "Change directory" do |v|
+  opts.on "-d DIR", "Set working directory" do |v|
     Dir.chdir v
   end
-  opts.on "-l LEVEL", "Minimal log level" do |l|
-    $LOGLEVEL = l.downcase.to_sym
+  opts.on "-l LEVEL", "Minimal log level" do |v|
+    $LOGLEVEL = v.downcase.to_sym
+  end
+  opts.on "-I DIR", "Add directory to search path" do |v|
+    $LOGLEVEL = v.downcase.to_sym
+  end
+  opts.on "-v", "Show version and exit" do |v|
+    puts Blower::VERSION
+    exit
   end
 end.order!
 

data/lib/blower/context.rb

@@ -148,11 +148,11 @@ module Blower
 
     # Execute a command on the remote host.
     # @return false if the command exits with a non-zero status
-    def ping (quiet: false)
+    def ping (quiet: false, **args)
       log.debug "ping" unless quiet
       win = true
       each do |host|
-        win &&= host.ping
+        win &&= host.ping(**args)
       end
       win
     end
@@ -162,7 +162,7 @@ module Blower
     end
 
     def rebase_path (path)
-      path.gsub(/^(?!\/)/, File.dirname(@file) + "/")
+      path.gsub(/^(?!\/|.\/)/, File.dirname(@file) + "/")
     end
 
     # Copy a file or readable to the host filesystem.
@@ -213,7 +213,7 @@ module Blower
         name = File.join(dir, task)
         name += ".rb" unless File.exist?(name)
         if File.directory?(name)
-          dirtask = File.join(name, @task ? File.basename(@task) : @basename)
+          dirtask = File.join(name, @basename)
           dirtask += ".rb" unless File.exist?(dirtask)
           name = dirtask
           blowfile = File.join(name, "Blowfile")

data/lib/blower/host.rb

@@ -30,15 +30,15 @@ module Blower
       super()
     end
 
-    def ping
+    def ping (retries: 0)
       Timeout.timeout(1) do
         TCPSocket.new(address, 22).close
       end
       true
-    rescue Timeout::Error
-      false
-    rescue Errno::ECONNREFUSED
-      false
+    rescue Timeout::Error, Errno::ECONNREFUSED
+      return false if retries == 0
+      retries -= 1
+      retry
     end
 
     def cp (froms, to, output = "", user: nil, rsync_command: nil, sh_command: nil)

data/lib/blower/version.rb

@@ -1,3 +1,3 @@
 module Blower
-  VERSION = "3.3"
+  VERSION = "3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blower
 version: !ruby/object:Gem::Version
-  version: '3.3'
+  version: '3.4'
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh