fezzik 0.8.1 → 0.8.2

data/README.md

@@ -54,9 +54,14 @@ $ fez prod echo
 ### host_task
 
 The `host_task` method is similar to Rake's `task` in functionality, but has a slightly different API due to
-its additional options. A host task is defined with a name and three (optional) options: `:args`, `:deps`,
-and `:roles`. `:args` and `:deps` correspond to Rake's task arguments and task dependencies, and `:roles` is a
-Fezzik-specific option explained later.
+its additional options. A host task is defined with a name some (optional) options. The three primary ones are
+`:args`, `:deps`, and `:roles`. `:args` and `:deps` correspond to Rake's task arguments and task dependencies,
+and `:roles` is a Fezzik-specific option explained later. There are also three additional options which
+control how host tasks run concurrently:
+
+- `:num_threads`: the number of threads used to run this task in parallel; defaults to 10.
+- `:serial`: whether to process the command for each connection one at a time; defaults to false
+- `:batch_by`: if set, group the connections into batches of no more than this value
 
 A Rake task that looks like this:
 

data/lib/fezzik/base.rb

@@ -34,15 +34,20 @@ module Fezzik
     host_task(name, { :args => Array(args), :deps => Array(deps), :roles => Array(roles) }, &block)
   end
 
+  WEAVE_OPTIONS = [:num_threads, :serial, :batch_by]
+
   def self.host_task(name, options = {}, &block)
     options = {
       :args => [],
       :deps => [],
       :roles => []
     }.merge(options)
+    weave_options = options.dup.keep_if { |k, v| WEAVE_OPTIONS.include? k }
+    options.delete_if { |k, v| WEAVE_OPTIONS.include? k }
     options.each { |key, value| options[key] = Array(value) }
     t = HostTask.define_task(name, { options[:args] => options[:deps] }, &block)
     t.roles += options[:roles]
+    t.weave_options = t.weave_options.merge(weave_options)
   end
 
   def self.init(options={})

data/lib/fezzik/host_task.rb

@@ -1,11 +1,12 @@
 module Fezzik
   class HostTask < Rake::Task
-    attr_accessor :roles
+    attr_accessor :roles, :weave_options
 
     def initialize(task_name, app)
       super
-      @roles = []
       @host_actions = []
+      @roles = []
+      @weave_options = {}
     end
 
     def enhance(deps = nil, &block)
@@ -21,7 +22,7 @@ module Fezzik
         @@connection_pool ||= Weave::ConnectionPool.new
         @host_actions.each do |action|
           begin
-            @@connection_pool.execute_with(hosts, :args => [self, args], &action)
+            @@connection_pool.execute_with(hosts, @weave_options.merge(:args => [self, args]), &action)
           rescue Weave::Error => e
             STDERR.puts "Error running command in HostTask '#{@name}':"
             abort e.message
@@ -35,7 +36,8 @@ module Fezzik
             @@role_connection_pools[role] ||= Weave::ConnectionPool.new
             @host_actions.each do |action|
               begin
-                @@role_connection_pools[role].execute_with(hosts, :args => [self, args], &action)
+                @@role_connection_pools[role].execute_with(hosts, @weave_options.merge(:args => [self, args]),
+                                                           &action)
               rescue Weave::Error => e
                 STDERR.puts "Error running command in HostTask '#{@name}' with role '#{role}':"
                 abort e.message

data/lib/fezzik/version.rb

@@ -1,3 +1,3 @@
 module Fezzik
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: fezzik
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
+  prerelease: 
 platform: ruby
 authors:
 - Daniel MacDougall
@@ -9,25 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: weave
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: scope
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,28 +95,31 @@ files:
 - test/integration_test_helper.rb
 homepage: http://github.com/dmacdougall/fezzik
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3699193931790573527
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fezzik
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Fezzik adds remote ssh capabilities to Rake. It simplifies running commands
   on remote servers and can be used for anything from deploying code to installing
   libraries remotely.
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 46f03aaa7fe191aeba95f63afef24ca9f2bec9d6
-  data.tar.gz: 237458033bb4d72fe30414e97213aba3a420f025
-SHA512:
-  metadata.gz: 8a569eaeaa834041ea0273c71e7485a47be4e4e64c3145f9b2fddaaf66c39f75149a3c29cc7f5851dbc0ddc724b8d85ee0a030bee8ff2054f91465989c1b3bce
-  data.tar.gz: d4096d2c482a9d763f1883ca172fc3848b5e4fa35b8c245416e51b348a68425e9e5749183ed4e378c13c8812837ddf40766ae67bce92149c62ceed8947ec60df