spork 1.0.0rc2 → 1.0.0rc3

data/lib/spork/diagnoser.rb

@@ -32,7 +32,7 @@ class Spork::Diagnoser
         end
         private :require
         
-        def load(string)
+        def load(string, wrap = false)
           ::Spork::Diagnoser.add_included_file(string, caller)
           load_without_diagnoser(string)
         end

data/lib/spork/forker.rb

@@ -37,17 +37,18 @@ class Spork::Forker
   #
   # If the fork was aborted, then result returns nil.
   def result
-    return unless running?
+    return @result if defined?(@result) || ! running?
     result_thread = Thread.new do
       begin
         @result = Marshal.load(@server_io)
         Marshal.dump('ACK', @server_io)
-      rescue ForkDiedException, EOFError
+      rescue EOFError
         @result = nil
+      rescue ForkDiedException
       end
     end
     Process.wait(@child_pid)
-    result_thread.raise(ForkDiedException) if @result.nil?
+    result_thread.raise(ForkDiedException) if result_thread.status == "sleep"
     @child_pid = nil
     @result
   end

data/spec/spork/forker_spec.rb

@@ -29,7 +29,12 @@ describe Spork::Forker do
     it "aborts a fork and returns nil for the result" do
       started_at = Time.now
       ended_at = nil
-      forker = Spork::Forker.new { sleep 5 }
+      forker = Spork::Forker.new do
+        begin
+          sleep 5
+        rescue SignalException
+        end
+      end
       Thread.new do
         forker.result.should == nil
         ended_at = Time.now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spork
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc2
+  version: 1.0.0rc3
   prerelease: 5
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-05-04 00:00:00.000000000Z
 dependencies: []
 description: A forking Drb spec server
 email: