parallel 0.4.0 → 0.4.1

data/README.markdown

@@ -20,6 +20,7 @@ Usage
 
 Same can be done with `each`
     Parallel.each(['a','b','c']){|one_letter| ... }
+or `each_with_index` or `map_with_index`
 
 ### Processes
  - Speedup through multiple CPUs

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/parallel.rb

@@ -34,6 +34,10 @@ class Parallel
     array
   end
 
+  def self.each_with_index(array, options={}, &block)
+    each(array, options.merge(:with_index => true), &block)
+  end
+
   def self.map(array, options = {})
     array = array.to_a if array.is_a?(Range)
 
@@ -54,13 +58,21 @@ class Parallel
       loop do
         index = Thread.exclusive{ current+=1 }
         break if index >= array.size
-        results[index] = *send(method, options.merge(:count => 1)){ yield array[index] }
+        results[index] = *send(method, options.merge(:count => 1)) do
+          args = [array[index]]
+          args << index if options[:with_index]
+          yield *args
+        end
       end
     end
 
     results
   end
 
+  def self.map_with_index(array, options={}, &block)
+    map(array, options.merge(:with_index => true), &block)
+  end
+
   def self.processor_count
     case RUBY_PLATFORM
     when /darwin/

data/parallel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-01-17}
+  s.date = %q{2010-04-18}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -20,6 +20,9 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/parallel.rb",
      "parallel.gemspec",
+     "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",
@@ -40,15 +43,18 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/parallel}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   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/cases/parallel_sleeping_2.rb",

data/spec/cases/each_with_index.rb

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

data/spec/cases/map_with_index.rb

@@ -0,0 +1,6 @@
+require 'spec/spec_helper.rb'
+
+result = Parallel.map_with_index(['a','b']) do |x, i|
+  "#{x}#{i}"
+end
+print result * ''

data/spec/cases/map_with_index_empty.rb

@@ -0,0 +1,6 @@
+require 'spec/spec_helper.rb'
+
+result = Parallel.map_with_index([]) do |x, i|
+  "#{x}#{i}"
+end
+print result * ''

data/spec/parallel_spec.rb

@@ -102,6 +102,16 @@ describe Parallel do
     end
   end
 
+  describe :map_with_index do
+    it "yields object and index" do
+      `ruby spec/cases/map_with_index.rb 2>&1`.should == 'a0b1'
+    end
+
+    it "does not crash with empty set" do
+      `ruby spec/cases/map_with_index_empty.rb 2>&1`.should == ''
+    end
+  end
+
   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'
@@ -112,6 +122,12 @@ describe Parallel do
     end
   end
 
+  describe :each_with_index do
+    it "yields object and index" do
+      `ruby spec/cases/each_with_index.rb 2>&1`.should == 'a0b1'
+    end
+  end
+
   describe :in_groups_of do
     it "works for empty" do
       Parallel.send(:in_groups_of, [], 3).should == []

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: parallel
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 +01:00
+date: 2010-04-18 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +32,9 @@ files:
 - VERSION
 - lib/parallel.rb
 - parallel.gemspec
+- 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
@@ -56,28 +64,33 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 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/cases/parallel_sleeping_2.rb