spork 0.8.5 → 0.9.0.rc

data/Gemfile

@@ -0,0 +1,6 @@
+source :gemcutter
+gem 'cucumber', '0.7.3'
+gem 'gherkin', '1.0.27'
+gem 'rspec',  '1.3.0'
+gem 'rake'
+gem 'ruby-debug'

data/README.rdoc

@@ -22,22 +22,22 @@ And more to come!  Vote for your favorite at http://github.com/timcharper/spork/
 
 == Supported Application Frameworks
 
-Actually, Spork ~can~ work with any application framework.  But, it ships with hooks and helpers to help make the experience much more "out of the box"
+Actually, Spork ~can~ work with any application framework.  But, it ships with hooks and helpers to make an "out of the box" experience.
 
-* Rails
-
-More can be added!  Vote for your favorite at http://github.com/timcharper/spork/issues
+* Rails 3.0 (for Rails 2.{1,2,3}.x, please try spork 0.8.x)
+* Padrino
 
 == INSTALL:
 
+=== rubygems:
+
   [sudo] gem install spork
 
-alternatively:
+=== bundler:
 
-  git clone git://github.com/timcharper/spork.git
-  cd spork
-  gem build spork.gemspec
-  sudo gem install spork.gemspec
+Add to your Gemfile:
+
+  gem "spork"
 
 == Usage
 
@@ -72,7 +72,7 @@ To get the TextMate RSpec bundle to use spork, go to config->advanced->shell var
 
 To run from the command line, use:
 
-  spec --drb spec/lib/my_spec.rb
+  rspec --drb spec/lib/my_spec.rb
 
 Or, you could add the following flag to your +spec.opts+ file.
 
@@ -88,6 +88,26 @@ Use this as a guideline when "Sporking" your features/support/env.rb file
 
   http://gist.github.com/123370
 
+== Running the Spork test suite
+
+If you wish to hack on spork, you will want to run the automated test suite to make sure your changes don't break anything.  Spork uses bundler to manage and install dependencies.  To start:
+
+  bundle install
+
+Then, to run the specs:
+
+  bundle exec rspec spec/
+
+(or, alternatively...)
+
+  bundle exec rake
+
+=== running features ===
+
+Essentially:
+
+  bundle exec cucumber features
+
 == Some potential issues and ways to overcome them:
 
 See http://wiki.github.com/timcharper/spork/troubleshooting
@@ -96,6 +116,6 @@ 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.
-* Lead Media Partners - just for being an awesome place to work.
+* LeadTune - just for being an awesome place to work.
 
-Spork (c) 2009 Tim Harper, released under the MIT license
+Spork (c) 2010 Tim Harper, released under the MIT license

data/ext/mkrf_conf.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb' 
+STDERR.puts "Actually, there aren't any native extensions. I'm just dynamically installing dependencies based off of your operating system"
+inst = Gem::DependencyInstaller.new
+
+# this will fail if rake isn't installed.
+begin
+  inst.install "rake"
+rescue
+  # oh well.  Let it fail later.
+end 
+
+if RUBY_PLATFORM =~ /mswin|mingw/ and RUBY_VERSION < '1.9.1'
+  STDERR.puts "installing windows dependencies"
+  begin
+    inst.install "win32-process", "~> 0.6.1"
+  rescue => e
+    STDERR.puts "Failed to install necessary dependency gem win32-process: #{e}"
+    exit(1)
+  end
+end
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
+f.write("task :default\n")
+f.close

data/features/at_exit_during_each_run.feature

@@ -7,7 +7,7 @@ Feature: At exit during each run
     Given a file named "spec/spec_helper.rb" with:
       """
       require 'rubygems'
-      require 'spec'
+      require 'rspec'
       Spork.prefork do
         puts "loading"
         at_exit { puts "prefork at_exit called" }
@@ -23,6 +23,7 @@ Feature: At exit during each run
 
     And a file named "spec/did_it_work_spec.rb" with:
       """
+      require 'spec_helper'
       describe "Did it work?" do
         it "checks to see if all worked" do
           puts "ran specs"
@@ -30,6 +31,6 @@ Feature: At exit during each run
       end
       """
     When I fire up a spork instance with "spork rspec"
-    And I run spec --drb spec/did_it_work_spec.rb
+    And I run rspec --drb spec/did_it_work_spec.rb
     Then the output should contain "second first"
     Then the output should not contain "prefork at_exit called"

data/features/cucumber_rails_integration.feature

@@ -22,7 +22,7 @@ Feature: Cucumber integration with rails
 
         require 'cucumber'
         require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
-        require 'spec/rails'
+        require 'rspec/rails'
         require 'cucumber/rails/rspec'
         
         #### this is for this test only #######
@@ -45,13 +45,6 @@ Feature: Cucumber integration with rails
         Scenario: did it work again?
           Then it should work
       """
