spork 0.7.5 → 0.7.6

data/features/at_exit_during_each_run.feature

@@ -0,0 +1,34 @@
+Feature: At exit during each run
+  In order to make sure at_exit hooks defined during the run get called
+  I want to override kernel #at_exit
+
+  Scenario: at exit
+
+    Given a file named "spec/spec_helper.rb" with:
+      """
+      require 'rubygems'
+      require 'spec'
+      Spork.prefork do
+        puts "loading"
+        at_exit { puts "prefork at_exit called" }
+      end
+
+      Spork.each_run do
+        puts "running"
+        at_exit { puts "each_run at_exit called" }
+      end
+
+      """
+
+    And a file named "spec/did_it_work_spec.rb" with:
+      """
+      describe "Did it work?" do
+        it "checks to see if all worked" do
+          puts "ran specs"
+        end
+      end
+      """
+    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 not contain "prefork at_exit called"

data/lib/spork.rb

@@ -37,6 +37,16 @@ module Spork
       end
     end
     
+    # Run a block after specs are run.
+    #
+    # == Parameters
+    #
+    # * +prevent_double_run+ - Pass false to disable double run prevention
+    def after_each_run(prevent_double_run = true, &block)
+      return if prevent_double_run && already_ran?(caller.first)
+      after_each_run_procs << block
+    end
+
     # Used by the server. Sets the state to activate spork. Otherwise, prefork and each_run are run in passive mode, allowing specs without a Spork server.
     def using_spork!
       @state = :using_spork
@@ -59,11 +69,18 @@ module Spork
     
     # Used by the server.  Called to run all of the prefork blocks.
     def exec_each_run(&block)
+      activate_after_each_run_at_exit_hook
       each_run_procs.each { |p| p.call }
       each_run_procs.clear
       yield if block_given?
     end
     
+    # 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
+    end
+
     # Traps an instance method of a class (or module) so any calls to it don't actually run until Spork.exec_each_run
     def trap_method(klass, method_name)
       method_name_without_spork, method_name_with_spork = alias_method_names(method_name, :spork)
@@ -98,6 +115,14 @@ module Spork
     end
 
     private
+      def activate_after_each_run_at_exit_hook
+        Kernel.module_eval do
+          def at_exit(&block)
+            Spork.after_each_run(false, &block)
+          end
+        end
+      end
+
       def alias_method_names(method_name, feature)
         /^(.+?)([\?\!]{0,1})$/.match(method_name.to_s)
         ["#{$1}_without_spork#{$2}", "#{$1}_with_spork#{$2}"]
@@ -122,5 +147,9 @@ module Spork
       def each_run_procs
         @each_run_procs ||= []
       end
+
+      def after_each_run_procs
+        @after_each_run_procs ||= []
+      end
   end
 end

data/lib/spork/app_framework.rb

@@ -8,7 +8,7 @@ class Spork::AppFramework
     :Rails => lambda {
       File.exist?("config/environment.rb") && File.read("config/environment.rb").include?('RAILS_GEM_VERSION')
     }
-  }
+  } unless defined? SUPPORTED_FRAMEWORKS
   
   def self.setup_autoload
     ([:Unknown] + SUPPORTED_FRAMEWORKS.keys).each do |name|

data/lib/spork/forker.rb

@@ -41,7 +41,7 @@ class Spork::Forker
       begin
         @result = Marshal.load(@server_io)
         Marshal.dump('ACK', @server_io)
-      rescue ForkDiedException
+      rescue ForkDiedException, EOFError
         @result = nil
       end
     end

data/lib/spork/run_strategy/forking.rb

@@ -10,7 +10,9 @@ class Spork::RunStrategy::Forking < Spork::RunStrategy
       $stdout, $stderr = stdout, stderr
       load test_framework.helper_file
       Spork.exec_each_run
-      test_framework.run_tests(argv, stderr, stdout)
+      result = test_framework.run_tests(argv, stderr, stdout)
+      Spork.exec_after_each_run
+      result
     end
     @child.result
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 -07:00
+date: 2010-03-02 00:00:00 -07:00
 default_executable: spork
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - assets/bootstrap.rb
+- features/at_exit_during_each_run.feature
 - features/cucumber_rails_integration.feature
 - features/diagnostic_mode.feature
 - features/rails_delayed_loading_workarounds.feature