parallel 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ac4872d57f53d1a1a2e557efb94d003ddaa32a6
-  data.tar.gz: 3e2c2a98d097f07ff3814400db4ede65df8d46c0
+  metadata.gz: e788b0e4f387c4644af1b2cdf2e3807d418bcc68
+  data.tar.gz: 53efe316b90f9c352c02e676a602c23462969920
 SHA512:
-  metadata.gz: 7acaad1d606d70f03581d8cad5abbd30366ee23a260802e2563dcd699de7a993be4672a4ff5b487b125788a09420393d79222df412ea1af0cab99d07fdb375e8
-  data.tar.gz: dab686f70e59c3dadd0c8f15be45828041b69f6a6c7d26a5d42855e4a7000fe155c49cae733fbe1fe175fede0bbc1a4925be9f0dedea658f52075a34b0fa278a
+  metadata.gz: 3c5a98ef6c7ee6fe67a2f78e8d9ff040fb9d460b920af5b7b164ec5a086e6b17ccae4f4094d1550496eec6b2ce60780a0f0ce9626d03d500dd9e8687dbbce135
+  data.tar.gz: 6746b969db1b1abf34c3b5fbf216b9e9f3de482fd3953c1cff36503931f5d43e2dff4897f6b9c789769a31f73d8449725c83c4a9e4973c05ded6b75e3abd786c

data/lib/parallel.rb

@@ -55,11 +55,13 @@ module Parallel
         raise DeadWorker
       end
 
-      begin
+      result = begin
         Marshal.load(read)
       rescue EOFError
         raise DeadWorker
       end
+      raise result.exception if ExceptionWrapper === result
+      result
     end
   end
 
@@ -267,20 +269,18 @@ module Parallel
               item, index = items.next
               break unless index
 
-              output = with_instrumentation item, index, options do
-                worker.work(items.pack(item, index))
-              end
-
-              if ExceptionWrapper === output
-                exception = output.exception
+              begin
+                results[index] = with_instrumentation item, index, options do
+                  worker.work(items.pack(item, index))
+                end
+              rescue StandardError => e
+                exception = e
                 if Parallel::Kill === exception
                   (workers - [worker]).each do |w|
                     kill_that_thing!(w.thread)
                     kill_that_thing!(w.pid)
                   end
                 end
-              else
-                results[index] = output
               end
             end
           ensure

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.3.4'
+  VERSION = Version = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it