spork 0.9.0.rc3 → 0.9.0.rc4

data/README.rdoc

@@ -8,7 +8,7 @@
 
 == SYNOPSIS:
 
-Spork is Tim Harper's implementation of test server (similar to the script/spec_server that used to be provided by rspec-rails), except rather than using the Rails constant unloading to reload your files, it forks a copy of the server each time you run your tests.  The result?  Spork runs more solid: it doesn't get corrupted over time, and it properly handles modules and any voodoo meta programming you may have put in your app.
+Spork is Tim Harper's implementation of test server (similar to the script/spec_server that used to be provided by rspec-rails), except rather than using the Rails constant unloading to reload your files, it forks a copy of the server each time you run your tests.  The result?  Spork runs more solid: it doesn't get corrupted over time, it can work with any ruby framework, and it properly handles modules and any voodoo meta programming you may have put in your app.
 
 Spork runs on POSIX systems using fork. It also runs on windows by pre-populating a pool of ready processes (referred to here as the "magazine" strategy).
 
@@ -18,8 +18,6 @@ Spork runs on POSIX systems using fork. It also runs on windows by pre-populatin
 * Cucumber
 * Test::Unit (via 'gem install spork-testunit')
 
-And more to come!  Vote for your favorite at http://github.com/timcharper/spork/issues
-
 == Supported Application Frameworks
 
 Actually, Spork ~can~ work with any application framework.  But, it ships with hooks and helpers to make an "out of the box" experience.
@@ -31,13 +29,21 @@ Actually, Spork ~can~ work with any application framework.  But, it ships with h
 
 === rubygems:
 
-  [sudo] gem install spork
+  [sudo] gem install spork --prerelease
+
+(Rails 2.x)
+
+  [sudo] gem install spork --version 0.8.4
 
 === bundler:
 
 Add to your Gemfile:
 
-  gem "spork"
+  gem 'spork', '~> 0.9.0.rc'
+
+(Rails 2.x, use this)
+
+  gem 'spork', '~> 0.8'
 
 == Usage
 
@@ -57,11 +63,13 @@ Finally, run spork.  A spec DRb server will be running!
 
 Initially, you may find that a few files don't reload automatically.  This is because they are being loaded during Spork startup.  To identify which project files are being pre-loaded, and why, run:
 
-  spork --diagnose
+  spork --diagnose | less
   (or spork -d, for short)
 
 It will output a lot of stuff.  At the top you'll find a summary of all project files loaded.  Down below, the stack trace for each file (how it got loaded).  Spork hooks into Rails and does some magic (TM) to prevent ApplicationController observers, etc from pre-loading.  Similar hooks for other ruby frameworks may come as support demands.
 
+You may find this wiki page useful for common ways to battle a variety of common pre-loading issues: http://github.com/timcharper/spork/wiki/Spork.trap_method-Jujutsu
+
 == Running specs over Spork
 
 === RSpec
@@ -82,7 +90,7 @@ Or, you could add the following flag to your +spec.opts+ file.
 
 Cucumber has DRb support (see http://wiki.github.com/aslakhellesoy/cucumber/spork-and-drb )
 
-  cucumber --drb
+  cucumber --drb features/my.feature
 
 Use this as a guideline when "Sporking" your features/support/env.rb file
 
@@ -117,5 +125,8 @@ See http://wiki.github.com/timcharper/spork/troubleshooting
 * Ben Mabey - help with documentation, testing, suggestions, patches, and bringing Cucumber support.
 * David Chelimsky - for the fine RSpec testing framework, and the original rspec-rails spec_server implementation, which Spork has built upon.
 * LeadTune - just for being an awesome place to work.
+* Alan Aslak - for the fine Cucumber testing framework, and for much collaboration getting cucumber working with spork.
+* Roger Pack - JRuby support / Windows
+* Donald Parish - Windows support (Magazine strategy)
 
-Spork (c) 2010 Tim Harper, released under the MIT license
+Spork (c) 2011 Tim Harper, released under the MIT license

data/features/gemfiles/rails3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/timcharper/projects/spork
   specs:
-    spork (0.9.0.rc2)
+    spork (0.9.0.rc3)
 
 GEM
   remote: http://rubygems.org/

data/lib/spork/app_framework/rails.rb

@@ -41,7 +41,7 @@ class Spork::AppFramework::Rails < Spork::AppFramework
   end
 
   def preload_rails
-    if deprecated_version && (not deprecated_version.match?(/^3/))
+    if deprecated_version && (not /^3/.match(deprecated_version))
       puts "This version of spork only supports Rails 3.0. To use spork with rails 2.3.x, downgrade to spork 0.8.x."
       exit 1
     end

data/lib/spork/run_strategy.rb

@@ -22,6 +22,10 @@ class Spork::RunStrategy
     raise NotImplementedError
   end
 
+  def assert_ready!
+    raise NotImplementedError
+  end
+
   def abort
     raise NotImplementedError
   end

data/lib/spork/run_strategy/forking.rb

@@ -29,4 +29,7 @@ class Spork::RunStrategy::Forking < Spork::RunStrategy
     @child && @child.running?
   end
 
-end
+  def assert_ready!
+    raise RuntimeError, "This process hasn't loaded the environment yet by loading the prefork block" unless Spork.using_spork?
+  end
+end

data/lib/spork/run_strategy/magazine.rb

@@ -138,4 +138,6 @@ class Spork::RunStrategy::Magazine < Spork::RunStrategy
     @running
   end
 
+  def assert_ready!
+  end
 end

data/lib/spork/run_strategy/magazine/magazine_slave_provider.rb

@@ -2,7 +2,7 @@
 require 'drb'
 require 'rinda/ring'
 require 'rinda/tuplespace'
-require 'magazine_slave'
+require './magazine_slave'
 
 
 

data/lib/spork/server.rb

@@ -22,7 +22,7 @@ class Spork::Server
   
   # Sets up signals and starts the DRb service. If it's successful, it doesn't return. Not ever.  You don't need to override this.
   def listen
-    raise RuntimeError, "you must call Spork.using_spork! before starting the server" unless Spork.using_spork?
+    @run_strategy.assert_ready!
     trap("SIGINT") { sig_int_received }
     trap("SIGTERM") { abort; exit!(0) }
     trap("USR2") { abort; restart } if Signal.list.has_key?("USR2")
@@ -45,8 +45,9 @@ class Spork::Server
   # When implementing a test server, don't override this method: override run_tests instead.
   def run(argv, stderr, stdout)
     puts "Running tests with args #{argv.inspect}..."
-    run_strategy.run(argv, stderr, stdout)
+    result = run_strategy.run(argv, stderr, stdout)
     puts "Done.\n\n"
+    result
   end
   
   def abort

data/lib/spork/test_framework/cucumber.rb

@@ -9,16 +9,30 @@ class Spork::TestFramework::Cucumber < Spork::TestFramework
 
   def preload
     require 'cucumber'
-    begin
-      @step_mother = ::Cucumber::StepMother.new
-      @step_mother.load_programming_language('rb')
-    rescue NoMethodError => pre_cucumber_0_4 # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
-      @step_mother = Spork::Server::Cucumber.mother_object
+    if ::Cucumber::VERSION >= '0.9.0'
+      # nothing to do nowadays
+    else
+      preload_legacy_cucumbers
     end
     super
   end
 
   def run_tests(argv, stderr, stdout)
-    ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(@step_mother)
+    if ::Cucumber::VERSION >= '0.9.0'
+      ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!
+    else
+      ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(@step_mother)
+    end
+  end
+
+  private
+  
+  def preload_legacy_cucumbers
+    begin
+      @step_mother = ::Cucumber::Runtime.new
+      @step_mother.load_programming_language('rb')
+    rescue NoMethodError => pre_cucumber_0_4 # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
+      @step_mother = Spork::Server::Cucumber.mother_object
+    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  hash: 15424131
+  hash: 15424141
   prerelease: 6
   segments: 
   - 0
   - 9
   - 0
   - rc
-  - 3
-  version: 0.9.0.rc3
+  - 4
+  version: 0.9.0.rc4
 platform: ruby
 authors: 
 - Tim Harper
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -07:00
+date: 2011-02-25 00:00:00 -07:00
 default_executable: spork
 dependencies: []