fezzik 0.8.2 → 0.8.3

data/README.md

@@ -56,12 +56,14 @@ $ fez prod echo
 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 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:
+and `:roles` is a Fezzik-specific option explained later. There are also three additional options which can be
+passed to [Weave](https://github.com/cespare/weave), Fezzik's underlying ssh library, by specifying them in a
+`:weave_options` hash. They 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
+- `:num_threads`: The number of threads used to run this task in parallel, or `:unlimited` to use a thread for
+                  every host. 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:
 
@@ -80,6 +82,22 @@ host_task :echo, :args => [:arg1, :arg2],
 end
 ```
 
+And with Weave options:
+
+```ruby
+host_task :echo, :args => [:arg1, :arg2],
+                 :deps => [:dep1, :dep2],
+                 :weave_options => {:num_threads => 20} do |t, args|
+  ...
+end
+```
+
+To avoid repeating the same `weave_options` on every host_task, set `Fezzik.default_weave_options`, which
+will be merged with the `:weave_options` hash of a `host_task`.
+
+```ruby
+Fezzik.default_weave_options = { :num_threads => :unlimited }
+```
 
 ## Deployments
 

data/fezzik.gemspec

@@ -24,7 +24,7 @@ EOS
   s.files = `git ls-files`.split("\n")
 
   s.add_dependency "rake"
-  s.add_dependency "weave", "=0.2.0"
+  s.add_dependency "weave", "~>1.0.0"
 
   s.add_development_dependency("scope", "~>0.2.3")
 end

data/lib/fezzik/base.rb

@@ -2,6 +2,9 @@ module Fezzik
   def self.activated=(value) @activated = value end
   def self.activated?() @activated || false end
 
+  def self.default_weave_options() @@default_weave_options ||= {} end
+  def self.default_weave_options=(options) @@default_weave_options = options end
+
   def self.set(name, value)
     @@settings ||= {}
 
@@ -34,16 +37,15 @@ 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 => []
+      :roles => [],
+      :weave_options => {}
     }.merge(options)
-    weave_options = options.dup.keep_if { |k, v| WEAVE_OPTIONS.include? k }
-    options.delete_if { |k, v| WEAVE_OPTIONS.include? k }
+    weave_options = options[:weave_options]
+    options.delete(:weave_options)
     options.each { |key, value| options[key] = Array(value) }
     t = HostTask.define_task(name, { options[:args] => options[:deps] }, &block)
     t.roles += options[:roles]

data/lib/fezzik/host_task.rb

@@ -17,12 +17,14 @@ module Fezzik
     def execute(args = nil)
       return if Rake.application.options.dryrun
 
+      merged_weave_options = Fezzik.default_weave_options.merge(@weave_options).merge(:args => [self, args])
+
       if @roles.empty?
         hosts = Fezzik.get(:domain).map { |domain| "#{Fezzik.get(:user)}@#{domain}" }
         @@connection_pool ||= Weave::ConnectionPool.new
         @host_actions.each do |action|
           begin
-            @@connection_pool.execute_with(hosts, @weave_options.merge(:args => [self, args]), &action)
+            @@connection_pool.execute_with(hosts, merged_weave_options, &action)
           rescue Weave::Error => e
             STDERR.puts "Error running command in HostTask '#{@name}':"
             abort e.message
@@ -36,8 +38,7 @@ module Fezzik
             @@role_connection_pools[role] ||= Weave::ConnectionPool.new
             @host_actions.each do |action|
               begin
-                @@role_connection_pools[role].execute_with(hosts, @weave_options.merge(:args => [self, args]),
-                                                           &action)
+                @@role_connection_pools[role].execute_with(hosts, merged_weave_options, &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.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fezzik
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -33,17 +33,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: scope
   requirement: !ruby/object:Gem::Requirement
@@ -105,9 +105,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3699193931790573527
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: