parallel 0.4.1 → 0.4.2

data/README.markdown

@@ -45,7 +45,8 @@ Authors
 =======
 
 ###Contributors (alphabetical)
- - [TJ Holowaychuk](http://vision-media.ca/) -- tj<$at$>vision-media.ca
+ - [Przemyslaw Wroblewski](http://github.com/lowang)
+ - [TJ Holowaychuk](http://vision-media.ca/)
 
 [Michael Grosser](http://pragmatig.wordpress.com)  
 grosser.michael@gmail.com  

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/parallel.rb

@@ -24,8 +24,9 @@ class Parallel
     count ||= processor_count
     preserve_results = (options[:preserve_results] != false)
 
-    pipes = fork_and_start_writing(count, :preserve_results => preserve_results, &block)
+    pipes, pids = fork_and_start_writing(count, :preserve_results => preserve_results, &block)
     out = read_from_pipes(pipes)
+    pids.each { |pid| Process.wait(pid) }
     out.map{|x| deserialize(x) } if preserve_results
   end
 
@@ -108,7 +109,7 @@ class Parallel
       write.close
     end
     kill_on_ctrl_c(pids)
-    reads
+    [reads, pids]
   end
 
   def self.do_in_new_process(work_item, options)

data/parallel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-04-18}
+  s.date = %q{2010-05-11}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -20,11 +20,12 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/parallel.rb",
      "parallel.gemspec",
+     "spec/cases/cloeses_processes_at_runtime.rb",
+     "spec/cases/each.rb",
      "spec/cases/each_with_index.rb",
      "spec/cases/map_with_index.rb",
      "spec/cases/map_with_index_empty.rb",
      "spec/cases/no_dump_with_each.rb",
-     "spec/cases/parallel_each.rb",
      "spec/cases/parallel_high_fork_rate.rb",
      "spec/cases/parallel_influence_outside_data.rb",
      "spec/cases/parallel_map.rb",
@@ -47,24 +48,25 @@ Gem::Specification.new do |s|
   s.summary = %q{Run any kind of code in parallel processes}
   s.test_files = [
     "spec/spec_helper.rb",
-     "spec/cases/parallel_with_nil_uses_detected_cpus.rb",
-     "spec/cases/map_with_index_empty.rb",
-     "spec/cases/parallel_map_uneven.rb",
-     "spec/cases/parallel_map_range.rb",
-     "spec/cases/map_with_index.rb",
-     "spec/cases/parallel_with_set_processes.rb",
-     "spec/cases/no_dump_with_each.rb",
-     "spec/cases/each_with_index.rb",
-     "spec/cases/parallel_start_and_kill.rb",
-     "spec/cases/parallel_raise.rb",
+     "spec/parallel_spec.rb",
      "spec/cases/parallel_sleeping_2.rb",
-     "spec/cases/parallel_each.rb",
-     "spec/cases/parallel_influence_outside_data.rb",
+     "spec/cases/no_dump_with_each.rb",
      "spec/cases/parallel_high_fork_rate.rb",
+     "spec/cases/map_with_index.rb",
+     "spec/cases/parallel_with_set_processes.rb",
      "spec/cases/parallel_map.rb",
-     "spec/cases/parallel_with_detected_cpus.rb",
+     "spec/cases/parallel_influence_outside_data.rb",
+     "spec/cases/parallel_start_and_kill.rb",
+     "spec/cases/parallel_map_uneven.rb",
      "spec/cases/parallel_map_sleeping.rb",
-     "spec/parallel_spec.rb"
+     "spec/cases/cloeses_processes_at_runtime.rb",
+     "spec/cases/parallel_with_detected_cpus.rb",
+     "spec/cases/each.rb",
+     "spec/cases/map_with_index_empty.rb",
+     "spec/cases/parallel_raise.rb",
+     "spec/cases/each_with_index.rb",
+     "spec/cases/parallel_with_nil_uses_detected_cpus.rb",
+     "spec/cases/parallel_map_range.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/cases/cloeses_processes_at_runtime.rb

@@ -0,0 +1,12 @@
+require 'spec/spec_helper.rb'
+cmd = "ps uaxw|grep ruby|wc -l"
+
+processes_before = `#{cmd}`.to_i
+Parallel.each((0..10).to_a, :in_processes => 5) { |a| a*2 }
+processes_after = `#{cmd}`.to_i
+
+if processes_before == processes_after
+  print 'OK'
+else
+  print "FAIL: before:#{processes_before} -- after:#{processes_after}"
+end

data/spec/cases/{parallel_each.rb → each.rb}

@@ -4,6 +4,5 @@ STDOUT.sync = true # otherwise results can go weird...
 x = ['a','b','c','d']
 result = Parallel.each(x) do |x|
   sleep 0.1 if x == 'a'
-  print "-#{x}-"
 end
 print result * ' '

data/spec/parallel_spec.rb

@@ -50,6 +50,10 @@ describe Parallel do
     it 'can handle to high fork rate' do
       `ruby spec/cases/parallel_high_fork_rate.rb`.should == 'OK'
     end
+
+    it 'it does not leave processes behind while running' do
+      `ruby spec/cases/cloeses_processes_at_runtime.rb`.should == 'OK'
+    end
   end
 
   describe :in_threads do
@@ -114,7 +118,7 @@ describe Parallel do
 
   describe :each do
     it "returns original array, works like map" do
-      `ruby spec/cases/parallel_each.rb`.should == '-b--c--d--a-a b c d'
+      `ruby spec/cases/each.rb`.should == 'a b c d'
     end
 
     it "does not use marshal_dump" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 +02:00
+date: 2010-05-11 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,11 +32,12 @@ files:
 - VERSION
 - lib/parallel.rb
 - parallel.gemspec
+- spec/cases/cloeses_processes_at_runtime.rb
+- spec/cases/each.rb
 - spec/cases/each_with_index.rb
 - spec/cases/map_with_index.rb
 - spec/cases/map_with_index_empty.rb
 - spec/cases/no_dump_with_each.rb
-- spec/cases/parallel_each.rb
 - spec/cases/parallel_high_fork_rate.rb
 - spec/cases/parallel_influence_outside_data.rb
 - spec/cases/parallel_map.rb
@@ -83,21 +84,22 @@ specification_version: 3
 summary: Run any kind of code in parallel processes
 test_files: 
 - spec/spec_helper.rb
-- spec/cases/parallel_with_nil_uses_detected_cpus.rb
-- spec/cases/map_with_index_empty.rb
-- spec/cases/parallel_map_uneven.rb
-- spec/cases/parallel_map_range.rb
-- spec/cases/map_with_index.rb
-- spec/cases/parallel_with_set_processes.rb
-- spec/cases/no_dump_with_each.rb
-- spec/cases/each_with_index.rb
-- spec/cases/parallel_start_and_kill.rb
-- spec/cases/parallel_raise.rb
+- spec/parallel_spec.rb
 - spec/cases/parallel_sleeping_2.rb
-- spec/cases/parallel_each.rb
-- spec/cases/parallel_influence_outside_data.rb
+- spec/cases/no_dump_with_each.rb
 - spec/cases/parallel_high_fork_rate.rb
+- spec/cases/map_with_index.rb
+- spec/cases/parallel_with_set_processes.rb
 - spec/cases/parallel_map.rb
-- spec/cases/parallel_with_detected_cpus.rb
+- spec/cases/parallel_influence_outside_data.rb
+- spec/cases/parallel_start_and_kill.rb
+- spec/cases/parallel_map_uneven.rb
 - spec/cases/parallel_map_sleeping.rb
-- spec/parallel_spec.rb
+- spec/cases/cloeses_processes_at_runtime.rb
+- spec/cases/parallel_with_detected_cpus.rb
+- spec/cases/each.rb
+- spec/cases/map_with_index_empty.rb
+- spec/cases/parallel_raise.rb
+- spec/cases/each_with_index.rb
+- spec/cases/parallel_with_nil_uses_detected_cpus.rb
+- spec/cases/parallel_map_range.rb