spork 0.9.0.rc8 → 0.9.0.rc9

data/Gemfile

@@ -1,6 +1,6 @@
 source :gemcutter
-gem 'cucumber', '0.10.2'
-gem "rspec", "2.5.0"
+gem 'cucumber', '~> 1.0.0'
+gem 'rspec', '~> 2.6'
 gem 'rake'
 
 if RUBY_VERSION =~ /^1\.9/

data/features/gemfiles/rails3.0/Gemfile

@@ -1,7 +1,7 @@
 source :gemcutter
 gem 'sqlite3-ruby', '1.2.5'
-gem 'cucumber', '0.10.2'
-gem 'cucumber-rails', '0.4.1'
+gem 'cucumber', '~> 1.0.0'
+gem 'cucumber-rails', '~> 1.0.0'
 gem "rspec", "2.5.0"
 gem 'rspec-rails', "2.5.0"
 gem 'rails', '3.0.7'

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

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/timcharper/projects/spork
   specs:
-    spork (0.9.0.rc7)
+    spork (0.9.0.rc8)
 
 GEM
   remote: http://rubygems.org/
@@ -35,24 +35,35 @@ GEM
     activesupport (3.0.7)
     arel (2.0.9)
     builder (2.1.2)
+    capybara (1.0.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
     columnize (0.3.2)
-    cucumber (0.10.2)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    cucumber-rails (0.4.1)
-      cucumber (>= 0.10.1)
-      nokogiri (>= 1.4.4)
-      rack-test (>= 0.5.7)
+    cucumber-rails (1.0.2)
+      capybara (>= 1.0.0)
+      cucumber (~> 1.0.0)
+      nokogiri (>= 1.4.6)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    gherkin (2.3.7)
+    ffi (1.0.9)
+    gherkin (2.4.1)
       json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.5.1)
+    json (1.5.3)
+    json_pure (1.5.3)
     linecache (0.43)
     mail (2.2.19)
       activesupport (>= 2.3.6)
@@ -60,7 +71,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.4)
+    nokogiri (1.4.6)
     polyglot (0.3.1)
     rack (1.2.2)
     rack-mount (0.6.14)
@@ -99,19 +110,27 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
+      ffi (>= 1.0.7)
+      json_pure
+      rubyzip
     sqlite3-ruby (1.2.5)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.27)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (= 0.10.2)
-  cucumber-rails (= 0.4.1)
+  cucumber (~> 1.0.0)
+  cucumber-rails (~> 1.0.0)
   rails (= 3.0.7)
   rspec (= 2.5.0)
   rspec-rails (= 2.5.0)

data/features/support/env.rb

@@ -86,7 +86,7 @@ class SporkWorld
   end
 end
 
-require(SPORK_ROOT + "features/support/bundler_helpers.rb")
+require((SPORK_ROOT + "features/support/bundler_helpers.rb").to_s)
 BundlerHelpers.set_gemfile(ENV["GEMFILE"])
 
 

data/lib/spork/gem_helpers.rb

@@ -19,7 +19,7 @@ module Spork::GemHelpers
   def latest_load_paths
     case
     when defined?(Bundler)
-      $LOAD_PATH.uniq
+      $LOAD_PATH.map { |p| File.expand_path(p) }.uniq
     when Gem.respond_to?(:path)
       Dir["{#{Gem.path.join(',')}}" + "/gems/*"].inject({}) do |h,f|
         gem_path = GemPath.new(f)
@@ -29,7 +29,7 @@ module Spork::GemHelpers
           h[gem_path.name] = gem_path
         end
         h
-      end.values.map(&:path)
+      end.values.map { |gem_path| File.expand_path("lib", gem_path.path) }.sort.uniq
     else
       STDERR.puts "No mechanism available to scan for other gems implementing spork hooks. "
       []

data/lib/spork/run_strategy/magazine.rb

@@ -8,6 +8,7 @@ if RUBY_PLATFORM =~ /mswin|mingw/  and RUBY_VERSION < '1.9.1'
     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."
+    exit 1
   end
 end
 

