blower 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40847731e80163a484abde1221b6262ae1dda13a
-  data.tar.gz: 3de0f99403ec2cba21482643e0972810e77252c0
+  metadata.gz: 9cfbaaa18cbeed95710091e851f7869055d0adb3
+  data.tar.gz: 5dba28a766c20b2c622a814687fe6defdc825982
 SHA512:
-  metadata.gz: 850978d570b60a14a329f8e574377d72b4d6b76b6418e4657ec90118d64c00cca4dd71af8dad17077e3d37b919d9b5620f4461eb9ca578e38a3ff5cf343cc9e9
-  data.tar.gz: 8c97ad6a254327b696061f16f9457e9a540465e20dd13b1b1bc9d9910cfd99908877283d2bb67e47be4b9fd78da626691ff7b60e8e96b48bf9c66c128df88217
+  metadata.gz: 720985c8137a5283d7b9909c767b39342d06b87ed8d83866f595ac44f18ccd86b6ce7286aca31bc4a54ba3246f148d5ddf63fc43b6351510d3d5100df84aa668
+  data.tar.gz: f6b2a4d82dc3ffc7ff803a082a8f1374e52b20f7f95c843aa8265197613f63dbec6d89d20962354da9441535bf5cd5458acab48d68408bbd5646fc426f621bec

data/lib/blower/context.rb

@@ -28,30 +28,30 @@ module Blower
     def add_host (spec)
       host = Host.new(*spec) unless spec.is_a?(Host)
       @hosts << host
+      host
     end
 
-    # Execute the block on one host.
-    # @param host Host to use. If nil, a random host is picked.
-    def one_host (host = nil, &block)
-      map [host || target.hosts.sample], &block
-    end
-
-    # Execute the block once for each host.
-    # Each block executes in a copy of the context.
+    # Execute the block once for each host and return nil.
     def each (hosts = @hosts, &block)
-      map(hosts, &block)
-      nil
+      Kernel.fail "No hosts left" if hosts.empty?
+      Enumerator.new do |y|
+        hosts.each do |host|
+          y << host
+        end
+      end.each(&block)
     end
 
-    # Execute the block once for each host.
-    # Each block executes in a copy of the context.
-    def map (hosts = @hosts, &block)
-      Kernel.fail "No hosts left" if hosts.empty?
-      hosts.map do |host|
-        Thread.new do
-          block.(host)
+    # Execute the block once for each host and return a hash of the results.
+    def hashmap (hosts = @hosts, &block)
+      result = {}
+      threads = []
+      each hosts do |host|
+        threads << Thread.new do
+          result[host] = block.(host)
         end
-      end.map(&:join)
+      end
+      threads.each(&:join)
+      result
     end
 
     # Reboot each host and waits for them to come back up.
@@ -64,6 +64,8 @@ module Blower
         end
         log.debug "Waiting for server to go away..."
         sleep 0.1 while ping(true)
+      end
+      each do
         log.debug "Waiting for server to come back..."
         sleep 1.0 until ping(true)
       end
@@ -72,9 +74,16 @@ module Blower
     # Execute a shell command on each host.
     def sh (command, quiet = false)
       log.info "sh: #{command}" unless quiet
-      map do |host|
-        status = host.sh(command)
-        fail host, "#{command}: exit status #{status}" if status != 0
+      win = true
+      hashmap do |host|
+        out = ""
+        status = host.sh(command, out)
+        if status != 0
+          fail host, "#{command}: exit status #{status}"
+          nil
+        else
+          out
+        end
       end
     end
 
@@ -83,7 +92,7 @@ module Blower
     def sh? (command, quiet = false)
       log.info "sh?: #{command}" unless quiet
       win = true
-      map do |host|
+      each do |host|
         status = host.sh(command)
         win = false if status != 0
       end
@@ -95,7 +104,7 @@ module Blower
     def ping (quiet = false)
       log.info "ping" unless quiet
       win = true
-      map do |host|
+      each do |host|
         win &&= host.ping
       end
       win
@@ -110,7 +119,7 @@ module Blower
     # @param to A string.
     def cp (from, to)
       log.info "cp: #{from} -> #{to}"
-      map do |host|
+      each do |host|
         host.cp(from, to)
       end
     end
@@ -123,14 +132,6 @@ module Blower
       target.cp(StringIO.new(string), to)
     end
 
-    # Capture the output a command on the remote host.
-    # @return (String) The combined stdout and stderr of the command.
-    def capture (command)
-      stdout = ""
-      target.sh(command, stdout)
-      stdout
-    end
-
     # Run a task.
     # @param task (String) The name of the task
     def run (task, optional: false)

data/lib/blower/host.rb

@@ -102,7 +102,7 @@ module Blower
     end
 
     # Execute the block with self as a parameter.
-    # Exists to confirm with the HostGroup interface.
+    # Exists to conform with the HostGroup interface.
     def each (&block)
       block.(self)
     end

data/lib/blower/version.rb

@@ -1,3 +1,3 @@
 module Blower
-  VERSION = "2.1.3"
+  VERSION = "2.2.0"
 end

data/lib/blower.rb

@@ -1,5 +1,4 @@
 require 'blower/logger'
 require 'blower/context'
 require 'blower/host'
-require 'blower/mock_host'
 require 'blower/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blower
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -78,7 +78,6 @@ files:
 - lib/blower/context.rb
 - lib/blower/host.rb
 - lib/blower/logger.rb
-- lib/blower/mock_host.rb
 - lib/blower/version.rb
 homepage: http://www.github.org/nbaum/blower
 licenses:

data/lib/blower/mock_host.rb

@@ -1,42 +0,0 @@
-module Blower
-
-  class MockHost
-    extend Forwardable
-
-    attr_accessor :log
-    attr_accessor :data
-
-    def_delegators :data, :[], :[]=
-
-    def initialize (name)
-      @log = Logger.new("mock #{name.ljust(15)} | ")
-      @data = {}
-    end
-
-    def sh (command, stdout: nil, stdin: nil)
-      log.info command
-      sleep rand * 0.1
-    end
-
-    def cp (from, to, quiet: false)
-      if from.is_a?(String)
-        to += File.basename(from) if to[-1] == "/"
-        log.info "#{from} -> #{to}" unless quiet
-      elsif from.is_a?(Array)
-        to += "/" unless to[-1] == "/"
-        log.info "#{from.join(", ")} -> #{to}" unless quiet
-      elsif from.is_a?(StringIO) or from.is_a?(IO)
-        log.info "string -> #{to}" unless quiet
-      else
-        fail "Don't know how to copy a #{from.class}: #{from}"
-      end
-      sleep rand * 0.1
-    end
-
-    def each (&block)
-      block.(self)
-    end
-
-  end
-
-end