parallel 0.6.3 → 0.6.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel (0.6.3)
+    parallel (0.6.4)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,9 @@ GEM
     rspec-mocks (2.12.0)
 
 PLATFORMS
+  java
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   bump

data/Readme.md

@@ -51,6 +51,14 @@ Parallel.each(User.all, :in_processes => 8) do |user|
 end
 ```
 
+### Break
+
+```Ruby
+Parallel.map(User.all) do |user|
+  raise Parallel::Break # -> stop all execution
+end
+```
+
 Processes/Threads are workers, they grab the next piece of work when they finish
 
 ### Progress / ETA
@@ -90,6 +98,7 @@ Authors
  - [Jurriaan Pruis](http://github.com/jurriaan)
  - [Rob Worley](http://github.com/robworley)
  - [Tasveer Singh](https://github.com/tazsingh)
+ - [Joachim](https://github.com/jmozmoz)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel.rb

@@ -6,6 +6,9 @@ module Parallel
   class DeadWorker < Exception
   end
 
+  class Break < Exception
+  end
+
   class ExceptionWrapper
     attr_reader :exception
     def initialize(exception)
@@ -185,9 +188,7 @@ module Parallel
         end
       end
 
-      raise exception if exception
-
-      results
+      handle_exception(exception, results)
     end
 
     def work_in_processes(items, options, &blk)
@@ -221,9 +222,7 @@ module Parallel
         end
       end
 
-      raise exception if exception
-
-      results
+      handle_exception(exception, results)
     end
 
     def create_workers(items, options, &block)
@@ -286,6 +285,12 @@ module Parallel
       end
     end
 
+    def handle_exception(exception, results)
+      return nil if exception.class == Parallel::Break
+      raise exception if exception
+      results
+    end
+
     # options is either a Integer or a Hash with :count
     def extract_count_from_options(options)
       if options.is_a?(Hash)

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '0.6.3'
+  VERSION = Version = '0.6.4'
 end

data/parallel.gemspec

@@ -9,6 +9,9 @@ Gem::Specification.new name, Parallel::VERSION do |s|
   s.homepage = "https://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")
   s.license = "MIT"
-  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
-  s.cert_chain = ["gem-public_cert.pem"]
+  key = File.expand_path("~/.ssh/gem-private_key.pem")
+  if File.exist?(key)
+    s.signing_key = key
+    s.cert_chain = ["gem-public_cert.pem"]
+  end
 end

data/spec/cases/map_with_processes_and_break.rb

@@ -0,0 +1,10 @@
+require File.expand_path('spec/spec_helper')
+
+result = Parallel.map(1..100, :in_processes => 4) do |x|
+  sleep 0.1 # so all processes get started
+  print x
+  raise Parallel::Break if x == 1
+  sleep 0.1 # so no now work gets queued before Parallel::Break is raised
+  x
+end
+print " Parallel::Break raised - result #{result.inspect}"

data/spec/cases/map_with_threads_and_break.rb

@@ -0,0 +1,9 @@
+require File.expand_path('spec/spec_helper')
+
+result = Parallel.map(1..100, :in_threads => 4) do |x|
+  sleep 0.1 # so all threads get started
+  print x
+  raise Parallel::Break if x == 1
+  sleep 0.1 # so no now work gets queued before Parallel::Break is raised
+end
+print " Parallel::Break raised - result #{result.inspect}"

data/spec/parallel_spec.rb

@@ -165,6 +165,14 @@ describe Parallel do
       `ruby spec/cases/map_with_threads_and_exceptions.rb 2>&1`.should =~ /^\d{0,4} raised$/
     end
 
+    it 'stops all workers when one raises Break in process' do
+      `ruby spec/cases/map_with_processes_and_break.rb 2>&1`.should =~ /^\d{4} Parallel::Break raised - result nil$/
+    end
+
+    it 'stops all workers when one raises Break in thread' do
+      `ruby spec/cases/map_with_threads_and_break.rb 2>&1`.should =~ /^\d{4} Parallel::Break raised - result nil$/
+    end
+
     it "can run with 0 threads" do
       Thread.should_not_receive(:exclusive)
       Parallel.map([1,2,3,4,5,6,7,8,9], :in_threads => 0){|x| x+2 }.should == [3,4,5,6,7,8,9,10,11]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   VHNmKzZNYWVud0FNa0FnSGRzd0dzSnp0T25ObkJhM0YKeTBrQ1NXbUs2RCt4
   L1NiZlM2cjdLZTA3TVJxemlKZEI5R3VFMSswY0lSdUZoOEVRK0xONkhYQ0tN
   NXBvbi9HVQp5Y3dNWGZsMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -63,7 +63,9 @@ files:
 - spec/cases/map_with_killed_worker_before_read.rb
 - spec/cases/map_with_killed_worker_before_write.rb
 - spec/cases/map_with_nested_arrays_and_nil.rb
+- spec/cases/map_with_processes_and_break.rb
 - spec/cases/map_with_processes_and_exceptions.rb
+- spec/cases/map_with_threads_and_break.rb
 - spec/cases/map_with_threads_and_exceptions.rb
 - spec/cases/no_dump_with_each.rb
 - spec/cases/parallel_high_fork_rate.rb
@@ -97,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2048790517211853939
+      hash: -2205036652942743668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2048790517211853939
+      hash: -2205036652942743668
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25