forkandreturn 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.2.3 (17-03-2012)
+
+* Ruby 1.9?
+
 0.2.2 (11-02-2012)
 
 * Using Tempfile instead of home brewed Utils.tempfile.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/forkandreturn/forkandreturn.rb

@@ -131,7 +131,9 @@ module ForkAndReturn
   # This runs each "object*2" statement in a seperate process, concurrently.
 
   def self.fork_and_return_core(*args, &block)
-    tempfile	= Tempfile.new("fork_and_return").unlink
+    tempfile	= Tempfile.new("fork_and_return")
+
+    tempfile.unlink
 
     #begin
       pid =

data/lib/forkandreturn/version.rb

@@ -1,3 +1,3 @@
 module ForkAndReturn
-  VERSION	= "0.2.2"
+  VERSION	= "0.2.3"
 end

data/test/test.rb

@@ -105,103 +105,94 @@ class ForkAndReturnEnumerableTest < Test::Unit::TestCase
 
   def test_array
     data	= (1..10).to_a
-    block	= lambda{|n| n**n}
-    result	= data.collect(&block)
+    result	= data.collect{|n| n**n}
 
-    assert_equal(result, data.concurrent_collect(0, &block))
-    assert_equal(result, data.concurrent_collect(3, &block))
-    assert_equal(result, data.concurrent_collect(-1, &block))
+    assert_equal(result, data.concurrent_collect(0){|n| n**n})
+    assert_equal(result, data.concurrent_collect(3){|n| n**n})
+    assert_equal(result, data.concurrent_collect(-1){|n| n**n})
   end
 
   def test_array_of_array
     data	= (1..10).zip(51..60)
-    block	= lambda{|x, y| [x, y, x**y]}
-    result	= data.collect(&block)
+    result	= data.collect{|x, y| [x, y, x**y]}
 
-    assert_equal(result, data.concurrent_collect(0, &block))
-    assert_equal(result, data.concurrent_collect(3, &block))
-    assert_equal(result, data.concurrent_collect(-1, &block))
+    assert_equal(result, data.concurrent_collect(0){|x, y| [x, y, x**y]})
+    assert_equal(result, data.concurrent_collect(3){|x, y| [x, y, x**y]})
+    assert_equal(result, data.concurrent_collect(-1){|x, y| [x, y, x**y]})
   end
 
   def test_hash
     data	= Hash[*(1..10).zip(51..60).flatten]
-    block	= lambda{|x, y| [x, y, x**y]}
-    result	= data.collect(&block)
+    result	= data.collect{|x, y| [x, y, x**y]}
 
-    assert_equal(result, data.concurrent_collect(0, &block))
-    assert_equal(result, data.concurrent_collect(3, &block))
-    assert_equal(result, data.concurrent_collect(-1, &block))
+    assert_equal(result, data.concurrent_collect(0){|x, y| [x, y, x**y]})
+    assert_equal(result, data.concurrent_collect(3){|x, y| [x, y, x**y]})
+    assert_equal(result, data.concurrent_collect(-1){|x, y| [x, y, x**y]})
   end
 
   def test_range
     data	= 1..10
-    block	= lambda{|n| n**n}
-    result	= data.collect(&block)
+    result	= data.collect{|n| n**n}
 
-    assert_equal(result, data.concurrent_collect(0, &block))
-    assert_equal(result, data.concurrent_collect(3, &block))
-    assert_equal(result, data.concurrent_collect(-1, &block))
+    assert_equal(result, data.concurrent_collect(0){|n| n**n})
+    assert_equal(result, data.concurrent_collect(3){|n| n**n})
+    assert_equal(result, data.concurrent_collect(-1){|n| n**n})
   end
 
   def test_select
     data	= (1..10).zip(51..60)
-    block	= lambda{|x, y| y%x==0}
-    result	= data.select(&block)
+    result	= data.select{|x, y| y%x==0}
 