-    And a file named "features/cucumber_rails_fr.feature" with:
-      """
-      # language: fr
-      Fonction: French
-        Scénario: ca marche?
-          Alors ca marche
-      """
     And a file named "features/support/cucumber_rails_helper.rb" with:
       """
       $loaded_stuff << 'features/support/cucumber_rails_helper.rb'

data/features/gemfiles/rails3.0/Gemfile

@@ -0,0 +1,10 @@
+source :gemcutter
+gem 'sqlite3-ruby', '1.2.5'
+gem 'cucumber', '0.7.3'
+gem 'cucumber-rails', '0.3.1'
+gem "gherkin", "1.0.30"
+gem "rspec", "2.0.0.beta.20"
+gem 'rspec-rails', "2.0.0.beta.20"
+gem 'rails', '3.0.0'
+gem 'ruby-debug', '>= 0.10.3'
+gem 'spork', :path => File.expand_path("../../..", File.dirname(__FILE__))

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

@@ -0,0 +1,116 @@
+PATH
+  remote: /Users/timcharper/projects/spork
+  specs:
+    spork (0.8.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    builder (2.1.2)
+    columnize (0.3.1)
+    cucumber (0.7.3)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 1.0.27)
+      json_pure (>= 1.2.4)
+      term-ansicolor (>= 1.0.4)
+    cucumber-rails (0.3.1)
+      cucumber (>= 0.7.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    gherkin (1.0.30)
+      trollop (>= 1.16.2)
+    i18n (0.4.1)
+    json_pure (1.4.6)
+    linecache (0.43)
+    mail (2.2.6)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.20)
+    rspec-rails (2.0.0.beta.20)
+      rspec (= 2.0.0.beta.20)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    sqlite3-ruby (1.2.5)
+    term-ansicolor (1.0.5)
+    thor (0.14.0)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    trollop (1.16.2)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (= 0.7.3)
+  cucumber-rails (= 0.3.1)
+  gherkin (= 1.0.30)
+  rails (= 3.0.0)
+  rspec (= 2.0.0.beta.20)
+  rspec-rails (= 2.0.0.beta.20)
+  ruby-debug (>= 0.10.3)
+  spork!
+  sqlite3-ruby (= 1.2.5)

data/features/rails_delayed_loading_workarounds.feature

@@ -1,7 +1,6 @@
 Feature: Rails Delayed Work arounds
   To allow a rails developer to update as many parts of his application as possible without needing to restart Spork
   Spork automatically tells rails to delay loading certain parts of the application until after the fork occurs
-  Providing work arounds
 
   Background: Rails App with RSpec and Spork
 
@@ -10,19 +9,26 @@ Feature: Rails Delayed Work arounds
       """
       require 'rubygems'
       require 'spork'
+      require 'spork/ext/ruby-debug'
 
       Spork.prefork do
         require File.dirname(__FILE__) + '/../config/environment.rb'
-        require 'spec'
-        require 'spec/rails'
+        require 'rspec'
+        require 'rspec/rails'
       end
 
       Spork.each_run do
       end
       """
     And the application has a model, observer, route, and application helper
+
+    Given the following code appears in "config/routes.rb" after /routes\.draw/:
+      """
+        resources :users
+      """
     Given a file named "app/helpers/application_helper.rb" with:
       """
+      require 'reverseatron'
       module ApplicationHelper
         include Reverseatron
       end
@@ -64,8 +70,9 @@ Feature: Rails Delayed Work arounds
   Scenario: within a view rendered by a controller, calling helper methods from an included module in ApplicationHelper
     Given a file named "spec/controllers/users_controller_spec.rb" with:
       """
+      require "spec_helper"
       describe UsersController do
-        integrate_views
+        render_views
         it "renders a page, using a method inherited from ApplicationController" do
           get :index
           response.body.should_not include('Original View')
@@ -81,17 +88,18 @@ Feature: Rails Delayed Work arounds
       """
     Given a file named "spec/views/index.html.erb_spec.rb" with:
       """
+      require "spec_helper"
       describe "/users/index.html.erb" do
 
         it "renders the view" do
           render
-          response.body.should_not include('Original View')
+          rendered.should_not include('Original View')
           puts "Views are not being cached when rendering directly"
 
-          response.body.should include('listing users')
+          rendered.should include('listing users')
           puts "Controller stack is functioning when rendering directly"
 
-          response.body.should include('hello miscellaneous')
+          rendered.should include('hello miscellaneous')
           puts "All helper modules were included when rendering directly"
         end
       end
@@ -104,12 +112,39 @@ Feature: Rails Delayed Work arounds
       <p>Here is a list of users</p>
       """
       
-    And I run spec --drb spec/controllers/users_controller_spec.rb
+    And I run rspec --drb spec/controllers/users_controller_spec.rb
     Then the output should contain "Controller stack is functioning when rendering from a controller"
-    Then the output should contain "Views are not being cached when rendering from a controller"
-    Then the output should contain "All helper modules were included when rendering from a controller"
+    And  the output should contain "Views are not being cached when rendering from a controller"
+    And  the output should contain "All helper modules were included when rendering from a controller"
 
-    And I run spec --drb spec/views/index.html.erb_spec.rb
+    When I run rspec --drb spec/views/index.html.erb_spec.rb
     Then the output should contain "Controller stack is functioning when rendering directly"
-    Then the output should contain "Views are not being cached when rendering directly"
-    Then the output should contain "All helper modules were included when rendering directly"
+    And  the output should contain "Views are not being cached when rendering directly"
+    And  the output should contain "All helper modules were included when rendering directly"
+
+    Given the contents of "app/helpers/application_helper.rb" are changed to:
+      """
+      module ApplicationHelper
+        def make_it_loud(message)
+          message.upcase
+        end
+      end
+      """
+    And the contents of "app/views/users/index.html.erb" are changed to:
+      """
+      <%= make_it_loud('listing users') %>
+      """
+    And the contents of "spec/controllers/users_controller_spec.rb" are changed to:
+      """
+      require "spec_helper"
+      describe UsersController do
+        render_views
+        it "renders a page, using a method inherited from ApplicationController" do
+          get :index
+          response.body.should include('LISTING USERS')
+          puts "Helpers aren't being cached"
+        end
+      end
+      """
+    When I run rspec --drb spec/controllers/users_controller_spec.rb
+    Then the output should contain "Helpers aren't being cached"

data/features/rspec_rails_integration.feature

@@ -4,7 +4,6 @@ Feature: Rails Integration
   Providing default hooks and behaviors
 
   Background: Rails App with RSpec and Spork
-
     Given I am in a fresh rails project named "test_rails_project"
     And a file named "spec/spec_helper.rb" with:
       """
@@ -16,8 +15,8 @@ Feature: Rails Integration
         # if you change any configuration or code from libraries loaded here, you'll
         # need to restart spork for it take effect.
         require File.dirname(__FILE__) + '/../config/environment.rb'
-        require 'spec'
-        require 'spec/rails'
+        require 'rspec'
+        require 'rspec/rails'
         
         #### this is for this test only #######
         $loaded_stuff << 'prefork block' ######
@@ -40,11 +39,12 @@ Feature: Rails Integration
     Then the output should not contain "app/controllers/application.rb"
     Then the output should not contain "app/controllers/application_controller.rb"
     Then the output should not contain "app/controllers/application_helper.rb"
-    Then the output should not contain "config/routes.rb"
+    # Then the output should not contain "config/routes.rb"
   
   Scenario: Running spork with a rails app and observers
     Given a file named "spec/did_it_work_spec.rb" with:
     """
+    require 'spec_helper'
     describe "Did it work?" do
       it "checks to see if all worked" do
         Spork.state.should == :using_spork
@@ -61,14 +61,13 @@ Feature: Rails Integration
     end
     """
     When I fire up a spork instance with "spork rspec"
-    And I run spec --drb spec/did_it_work_spec.rb 
+    And I run rspec --drb spec/did_it_work_spec.rb
     Then the error output should be empty
     And the output should contain "Specs successfully run within spork, and all initialization files were loaded"
     And the file "log/test.log" should include "hey there"
 
 
   Scenario: Running spork with a rails app and a non-standard port
-    Given this scenario is pending until rspec releases a version that supports --port
     Given a file named "spec/did_it_work_spec.rb" with:
     """
     describe "Did it work?" do
