spork 0.5.8 → 0.5.9

data/features/cucumber_rails_integration.feature

@@ -39,11 +39,11 @@ Feature: Cucumber integration with rails
 
       Spork.each_run do
         # This code will be run each time you run your specs.
-        require 'cucumber/rails/world'
+
         Cucumber::Rails.use_transactional_fixtures
         Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling
                                       # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
-        
+
         #### this is for this test only #######
         $loaded_stuff << 'each_run block' #####
         #######################################
@@ -52,8 +52,18 @@ Feature: Cucumber integration with rails
     And a file named "features/cucumber_rails.feature" with:
       """
       Feature: cucumber rails
-        Scenario: did it work
+        Scenario: did it work?
           Then it should work
+
+        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:
       """
@@ -73,8 +83,6 @@ Feature: Cucumber integration with rails
     And a file named "features/step_definitions/cucumber_rails_steps.rb" with:
       """
       Then "it should work" do
-        Spork.state.should == :using_spork
-        RAILS_ENV.should == 'features'
         (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')
@@ -86,6 +94,9 @@ Feature: Cucumber integration with rails
         $loaded_stuff.should include('prefork block')
         puts "It worked!"
       end
+      
+      Alors /ca marche/ do
+      end
       """
     Scenario: Analyzing files were preloaded
       When I run spork --diagnose
@@ -98,9 +109,23 @@ Feature: Cucumber integration with rails
       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"
       
+    Scenario: Running spork with a rails app and no server
+      When I run cucumber --drb features
+      Then the error output should contain
+        """
+        WARNING: No DRb server is running. Running features locally
+        """
+
     Scenario: Running spork with a rails app and observers
       When I fire up a spork instance with "spork cucumber"
-      And I run cucumber --drb features/cucumber_rails.feature
-      Then the output should contain "It worked!"
+      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"
+      
+    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"
-      

data/features/diagnostic_mode.feature

@@ -30,7 +30,11 @@ Feature: Diagnostic Mode
       end
       """
     When I run spork --diagnose
-    Then the output should contain "lib/awesome.rb"
+    Then the error output should contain
+      """
+      Loading Spork.prefork block...
+      """
+    And the output should contain "lib/awesome.rb"
     And the output should contain "spec/spec_helper.rb:5"
     And the output should not contain "super_duper.rb"
     And the output should not contain "diagnose.rb"

data/features/rspec_rails_integration.feature

@@ -62,5 +62,31 @@ Feature: Rails Integration
     """
     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 "Specs successfully run within spork, and all initialization files were loaded"
