cucumber 0.7.0.beta.4 → 0.7.0.beta.5

data/.gitignore

@@ -18,3 +18,4 @@ examples/self_test/tmp
 *.pyc
 rerun.txt
 ._*
+examples/self_test/tmp

data/History.txt

@@ -1,3 +1,11 @@
+== 0.7.0.beta.5 (2010-04-27)
+
+=== New Features
+* Support RSpec 2. (RSpec >= 1.2.4 is still supported). (Aslak Hellesøy, Ryan Bigg)
+
+=== Removed features
+* No more support for RSpec <= 1.2.3. (Aslak Hellesøy)
+
 == 0.7.0.beta.4 (2010-04-24)
 
 === New Features

data/Rakefile

@@ -11,12 +11,12 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "cucumber"
     gem.summary = %Q{Behaviour Driven Development with elegance and joy}
-    gem.description = %Q{A BDD tool written in Ruby}
+    gem.description = %Q{Behaviour Driven Development with elegance and joy}
     gem.email = "cukes@googlegroups.com"
     gem.homepage = "http://cukes.info"
     gem.authors = ["Aslak Hellesøy"]
 
-    gem.add_dependency 'gherkin', '= 1.0.20'
+    gem.add_dependency 'gherkin', '= 1.0.21'
     gem.add_dependency 'term-ansicolor', '>= 1.0.4'
     gem.add_dependency 'builder', '>= 2.1.2'
     gem.add_dependency 'diff-lcs', '>= 1.1.2'

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :patch: 0
-:build: beta.4
+:build: beta.5
 :major: 0
 :minor: 7

data/bin/cucumber

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 
-require 'cucumber/rspec_neuter'
+require 'cucumber/rspec/disable_option_parser'
 require 'cucumber/cli/main'
 begin
   # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.

data/cucumber.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber}
-  s.version = "0.7.0.beta.4"
+  s.version = "0.7.0.beta.5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aslak Helles\303\270y"]
-  s.date = %q{2010-04-24}
+  s.authors = ["Aslak Hellesøy"]
+  s.date = %q{2010-04-27}
   s.default_executable = %q{cucumber}
