mattmatt-cap-ext-parallelize 0.1.1 → 0.1.2

data/README.md

@@ -37,6 +37,14 @@ If one of your tasks ran in a transaction block and issued a rollback,
 parallelize will rollback all other threads, if they have rollback statements
 defined.
 
+Known Issues
+============
+
+Due to the threading you have to be sure to already have authenticated your SSH
+key (you're using SSH keys, right?) using an SSH agent before you run the
+parallelized code. Otherwise it'll blow up, let's just leave it at that. That'll
+change in the future.
+
 Installation
 ============
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 1
+:patch: 2
 :major: 0

data/lib/capistrano/configuration/extensions/actions/invocation.rb

@@ -3,6 +3,7 @@ module Capistrano
     module Extensions
       module Actions
         module Invocation
+
           class BlockProxy
             attr_accessor :blocks
         
@@ -22,7 +23,6 @@ module Capistrano
             yield proxy
         
             logger.info "Running #{proxy.blocks.size} threads in chunks of #{thread_count || parallelize_thread_count}"
-        
             run_parallelize_loop(proxy, thread_count || parallelize_thread_count)
           end
 
@@ -60,6 +60,7 @@ module Capistrano
                 thread.join
               rescue
                 logger.important "Subthread failed: #{$!.message}"
+                thread[:exception_raised] = $!
               end
             end
           end

data/lib/capistrano/configuration/extensions/connections.rb

@@ -1,6 +1,7 @@
 module Capistrano
   class Configuration
     module Extensions
+      
       # Thread-safe(r) version of the Capistrano default
       # connection handling.
       module Connections
@@ -49,6 +50,7 @@ module Capistrano
           raise unless failures
           failures << { :server => server, :error => err }
         end
+        
       end
     end
   end

data/lib/capistrano/configuration/extensions/execution.rb

@@ -2,6 +2,7 @@ module Capistrano
   class Configuration
     module Extensions
       module Execution
+        
         def task_call_frames
           Thread.current[:task_call_frames] ||= []
         end
@@ -20,18 +21,28 @@ module Capistrano
           all_task_call_frames.last.task
         end
   
-        def transaction
+        def transaction?
+          !(rollback_requests.nil? && Thread.main[:rollback_requests].nil?)
+        end
+  
+        def transaction(&blk)
           super do
             self.rollback_requests = [] unless transaction?
-            yield
+            blk.call
           end
         end
 
+        def on_rollback(&block)
+          self.rollback_requests ||= [] if transaction?
+          super
+        end
+
         def rollback!
-          return if Thread.current[:rollback_requests].nil?
-          Thread.current[:rolled_back] = true
+          return if rollback_requests.nil?
           super
+          Thread.current[:rolled_back] = true
         end
+        
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattmatt-cap-ext-parallelize
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -39,7 +39,6 @@ files:
 - lib/capistrano/configuration
 - lib/capistrano/configuration/extensions
 - lib/capistrano/configuration/extensions/actions
-- lib/capistrano/configuration/extensions/actions/extensions
 - lib/capistrano/configuration/extensions/actions/invocation.rb
 - lib/capistrano/configuration/extensions/connections.rb
 - lib/capistrano/configuration/extensions/execution.rb