+    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 a file named "spec/did_it_work_spec.rb" with:
+    """
+    describe "Did it work?" do
+      it "checks to see if all worked" do
+        Spork.state.should == :using_spork
+        (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')
+        $loaded_stuff.should include('UserObserver')
+        $loaded_stuff.should include('ApplicationHelper')
+        $loaded_stuff.should include('config/routes.rb')
+        $loaded_stuff.should include('each_run block')
+        $loaded_stuff.should include('prefork block')
+        puts "Specs successfully run within spork, and all initialization files were loaded"
+      end
+    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
+    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/steps/rails_steps.rb

@@ -2,7 +2,7 @@ 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
   # run("#{SporkWorld::RUBY_BINARY} #{%x{which rails}.chomp} #{folder_name}")
-  run([SporkWorld::RUBY_BINARY, %x{which rails}.chomp, version_argument, folder_name].compact * " ")
+  run([SporkWorld::RUBY_BINARY, '-I', Cucumber::LIBDIR, %x{which rails}.chomp, version_argument, folder_name].compact * " ")
   @current_dir = File.join(File.join(SporkWorld::SANDBOX_DIR, folder_name))
 end
 

data/features/steps/sandbox_steps.rb

@@ -34,16 +34,19 @@ Given /^the following code appears in "([^\"]*)" after \/([^\\\/]*)\/:$/ do |fil
 end
 
 When /^I run (spork|spec|cucumber)($| .*$)/ do |command, spork_opts|
-  if command == 'spork'
+  case command
+  when 'spork'
     command = SporkWorld::BINARY
+  when 'cucumber'
+    command = Cucumber::BINARY
   else
     command = %x{which #{command}}.chomp
   end
-  run "#{SporkWorld::RUBY_BINARY} #{command} #{spork_opts}"
+  run "#{SporkWorld::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{command} #{spork_opts}"
 end
 
 When /^I fire up a spork instance with "spork(.*)"$/ do |spork_opts|
-  run_in_background "#{SporkWorld::RUBY_BINARY} #{SporkWorld::BINARY} #{spork_opts}"
+  run_in_background "#{SporkWorld::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{SporkWorld::BINARY} #{spork_opts}"
   output = ""
   begin
     status = Timeout::timeout(15) do
@@ -86,6 +89,10 @@ Then /^the (error output|output) should not contain "(.+)"$/ do |which, text|
   (which == "error output" ? last_stderr : last_stdout).should_not include(text)
 end
 
+Then /^the (error output|output) should be empty$/ do |which|
+  (which == "error output" ? last_stderr : last_stdout).should == ""
+end
+
 Then /^the (error output|output) should be$/ do |which, text|
   (which == "error output" ? last_stderr : last_stdout).should == text
 end

data/features/support/env.rb

@@ -4,10 +4,11 @@ require 'forwardable'
 require 'tempfile'
 require 'spec/expectations'
 require 'timeout'
+require 'spork'
 
 class SporkWorld
-  RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
   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'))
   
   extend Forwardable

data/lib/spork.rb

@@ -1,5 +1,8 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 module Spork
+  BINARY = File.expand_path(File.dirname(__FILE__) + '/../bin/spork')
+  LIBDIR = File.expand_path(File.dirname(__FILE__))
+
   class << self
     # Run a block, during prefork mode.  By default, if prefork is called twice in the same file and line number, the supplied block will only be ran once.
     #

data/lib/spork/runner.rb

@@ -22,6 +22,7 @@ module Spork
       opt.on("-b", "--bootstrap")  {|ignore| @options[:bootstrap] = true }
       opt.on("-d", "--diagnose")  {|ignore| @options[:diagnose] = true }
       opt.on("-h", "--help")  {|ignore| @options[:help] = true }
+      opt.on("-p", "--port [PORT]") {|port| @options[:port] = port }
       non_option_args = args.select { |arg| ! args[0].match(/^-/) }
       @options[:server_matcher] = non_option_args[0]
       opt.parse!(args)
@@ -81,6 +82,9 @@ Are you running me from a project directory?
       ENV["DRB"] = 'true'
       @error.puts "Using #{server.server_name}"
       @error.flush
+
+      server.port = options[:port]
+
       case
       when options[:bootstrap]
         server.bootstrap

data/lib/spork/server.rb

@@ -94,7 +94,11 @@ class Spork::Server
   end
   
   def port
-    self.class.port
+    self.class.instance_variable_get("@port") || self.class.port
+  end
+
+  def self.port= p
+    @port = p
   end
   
   def helper_file
@@ -194,4 +198,4 @@ class Spork::Server
     end
 end
 
-Dir[File.dirname(__FILE__) + "/server/*.rb"].each { |file| require file }
+Dir[File.dirname(__FILE__) + "/server/*.rb"].each { |file| require file }

data/lib/spork/server/cucumber.rb

@@ -1,34 +1,35 @@
+require 'cucumber'
+
 class Spork::Server::Cucumber < Spork::Server
   CUCUMBER_PORT = 8990
   CUCUMBER_HELPER_FILE = File.join(Dir.pwd, "features/support/env.rb")
 
   class << self
     def port
-      CUCUMBER_PORT
+      (ENV['CUCUMBER_DRB'] || CUCUMBER_PORT).to_i
     end
 
     def helper_file
       CUCUMBER_HELPER_FILE
     end
 
-    # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
+    # REMOVE WHEN SUPPORT FOR 0.3.95 AND EARLIER IS DROPPED
     attr_accessor :step_mother
   end
 
-  # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
+  # REMOVE WHEN SUPPORT FOR 0.3.95 AND EARLIER IS DROPPED
   def step_mother
     self.class.step_mother
   end
 
   def run_tests(argv, stderr, stdout)
-    begin
-      require 'cucumber/cli/main'
-      ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(::Cucumber::StepMother.new)
-    rescue NoMethodError => pre_cucumber_0_4 # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
-      ::Cucumber::Cli::Main.step_mother = step_mother
-      ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(step_mother)
-    end
+    ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(step_mother)
   end
 end
 
-Spork::Server::Cucumber.step_mother = self # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
+begin
+  Spork::Server::Cucumber.step_mother = ::Cucumber::StepMother.new
+  Spork::Server::Cucumber.step_mother.load_programming_language('rb') if defined?(Spork::Server)
+rescue NoMethodError => pre_cucumber_0_4 # REMOVE WHEN SUPPORT FOR 0.3.95 AND EARLIER IS DROPPED
+  Spork::Server::Cucumber.step_mother = self
+end

data/lib/spork/server/rspec.rb

@@ -3,7 +3,7 @@ class Spork::Server::RSpec < Spork::Server
   RSPEC_HELPER_FILE = File.join(Dir.pwd, "spec/spec_helper.rb")
   
   def self.port
-    RSPEC_PORT
+    (ENV['RSPEC_DRB'] ||  RSPEC_PORT).to_i
   end
   
   def self.helper_file

data/spec/spork/server/cucumber_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Spork::Server::Cucumber do
+  before(:each) do
+    @server = Spork::Server::Cucumber.new
+  end
+  
+  it "uses the CUCUMBER_PORT for it's default port" do
+    @server.port.should == Spork::Server::Cucumber::CUCUMBER_PORT
+  end
+
+  it "uses ENV['CUCUMBER_DRB'] as port if present" do
+    orig = ENV['CUCUMBER_DRB']
+    begin
+      ENV['CUCUMBER_DRB'] = "9000"
+      @server.port.should == 9000
+    ensure
+      ENV['CUCUMBER_DRB'] = orig
+    end
+  end
+  
+  it "uses the CUCUMBER_HELPER_FILE for it's helper_file" do
+    @server.helper_file.should == Spork::Server::Cucumber::CUCUMBER_HELPER_FILE
+  end
+end

data/spec/spork/server/rspec_spec.rb

@@ -5,9 +5,19 @@ describe Spork::Server::RSpec do
     @server = Spork::Server::RSpec.new
   end
   
-  it "uses the RSPEC_PORT for it's port" do
+  it "uses the RSPEC_PORT for it's default port" do
     @server.port.should == Spork::Server::RSpec::RSPEC_PORT
   end
+
+  it "uses ENV['RSPEC_DRB'] as port if present" do
+    orig = ENV['RSPEC_DRB']
+    begin
+      ENV['RSPEC_DRB'] = "9000"
+      @server.port.should == 9000
+    ensure
+      ENV['RSPEC_DRB'] = orig
+    end
+  end
   
   it "uses the RSPEC_HELPER_FILE for it's helper_file" do
     @server.helper_file.should == Spork::Server::RSpec::RSPEC_HELPER_FILE

data/spec/spork/server_spec.rb

@@ -124,5 +124,18 @@ describe Spork::Server do
       @fake.stub!(:run_tests).and_return("tests were ran")
       @fake.run("test", STDOUT, STDIN).should == "tests were ran"
     end
+
+    it "accepts a port" do
+      create_helper_file
+      @fake.class.port = 12345
+      @fake.port.should == 12345
+    end
+
+    it "falls back to a default port" do
+      create_helper_file
+      @fake.class.port = nil
+      @fake.port.should == FakeServer.port
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -06:00
+date: 2009-08-19 00:00:00 -06:00
 default_executable: spork
 dependencies: []
 
@@ -56,6 +56,7 @@ files:
 - spec/spork/diagnoser_spec.rb
 - spec/spork/forker_spec.rb
 - spec/spork/runner_spec.rb
+- spec/spork/server/cucumber_spec.rb
 - spec/spork/server/rspec_spec.rb
 - spec/spork/server_spec.rb
 - spec/spork_spec.rb
@@ -96,6 +97,7 @@ test_files:
 - spec/spork/diagnoser_spec.rb
 - spec/spork/forker_spec.rb
 - spec/spork/runner_spec.rb
+- spec/spork/server/cucumber_spec.rb
 - spec/spork/server/rspec_spec.rb
 - spec/spork/server_spec.rb
 - spec/spork_spec.rb