spork 0.9.0.rc → 0.9.0.rc2

data/Gemfile

@@ -1,6 +1,6 @@
 source :gemcutter
 gem 'cucumber', '0.7.3'
 gem 'gherkin', '1.0.27'
-gem 'rspec',  '1.3.0'
+gem "rspec", "2.0.0.beta.20"
 gem 'rake'
 gem 'ruby-debug'

data/README.rdoc

@@ -12,6 +12,14 @@ Spork is Tim Harper's implementation of test server (similar to the script/spec_
 
 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).
 
+== RAILS 3
+
+Rails 3.0 support is in progress, but is not ready.  The master branch is stable and works with rails 2.3.x.
+
+Rspec 2.x support is not ready either.
+
+If you want to help, see the rails3 branch.
+
 == Supported Testing Frameworks
 
 * Rspec

data/features/cucumber_rails_integration.feature

@@ -10,6 +10,8 @@ Feature: Cucumber integration with rails
       """
       require 'rubygems'
       require 'spork'
+      ENV["RAILS_ENV"] ||= "test"
+
 
       Spork.prefork do
         # Loading more in this block will cause your tests to run faster. However, 
@@ -17,7 +19,6 @@ Feature: Cucumber integration with rails
         # need to restart spork for it take effect.
         
         # Sets up the Rails environment for Cucumber
-        ENV['RAILS_ENV'] = "features"
         require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 
         require 'cucumber'
@@ -49,15 +50,11 @@ Feature: Cucumber integration with rails
       """
       $loaded_stuff << 'features/support/cucumber_rails_helper.rb'
       """
-    And a file named "config/environments/features.rb" with:
-      """
-      # your cucumber env here
-      """
     And a file named "config/database.yml" with:
       """
-      features:
+      test:
         adapter: sqlite3
-        database: db/features.sqlite3
+        database: db/test.sqlite3
         timeout: 5000
       """
     And a file named "features/step_definitions/cucumber_rails_steps.rb" with:
@@ -85,7 +82,6 @@ Feature: Cucumber integration with rails
       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 "features/step_definitions/cucumber_rails_steps.rb"
       Then the output should not contain "features/support/cucumber_rails_helper.rb"
       
@@ -101,11 +97,11 @@ Feature: Cucumber integration with rails
       And I run cucumber --drb features
       Then the error output should be empty
       And the output should contain "It worked!"
-      And the file "log/features.log" should include "hey there"
+      And the file "log/test.log" should include "hey there"
       
     Scenario: Running spork with a rails app and a non-standard port
       When I fire up a spork instance with "spork cucumber -p 9000"
       And I run cucumber --drb --port 9000 features
       Then the error output should be empty
       And the output should contain "It worked!"
-      And the file "log/features.log" should include "hey there"
+      And the file "log/test.log" should include "hey there"

data/features/gemfiles/rails3.0/Gemfile

@@ -1,8 +1,8 @@
 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 'cucumber', '0.8.5'
+gem 'cucumber-rails', '0.3.2'
+gem "gherkin", "2.1.4"
 gem "rspec", "2.0.0.beta.20"
 gem 'rspec-rails', "2.0.0.beta.20"
 gem 'rails', '3.0.0'

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

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/timcharper/projects/spork
   specs:
-    spork (0.8.4)
+    spork (0.9.0.rc)
 
 GEM
   remote: http://rubygems.org/
@@ -37,23 +37,23 @@ GEM
       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)
+    cucumber (0.8.5)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.1.4)
+      json_pure (~> 1.4.3)
+      term-ansicolor (~> 1.0.4)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    gherkin (1.0.30)
-      trollop (>= 1.16.2)
+    gherkin (2.1.4)
+      trollop (~> 1.16.2)
     i18n (0.4.1)
     json_pure (1.4.6)
     linecache (0.43)
-    mail (2.2.6)
+    mail (2.2.6.1)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -105,9 +105,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (= 0.7.3)
-  cucumber-rails (= 0.3.1)
-  gherkin (= 1.0.30)
+  cucumber (= 0.8.5)
+  cucumber-rails (= 0.3.2)
+  gherkin (= 2.1.4)
   rails (= 3.0.0)
   rspec (= 2.0.0.beta.20)
   rspec-rails (= 2.0.0.beta.20)

data/features/rspec_rails_integration.feature

@@ -47,7 +47,7 @@ Feature: Rails Integration
     require 'spec_helper'
     describe "Did it work?" do
       it "checks to see if all worked" do
-        Spork.state.should == :using_spork
+        Spork.using_spork?.should == true
         (Rails.respond_to?(:logger) ? Rails.logger : ActionController::Base.logger).info "hey there"
         $loaded_stuff.should include('ActiveRecord::Base.establish_connection')
         $loaded_stuff.should include('User')
@@ -72,7 +72,7 @@ Feature: Rails Integration
     """
     describe "Did it work?" do
       it "checks to see if all worked" do
