blower 4.2 → 4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55806c505a65e5ffaee6b32452ce71a5e0b624e
-  data.tar.gz: fca7868031a386caf0f1d3d6163c0a02a0af4c02
+  metadata.gz: a923b0167ae5ee7acc8461d3929b7001134f93a2
+  data.tar.gz: 2647d91696288ef1ea8cba942c6dc9b467e36f23
 SHA512:
-  metadata.gz: 092f012a5b3f1732a89be2488415da2f1a8d544ec65c91d21084b2d6cfb34edb3b4f8b100ead6d121a94d00c2c2a376296fda57094a5fff2b2e1c36d12b8b42e
-  data.tar.gz: ded113687dbc5a0fc3a5a82e8a5dc351a7e2c3c649fc72d3800bd70660175a358e9f3a9ddc98ca5d0e4ec78d03c07e20d2fb5da02eef322b2d4b5493a273e683
+  metadata.gz: de25c87aadad63fa9b007224836be6bc2c83b0a5c62bea88f3a00c972e8ed3cdb00f7c5de1668802915a33bb63294ed57ed5b7d1190a6b937b572df03ecd7b34
+  data.tar.gz: bfeab889da3cdde2b2f5e9b26a1ddfecb948699b2095918cfd1103d7b17607fd0ae615abd0d96580f2bee0c5f4771cd1a829997dc02e8638767c7f75416c981d

data/bin/blow

@@ -6,6 +6,7 @@ require 'optparse'
 path = []
 
 OptionParser.new do |opts|
+  Version = Blower::VERSION
   opts.banner = "Usage: blow [options] task..."
   opts.on "-d DIR", "Set working directory" do |v|
     Dir.chdir v
@@ -16,10 +17,6 @@ OptionParser.new do |opts|
   opts.on "-I DIR", "Add directory to search path" do |v|
     path << v
   end
-  opts.on "-v", "Show version and exit" do |v|
-    puts "blow (blower) #{Blower::VERSION}"
-    exit
-  end
 end.order!
 
 $: << File.join(Dir.pwd, "lib")

data/lib/blower/context.rb

@@ -275,14 +275,17 @@ module Blower
 
     def each (hosts = self.hosts)
       fail "No hosts" if hosts.empty?
-      [hosts].flatten.each do |host|
-        begin
-          yield host
-        rescue => e
-          host.log.error e.message
-          hosts.delete host
+      threads = [hosts].flatten.map do |host|
+        Thread.new do
+          begin
+            yield host
+          rescue => e
+            host.log.error e.message
+            hosts.delete host
+          end
         end
       end
+      threads.each(&:join)
       fail "No hosts remaining" if hosts.empty?
     end
 

data/lib/blower/host.rb

@@ -62,7 +62,7 @@ module Blower
         [froms].flatten.each do |from|
           if from.is_a?(String)
             to += "/" if to[-1] != "/" && from.is_a?(Array)
-            command = ["rsync", "-e", "ssh -oStrictHostKeyChecking=no", "-r"]
+            command = ["rsync", "-e", ssh_command, "-r"]
             command += [*from, "#{as}@#{@address}:#{to}"]
             log.trace command.shelljoin, quiet: quiet
             IO.popen(command, in: :close, err: %i(child out)) do |io|
@@ -147,13 +147,21 @@ module Blower
     # Connect to the host as a Gateway
     # @api private
     def gateway ()
-      Net::SSH::Gateway(address, user)
+      Net::SSH::Gateway.new(address, user)
     end
 
     private
 
     attr_accessor :data
 
+    def ssh_command
+      if via
+        "ssh -t -A -oStrictHostKeyChecking=no #{via} ssh -oStrictHostKeyChecking=no"
+      else
+        "ssh -oStrictHostKeyChecking=no"
+      end
+    end
+
     def ssh (user)
       @sessions ||= {}
       if @sessions[user] && @sessions[user].closed?

data/lib/blower/plugin.rb

@@ -0,0 +1,22 @@
+module Blower
+
+  class Plugin
+    extend Forwardable
+
+    def_delegators :@context, *%i(get unset set with on as run sh cp read write render ping once)
+
+    def initialize (context)
+      @context = context
+    end
+
+  end
+
+  def self.plugin (name, &body)
+    Class.new(Plugin, &body).tap do |klass|
+      Context.send :define_method, name do
+        klass.new(self)
+      end
+    end
+  end
+
+end

data/lib/blower/version.rb

@@ -1,3 +1,3 @@
 module Blower
-  VERSION = "4.2"
+  VERSION = "4.3"
 end

data/lib/blower.rb

@@ -8,4 +8,5 @@ require 'blower/logger'
 require 'blower/errors'
 require 'blower/context'
 require 'blower/host'
+require 'blower/plugin'
 require 'blower/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blower
 version: !ruby/object:Gem::Version
-  version: '4.2'
+  version: '4.3'
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -93,6 +93,7 @@ files:
 - lib/blower/errors.rb
 - lib/blower/host.rb
 - lib/blower/logger.rb
+- lib/blower/plugin.rb
 - lib/blower/util.rb
 - lib/blower/version.rb
 homepage: http://www.github.org/nbaum/blower