spork 0.7.6 → 0.7.7

data/features/at_exit_during_each_run.feature

@@ -15,7 +15,8 @@ Feature: At exit during each run
 
       Spork.each_run do
         puts "running"
-        at_exit { puts "each_run at_exit called" }
+        at_exit { printf "first " }
+        at_exit { printf "second " }
       end
 
       """
@@ -30,5 +31,5 @@ Feature: At exit during each run
       """
     When I fire up a spork instance with "spork rspec"
     And I run spec --drb spec/did_it_work_spec.rb
-    Then the output should contain "each_run at_exit called"
+    Then the output should contain "second first"
     Then the output should not contain "prefork at_exit called"

data/lib/spork.rb

@@ -77,8 +77,9 @@ module Spork
     
     # Used by the server.  Called to run all of the after_each_run blocks.
     def exec_after_each_run
-      after_each_run_procs.each { |p| p.call }
-      after_each_run_procs.clear
+      # processes in reverse order similar to at_exit
+      while p = after_each_run_procs.pop; p.call; end
+      true
     end
 
     # Traps an instance method of a class (or module) so any calls to it don't actually run until Spork.exec_each_run

data/lib/spork/app_framework/rails_stub_files/application_controller.rb

@@ -5,6 +5,10 @@ class ::ApplicationController < ActionController::Base
     def inherited(klass)
       (@_descendants ||= []) << klass if @@preloading
       super
+      Spork.each_run do
+        klass.master_helper_module.send(:include, master_helper_module)
+        klass.send(:default_helper_module!)
+      end
     end
 
     def reapply_inheritance!

data/lib/spork/forker.rb

@@ -16,15 +16,16 @@ class Spork::Forker
     return unless block_given?
     @child_io, @server_io = UNIXSocket.socketpair
     @child_pid = Kernel.fork do
-      @server_io.close
-      Marshal.dump(yield, @child_io)
-      # wait for the parent to acknowledge receipt of the result.
-      master_response = 
-        begin
-          Marshal.load(@child_io)
-        rescue EOFError
-          nil
-        end
+      begin
+        @server_io.close
+        Marshal.dump(yield, @child_io)
+        # wait for the parent to acknowledge receipt of the result.
+        master_response = Marshal.load(@child_io)
+      rescue EOFError
+        nil
+      rescue Exception => e
+        puts "Exception encountered: #{e.inspect}\nbacktrace:\n#{e.backtrace * %(\n)}"
+      end
       
       # terminate, skipping any at_exit blocks.
       exit!(0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -07:00
+date: 2010-03-03 00:00:00 -07:00
 default_executable: spork
 dependencies: []