parallel 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e98f73ce25c329aab14185e79d68643dde8b705
-  data.tar.gz: bcf7f3490b62a267b9c54b82114c25193fdef811
+  metadata.gz: 11290960cd496e43b8e7c9314769ffc8a3554daa
+  data.tar.gz: bfc4d8c942312266e0fbe3ebc66f0fd19923fffe
 SHA512:
-  metadata.gz: 6209b06e7fd1a09a92c1e485c156b4abc57ba5c230f21ae6d7df5752d06acaf2adc55771230bda207a37a770b0a3241cad33e0d27da125ed1c8642c848f16633
-  data.tar.gz: 6e08572a7a48ce2d5da1e325c02ab701297854fd5e22397835e48d361f86968a79fb764a5c2df91f4cfbf81ff31d9f5bb3ed39ed86f570ffc075c29084fb049f
+  metadata.gz: 90cd2a5f9af376e208f64483b416ea23cb92de3ac03eb8c5fbb2cf86576717d846dfaa8a3d0dd8a183a4543c855b81978829b09325e7b0e7f32283b8ff69dcfa
+  data.tar.gz: 066e43a835be012a025536bbfcf0f2ff7ed8bd50a9295d760b44b3f10492be3496e36154ff816717126dd0dd3b53cd1152340b01db025b60e46a30609a65e9d3

data/lib/parallel.rb

@@ -12,6 +12,8 @@ module Parallel
   class Kill < StandardError
   end
 
+  INTERRUPT_SIGNAL = :SIGINT
+
   class ExceptionWrapper
     attr_reader :exception
     def initialize(exception)
@@ -360,21 +362,41 @@ module Parallel
 
     # kill all these pids or threads if user presses Ctrl+c
     def kill_on_ctrl_c(things)
-      if defined?(@to_be_killed) && @to_be_killed
-        @to_be_killed << things
-      else
-        @to_be_killed = [things]
-        Signal.trap :SIGINT do
-          if @to_be_killed.any?
-            $stderr.puts 'Parallel execution interrupted, exiting ...'
-            @to_be_killed.flatten.compact.each { |thing| kill_that_thing!(thing) }
-          end
-          exit 1 # Quit with 'failed' signal
+      @to_be_killed ||= []
+      old_interrupt = nil
+
+      if @to_be_killed.empty?
+        old_interrupt = trap_interrupt do
+          $stderr.puts 'Parallel execution interrupted, exiting ...'
+          @to_be_killed.flatten.compact.each { |thing| kill_that_thing!(thing) }
         end
       end
+
+      @to_be_killed << things
+
       yield
     ensure
       @to_be_killed.pop # free threads for GC and do not kill pids that could be used for new processes
+      restore_interrupt(old_interrupt) if @to_be_killed.empty?
+    end
+
+    def trap_interrupt
+      old = Signal.trap INTERRUPT_SIGNAL, 'IGNORE'
+
+      Signal.trap INTERRUPT_SIGNAL do
+        yield
+        if old == "DEFAULT"
+          raise Interrupt
+        else
+          old.call
+        end
+      end
+
+      old
+    end
+
+    def restore_interrupt(old)
+      Signal.trap INTERRUPT_SIGNAL, old
     end
 
     def kill_that_thing!(thing)

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.1.2'
+  VERSION = Version = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it