-    assert_equal(result, data.concurrent_select(0, &block))
-    assert_equal(result, data.concurrent_select(3, &block))
-    assert_equal(result, data.concurrent_select(-1, &block))
+    assert_equal(result, data.concurrent_select(0){|x, y| y%x==0})
+    assert_equal(result, data.concurrent_select(3){|x, y| y%x==0})
+    assert_equal(result, data.concurrent_select(-1){|x, y| y%x==0})
   end
 
   def test_reject
     data	= (1..10).zip(51..60)
-    block	= lambda{|x, y| y%x==0}
-    result	= data.reject(&block)
+    result	= data.reject{|x, y| y%x==0}
 
-    assert_equal(result, data.concurrent_reject(0, &block))
-    assert_equal(result, data.concurrent_reject(3, &block))
-    assert_equal(result, data.concurrent_reject(-1, &block))
+    assert_equal(result, data.concurrent_reject(0){|x, y| y%x==0})
+    assert_equal(result, data.concurrent_reject(3){|x, y| y%x==0})
+    assert_equal(result, data.concurrent_reject(-1){|x, y| y%x==0})
   end
 
   def test_each_as_well_as_scope
     data	= (1..10).zip(51..60)
     count	= nil
-    block	= lambda{|x, y| count += x + y}
 
     count	= 0
-    result1	= data.each(&block)
+    result1	= data.each{|x, y| count += x + y}
     result2	= count
 
     count	= 0
-    assert_equal(result1, data.concurrent_each(0, &block))
+    assert_equal(result1, data.concurrent_each(0){|x, y| count += x + y})
     assert_equal(result2, count)
 
     count	= 0
-    assert_equal(result1, data.concurrent_each(3, &block))
+    assert_equal(result1, data.concurrent_each(3){|x, y| count += x + y})
     assert_equal(0, count)	# count isn't shared among processes!
 
     count	= 0
-    assert_equal(result1, data.concurrent_each(-1, &block))
+    assert_equal(result1, data.concurrent_each(-1){|x, y| count += x + y})
     assert_equal(0, count)	# count isn't shared among processes!
   end
 
   def test_pids
     data	= 1..10
-    block	= lambda{$$}
-    result	= data.collect(&block)
+    result	= data.collect{$$}
 
-    assert_equal(result, data.concurrent_collect(0, &block))
-    assert_not_equal(result, data.concurrent_collect(3, &block))
-    assert_not_equal(result, data.concurrent_collect(-1, &block))
+    assert_equal(result, data.concurrent_collect(0){$$})
+    assert_not_equal(result, data.concurrent_collect(3){$$})
+    assert_not_equal(result, data.concurrent_collect(-1){$$})
   end
 
   def test_exceptions
     data	= 1..10
-    block	= lambda{|n| raise ForkAndReturnEnumerableTestException if n == 2}
 
-    assert_raise(ForkAndReturnEnumerableTestException){data.concurrent_collect(0, &block)}
-    assert_raise(ForkAndReturnEnumerableTestException){data.concurrent_collect(3, &block)}
-    assert_raise(ForkAndReturnEnumerableTestException){data.concurrent_collect(-1, &block)}
+    assert_raise(ForkAndReturnEnumerableTestException){data.concurrent_collect(0){|n| raise ForkAndReturnEnumerableTestException if n == 2}}
+    assert_raise(ForkAndReturnEnumerableTestException){data.concurrent_collect(3){|n| raise ForkAndReturnEnumerableTestException if n == 2}}
+    assert_raise(ForkAndReturnEnumerableTestException){data.concurrent_collect(-1){|n| raise ForkAndReturnEnumerableTestException if n == 2}}
   end
 
   def test_at_exit_handler
@@ -229,43 +220,39 @@ class ForkAndReturnEnumerableTest < Test::Unit::TestCase
 
   def test_clustered_concurrent_collect
     data	= 1..10
-    block	= lambda{$$}
-    result	= data.collect(&block)
+    result	= data.collect{$$}
 