-        Spork.state.should == :using_spork
+        Spork.using_spork?.should == true
         (Rails.respond_to?(:logger) ? Rails.logger : ActionController::Base.logger).info "hey there"
         $loaded_stuff.should include('ActiveRecord::Base.establish_connection')
         $loaded_stuff.should include('User')

data/features/steps/rails_steps.rb

@@ -57,8 +57,8 @@ Given "the application has a model, observer, route, and application helper" do
     class ActiveRecord::Base
       class << self
         def establish_connection_with_load_logging(*args)
-          establish_connection_without_load_logging(*args)
           $loaded_stuff << 'ActiveRecord::Base.establish_connection'
+          establish_connection_without_load_logging(*args)
         end
         alias_method_chain :establish_connection, :load_logging
       end

data/features/steps/sandbox_steps.rb

@@ -32,11 +32,11 @@ Given /^the following code appears in "([^\"]*)" after \/([^\/]*)\/:$/ do |file_
 end
 
 When /^I run (spork|rspec|cucumber)(| .*)$/ do |command, args|
-  run(localized_command(command, args))
+  run("#{command} #{args}")
 end
 
 When /^I run this in the background: (spork|rspec|cucumber)(| .*)$/ do |command, args|
-  @background_script = run_in_background(localized_command(command, args))
+  @background_script = run_in_background("#{command} #{args}")
 end
 
 When /^I fire up a spork instance with "spork(.*)"$/ do |spork_opts|

data/features/support/bundler_helpers.rb

@@ -4,7 +4,6 @@ module BundlerHelpers
   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

data/features/support/env.rb

@@ -3,7 +3,7 @@ require 'pathname'
 require 'fileutils'
 require 'forwardable'
 require 'tempfile'
-require 'spec/expectations'
+require 'rspec/expectations'
 require 'timeout'
 
 require(File.dirname(__FILE__) + '/background_job.rb')
@@ -57,18 +57,6 @@ class SporkWorld
     Dir.chdir(@current_dir, &block)
   end
 
-  def localized_command(command, args)
-    case command
-    when 'spork'
-      command = SporkWorld::BINARY
-    when 'cucumber'
-      command = Cucumber::BINARY
-    else
-      command = %x{which #{command}}.chomp
-    end
-    "#{SporkWorld::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{command} #{args}"
-  end
-
   def run(command)
     stderr_file = Tempfile.new('spork')
     stderr_file.close

data/lib/spork.rb

@@ -47,13 +47,8 @@ module Spork
       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!
-      @using_spork = true
-    end
-    
     def using_spork?
-      @using_spork
+      state != :not_using_spork
     end
 
     def state
@@ -62,7 +57,6 @@ 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

data/lib/spork/app_framework/rails.rb

@@ -54,9 +54,9 @@ class Spork::AppFramework::Rails < Spork::AppFramework
     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)
-    
-    
+    Spork.each_run { ActiveRecord::Base.establish_connection rescue nil } if Object.const_defined?(:ActiveRecord)
+
+
     AbstractController::Helpers::ClassMethods.module_eval do
       def helper(*args, &block)
         ([args].flatten - [:all]).each do |arg|

data/lib/spork/runner.rb

@@ -70,7 +70,6 @@ module Spork
         Spork::Diagnoser.output_results(@output)
         return true
       else
-        Spork.using_spork!
         run_strategy = Spork::RunStrategy.factory(test_framework)
         return(false) unless run_strategy.preload
         Spork::Server.run(:port => @options[:port] || test_framework.default_port, :run_strategy => run_strategy)

data/spec/spec_helper.rb

@@ -8,8 +8,9 @@ unless $spec_helper_loaded
   require 'spork'
   require 'stringio'
   require 'fileutils'
+  require 'rspec'
 
-  Spec::Runner.configure do |config|
+  RSpec.configure do |config|
     config.before(:each) do
       $test_stdout = StringIO.new
       $test_stderr = StringIO.new
@@ -48,7 +49,7 @@ unless $spec_helper_loaded
   end
 
 
-  module Spec
+  module RSpec
     module Matchers
       class IncludeAStringLike
         def initialize(substring_or_regex)

data/spec/spork/app_framework/rails_spec.rb

@@ -1,21 +1,21 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Spork::AppFramework::Rails do
-  describe ".version" do
+  describe ".deprecated_version" do
     it "detects the current version of rails" do
       create_file("config/environment.rb", "RAILS_GEM_VERSION = '2.1.0'")
       in_current_dir do
-        Spork::AppFramework::Rails.new.version.should == "2.1.0"
+        Spork::AppFramework::Rails.new.deprecated_version.should == "2.1.0"
       end
       
       create_file("config/environment.rb", 'RAILS_GEM_VERSION = "2.1.0"')
       in_current_dir do
-        Spork::AppFramework::Rails.new.version.should == "2.1.0"
+        Spork::AppFramework::Rails.new.deprecated_version.should == "2.1.0"
       end
       
       create_file("config/environment.rb", 'RAILS_GEM_VERSION = "> 2.1.0"')
       in_current_dir do
-        Spork::AppFramework::Rails.new.version.should == "> 2.1.0"
+        Spork::AppFramework::Rails.new.deprecated_version.should == "> 2.1.0"
       end
     end
   end