@@ -87,7 +86,7 @@ Feature: Rails Integration
     end
     """
     When I fire up a spork instance with "spork rspec --port 7000"
-    And I run spec --drb --port 7000 spec/did_it_work_spec.rb
+    And I run rspec --drb --drb-port 7000 spec/did_it_work_spec.rb
     Then the error output should be empty
     And the output should contain "Specs successfully run within spork, and all initialization files were loaded"
     And the file "log/test.log" should include "hey there"

data/features/spork_debugger.feature

@@ -10,12 +10,12 @@ Feature: Spork Debugger integration
       require 'spork'
       require 'spork/ext/ruby-debug'
 
-      Spork.prefork { require 'spec' }
+      Spork.prefork { require 'rspec' }
       Spork.each_run { }
       """
     And a file named "spec/debugger_spec.rb" with:
       """
-      require File.dirname(__FILE__) + '/spec_helper.rb'
+      require 'spec_helper.rb'
 
       describe "Debugger" do
         it "should debug" do
@@ -30,7 +30,7 @@ Feature: Spork Debugger integration
       """
 
     When I fire up a spork instance with "spork rspec"
-    And I run this in the background: spec --drb spec/debugger_spec.rb
+    And I run this in the background: rspec --drb spec/debugger_spec.rb
 
     Then the spork window should output a line containing "Debug Session Started"
 
@@ -57,7 +57,7 @@ Feature: Spork Debugger integration
 
       require 'spork/ext/ruby-debug'
 
-      Spork.prefork { require 'spec' }
+      Spork.prefork { require 'rspec' }
       Spork.each_run { }
       """
 
@@ -75,7 +75,7 @@ Feature: Spork Debugger integration
       """
 
     When I fire up a spork instance with "spork rspec"
-    And I run this in the background: spec --drb spec/debugger_spec.rb
+    And I run this in the background: rspec --drb spec/debugger_spec.rb
 
     Then the spork window should output a line containing "Debug Session Started"
 
@@ -97,7 +97,7 @@ Feature: Spork Debugger integration
       STDERR.puts("Spork is ready and listening") # trick out the start spork step to believe spork is ready... naughty, but effective.
       @message = "it worked"
       debugger
-      Spork.prefork { require 'spec' }
+      Spork.prefork { require 'rspec' }
       Spork.each_run { }
       """
 

data/features/steps/rails_steps.rb

@@ -1,13 +1,27 @@
 Given /^I am in a fresh rails project named "(.+)"$/ do |folder_name|
   @current_dir = SporkWorld::SANDBOX_DIR
-  version_argument = ENV['RAILS_VERSION'] ? "_#{ENV['RAILS_VERSION']}_" : nil
+  # version_argument = ENV['RAILS_VERSION'] ? "_#{ENV['RAILS_VERSION']}_" : nil
   # run("#{SporkWorld::RUBY_BINARY} #{%x{which rails}.chomp} #{folder_name}")
-  run([SporkWorld::RUBY_BINARY, '-I', Cucumber::LIBDIR, %x{which rails}.chomp, version_argument, folder_name].compact * " ")
+  run(["rails", "new", folder_name].compact * " ")
+
+  if last_exit_status != 0
+    puts "Couldn't generate project.  Output:\nSTDERR:\n-------\n#{last_stderr}\n------\n\nSTDOUT:\n-------\n#{last_stdout}\n\n"
+    last_exit_status.should == 0
+  end
   @current_dir = File.join(File.join(SporkWorld::SANDBOX_DIR, folder_name))
+  in_current_dir do
+    FileUtils.ln_sf(ENV["BUNDLE_GEMFILE"], "Gemfile")
+    FileUtils.ln_sf(ENV["BUNDLE_GEMFILE"] + ".lock", "Gemfile.lock")
+    FileUtils.ln_sf(File.dirname(ENV["BUNDLE_GEMFILE"]) + "/.bundle", ".bundle")
+  end
 end
 
 
 Given "the application has a model, observer, route, and application helper" do
+  Given 'the following code appears in "config/application.rb" after /^end/:',
+    """
+    ActiveRecord::Base.observers = [:user_observer]
+    """
   Given 'a file named "app/models/user.rb" with:',
     """
     class User < ActiveRecord::Base
