parallel 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf2d8203167b88c7236cff2d35bad7532f375d6
-  data.tar.gz: b07e88749f615799fa2791fd3f860db76bb51dde
+  metadata.gz: e4e78d815458047cedffa16bc96039d7e3190c91
+  data.tar.gz: 61b2f747f5316c87243377f29360cf5d672cb162
 SHA512:
-  metadata.gz: 5401bcaeac66a97ffb01082f22e7c700adf3d6ad869a2a674bdd5ff5e2444cc9d0d9132be2b66dd813d87ec47e05795fb21efe21c1f5b142ad19ade34c9888c3
-  data.tar.gz: 0240f79864e6c479711632c8275c0a7e391198eec937cb76de38d9d45ce47ce059d4d7a9fcfb262d36bc79ae1cb4e4bcf43520eb624231c12f6fda6c37cdf4ba
+  metadata.gz: 04f1cbad473a3120c8b1d4092e9a6e264c77d480ebc50c2b1ddaac61310b998cef3de43c14bdd9d276485303f890a7d3ac7f2aaf3fd15181e4e01402aa10effc
+  data.tar.gz: 30e97bd0a5bbac98e151cb06eb8d16989d51fa4d9446b7c9415b9cc4c70bf363cf84850165e51428eeeb754499fafe3e69b503ed769300f5be4c2d92bf16c58e

data/lib/parallel.rb

@@ -136,7 +136,7 @@ module Parallel
         end
       end
 
-      kill_on_ctrl_c(threads) { wait_for_threads(threads) }
+      kill_on_ctrl_c(threads, options) { wait_for_threads(threads) }
 
       out
     end
@@ -227,7 +227,7 @@ module Parallel
       results = []
       exception = nil
 
-      in_threads(options[:count]) do
+      in_threads(options) do
         # as long as there are more items, work on one of them
         loop do
           break if exception
@@ -253,8 +253,8 @@ module Parallel
       results = []
       exception = nil
 
-      kill_on_ctrl_c(workers.map(&:pid)) do
-        in_threads(options[:count]) do |i|
+      kill_on_ctrl_c(workers.map(&:pid), options) do
+        in_threads(options) do |i|
           worker = workers[i]
           worker.thread = Thread.current
 
@@ -368,12 +368,13 @@ module Parallel
     end
 
     # kill all these pids or threads if user presses Ctrl+c
-    def kill_on_ctrl_c(things)
+    def kill_on_ctrl_c(things, options)
       @to_be_killed ||= []
       old_interrupt = nil
+      signal = options.fetch(:interrupt_signal, INTERRUPT_SIGNAL)
 
       if @to_be_killed.empty?
-        old_interrupt = trap_interrupt do
+        old_interrupt = trap_interrupt(signal) do
           $stderr.puts 'Parallel execution interrupted, exiting ...'
           @to_be_killed.flatten.compact.each { |thing| kill_that_thing!(thing) }
         end
@@ -384,13 +385,13 @@ module Parallel
       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?
+      restore_interrupt(old_interrupt, signal) if @to_be_killed.empty?
     end
 
-    def trap_interrupt
-      old = Signal.trap INTERRUPT_SIGNAL, 'IGNORE'
+    def trap_interrupt(signal)
+      old = Signal.trap signal, 'IGNORE'
 
-      Signal.trap INTERRUPT_SIGNAL do
+      Signal.trap signal do
         yield
         if old == "DEFAULT"
           raise Interrupt
@@ -402,8 +403,8 @@ module Parallel
       old
     end
 
-    def restore_interrupt(old)
-      Signal.trap INTERRUPT_SIGNAL, old
+    def restore_interrupt(old, signal)
+      Signal.trap signal, old
     end
 
     def kill_that_thing!(thing)

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.3.1'
+  VERSION = Version = '1.3.2'
 end

metadata

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