-  s.description = %q{A BDD tool written in Ruby}
+  s.description = %q{Behaviour Driven Development with elegance and joy}
   s.email = %q{cukes@googlegroups.com}
   s.executables = ["cucumber"]
   s.extra_rdoc_files = [
@@ -402,7 +402,6 @@ Gem::Specification.new do |s|
      "gem_tasks/rspec.rake",
      "gem_tasks/sass.rake",
      "gem_tasks/sdoc.rake",
-     "gem_tasks/treetop.rake",
      "lib/README.rdoc",
      "lib/autotest/cucumber.rb",
      "lib/autotest/cucumber_mixin.rb",
@@ -482,7 +481,8 @@ Gem::Specification.new do |s|
      "lib/cucumber/rb_support/rb_transform.rb",
      "lib/cucumber/rb_support/rb_world.rb",
      "lib/cucumber/rb_support/regexp_argument_matcher.rb",
-     "lib/cucumber/rspec_neuter.rb",
+     "lib/cucumber/rspec/diffing.rb",
+     "lib/cucumber/rspec/disable_option_parser.rb",
      "lib/cucumber/step_argument.rb",
      "lib/cucumber/step_definition_light.rb",
      "lib/cucumber/step_match.rb",
@@ -532,7 +532,6 @@ Gem::Specification.new do |s|
      "spec/cucumber/wire_support/wire_packet_spec.rb",
      "spec/cucumber/wire_support/wire_step_definition_spec.rb",
      "spec/cucumber/world/pending_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://cukes.info}
@@ -541,7 +540,7 @@ Gem::Specification.new do |s|
 
                      (::)   U P G R A D I N G    (::)
 
-Thank you for installing cucumber-0.7.0.beta.4.
+Thank you for installing cucumber-0.7.0.beta.5.
 Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
 for important information about this release. Happy cuking!
 
@@ -681,7 +680,6 @@ for important information about this release. Happy cuking!
      "examples/ruby2python/features/support/env.rb",
      "examples/self_test/features/step_definitions/sample_steps.rb",
      "examples/self_test/features/support/env.rb",
-     "examples/self_test/tmp/features/step_definitions/steps.rb",
      "examples/sinatra/app.rb",
      "examples/sinatra/features/step_definitions/add_steps.rb",
      "examples/sinatra/features/support/env.rb",
@@ -714,7 +712,7 @@ for important information about this release. Happy cuking!
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gherkin>, ["= 1.0.20"])
+      s.add_runtime_dependency(%q<gherkin>, ["= 1.0.21"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
@@ -727,7 +725,7 @@ for important information about this release. Happy cuking!
       s.add_development_dependency(%q<syntax>, [">= 1.0.0"])
       s.add_development_dependency(%q<spork>, [">= 0.7.5"])
     else
-      s.add_dependency(%q<gherkin>, ["= 1.0.20"])
+      s.add_dependency(%q<gherkin>, ["= 1.0.21"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
@@ -741,7 +739,7 @@ for important information about this release. Happy cuking!
       s.add_dependency(%q<spork>, [">= 0.7.5"])
     end
   else
-    s.add_dependency(%q<gherkin>, ["= 1.0.20"])
+    s.add_dependency(%q<gherkin>, ["= 1.0.21"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])

data/cucumber.yml

@@ -2,11 +2,17 @@
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format pretty #{rerun}"
 std_opts = "--format progress features --strict --tags ~@wip"
+begin
+  require 'rspec/expectations'
+  std_opts << ' --tags ~@rspec1'
+rescue LoadError
+  # rspec 1
+  std_opts << ' --tags ~@rspec2'
+end
 %>
 default: <%= std_opts %>
 jruby: <%= std_opts %> --tags ~@spork --tags ~@wire
 jruby_win: <%= std_opts %> --tags ~@spork --tags ~@wire CUCUMBER_FORWARD_SLASH_PATHS=true
-run_code_run: <%= std_opts %> --tags ~@spork
 windows_mri: <%= std_opts %> --tags ~@spork --tags ~@wire --tags ~@needs-many-fonts CUCUMBER_FORWARD_SLASH_PATHS=true
 ruby_1_9: <%= std_opts %> --tags ~@fails_on_1_9
 wip: --tags @wip:3 --wip features

data/examples/i18n/ar/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'

data/examples/i18n/bg/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'

data/examples/i18n/ca/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculadora'

data/examples/i18n/da/features/step_definitons/lommeregner_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'lommeregner'

data/examples/i18n/de/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/en-lol/features/support/env.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'cucumber/formatter/unicode'
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'basket'

data/examples/i18n/en/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations' 
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end 
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'

data/examples/i18n/eo/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations' 
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end 
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'

data/examples/i18n/es/features/step_definitons/calculador_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations' 
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end 
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculador'

data/examples/i18n/et/features/step_definitions/kalkulaator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'kalkulaator'

data/examples/i18n/fi/features/step_definitons/laskin_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'laskin'

data/examples/i18n/fr/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculatrice'

data/examples/i18n/he/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/hu/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/id/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/it/features/step_definitons/calcolatrice_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calcolatrice'

data/examples/i18n/ja/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/ko/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/lt/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/lv/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/no/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 

data/examples/i18n/pl/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/pl/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'

data/examples/i18n/pt/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculadora'

data/examples/i18n/ro/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/ru/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'

data/examples/i18n/sk/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/sr-Cyrl/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/sr-Latn/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/sv/features/step_definitons/kalkulator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'kalkulator'

data/examples/i18n/tr/features/step_definitons/hesap_makinesi_adimlari.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'hesap_makinesi'

data/examples/i18n/uk/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'

data/examples/i18n/uz/features/support/env.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'

data/examples/i18n/zh-CN/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/i18n/zh-TW/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'

data/examples/ramaze/features/support/env.rb

@@ -9,7 +9,7 @@ require 'ramaze'
 Ramaze.options.started = true
 require __DIR__("../../app.rb")
 
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'rack/test'
 require 'webrat'
 

data/examples/self_test/features/support/env.rb

@@ -1,4 +1,4 @@
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 $KCODE = 'u' unless Cucumber::RUBY_1_9
 
 Before('@not_used') do

data/examples/sinatra/features/support/env.rb

@@ -6,7 +6,7 @@ require app_file
 # Force the application name because polyglot breaks the auto-detection logic.
 Sinatra::Application.app_file = app_file
 
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'rack/test'
 require 'capybara/cucumber'
 

data/examples/tickets/features/229/tagged_hooks.rb

@@ -1,4 +1,4 @@
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
 Before('@i_am_so_special') do
   @something_special = 10

data/examples/tickets/features/270/back.steps.rb

@@ -1,4 +1,4 @@
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
 Given /^plop$/ do
   raise "Only one plop!" if @plop

data/examples/tickets/features/272/hooks_steps.rb

@@ -1,4 +1,4 @@
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
 Given /^I fail$/ do
   raise "BOOM (this is expected)"

data/examples/tickets/features/279/py_string_indent.steps.rb

@@ -1,4 +1,4 @@
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
 require File.dirname(__FILE__) + '/../../../../features/step_definitions/cucumber_steps.rb'
 require File.dirname(__FILE__) + '/../../../../features/support/env.rb'

data/examples/tickets/features/301/filter_background_tagged_hooks_steps.rb

@@ -1,4 +1,4 @@
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
 Before('@nothing_has_this_tag') do
   @vb = :cool

data/examples/tickets/features/step_definitons/tickets_steps.rb

@@ -1,4 +1,4 @@
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
 Given "be_empty" do
   [1,2].should_not be_empty

data/examples/watir/features/support/env.rb

@@ -1,4 +1,4 @@
-require 'spec/expectations'
+begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
 if ENV['FIREWATIR']
   require 'firewatir'

data/features/announce.feature

@@ -139,6 +139,19 @@ Feature: Delayed announcement
         ...
         """
 
+    @rspec2
+    Scenario: announce world
+      When I run cucumber --format progress features/announce_world.feature
+      Then the output should contain
+      """
+      WORLD:
+        Object
+
+        Rspec::Matchers
+        Cucumber::RbSupport::RbWorld
+      """
+
+    @rspec1
     Scenario: announce world
       When I run cucumber --format progress features/announce_world.feature
       Then the output should contain

data/features/background.feature

@@ -5,6 +5,7 @@ Feature: backgrounds
 
   Scenario: run a specific scenario with a background
     When I run cucumber -q features/background/passing_background.feature:9 --require features
+    Then STDERR should be empty
     Then it should pass with
     """
     Feature: Passing background sample
@@ -274,7 +275,7 @@ Feature: backgrounds
       """
     And a file named "features/only_background_and_hooks_steps.rb" with:
       """
-      require 'spec/expectations'
+      begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 
       Before do
         $before = true

data/features/cucumber_cli_diff_disabled.feature

@@ -2,6 +2,7 @@ Feature: Cucumber command line
   In order to write better software
   Developers should be able to execute requirements as tests
 
+  @rspec2
   Scenario: Run single failing scenario with default diff enabled
     When I run cucumber -q features/failing_expectation.feature
     Then it should fail with
@@ -12,12 +13,11 @@ Feature: Cucumber command line
           Given failing expectation
             expected: "that",
                  got: "this" (using ==)
-            
-             Diff:
+            Diff:
             @@ -1,2 +1,2 @@
             -that
             +this
-             (Spec::Expectations::ExpectationNotMetError)
+             (Rspec::Expectations::ExpectationNotMetError)
             ./features/step_definitions/sample_steps.rb:63:in `/^failing expectation$/'
             features/failing_expectation.feature:4:in `Given failing expectation'
       
@@ -29,6 +29,7 @@ Feature: Cucumber command line
 
       """
 
+  @rspec2
   Scenario: Run single failing scenario with diff output disabled
     When I run cucumber -q --no-diff features/failing_expectation.feature
     Then it should fail with
@@ -38,7 +39,7 @@ Feature: Cucumber command line
         Scenario: Failing expectation
           Given failing expectation
             expected: "that",
-                 got: "this" (using ==) (Spec::Expectations::ExpectationNotMetError)
+                 got: "this" (using ==) (Rspec::Expectations::ExpectationNotMetError)
             ./features/step_definitions/sample_steps.rb:63:in `/^failing expectation$/'
             features/failing_expectation.feature:4:in `Given failing expectation'
 

data/features/html_formatter.feature

@@ -1,4 +1,4 @@
-@fails_on_1_9
+@fails_on_1_9 @rspec2
 Feature: HTML formatter
   In order to make it easy to read Cucumber results
   there should be a HTML formatter with an awesome CSS

data/features/html_formatter/a.html

@@ -331,8 +331,7 @@ features/call_undefined_step_from_step_def.feature:7:in `Given call step "a step
   pending # express the regexp above with the code you wish you had
 end</pre></li> <script type="text/javascript">moveProgressBar('38.4');</script></ol></div></div><div class="feature"><h2><span class="val">Feature: Failing expectation</span></h2><p class="narrative"></p><div class='scenario'><h3 id="scenario_19"><span class="keyword">Scenario</span> <span class="val">Failing expectation</span></h3><ol><script>makeRed('scenario_19');</script><li id='features_failing_expectation_feature_4' class='step failed'><div class="step_name"><span class="keyword">Given </span><span class="step val">failing expectation</span></div><div class="step_file"><span>features/step_definitions/sample_steps.rb:62</span></div><div class="message"><pre>expected: "that",
      got: "this" (using ==)
-
- Diff:
+Diff:
 @@ -1,2 +1,2 @@
 -that
 +this

data/features/support/env.rb

@@ -1,6 +1,10 @@
 require 'rubygems'
 require 'tempfile'
-require 'spec/expectations'
+begin
+  require 'rspec/expectations'
+rescue LoadError
+  require 'spec/expectations'
+end
 require 'fileutils'
 require 'forwardable'
 require 'cucumber/formatter/unicode'

data/gem_tasks/features.rake

@@ -3,9 +3,7 @@ require 'cucumber/rake/task'
 require 'cucumber/platform'
 
 Cucumber::Rake::Task.new do |t|
-  if(ENV["RUN_CODE_RUN"])
-    t.profile = 'run_code_run'
-  elsif(Cucumber::JRUBY)
+  if(Cucumber::JRUBY)
     t.profile = Cucumber::WINDOWS ? 'jruby_win' : 'jruby'
   elsif(Cucumber::WINDOWS_MRI)
     t.profile = 'windows_mri'

data/gem_tasks/rspec.rake

@@ -1,15 +1,20 @@
 begin
-  require 'spec/expectations'
+  require 'rspec/core/rake_task'
+
+  desc "Run RSpec"
+  Rspec::Core::RakeTask.new do |t|
+    t.rcov = ENV['RCOV']
+    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
+    t.verbose = true
+  end
+rescue LoadError => e
   require 'spec/rake/spectask'
 
   desc "Run RSpec"
   Spec::Rake::SpecTask.new do |t|
-    t.spec_opts = ['--options', "spec/spec.opts"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = %w{--color --diff}
     t.rcov = ENV['RCOV']
     t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
     t.verbose = true
   end
-rescue LoadError
-  task :spec
 end

data/lib/cucumber/cli/main.rb

@@ -6,7 +6,6 @@ rescue LoadError
 end
 require 'optparse'
 require 'cucumber'
-require 'ostruct'
 require 'logger'
 require 'cucumber/parser'
 require 'cucumber/feature_file'
@@ -102,17 +101,7 @@ module Cucumber
 
       def enable_diffing
         if configuration.diff_enabled?
-          begin
-            require 'spec/expectations'
-            begin
-              require 'spec/runner/differs/default' # RSpec >=1.2.4
-            rescue ::LoadError
-              require 'spec/expectations/differs/default' # RSpec <=1.2.3
-            end
-            options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
-            ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)
-          rescue ::LoadError => ignore
-          end
+          require 'cucumber/rspec/diffing'
         end
       end
 

data/lib/cucumber/rb_support/rb_language.rb

@@ -145,7 +145,8 @@ module Cucumber
 
       def extend_world
         @current_world.extend(RbWorld)
-        @current_world.extend(::Spec::Matchers) if defined?(::Spec::Matchers)
+        @current_world.extend(::Spec::Matchers) if defined?(::Spec::Matchers)   # RSpec 1.x
+        @current_world.extend(::Rspec::Matchers) if defined?(::Rspec::Matchers) # RSpec 2.x
         (@world_modules || []).each do |mod|
           @current_world.extend(mod)
         end

data/lib/cucumber/rspec/diffing.rb

@@ -0,0 +1,17 @@
+require 'ostruct'
+
+options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
+
+begin
+  # RSpec >=2.0
+  require 'rspec/expectations'
+  require 'rspec/expectations/differs/default'
+  Rspec::Expectations.differ = ::Rspec::Expectations::Differs::Default.new(options)
+rescue LoadError => try_rspec_1_2_4_or_higher
+  begin
+    require 'spec/expectations'
+    require 'spec/runner/differs/default'
+    Spec::Expectations.differ = Spec::Expectations::Differs::Default.new(options)
+  rescue LoadError => give_up
+  end
+end

data/lib/cucumber/step_match.rb

@@ -7,6 +7,7 @@ module Cucumber
     # 
     def initialize(step_definition, name_to_match, name_to_report, step_arguments)
       raise "name_to_match can't be nil" if name_to_match.nil?
+      raise "step_arguments can't be nil (but it can be an empty array)" if step_arguments.nil?
       @step_definition, @name_to_match, @name_to_report, @step_arguments = step_definition, name_to_match, name_to_report, step_arguments
     end
 

data/lib/cucumber/step_mother.rb

@@ -2,6 +2,7 @@ require 'cucumber/constantize'
 require 'cucumber/core_ext/instance_exec'
 require 'cucumber/language_support/language_methods'
 require 'cucumber/formatter/duration'
+require 'cucumber/cli/options'
 require 'timeout'
 
 module Cucumber
@@ -101,7 +102,7 @@ module Cucumber
 
     # Returns the options passed on the command line.
     def options
-      @options ||= {}
+      @options ||= Cli::Options.new
     end
 
     def step_visited(step) #:nodoc:

data/spec/cucumber/ast/table_spec.rb

@@ -80,6 +80,7 @@ module Cucumber
           @table.match('one,four,seven').should be_nil
         end
       end
+
       describe "#transpose" do
         before(:each) do
           @table = Table.new([
@@ -272,6 +273,7 @@ module Cucumber
             ['aslak', true,   'hellesøy', false]
           ])
           lambda{t1.diff!(t2)}.should raise_error
+
           t1.to_s(:indent => 12, :color => false).should == %{
             |     name  |     male       |     lastname |     swedish     |
             | (-) aslak | (-) (i) "true" | (-) hellesøy | (-) (i) "false" |
@@ -385,8 +387,12 @@ module Cucumber
             })
             lambda { t1.dup.diff!(t2) }.should raise_error
 
-            pending "http://groups.google.com/group/cukes/browse_thread/thread/5d96431c8245f05f" do
-              lambda { t1.dup.diff!(t2, :surplus_row => false) }.should_not raise_error
+            begin
+              pending "http://groups.google.com/group/cukes/browse_thread/thread/5d96431c8245f05f" do
+                lambda { t1.dup.diff!(t2, :surplus_row => false) }.should_not raise_error
+              end
+            rescue => e
+              warn(e.message + " - see http://www.ruby-forum.com/topic/208508")
             end
           end
 

data/spec/cucumber/cli/main_spec.rb

@@ -1,10 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
-begin
-  require 'spec/runner/differs/default' # RSpec >=1.2.4
-rescue ::LoadError
-  require 'spec/expectations/differs/default' # RSpec <=1.2.3
-end
 
 module Cucumber
   module Cli
@@ -36,35 +31,6 @@ module Cucumber
 
       end
 
-      describe "diffing" do
-
-        before :each do
-          @configuration = mock('Configuration', :null_object => true, :drb? => false)
-          Configuration.should_receive(:new).and_return(@configuration)
-
-          @step_mother = mock('StepMother', :null_object => true)
-
-          @cli = Main.new(nil, @out)
-        end
-
-        it "uses Spec Differ::Default when diff is enabled" do
-          @configuration.should_receive(:diff_enabled?).and_return(true)
-
-          ::Spec::Expectations::Differs::Default.should_receive(:new)
-
-          @cli.execute!(@step_mother)
-        end
-
-        it "does not use Spec Differ::Default when diff is disabled" do
-          @configuration.should_receive(:diff_enabled?).and_return(false)
-
-          ::Spec::Expectations::Differs::Default.should_not_receive(:new)
-
-          @cli.execute!(@step_mother)
-        end
-
-      end
-
       describe "--format with class" do
 
        describe "in module" do

data/spec/cucumber/formatter/html_spec.rb

@@ -10,8 +10,10 @@ module Cucumber
     describe Html do
       extend SpecHelperDsl
       include SpecHelper
-    
-      Spec::Matchers.define :have_css_node do |css, regexp|
+
+      matcher = defined?(Spec::Matchers) ? Spec::Matchers : Rspec::Matchers
+
+      matcher.define :have_css_node do |css, regexp|
         match do |doc|
           nodes = doc.css(css)
           nodes.detect{ |node| node.text =~ regexp }

data/spec/cucumber/step_match_spec.rb

@@ -29,6 +29,7 @@ module Cucumber
     end
 
     it "should deal with Unicode both inside and outside arguments" do
+      "Jæ vø ålsker døtte løndet".should =~ /Jæ (\w+) ålsker (\w+) løndet/
       m = step_match(/Jæ (\w+) ålsker (\w+) løndet/, "Jæ vø ålsker døtte løndet")
       m.format_args("<span>%s</span>").should == "Jæ <span>vø</span> ålsker <span>døtte</span> løndet"
     end

data/spec/spec_helper.rb

@@ -1,17 +1,29 @@
-require 'rubygems'
-gem 'rspec'
-require 'spec'
-require 'spec/autorun'
-
 ENV['CUCUMBER_COLORS']=nil
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'cucumber'
 $:.unshift(File.dirname(__FILE__))
 
-Spec::Runner.configure do |config|
-  config.before(:each) do
-    ::Term::ANSIColor.coloring = true
+require 'rubygems'
+
+begin
+  require 'rspec'
+  require 'rspec/autorun'
+  Rspec.configure do |c|
+    c.color_enabled = true
+    c.before(:each) do
+      ::Term::ANSIColor.coloring = true
+    end
+  end
+rescue LoadError
+  require 'spec'
+  require 'spec/autorun'
+  Spec::Runner.configure do |c|
+    c.before(:each) do
+      ::Term::ANSIColor.coloring = true
+    end
   end
 end
 
+require 'cucumber'
+$KCODE='u' unless Cucumber::RUBY_1_9
+
 alias running lambda

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 7
   - 0
   - beta
-  - 4
-  version: 0.7.0.beta.4
+  - 5
+  version: 0.7.0.beta.5
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 +02:00
+date: 2010-04-27 00:00:00 -05:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 20
-        version: 1.0.20
+        - 21
+        version: 1.0.21
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -187,7 +187,7 @@ dependencies:
         version: 0.7.5
   type: :development
   version_requirements: *id012
-description: A BDD tool written in Ruby
+description: Behaviour Driven Development with elegance and joy
 email: cukes@googlegroups.com
 executables: 
 - cucumber
@@ -580,7 +580,6 @@ files:
 - gem_tasks/rspec.rake
 - gem_tasks/sass.rake
 - gem_tasks/sdoc.rake
-- gem_tasks/treetop.rake
 - lib/README.rdoc
 - lib/autotest/cucumber.rb
 - lib/autotest/cucumber_mixin.rb
@@ -660,7 +659,8 @@ files:
 - lib/cucumber/rb_support/rb_transform.rb
 - lib/cucumber/rb_support/rb_world.rb
 - lib/cucumber/rb_support/regexp_argument_matcher.rb
-- lib/cucumber/rspec_neuter.rb
+- lib/cucumber/rspec/diffing.rb
+- lib/cucumber/rspec/disable_option_parser.rb
 - lib/cucumber/step_argument.rb
 - lib/cucumber/step_definition_light.rb
 - lib/cucumber/step_match.rb
@@ -710,7 +710,6 @@ files:
 - spec/cucumber/wire_support/wire_packet_spec.rb
 - spec/cucumber/wire_support/wire_step_definition_spec.rb
 - spec/cucumber/world/pending_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://cukes.info
@@ -722,7 +721,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.7.0.beta.4.
+  Thank you for installing cucumber-0.7.0.beta.5.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!
   
@@ -884,7 +883,6 @@ test_files:
 - examples/ruby2python/features/support/env.rb
 - examples/self_test/features/step_definitions/sample_steps.rb
 - examples/self_test/features/support/env.rb
-- examples/self_test/tmp/features/step_definitions/steps.rb
 - examples/sinatra/app.rb
 - examples/sinatra/features/step_definitions/add_steps.rb
 - examples/sinatra/features/support/env.rb

data/gem_tasks/treetop.rake

@@ -1,13 +0,0 @@
-namespace :tt do
-  files = %w{lib/cucumber/parser/common.tt lib/cucumber/parser/feature.tt lib/cucumber/parser/py_string.tt lib/cucumber/parser/table.tt}
-
-  desc 'Compile .tt files'
-  task :compile do
-    files.each {|tt| sh("tt #{tt}") }
-  end
-
-  desc 'Remove compiled .tt files'
-  task :rm do
-    rm_rf files.map{|tt| tt.gsub(/\.tt$/, '.rb')}
-  end
-end

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format
-profile
---diff