gofer 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWNlZjlhNDIyYjAyMDAxMWMwNTRiMmFlN2ZjMjk4NGYzYmU4NDRlMQ==
+    NjZkNzBmMjZlMWI5ODk4MDE0ZDNmNTFlYzAxNjU4NTFlNzgyMDQ4NQ==
   data.tar.gz: !binary |-
-    YzA2ZmJkNGUzY2U5NmQwN2I4YTRmODIwMmY5OTJiOTk1ZmZjNjdmZQ==
+    ZjMwYjNmMTAwMWQ2NDJlOWUzZTE1MTdmODBkNjg2ZWVlMTQ2OTZiOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTBmYWFhOGEwODAzMzZhNGVhNWJmOTMyNDQ0N2FjMDc5ZjkwZjI3OWU2YmQx
-    ZjZkYTZlZmQ3MWYyMGE0MWFlM2FkODFjNTI1ZjE0MGMzYjY3MTEwMzc5ZGFk
-    OGQyYTZkZmE0OWQ3NjgzN2ExYmIxMTBkZjliZDE2YzM2ZWNmMTQ=
+    N2MwNTRkYzQzZDM4MGIyN2Q0ZTJmNmY3MDY2NWFhZTgwNTg2ZmFhOWU1OGRk
+    NWE3ZGRjZWJkMjM2OGFkOTA0Mjk4NTIyMDA4YTcwYjlhYWM0NmE1OWU2Mzdm
+    YzNlZjU1MzYxY2ExYWJkOGY5NTVjYmUxZGMzOGVlNzIzMzMwNzQ=
   data.tar.gz: !binary |-
-    MzU4MGRhMmM1ZWNlNWE4MWFiNzZkMmViZjk1MTNiYjJmMDI1ZmZjODM4NGM3
-    NGM3YjNhOTUzYmEyYjEwYjRiZGYyN2E2ZWRmM2E0YWEyMzdiOTQ1NTYyMWUz
-    M2Q4M2U4M2Q0YmVlYmZhYTVmMDJkMzA1MGUyYTMyNzM3YzE5NjM=
+    ZTYyNDAxYTU2MTdjNTQ1YWRjMjNmODFkYWI4MTA4YTVkYmQxZDlmMWIxMTE0
+    NTU2NmQ1MTJiOThkMTBkMjNhNGZhYzBjNTIwY2U2M2UzMGI0ZmU1MjVjYTAw
+    MDA1NmUxYWZlNzcxY2U5M2M2MTZmMzFmNGQzNjM1Zjc4OWI1YWE=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Revision History
 
+### v0.4.0
+
+  * Rework `Gofer::Cluster` to be a direct proxy, rather than requiring a block
+  * Add all `Gofer::Host` methods to the `Gofer::Cluster` proxy (@rich0h)
+
 ### v0.3.1
 
  * Prefix stderr/stdout per host with `:output_prefix`

data/README.md

@@ -90,13 +90,20 @@ cluster = Gopher::Cluster.new
 cluster << Gofer::Host.new('my.host.com', 'ubuntu', :keys => ['key.pem'], :output_prefix => "   my")
 cluster << Gofer::Host.new('other.host.com', 'ubuntu', :keys => ['key.pem'], :output_prefix => "other")
 
-cluster.run do |c|
-    c.run("hostname") # This will run on both hosts at once
-end
+# Run on all the hosts at once
+cluster.run "hostname"
 