@@ -50,4 +64,4 @@ Given "the application has a model, observer, route, and application helper" do
       end
     end
     """
-end
+end

data/features/steps/sandbox_steps.rb

@@ -17,7 +17,7 @@ When /^the contents of "([^\"]*)" are changed to:$/ do |file_name, file_content|
 end
 
 # the following code appears in "config/environment.rb" after /Rails::Initializer.run/:
-Given /^the following code appears in "([^\"]*)" after \/([^\\\/]*)\/:$/ do |file_name, regex, content|
+Given /^the following code appears in "([^\"]*)" after \/([^\/]*)\/:$/ do |file_name, regex, content|
   regex = Regexp.new(regex)
   in_current_dir do
     content_lines = File.read(file_name).split("\n")
@@ -31,11 +31,11 @@ Given /^the following code appears in "([^\"]*)" after \/([^\\\/]*)\/:$/ do |fil
   end
 end
 
-When /^I run (spork|spec|cucumber)(| .*)$/ do |command, args|
+When /^I run (spork|rspec|cucumber)(| .*)$/ do |command, args|
   run(localized_command(command, args))
 end
 
-When /^I run this in the background: (spork|spec|cucumber)(| .*)$/ do |command, args|
+When /^I run this in the background: (spork|rspec|cucumber)(| .*)$/ do |command, args|
   @background_script = run_in_background(localized_command(command, args))
 end
 

data/features/support/bundler_helpers.rb

@@ -0,0 +1,42 @@
+require 'bundler'
+module BundlerHelpers
+  extend self
+  def install_bundle(dir)
+    Dir.chdir(dir) do
+      command = "env RUBYOPT= BUNDLE_GEMFILE=Gemfile bundle install"
+      command << " --relock" unless File.exist?("Gemfile.lock")
+      system(command)
+      $?.exitstatus
+    end
+  end
+
+  def ensure_installed(dir)
+    gemfile_lock = dir + "/Gemfile.lock"
+    gemfile = dir + "/Gemfile"
+    bundle_environment = dir + "/.bundle/environment.rb"
+    case
+    when File.exist?(gemfile_lock) && File.mtime(gemfile) > File.mtime(gemfile_lock)
+      puts "Gemfile #{gemfile} has changed since it was locked. Re-locking..."
+      FileUtils.rm(gemfile_lock)
+      FileUtils.rm_rf(dir + "/.bundle")
+    when ! File.exist?(bundle_environment)
+      puts "Bundle #{gemfile} not installed.  Installing..."
+    when File.mtime(bundle_environment) < File.mtime(gemfile_lock)
+      puts "#{gemfile_lock} is newer than #{bundle_environment}.  Reinstalling"
+    else
+      return false
+    end
+    install_bundle(dir)
+  end
+
+  def expand_gemfile(gemfile)
+    possibilities = [File.expand_path(gemfile, Dir.pwd), SporkWorld::GEMFILES_ROOT + gemfile + "Gemfile"]
+    possibilities.detect {|f| File.exist?(f)} || raise(RuntimeError, %(Gemfile not found:\n #{possibilities * "\n"}))
+  end
+
+  def set_gemfile(gemfile)
+    gemfile = expand_gemfile(gemfile || "rails3.0")
+    ensure_installed(File.dirname(gemfile))
+    ENV["BUNDLE_GEMFILE"] = gemfile
+  end
+end

data/features/support/env.rb

@@ -1,17 +1,20 @@
 require 'rubygems'
+require 'pathname'
 require 'fileutils'
 require 'forwardable'
 require 'tempfile'
 require 'spec/expectations'
 require 'timeout'
-require 'spork'
 
 require(File.dirname(__FILE__) + '/background_job.rb')
 
+SPORK_ROOT    = Pathname.new(File.expand_path('../../', File.dirname(__FILE__)))
 class SporkWorld
-  BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/spork')
   RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-  SANDBOX_DIR   = File.expand_path(File.join(File.dirname(__FILE__), '../../tmp/sandbox'))
+  BINARY        = SPORK_ROOT + 'bin/spork'
+  SANDBOX_DIR   = SPORK_ROOT + "tmp/sandbox"
+  GEMFILES_ROOT = SPORK_ROOT + "features/gemfiles"
+  SPORK_LIBDIR  = SPORK_ROOT + "lib"
   
   extend Forwardable
   def_delegators SporkWorld, :sandbox_dir, :spork_lib_dir
@@ -70,7 +73,7 @@ class SporkWorld
     stderr_file = Tempfile.new('spork')
     stderr_file.close
     in_current_dir do
-      @last_stdout = `#{command} 2> #{stderr_file.path}`
+      @last_stdout = `env RUBYOPT= bundle exec #{command} 2> #{stderr_file.path}`
       @last_exit_status = $?.exitstatus
     end
     @last_stderr = IO.read(stderr_file.path)
@@ -78,7 +81,7 @@ class SporkWorld
 
   def run_in_background(command)
     in_current_dir do
-      @background_job = BackgroundJob.run(command)
+      @background_job = BackgroundJob.run("env RUBYOPT= bundle exec " +  command)
     end
     @background_jobs << @background_job
     @background_job
@@ -93,9 +96,12 @@ class SporkWorld
     @background_jobs.clear
     @background_job = nil
   end
-
 end
 
+require(SPORK_ROOT + "features/support/bundler_helpers.rb")
+BundlerHelpers.set_gemfile(ENV["GEMFILE"])
+
+
 World do
   SporkWorld.new
 end

data/lib/spork.rb

@@ -30,7 +30,7 @@ module Spork
     # * +prevent_double_run+ - Pass false to disable double run prevention
     def each_run(prevent_double_run = true, &block)
       return if prevent_double_run && already_ran?(caller.first)
-      if @state == :using_spork
+      if state == :prefork
         each_run_procs << block
       else
         yield
@@ -49,14 +49,13 @@ module Spork
 
     # 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
+      @using_spork = true
     end
     
     def using_spork?
-      @state == :using_spork
+      @using_spork
     end
 
-    # Used by the server.  Returns the current state of Spork.
     def state
       @state ||= :not_using_spork
     end
@@ -64,11 +63,13 @@ module Spork
     # Used by the server.  Called when loading the prefork blocks of the code.
     def exec_prefork(&block)
       using_spork!
+      @state = :prefork
       yield
     end
     
     # Used by the server.  Called to run all of the prefork blocks.
     def exec_each_run(&block)
+      @state = :run
       activate_after_each_run_at_exit_hook
       each_run_procs.each { |p| p.call }
       each_run_procs.clear
@@ -88,9 +89,9 @@ module Spork
       
       klass.class_eval <<-EOF, __FILE__, __LINE__ + 1
         alias :#{method_name_without_spork} :#{method_name} unless method_defined?(:#{method_name_without_spork}) 
-        def #{method_name}(*args)
+        def #{method_name}(*args, &block)
           Spork.each_run(false) do
-            #{method_name_without_spork}(*args)
+            #{method_name_without_spork}(*args, &block)
           end
         end
       EOF

data/lib/spork/app_framework.rb

@@ -9,7 +9,10 @@ class Spork::AppFramework
       File.exist?("config/boot.rb") && File.read("config/boot.rb").include?('PADRINO')
     },
     :Rails => lambda {
-      File.exist?("config/environment.rb") && File.read("config/environment.rb").include?('RAILS_GEM_VERSION')
+      File.exist?("config/environment.rb") && (
+        File.read("config/environment.rb").include?('RAILS_GEM_VERSION') ||
+        (File.exist?("config/application.rb") && File.read("config/application.rb").include?("Rails::Application"))
+      )
     }
   } unless defined? SUPPORTED_FRAMEWORKS
   

data/lib/spork/app_framework/rails.rb

@@ -1,118 +1,5 @@
 class Spork::AppFramework::Rails < Spork::AppFramework
 
-  # TODO - subclass this out to handle different versions of rails
-  # Also... this is the nastiest duck punch ever.  Clean this up.
-  module NinjaPatcher
-    def self.included(klass)
-      klass.class_eval do
-        unless method_defined?(:load_environment_without_spork)
-          alias :load_environment_without_spork :load_environment
-          alias :load_environment :load_environment_with_spork
-        end
-
-        def self.run_with_spork(*args, &block) # it's all fun and games until someone gets an eye poked out
-          if ENV['RAILS_ENV']
-            Object.send(:remove_const, :RAILS_ENV)
-            Object.const_set(:RAILS_ENV, ENV['RAILS_ENV'].dup)
-          end
-          run_without_spork(*args, &block)
-        end
-
-        class << self
-          unless method_defined?(:run_without_spork)
-            alias :run_without_spork :run
-            alias :run :run_with_spork
-          end
-        end
-      end
-    end
-
-    def load_environment_with_spork
-      result = load_environment_without_spork
-      install_hooks
-      result
-    end
-
-    def install_hooks
-      auto_reestablish_db_connection
-      delay_observer_loading
-      delay_app_preload
-      delay_application_controller_loading
-      delay_route_loading
-      delay_eager_view_loading
-    end
-
-    def reset_rails_env
-      return unless ENV['RAILS_ENV']
-      Object.send(:remove_const, :RAILS_ENV)
-      Object.const_set(:RAILS_ENV, ENV['RAILS_ENV'].dup)
-    end
-
-    def delay_observer_loading
-      if ::Rails::Initializer.instance_methods.map(&:to_sym).include?(:load_observers)
-        Spork.trap_method(::Rails::Initializer, :load_observers)
-      end
-      if Object.const_defined?(:ActionController)
-        require "action_controller/dispatcher.rb"
-        Spork.trap_class_method(::ActionController::Dispatcher, :define_dispatcher_callbacks) if ActionController::Dispatcher.respond_to?(:define_dispatcher_callbacks)
-      end
-    end
-
-    def delay_app_preload
-      if ::Rails::Initializer.instance_methods.map(&:to_sym).include?(:load_application_classes)
-        Spork.trap_method(::Rails::Initializer, :load_application_classes)
-      end
-    end
-
-    def delay_application_controller_loading
-      if application_controller_source = ["#{Dir.pwd}/app/controllers/application.rb", "#{Dir.pwd}/app/controllers/application_controller.rb"].find { |f| File.exist?(f) }
-        application_helper_source = "#{Dir.pwd}/app/helpers/application_helper.rb"
-        load_paths = (::ActiveSupport.const_defined?(:Dependencies) ? ::ActiveSupport::Dependencies : ::Dependencies).load_paths
-        load_paths.unshift(File.expand_path('rails_stub_files', File.dirname(__FILE__)))
-        Spork.each_run do
-          require application_controller_source
-          require application_helper_source if File.exist?(application_helper_source)
-          # update the rails magic to refresh the module
-          ApplicationController.send(:helper, ApplicationHelper)
-        end
-      end
-    end
-
-    def auto_reestablish_db_connection
-      if Object.const_defined?(:ActiveRecord)
-        Spork.each_run do
-          # rails lib/test_help.rb is very aggressive about overriding RAILS_ENV and will switch it back to test after the cucumber env was loaded
-          reset_rails_env
-          ActiveRecord::Base.establish_connection
-        end
-      end
-    end
-
-    def delay_route_loading
-      if ::Rails::Initializer.instance_methods.map(&:to_sym).include?(:initialize_routing)
-        Spork.trap_method(::Rails::Initializer, :initialize_routing)
-      end
-    end
-
-    def delay_eager_view_loading
-      # So, in testing mode it seems it would be optimal to not eager load
-      # views (as your may only run a test that uses one or two views).
-      # However, I decided to delay eager loading rather than force it to
-      # disable because you may wish to eager load your views (I.E. you're
-      # testing concurrency)
-
-      # Rails 2.3.x +
-      if defined?(::ActionView::Template::EagerPath)
-        Spork.trap_method(::ActionView::Template::EagerPath, :load!)
-      end
-      # Rails 2.2.x
-      if defined?(::ActionView::PathSet::Path)
-        Spork.trap_method(::ActionView::PathSet::Path, :load)
-      end
-      # Rails 2.0.5 - 2.1.x don't appear to eager cache views.
-    end
-  end
-
   def preload(&block)
     STDERR.puts "Preloading Rails environment"
     STDERR.flush
@@ -131,6 +18,10 @@ class Spork::AppFramework::Rails < Spork::AppFramework
     @boot_file ||= File.join(File.dirname(environment_file), 'boot')
   end
 
+  def application_file
+    @application_file ||= File.join(File.dirname(environment_file), 'application')
+  end
+
   def environment_contents
     @environment_contents ||= File.read(environment_file)
   end
@@ -139,7 +30,7 @@ class Spork::AppFramework::Rails < Spork::AppFramework
     @vendor ||= File.expand_path("vendor/rails", Dir.pwd)
   end
 
-  def version
+  def deprecated_version
     @version ||= (
       if /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/.match(environment_contents)
         $1
@@ -150,9 +41,42 @@ class Spork::AppFramework::Rails < Spork::AppFramework
   end
 
   def preload_rails
-    Object.const_set(:RAILS_GEM_VERSION, version) if version
-    require boot_file
-    ::Rails::Initializer.send(:include, Spork::AppFramework::Rails::NinjaPatcher)
+    if deprecated_version && (not deprecated_version.match?(/^3/))
+      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
+    require application_file
+    ::Rails.application
+    ::Rails::Engine.class_eval do
+      def eager_load!
+        # turn off eager_loading, all together
+      end
+    end
+    # Spork.trap_method(::AbstractController::Helpers::ClassMethods, :helper)
+    Spork.trap_method(::ActiveModel::Observing::ClassMethods, :instantiate_observers)
+    Spork.each_run { ActiveRecord::Base.establish_connection } if Object.const_defined?(:ActiveRecord)
+    
+    
+    AbstractController::Helpers::ClassMethods.module_eval do
+      def helper(*args, &block)
+        ([args].flatten - [:all]).each do |arg|
+          next unless arg.is_a?(String)
+          filename = arg + "_helper"
+          unless ::ActiveSupport::Dependencies.search_for_file(filename)
+            # this error message must raise in the format such that LoadError#path returns the filename
+            raise LoadError.new("Missing helper file helpers/%s.rb" % filename)
+          end
+        end
+
+        Spork.each_run(false) do
+          modules_for_helpers(args).each do |mod|
+            add_template_helper(mod)
+          end
+
+          _helpers.module_eval(&block) if block_given?
+        end
+      end
+    end
   end
 
 end

data/lib/spork/run_strategy/magazine.rb

@@ -3,15 +3,7 @@
 # as they come in
 require 'drb'
 require 'rinda/ring'
-if RUBY_PLATFORM =~ /mswin|mingw/  and RUBY_VERSION < '1.9.1'
-  begin
-    require 'win32/process'
-  rescue LoadError
-    puts "The 'win32-process' gem is required for windows Spork support with ruby 1.9.1 and lower. Install it, or if using bundler, add it to your Gemfile."
-  end
-end
-
-require 'rubygems' # used for Gem.ruby
+require 'win32/process' if RUBY_PLATFORM =~ /mswin|mingw/  and RUBY_VERSION < '1.9.1'
 
 $:.unshift(File.dirname(__FILE__))
 require 'magazine/magazine_slave'

data/lib/spork/runner.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'stringio'
 
 module Spork
   # This is used by bin/spork. It's wrapped in a class because it's easier to test that way.

data/lib/spork/test_framework.rb

@@ -118,7 +118,7 @@ class Spork::TestFramework
 
   def preload
     Spork.exec_prefork do
-      unless bootstrapped?
+      if not bootstrapped?
         stderr.puts "#{helper_file} has not been bootstrapped.  Run spork --bootstrap to do so."
         stderr.flush
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: 
+  hash: 7712082
+  prerelease: true
   segments: 
   - 0
-  - 8
-  - 5
-  version: 0.8.5
+  - 9
+  - 0
+  - rc
+  version: 0.9.0.rc
 platform: ruby
 authors: 
 - Tim Harper
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -06:00
+date: 2010-09-12 00:00:00 -06:00
 default_executable: spork
 dependencies: []
 
@@ -25,12 +26,13 @@ email:
 - timcharper+spork@gmail.com
 executables: 
 - spork
-extensions: []
-
+extensions: 
+- ext/mkrf_conf.rb
 extra_rdoc_files: 
 - MIT-LICENSE
 - README.rdoc
 files: 
+- Gemfile
 - README.rdoc
 - MIT-LICENSE
 - lib/spork/app_framework/padrino.rb
@@ -61,6 +63,8 @@ files:
 - features/at_exit_during_each_run.feature
 - features/cucumber_rails_integration.feature
 - features/diagnostic_mode.feature
+- features/gemfiles/rails3.0/Gemfile
+- features/gemfiles/rails3.0/Gemfile.lock
 - features/rails_delayed_loading_workarounds.feature
 - features/rspec_rails_integration.feature
 - features/spork_debugger.feature
@@ -68,6 +72,7 @@ files:
 - features/steps/rails_steps.rb
 - features/steps/sandbox_steps.rb
 - features/support/background_job.rb
+- features/support/bundler_helpers.rb
 - features/support/env.rb
 - features/unknown_app_framework.feature
 - spec/spec_helper.rb
@@ -86,6 +91,7 @@ files:
 - spec/support/fake_framework.rb
 - spec/support/fake_run_strategy.rb
 - bin/spork
+- ext/mkrf_conf.rb
 has_rdoc: true
 homepage: http://github.com/timcharper/spork
 licenses: []
@@ -117,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spork
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: spork
@@ -125,6 +131,8 @@ test_files:
 - features/at_exit_during_each_run.feature
 - features/cucumber_rails_integration.feature
 - features/diagnostic_mode.feature
+- features/gemfiles/rails3.0/Gemfile
+- features/gemfiles/rails3.0/Gemfile.lock
 - features/rails_delayed_loading_workarounds.feature
 - features/rspec_rails_integration.feature
 - features/spork_debugger.feature
@@ -132,6 +140,7 @@ test_files:
 - features/steps/rails_steps.rb
 - features/steps/sandbox_steps.rb
 - features/support/background_job.rb
+- features/support/bundler_helpers.rb
 - features/support/env.rb
 - features/unknown_app_framework.feature
 - spec/spec_helper.rb