-    assert_equal(3, data.clustered_concurrent_collect(3, &block).sort.uniq.length)
-    assert_equal(result, data.clustered_concurrent_collect(0, &block))
-    assert_not_equal(result, data.clustered_concurrent_collect(3, &block))
-    assert_not_equal(result, data.clustered_concurrent_collect(-1, &block))
+    assert_equal(3, data.clustered_concurrent_collect(3){$$}.sort.uniq.length)
+    assert_equal(result, data.clustered_concurrent_collect(0){$$})
+    assert_not_equal(result, data.clustered_concurrent_collect(3){$$})
+    assert_not_equal(result, data.clustered_concurrent_collect(-1){$$})
   end
 
   def test_clustered_select
     data	= (1..10).zip(51..60)
-    block	= lambda{|x, y| y%x==0}
-    result	= data.select(&block)
+    result	= data.select{|x, y| y%x==0}
 
-    assert_equal(result, data.clustered_concurrent_select(0, &block))
-    assert_equal(result, data.clustered_concurrent_select(3, &block))
-    assert_equal(result, data.clustered_concurrent_select(-1, &block))
+    assert_equal(result, data.clustered_concurrent_select(0){|x, y| y%x==0})
+    assert_equal(result, data.clustered_concurrent_select(3){|x, y| y%x==0})
+    assert_equal(result, data.clustered_concurrent_select(-1){|x, y| y%x==0})
   end
 
   def test_clustered_reject
     data	= (1..10).zip(51..60)
-    block	= lambda{|x, y| y%x==0}
-    result	= data.reject(&block)
+    result	= data.reject{|x, y| y%x==0}
 
-    assert_equal(result, data.clustered_concurrent_reject(0, &block))
-    assert_equal(result, data.clustered_concurrent_reject(3, &block))
-    assert_equal(result, data.clustered_concurrent_reject(-1, &block))
+    assert_equal(result, data.clustered_concurrent_reject(0){|x, y| y%x==0})
+    assert_equal(result, data.clustered_concurrent_reject(3){|x, y| y%x==0})
+    assert_equal(result, data.clustered_concurrent_reject(-1){|x, y| y%x==0})
   end
 
   def test_clustered_each
     data	= (1..10).zip(51..60)
-    block	= lambda{|x, y| y%x==0}
-    result	= data.each(&block)
+    result	= data.each{|x, y| y%x==0}
 
-    assert_equal(result, data.clustered_concurrent_each(0, &block))
-    assert_equal(result, data.clustered_concurrent_each(3, &block))
-    assert_equal(result, data.clustered_concurrent_each(-1, &block))
+    assert_equal(result, data.clustered_concurrent_each(0){|x, y| y%x==0})
+    assert_equal(result, data.clustered_concurrent_each(3){|x, y| y%x==0})
+    assert_equal(result, data.clustered_concurrent_each(-1){|x, y| y%x==0})
   end
 
   def test_multi_core

metadata

@@ -1,47 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: forkandreturn
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Erik Veenstra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: threadlimiter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  version_requirements: *id001
-description: Runs a block of code in a seperate process and collects the result later. Includes a lot of convenient methods on Enumerable.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+description: Runs a block of code in a seperate process and collects the result later.
+  Includes a lot of convenient methods on Enumerable.
 email: forkandreturn@erikveen.dds.nl
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/forkandreturn/forkandreturn.rb
 - lib/forkandreturn/util.rb
 - lib/forkandreturn/enumerable.rb
@@ -56,44 +48,37 @@ files:
 - test/test.rb
 homepage: http://www.erikveen.dds.nl/forkandreturn/index.html
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - README
 - LICENSE
 - VERSION
 - CHANGELOG
 - example.txt
 - --title
-- forkandreturn (0.2.2)
+- forkandreturn (0.2.3)
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: forkandreturn
-rubygems_version: 1.8.12
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
-summary: Runs a block of code in a seperate process and collects the result later. Includes a lot of convenient methods on Enumerable.
-test_files: 
+summary: Runs a block of code in a seperate process and collects the result later.
+  Includes a lot of convenient methods on Enumerable.
+test_files:
 - test/test.rb