-cluster.run(:max_concurrency => 1) do |c|
-    c.run("sudo /etc/init.d/apache2 restart") # This will run on one machine at a time
-end
+# Run on only one host at a time
+cluster.max_concurrency = 1
+cluster.run("sudo /etc/init.d/apache2 restart")
+
+# Run a command on only one host
+host = cluster.shuffle.first
+host.run("rake migrations")
+
+# Inspect the results from each host
+results = cluster.run "echo hostname"
+puts results.values.join(", ") # will print "my.host.com, other.host.com"
 ```
 
 ## Testing

data/lib/gofer/cluster.rb

@@ -2,72 +2,69 @@ require 'thread'
 
 module Gofer
   class Cluster
+
     attr_reader :hosts
     attr_accessor :max_concurrency
-    def initialize(parties=[])
+
+    def initialize(parties=[], opts={})
       @hosts = []
-      @max_concurrency = nil
+      @max_concurrency = opts.delete(:max_concurrency)
 
-      parties.each do |i|
-        self << i
-      end
+      parties.each { |i| self << i }
+    end
+
+    def concurrency
+      max_concurrency.nil? ? hosts.length : [max_concurrency, hosts.length].min
     end
 
     def <<(other)
       case other
       when Cluster
-        other.hosts.each do |host|
-          @hosts << host
-        end
+        other.hosts.each { |host| self << host }
       when Host
         @hosts << other
       end
     end
 
-    def run(opts={}, &block)
-      concurrency = opts[:max_concurrency] || max_concurrency || hosts.length
-      block.call(ClusterCommandRunner.new(hosts, concurrency))
+    %w{run exist? read directory? ls upload read write}.each do |host_method|
+      define_method host_method do |*args|
+        threaded(host_method, *args)
+      end
     end
 
-    class ClusterCommandRunner
-      def initialize(hosts, concurrency)
-        @concurrency = concurrency
-        @hosts = hosts
-      end
+    private
 
-      # Spawn +concurrency+ worker threads, each of which pops work off the
-      # +_in+ queue, and writes values to the +_out+ queue for syncronisation.
-      def run(cmd, opts={})
-        _in = run_queue
-        length = run_queue.length
-        _out = Queue.new
-        results = {}
-        (0...@concurrency).map do
-          Thread.new do
-            loop do
-              host = _in.pop(false) rescue Thread.exit
+    # Spawn +concurrency+ worker threads, each of which pops work off the
+    # +_in+ queue, and writes values to the +_out+ queue for syncronisation.
+    def threaded(meth, *args)
+      _in = run_queue
+      length = run_queue.length
+      _out = Queue.new
+      results = {}
+      (0...concurrency).map do
+        Thread.new do
+          loop do
+            host = _in.pop(false) rescue Thread.exit
 
-              results[host] = host.run(cmd, opts)
-              _out << true
-            end
+            results[host] = host.send(meth, *args)
+            _out << true
           end
         end
+      end
 
-        length.times do
-          _out.pop
-        end
-
-        return results
+      length.times do
+        _out.pop
       end
 
-      def run_queue
-        Queue.new.tap do |q|
-          @hosts.each do |h|
-            q << h
-          end
+      results
+    end
+
+    def run_queue
+      Queue.new.tap do |q|
+        @hosts.each do |h|
+          q << h
         end
       end
     end
-
   end
 end

data/lib/gofer/version.rb

@@ -1,3 +1,3 @@
 module Gofer # :nodoc:
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/gofer/integration_spec.rb

@@ -251,9 +251,7 @@ describe Gofer do
     end
 
     it "should run commands in parallel" do
-      results = @cluster.run do |c|
-        c.run "ruby -e 'puts Time.now.to_f; sleep 0.1; puts Time.now.to_f'"
-      end
+      results = @cluster.run("ruby -e 'puts Time.now.to_f; sleep 0.1; puts Time.now.to_f'")
 
       res1 = results[@host1].stdout.lines.to_a
       res2 = results[@host2].stdout.lines.to_a
@@ -262,9 +260,8 @@ describe Gofer do
     end
 
     it "should respect max_concurrency" do
-      results = @cluster.run(:max_concurrency => 1) do |c|
-        c.run "ruby -e 'puts Time.now.to_f; sleep 0.1; puts Time.now.to_f'"
-      end
+      @cluster.max_concurrency = 1
+      results = @cluster.run("ruby -e 'puts Time.now.to_f; sleep 0.1; puts Time.now.to_f'")
 
       res1 = results[@host1].stdout.lines.to_a
       res2 = results[@host2].stdout.lines.to_a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gofer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh