forkandreturn 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.2.2 (11-02-2012)
+
+* Using Tempfile instead of home brewed Utils.tempfile.
+
 0.2.1 (06-10-2008)
 
 * Fixed a bug concerning single-core machines.

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/example.txt

@@ -128,7 +128,7 @@ parameter:
 
  count   = 0
 
- Dir.glob("*.gz").sort.concurrent_collect do |file|
+ Dir.glob("*.gz").sort.concurrent_collect(4) do |file|
    c     = 0
 
    Zlib::GzipReader.open(file) do |io|

data/lib/forkandreturn/forkandreturn.rb

@@ -117,7 +117,7 @@ module ForkAndReturn
   # Example:
   #
   #  [1, 2, 3, 4].collect do |object|
-  #    ForkAndReturn.fork_and_return do
+  #    ForkAndReturn.fork_and_return_core do
   #      object*2
   #    end
   #  end.collect do |wait|
@@ -131,7 +131,7 @@ module ForkAndReturn
   # This runs each "object*2" statement in a seperate process, concurrently.
 
   def self.fork_and_return_core(*args, &block)
-    file	= Util.tempfile
+    tempfile	= Tempfile.new("fork_and_return").unlink
 
     #begin
       pid =
@@ -149,11 +149,9 @@ module ForkAndReturn
           ok, res	= false, $!
         end
 
-        File.open(file, "wb") do |f|
-          f.chmod(0600)
+        Marshal.dump([ok, res], tempfile)
 
-          Marshal.dump([ok, res], f)
-        end
+        tempfile.close
       end
     #rescue Errno::EAGAIN	# Resource temporarily unavailable - fork(2)
     #  Kernel.sleep 0.1
@@ -166,19 +164,15 @@ module ForkAndReturn
 
       lambda do			# Load the result and delete the temp file.
         begin
-          if File.owned?(file)
-            ok, res	= File.open(file, "rb"){|f| Marshal.load(f.read)}
-          else
-            ok, res	= false, WorkerError.new("you're not the owner of the temporary file")
-          end
-        rescue Errno::ENOENT	# No such file or directory
-          ok, res	= false, WorkerError.new("the worker hasn't returned a result")
+          tempfile.rewind
+
+          ok, res	= *Marshal.load(tempfile)
         rescue EOFError		# end of file reached
           ok, res	= false, WorkerError.new("the worker hasn't returned a result")
         rescue TypeError	# can't be read
           ok, res	= false, WorkerError.new("the worker has returned corrupt data")
         ensure
-          File.delete(file)	if File.file?(file)
+          tempfile.close
         end
 
         lambda do		# Handle the result.

data/lib/forkandreturn/util.rb

@@ -45,30 +45,5 @@ module ForkAndReturn
         false
       end
     end
-
-    def self.generate_counter(count=0)
-      fun =
-      lambda do
-        Thread.exclusive do
-          count	= count.succ
-        end
-      end
-
-      class << fun
-        alias next call
-      end
-
-      fun
-    end
-
-    @tempfile_counter	= Util.generate_counter
-
-    def self.tempfile
-      File.join(tempdir, "%s.%d.%d.tmp" % ["fork_and_return", $$, @tempfile_counter.next])
-    end
-
-    def self.tempdir
-      [ENV["TMPDIR"], ENV["TMP"], ENV["TEMP"], "/tmp", "c:/temp"].compact.find{|dir| File.directory?(dir)}
-    end
   end
 end

data/lib/forkandreturn/version.rb

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

data/lib/forkandreturn.rb

@@ -1,5 +1,8 @@
+require "tempfile"
+
 require "threadlimiter"
 
+require "forkandreturn/version"
 require "forkandreturn/forkandreturn"
 require "forkandreturn/exceptions"
 require "forkandreturn/util"

data/test/test.rb

@@ -1,4 +1,5 @@
 require "test/unit"
+require "rubygems"
 require "forkandreturn"
 
 class ForkAndReturnTest < Test::Unit::TestCase
@@ -266,4 +267,8 @@ class ForkAndReturnEnumerableTest < Test::Unit::TestCase
     assert_equal(result, data.clustered_concurrent_each(3, &block))
     assert_equal(result, data.clustered_concurrent_each(-1, &block))
   end
+
+  def test_multi_core
+    assert_equal(true, ForkAndReturn::Util.multi_core?)
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: forkandreturn
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Erik Veenstra
@@ -9,19 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 +02:00
-default_executable: 
+date: 2012-02-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: threadlimiter
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
         version: 0.1.2
-    version: 
+  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.
 email: forkandreturn@erikveen.dds.nl
 executables: []
@@ -31,19 +42,21 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/forkandreturn
-- lib/forkandreturn/exceptions.rb
-- lib/forkandreturn/enumerable.rb
 - lib/forkandreturn/forkandreturn.rb
 - lib/forkandreturn/util.rb
+- lib/forkandreturn/enumerable.rb
+- lib/forkandreturn/version.rb
+- lib/forkandreturn/exceptions.rb
 - lib/forkandreturn.rb
 - README
 - LICENSE
 - VERSION
 - CHANGELOG
 - example.txt
-has_rdoc: true
+- test/test.rb
 homepage: http://www.erikveen.dds.nl/forkandreturn/index.html
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - README
@@ -52,29 +65,35 @@ rdoc_options:
 - CHANGELOG
 - example.txt
 - --title
-- forkandreturn (0.2.1)
+- forkandreturn (0.2.2)
 - --main
 - README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: forkandreturn
-rubygems_version: 1.2.0
+rubygems_version: 1.8.12
 signing_key: 
-specification_version: 2
+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: 
 - test/test.rb