parallel 0.5.19 → 0.5.20

data/Gemfile

@@ -1,5 +1,6 @@
 source :rubygems
 gemspec
 
+gem 'bump'
 gem 'rake'
 gem 'rspec', '~>2'

data/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
   remote: .
   specs:
-    parallel (0.5.19)
+    parallel (0.5.20)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    bump (0.3.5)
     diff-lcs (1.1.3)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rake (10.0.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec-mocks (2.12.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump
   parallel!
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,23 +1,7 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 
 task :default do
   sh "rspec spec/"
 end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/parallel/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end
-

data/Readme.md

@@ -34,12 +34,36 @@ or `each_with_index` or `map_with_index`
  - Global data can be modified
  - No extra memory used
 
+### ActiveRecord
+
+Try either of those to get working parallel AR
+
+```Ruby
+Parallel.each(User.all, :in_threads => 8) do |user|
+  ActiveRecord::Base.connection_pool.with_connection do
+    user.update_attribute(:some_attribute, some_value)
+  end
+end
+
+Parallel.each(User.all, :in_processes => 8) do |user|
+  ActiveRecord::Base.connection.reconnect!
+  user.update_attribute(:some_attribute, some_value)
+end
+```
 
 Processes/Threads are workers, they grab the next piece of work when they finish
 
+### Progress / ETA
+
+```Ruby
+require 'progressbar'
+progress = ProgressBar.new("test", 100)
+Parallel.map(1..100, :finish => lambda { |i, item| progress.inc }) { sleep 1 }
+progress.finish
+```
+
 Tips
 ====
- - [ActiveRecord] `ActiveRecord::Base.connection.reconnect!` inside the parallel block prevents errors
  - [Benchmark/Test] Disable threading/forking with `:in_threads => 0` or `:in_processes => 0`, great to test performance or to debug parallel issues
 
 TODO
@@ -64,6 +88,7 @@ Authors
  - [Norio Sato]
  - [Neal Stewart](https://github.com/n-time)
  - [Jurriaan Pruis](http://github.com/jurriaan)
+ - [Rob Worley](http://github.com/robworley)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel.rb

@@ -117,6 +117,8 @@ module Parallel
     results = []
     current = -1
     exception = nil
+    on_start = options[:start]
+    on_finish = options[:finish]
 
     in_threads(options[:count]) do
       # as long as there are more items, work on one of them
@@ -126,11 +128,16 @@ module Parallel
         index = Thread.exclusive{ current+=1 }
         break if index >= items.size
 
+        item = items[index]
+        on_start.call(item, index) if on_start
+
         begin
           results[index] = call_with_index(items, index, options, &block)
         rescue Exception => e
           exception = e
           break
+        ensure
+          on_finish.call(item, index) if on_finish
         end
       end
     end
@@ -145,6 +152,8 @@ module Parallel
     current_index = -1
     results = []
     exception = nil
+    on_start = options[:start]
+    on_finish = options[:finish]
 
     in_threads(options[:count]) do |i|
       worker = workers[i]
@@ -155,8 +164,13 @@ module Parallel
           index = Thread.exclusive{ current_index += 1 }
           break if index >= items.size
 
+          item = items[index]
+
           Marshal.dump(index, worker[:write])
+          on_start.call(item, index) if on_start
+
           output = Marshal.load(worker[:read])
+          on_finish.call(item, index) if on_finish
 
           if ExceptionWrapper === output
             exception = output.exception

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '0.5.19'
+  VERSION = Version = '0.5.20'
 end

data/spec/parallel_spec.rb

@@ -174,6 +174,38 @@ describe Parallel do
       Process.should_not_receive(:fork)
       Parallel.map([1,2,3,4,5,6,7,8,9], :in_processes => 0){|x| x+2 }.should == [3,4,5,6,7,8,9,10,11]
     end
+
+    it "notifies when an item of work is dispatched to a worker process" do
+      monitor = double('monitor', :call => nil)
+      monitor.should_receive(:call).once.with(:first, 0)
+      monitor.should_receive(:call).once.with(:second, 1)
+      monitor.should_receive(:call).once.with(:third, 2)
+      Parallel.map([:first, :second, :third], :start => monitor, :in_processes => 3) {}
+    end
+
+    it "notifies when an item of work is completed by a worker process" do
+      monitor = double('monitor', :call => nil)
+      monitor.should_receive(:call).once.with(:first, 0)
+      monitor.should_receive(:call).once.with(:second, 1)
+      monitor.should_receive(:call).once.with(:third, 2)
+      Parallel.map([:first, :second, :third], :finish => monitor, :in_processes => 3) {}
+    end
+
+    it "notifies when an item of work is dispatched to a threaded worker" do
+      monitor = double('monitor', :call => nil)
+      monitor.should_receive(:call).once.with(:first, 0)
+      monitor.should_receive(:call).once.with(:second, 1)
+      monitor.should_receive(:call).once.with(:third, 2)
+      Parallel.map([:first, :second, :third], :start => monitor, :in_threads => 3) {}
+    end
+
+    it "notifies when an item of work is completed by a threaded worker" do
+      monitor = double('monitor', :call => nil)
+      monitor.should_receive(:call).once.with(:first, 0)
+      monitor.should_receive(:call).once.with(:second, 1)
+      monitor.should_receive(:call).once.with(:third, 2)
+      Parallel.map([:first, :second, :third], :finish => monitor, :in_threads => 3) {}
+    end
   end
 
   describe ".map_with_index" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.5.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -66,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -960413124203525462
+      hash: 2227886358623378037
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -960413124203525462
+      hash: 2227886358623378037
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24