data/spec/spork/test_framework/cucumber_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + "/../test_framework_spec"
+require File.dirname(__FILE__) + "/../test_framework_shared_examples"
 
 describe Spork::TestFramework::Cucumber do
   before(:each) do

data/spec/spork/test_framework/rspec_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + "/../test_framework_spec"
+require File.dirname(__FILE__) + "/../test_framework_shared_examples"
 
 describe Spork::TestFramework::RSpec do
   before(:each) do

data/spec/spork/test_framework_shared_examples.rb

@@ -0,0 +1,23 @@
+shared_examples_for "a TestFramework" do
+  describe ".default_port" do
+    it "uses the DEFAULT_PORT when the environment variable is not set" do
+      @klass.default_port.should == @klass::DEFAULT_PORT
+    end
+
+    it 'uses ENV["#{short_name.upcase}_DRB"] as port if present' do
+      env_name = "#{@klass.short_name.upcase}_DRB"
+      orig, ENV[env_name] = ENV[env_name], "9000"
+      begin
+        @klass.default_port.should == 9000
+      ensure
+        ENV[env_name] = orig
+      end
+    end
+  end
+
+  describe ".helper_file" do
+    it "returns ::HELPER_FILE for the TestFramework" do
+      @klass.helper_file.should == @klass::HELPER_FILE
+    end
+  end
+end

data/spec/spork/test_framework_spec.rb

@@ -1,29 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "a TestFramework", :shared => true do
-  describe ".default_port" do
-    it "uses the DEFAULT_PORT when the environment variable is not set" do
-      @klass.default_port.should == @klass::DEFAULT_PORT
-    end
-
-    it 'uses ENV["#{short_name.upcase}_DRB"] as port if present' do
-      env_name = "#{@klass.short_name.upcase}_DRB"
-      orig, ENV[env_name] = ENV[env_name], "9000"
-      begin
-        @klass.default_port.should == 9000
-      ensure
-        ENV[env_name] = orig
-      end
-    end
-  end
-
-  describe ".helper_file" do
-    it "returns ::HELPER_FILE for the TestFramework" do
-      @klass.helper_file.should == @klass::HELPER_FILE
-    end
-  end
-end
-
 describe Spork::TestFramework do
 
   before(:each) do

data/spec/spork_spec.rb

@@ -3,17 +3,19 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 Spork.class_eval do
   def self.reset!
     @state = nil
+    @using_spork = false
     @already_ran = nil
+    @each_run_procs = nil
   end
 end
 
 describe Spork do
   before(:each) do
     Spork.reset!
+    @ran = []
   end
   
   def spec_helper_simulator
-    @ran ||= []
     Spork.prefork do
       @ran << :prefork
     end
@@ -63,14 +65,14 @@ describe Spork do
   describe "#using_spork?" do
     it "returns true if Spork is being used" do
       Spork.using_spork?.should be_false
-      Spork.using_spork!
+      Spork.exec_prefork { }
       Spork.using_spork?.should be_true
     end
   end
 
   describe "#trap_method" do
     before(:each) do
-      Spork.using_spork!
+      Spork.exec_prefork { }
       
       Object.class_eval do
         class TrapTest
@@ -99,7 +101,7 @@ describe Spork do
     end
     
     it "delays execution of a method until after Spork.exec_each_run is called" do
-      Spork.using_spork!
+      Spork.exec_prefork { }
       Spork.trap_method(TrapTest, :hello)
       @trap_test.hello
       @trap_test.goodbye
@@ -140,7 +142,7 @@ describe Spork do
     end
     
     it "delays execution of a method until after Spork.exec_each_run is called" do
-      Spork.using_spork!
+      Spork.exec_prefork { }
       Spork.trap_class_method(TrapTest, :hello)
       TrapTest.hello
       TrapTest.goodbye

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  hash: 7712082
+  hash: 977940487
   prerelease: true
   segments: 
   - 0
   - 9
   - 0
-  - rc
-  version: 0.9.0.rc
+  - rc2
+  version: 0.9.0.rc2
 platform: ruby
 authors: 
 - Tim Harper
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -06:00
+date: 2010-09-13 00:00:00 -06:00
 default_executable: spork
 dependencies: []
 
@@ -86,6 +86,7 @@ files:
 - spec/spork/server_spec.rb
 - spec/spork/test_framework/cucumber_spec.rb
 - spec/spork/test_framework/rspec_spec.rb
+- spec/spork/test_framework_shared_examples.rb
 - spec/spork/test_framework_spec.rb
 - spec/spork_spec.rb
 - spec/support/fake_framework.rb
@@ -154,6 +155,7 @@ test_files:
 - spec/spork/server_spec.rb
 - spec/spork/test_framework/cucumber_spec.rb
 - spec/spork/test_framework/rspec_spec.rb
+- spec/spork/test_framework_shared_examples.rb
 - spec/spork/test_framework_spec.rb
 - spec/spork_spec.rb
 - spec/support/fake_framework.rb