parallel 0.4.3 → 0.4.4

data/Rakefile

@@ -1,6 +1,6 @@
 task :default => :spec
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color'] }
 
 begin
   require 'jeweler'
@@ -15,5 +15,5 @@ begin
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
+end

data/Readme.md

@@ -44,10 +44,11 @@ TODO
 Authors
 =======
 
-###Contributors
+### [Contributors](http://github.com/grosser/parallel/contributors)
  - [Przemyslaw Wroblewski](http://github.com/lowang)
  - [TJ Holowaychuk](http://vision-media.ca/)
  - [Masatomo Nakano](http://twitter.com/masatomo2)
+ - [Fred Wu](http://fredwu.me)
 
 [Michael Grosser](http://pragmatig.wordpress.com)  
 grosser.michael@gmail.com  

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/parallel.rb

@@ -2,6 +2,7 @@ require 'thread' # to get Thread.exclusive
 
 class Parallel
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
+  SPLAT_BUG = *[] # fix for bug/feature http://redmine.ruby-lang.org/issues/show/2422
 
   def self.in_threads(options={:count => 2})
     count, options = extract_count_from_options(options)
@@ -67,6 +68,7 @@ class Parallel
       end
     end
 
+    results = results.flatten(1) if SPLAT_BUG 
     results
   end
 

data/parallel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-08-24}
+  s.date = %q{2010-09-24}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Rakefile",

data/spec/cases/cloeses_processes_at_runtime.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 cmd = "ps uaxw|grep ruby|wc -l"
 
 processes_before = `#{cmd}`.to_i

data/spec/cases/each.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 STDOUT.sync = true # otherwise results can go weird...
 
 x = ['a','b','c','d']

data/spec/cases/each_with_index.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 Parallel.each_with_index(['a','b'], :in_threads => 2) do |x, i|
   print "#{x}#{i}"

data/spec/cases/map_with_index.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 result = Parallel.map_with_index(['a','b']) do |x, i|
   "#{x}#{i}"

data/spec/cases/map_with_index_empty.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 result = Parallel.map_with_index([]) do |x, i|
   "#{x}#{i}"

data/spec/cases/no_dump_with_each.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 class NotDumpable
   def marshal_dump

data/spec/cases/parallel_high_fork_rate.rb

@@ -1,4 +1,5 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
+
 Parallel.each((0..200).to_a, :in_processes=>200) do |x|
   sleep 1
 end

data/spec/cases/parallel_influence_outside_data.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 x = 'yes'
 

data/spec/cases/parallel_map.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 result = Parallel.map(['a','b','c','d']) do |x|
   "-#{x}-"

data/spec/cases/parallel_map_range.rb

@@ -1,6 +1,6 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 result = Parallel.map(1..5) do |x|
   x
 end
-print result
+print result.inspect

data/spec/cases/parallel_map_sleeping.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 Parallel.map(['a','b','c','d']) do |x|
   sleep 1

data/spec/cases/parallel_map_uneven.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 Parallel.map([1,2,1,2]) do |x|
   sleep 2 if x == 1

data/spec/cases/parallel_raise.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 begin
   Parallel.in_processes(2) do

data/spec/cases/parallel_sleeping_2.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 Parallel.in_processes(5) do
   sleep 2

data/spec/cases/parallel_start_and_kill.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 Parallel.in_processes(2) do
   sleep 10

data/spec/cases/parallel_with_detected_cpus.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 x = Parallel.in_processes do
   "HELLO"

data/spec/cases/parallel_with_nil_uses_detected_cpus.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 x = Parallel.in_processes(nil) do
   "HELLO"

data/spec/cases/parallel_with_set_processes.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require File.expand_path('spec/spec_helper')
 
 x = Parallel.in_processes(5) do
   "HELLO"

data/spec/parallel_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec/spec_helper')
 
 describe Parallel do
   describe :in_processes do
@@ -14,7 +14,7 @@ describe Parallel do
       `ruby spec/cases/parallel_with_nil_uses_detected_cpus.rb`.should == "HELLO\n" * @cpus
     end
 
-    it "set ammount of parallel processes" do
+    it "set amount of parallel processes" do
       `ruby spec/cases/parallel_with_set_processes.rb`.should == "HELLO\n" * 5
     end
 
@@ -29,8 +29,9 @@ describe Parallel do
           `ruby spec/cases/parallel_start_and_kill.rb`
         end
         sleep 1
-        running_processes = `ps -f`.split("\n").map{|line| line.split(/\s+/)}
-        parent = running_processes.detect{|line| line.include?("00:00:00") and line.include?("ruby") }[1]
+        running_processes = `ps -f`.split("\n").map{ |line| line.split(/\s+/) }
+        uid_index         = running_processes.detect{ |line| line.include?("UID") }.index("UID") + 1
+        parent            = running_processes.detect{ |line| line.grep(/(0|)0:00(:|.)00/).any? and line.include?("ruby") }[uid_index]
         `kill -2 #{parent}` #simulates Ctrl+c
       }.should_not change{`ps`.split("\n").size}
       Time.now.should be_close(t, 3)
@@ -102,7 +103,7 @@ describe Parallel do
     end
 
     it 'supports ranges' do
-      `ruby spec/cases/parallel_map_range.rb`.should == '12345'
+      `ruby spec/cases/parallel_map_range.rb`.should == '[1, 2, 3, 4, 5]'
     end
   end
 
@@ -149,4 +150,4 @@ describe Parallel do
       Parallel.send(:in_groups_of, [1,2,3,4], 3).should == [[1,2,3],[4]]
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-$LOAD_PATH << 'lib'
+$LOAD_PATH.unshift 'lib'
 require 'parallel'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: []