data/lib/spork/test_framework/cucumber.rb

@@ -9,7 +9,7 @@ class Spork::TestFramework::Cucumber < Spork::TestFramework
 
   def preload
     require 'cucumber'
-    if ::Cucumber::VERSION >= '0.9.0'
+    if ::Cucumber::VERSION >= '0.9.0' && ::Cucumber::VERSION < '1.0.0'
       # nothing to do nowadays
     else
       preload_legacy_cucumbers
@@ -18,7 +18,7 @@ class Spork::TestFramework::Cucumber < Spork::TestFramework
   end
 
   def run_tests(argv, stderr, stdout)
-    if ::Cucumber::VERSION >= '0.9.0'
+    if ::Cucumber::VERSION >= '0.9.0'  && ::Cucumber::VERSION < '1.0.0'
       ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!
     else
       ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(@step_mother)

data/lib/spork/test_framework/rspec.rb

@@ -3,12 +3,16 @@ class Spork::TestFramework::RSpec < Spork::TestFramework
   HELPER_FILE = File.join(Dir.pwd, "spec/spec_helper.rb")
 
   def run_tests(argv, stderr, stdout)
-    ::Spec::Runner::CommandLine.run(
-      ::Spec::Runner::OptionParser.parse(
-        argv,
-        stderr,
-        stdout
+    if rspec1?
+      ::Spec::Runner::CommandLine.run(
+        ::Spec::Runner::OptionParser.parse(argv, stderr, stdout)
       )
-    )
+    else
+      ::RSpec::Core::CommandLine.new(argv).run(stderr, stdout)
+    end
+  end
+
+  def rspec1?
+    defined?(Spec) && !defined?(RSpec)
   end
 end

data/spec/spec_helper.rb

@@ -1,113 +1,107 @@
 require 'rubygems'
 
-unless $spec_helper_loaded
-  $spec_helper_loaded = true
-
-  $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
-  SPEC_TMP_DIR = File.expand_path('tmp', File.dirname(__FILE__))
-  require 'spork'
-  require 'stringio'
-  require 'fileutils'
-  require 'rspec'
-
-  RSpec.configure do |config|
-    config.before(:each) do
-      $test_stdout = StringIO.new
-      $test_stderr = StringIO.new
-      @current_dir = nil
-    end
-  
-    config.after(:each) do
-      FileUtils.rm_rf(SPEC_TMP_DIR) if File.directory?(SPEC_TMP_DIR)
-    
-    end
-  
-    def create_file(filename, contents)
-      FileUtils.mkdir_p(SPEC_TMP_DIR) unless File.directory?(SPEC_TMP_DIR)
-    
-      in_current_dir do
-        FileUtils.mkdir_p(File.dirname(filename))
-        File.open(filename, 'wb') { |f| f << contents }
-      end
-    end
+SPEC_TMP_DIR = File.expand_path('tmp', File.dirname(__FILE__))
+require 'spork'
+require 'stringio'
+require 'fileutils'
+require 'rspec'
 
-    def create_helper_file(test_framework = FakeFramework)
-      create_file(test_framework.helper_file, "# stub spec helper file")
-    end
+RSpec.configure do |config|
+  config.before(:each) do
+    $test_stdout = StringIO.new
+    $test_stderr = StringIO.new
+    @current_dir = nil
+  end
 
-    def in_current_dir(&block)
-      Dir.chdir(current_dir, &block)
-    end
-  
-    def current_dir
-      @current_dir ||= SPEC_TMP_DIR
-    end
-    
-    def change_current_dir(sub_path)
-      @current_dir = File.expand_path(sub_path, SPEC_TMP_DIR)
-    end
-    
-    def windows?
-      ENV['OS'] == 'Windows_NT'
-    end
+  config.after(:each) do
+    FileUtils.rm_rf(SPEC_TMP_DIR) if File.directory?(SPEC_TMP_DIR)
+  end
+end
+
+def create_file(filename, contents)
+  FileUtils.mkdir_p(SPEC_TMP_DIR) unless File.directory?(SPEC_TMP_DIR)
+
+  in_current_dir do
+    FileUtils.mkdir_p(File.dirname(filename))
+    File.open(filename, 'wb') { |f| f << contents }
   end
+end
 
+def create_helper_file(test_framework = FakeFramework)
+  create_file(test_framework.helper_file, "# stub spec helper file")
+end
 
-  module RSpec
-    module Matchers
-      class IncludeAStringLike
-        def initialize(substring_or_regex)
-          case substring_or_regex
-          when String
-            @regex = Regexp.new(Regexp.escape(substring_or_regex))
-          when Regexp
-            @regex = substring_or_regex
-          else
-            raise ArgumentError, "don't know what to do with the #{substring_or_regex.class} you provided"
-          end
-        end
+def in_current_dir(&block)
+  Dir.chdir(current_dir, &block)
+end
 
-        def matches?(list_of_strings)
-          @list_of_strings = list_of_strings
-          @list_of_strings.any? { |s| s =~ @regex }
-        end
-        def failure_message
-          "#{@list_of_strings.inspect} expected to include a string like #{@regex.inspect}"
-        end
-        def negative_failure_message
-          "#{@list_of_strings.inspect} expected to not include a string like #{@regex.inspect}, but did"
+def current_dir
+  @current_dir ||= SPEC_TMP_DIR
+end
+
+def change_current_dir(sub_path)
+  @current_dir = File.expand_path(sub_path, SPEC_TMP_DIR)
+end
+
+def windows?
+  ENV['OS'] == 'Windows_NT'
+end
+
+
+module RSpec
+  module Matchers
+    class IncludeAStringLike
+      def initialize(substring_or_regex)
+        case substring_or_regex
+        when String
+          @regex = Regexp.new(Regexp.escape(substring_or_regex))
+        when Regexp
+          @regex = substring_or_regex
+        else
+          raise ArgumentError, "don't know what to do with the #{substring_or_regex.class} you provided"
         end
       end
 
-      def include_a_string_like(substring_or_regex)
-        IncludeAStringLike.new(substring_or_regex)
+      def matches?(list_of_strings)
+        @list_of_strings = list_of_strings
+        @list_of_strings.any? { |s| s =~ @regex }
+      end
+      def failure_message
+        "#{@list_of_strings.inspect} expected to include a string like #{@regex.inspect}"
+      end
+      def negative_failure_message
+        "#{@list_of_strings.inspect} expected to not include a string like #{@regex.inspect}, but did"
       end
     end
-  end
 
-  module Spork::TestIOStreams
-    def self.included(klass)
-      klass.send(:extend, ::Spork::TestIOStreams::ClassMethods)
+    def include_a_string_like(substring_or_regex)
+      IncludeAStringLike.new(substring_or_regex)
     end
-  
+  end
+end
+
+module Spork::TestIOStreams
+  def self.included(klass)
+    klass.send(:extend, ::Spork::TestIOStreams::ClassMethods)
+  end
+
+  def stderr
+    self.class.stderr
+  end
+
+  def stdout
+    self.class.stdout
+  end
+
+  module ClassMethods
     def stderr
-      self.class.stderr
+      $test_stderr
     end
 
     def stdout
-      self.class.stdout
-    end
-  
-    module ClassMethods
-      def stderr
-        $test_stderr
-      end
-  
-      def stdout
-        $test_stdout
-      end
+      $test_stdout
     end
   end
-
-  Dir.glob(File.dirname(__FILE__) + "/support/*.rb").each { |f| require(f) }
 end
+
+Dir.glob(File.dirname(__FILE__) + "/support/*.rb").each { |f| require(f) }

data/spec/spork/app_framework/rails_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Spork::AppFramework::Rails do
   describe ".deprecated_version" do

data/spec/spork/app_framework/unknown_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Spork::AppFramework::Unknown do
   it "requires bootstrapping" do

data/spec/spork/app_framework_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Spork::AppFramework do
   describe ".detect_framework" do

data/spec/spork/diagnoser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 
 describe Spork::Diagnoser do

data/spec/spork/forker_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Spork::Forker do
   describe ".new" do
@@ -37,7 +37,7 @@ describe Spork::Forker do
       sleep 0.5
       forker.abort
       sleep 0.1
-      (ended_at - started_at).should be_close(0.5, 0.1)
+      (ended_at - started_at).should be_within(0.1).of(0.5)
       forker.running?.should == false
     end
   end

data/spec/spork/run_strategy/forking_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Spork::RunStrategy::Forking do
   before(:each) do

data/spec/spork/runner_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Spork::Runner do
   def use_test_server(klass = Spork::TestFramework::RSpec)

data/spec/spork/server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Spork::Server do
   describe "a fake server" do

data/spec/spork/test_framework/cucumber_spec.rb

@@ -1,11 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + "/../test_framework_shared_examples"
+require 'spec_helper'
+require 'spork/test_framework_shared_examples'
 
 describe Spork::TestFramework::Cucumber do
-  before(:each) do
-    @klass = Spork::TestFramework::Cucumber
-    @server = @klass.new
-  end
-
-  it_should_behave_like "a TestFramework"
+  it_behaves_like "a TestFramework"
 end

data/spec/spork/test_framework/rspec_spec.rb

@@ -1,10 +1,31 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + "/../test_framework_shared_examples"
+require 'spec_helper'
+require 'spork/test_framework_shared_examples'
 
 describe Spork::TestFramework::RSpec do
-  before(:each) do
-    @klass = Spork::TestFramework::RSpec
+  it_behaves_like "a TestFramework"
+
+  it "supports rspec 1.x" do
+    begin
+      Object.const_set(:Spec, Module.new)
+      Spec.const_set(:Runner, Module.new)
+      Spec::Runner.const_set(:CommandLine, Module.new)
+      Spec::Runner.const_set(:OptionParser, Module.new)
+      Spec::Runner::OptionParser.stub(:parse)
+
+      framework = Spork::TestFramework::RSpec.new
+      framework.stub(:rspec1?).and_return(true)
+
+      Spec::Runner::CommandLine.should_receive(:run)
+
+      framework.run_tests([],StringIO.new,StringIO.new)
+    ensure
+      Object.__send__(:remove_const, :Spec)
+    end
   end
 
-  it_should_behave_like "a TestFramework"
+  it "supports rspec >= 2.0" do
+    RSpec::Core::CommandLine.any_instance.should_receive(:run)
+    framework = Spork::TestFramework::RSpec.new
+    framework.run_tests([],StringIO.new,StringIO.new)
+  end
 end

data/spec/spork/test_framework_shared_examples.rb

@@ -1,14 +1,14 @@
-shared_examples_for "a TestFramework" do
+shared_examples "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
+      described_class.default_port.should == described_class::DEFAULT_PORT
     end
 
     it 'uses ENV["#{short_name.upcase}_DRB"] as port if present' do
-      env_name = "#{@klass.short_name.upcase}_DRB"
+      env_name = "#{described_class.short_name.upcase}_DRB"
       orig, ENV[env_name] = ENV[env_name], "9000"
       begin
-        @klass.default_port.should == 9000
+        described_class.default_port.should == 9000
       ensure
         ENV[env_name] = orig
       end
@@ -17,7 +17,7 @@ shared_examples_for "a TestFramework" do
 
   describe ".helper_file" do
     it "returns ::HELPER_FILE for the TestFramework" do
-      @klass.helper_file.should == @klass::HELPER_FILE
+      described_class.helper_file.should == described_class::HELPER_FILE
     end
   end
 end

data/spec/spork/test_framework_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Spork::TestFramework do
 

data/spec/spork_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 Spork.class_eval do
   def self.reset!

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  hash: 15424149
+  hash: 15424151
   prerelease: 6
   segments: 
   - 0
   - 9
   - 0
   - rc
-  - 8
-  version: 0.9.0.rc8
+  - 9
+  version: 0.9.0.rc9
 platform: ruby
 authors: 
 - Tim Harper
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -06:00
+date: 2011-06-30 00:00:00 -06:00
 default_executable: 
 dependencies: []