cucumber 0.8.4 → 0.8.5

data/History.txt

@@ -1,3 +1,9 @@
+== 0.8.5 (2010-07-14)
+
+=== Bugfixes
+* Location of stepdefs outside the project (in gems) are reported incorrectly. (#583 Aslak Hellesøy)
+* Cucumber::Rake::Task uses 'bundle exec' when using bundler (#626 John Firebaugh)
+
 == 0.8.4 (2010-07-12)
 
 === Bugfixes

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gem.homepage = "http://cukes.info"
     gem.authors = ["Aslak Hellesøy"]
 
-    gem.add_dependency 'gherkin', '~> 2.1.1'
+    gem.add_dependency 'gherkin', '~> 2.1.4'
     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: 4
+:patch: 5
 :build:
 :major: 0
 :minor: 8

data/cucumber.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber}
-  s.version = "0.8.4"
+  s.version = "0.8.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aslak Helles\303\270y"]
-  s.date = %q{2010-07-13}
+  s.date = %q{2010-07-14}
   s.default_executable = %q{cucumber}
   s.description = %q{Behaviour Driven Development with elegance and joy}
   s.email = %q{cukes@googlegroups.com}
@@ -237,6 +237,7 @@ Gem::Specification.new do |s|
      "examples/ramaze/features/support/env.rb",
      "examples/ramaze/layout/default.html.erb",
      "examples/ramaze/view/index.html.erb",
+     "examples/rspec_doubles/Rakefile",
      "examples/rspec_doubles/features/mocking.feature",
      "examples/rspec_doubles/features/step_definitions/calvin_steps.rb",
      "examples/rspec_doubles/features/support/env.rb",
@@ -277,10 +278,6 @@ Gem::Specification.new do |s|
      "examples/watir/features/step_definitions/search_steps.rb",
      "examples/watir/features/support/env.rb",
      "examples/watir/features/support/screenshots.rb",
-     "examples/webrat/Rakefile",
-     "examples/webrat/features/search.feature",
-     "examples/webrat/features/step_definitions/kvasir_steps.rb",
-     "examples/webrat/features/support/env.rb",
      "features/announce.feature",
      "features/around_hooks.feature",
      "features/background.feature",
@@ -396,6 +393,8 @@ Gem::Specification.new do |s|
      "fixtures/tickets/features/301/filter_background_tagged_hooks_steps.rb",
      "fixtures/tickets/features/306/only_background.feature",
      "fixtures/tickets/features/around_timeout.feature",
+     "fixtures/tickets/features/gherkin_67.feature",
+     "fixtures/tickets/features/gherkin_68.feature",
      "fixtures/tickets/features/half_manual.feature",
      "fixtures/tickets/features/lib/eatting_machine.rb",
      "fixtures/tickets/features/lib/pantry.rb",
@@ -559,7 +558,7 @@ Gem::Specification.new do |s|
 
                      (::)   U P G R A D I N G    (::)
 
-Thank you for installing cucumber-0.8.4.
+Thank you for installing cucumber-0.8.5.
 Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
 for important information about this release. Happy cuking!
 
@@ -707,9 +706,7 @@ for important information about this release. Happy cuking!
      "examples/test_unit/features/step_definitions/test_unit_steps.rb",
      "examples/watir/features/step_definitions/search_steps.rb",
      "examples/watir/features/support/env.rb",
-     "examples/watir/features/support/screenshots.rb",
-     "examples/webrat/features/step_definitions/kvasir_steps.rb",
-     "examples/webrat/features/support/env.rb"
+     "examples/watir/features/support/screenshots.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -717,7 +714,7 @@ for important information about this release. Happy cuking!
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gherkin>, ["~> 2.1.1"])
+      s.add_runtime_dependency(%q<gherkin>, ["~> 2.1.4"])
       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"])
@@ -729,7 +726,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.8.4"])
     else
-      s.add_dependency(%q<gherkin>, ["~> 2.1.1"])
+      s.add_dependency(%q<gherkin>, ["~> 2.1.4"])
       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"])
@@ -742,7 +739,7 @@ for important information about this release. Happy cuking!
       s.add_dependency(%q<spork>, ["~> 0.8.4"])
     end
   else
-    s.add_dependency(%q<gherkin>, ["~> 2.1.1"])
+    s.add_dependency(%q<gherkin>, ["~> 2.1.4"])
     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/features/rake_task.feature

@@ -149,4 +149,4 @@ Feature: Rake task
          Scenario: Orange
            Given this is missing
 
-       """
+       """

data/fixtures/tickets/features/gherkin_67.feature

@@ -0,0 +1,12 @@
+Feature:
+  @wip
+  Scenario Outline:
+    When blah
+
+    Examples:
+      | a |
+      | b |
+      | c |
+
+  Scenario:
+    When blah

data/fixtures/tickets/features/gherkin_68.feature

@@ -0,0 +1,4 @@
+Feature:
+  Scenario:
+    Given I call empty steps
+  

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

@@ -57,6 +57,13 @@ Given /^I have a pending step$/ do
   pending
 end
 
+Given /^I have (\d+) cukes in my belly$/ do |arg1|
+end
+
+Given /^I call empty steps$/ do
+  steps ""
+end
+
 When /^I run this feature with the progress format$/ do
   pending
 end

data/gem_tasks/examples.rake

@@ -4,6 +4,7 @@ task :examples do
     next if !File.directory?(example_dir) || %w{examples/i18n examples/python examples/ruby2python}.index(example_dir)
     puts "Running #{example_dir}"
     Dir.chdir(example_dir) do
+      raise "No Rakefile in #{Dir.pwd}" unless File.file?('Rakefile')
       sh "rake cucumber"
     end
   end

data/lib/cucumber/core_ext/proc.rb

@@ -14,8 +14,12 @@ class Proc #:nodoc:
     def file_colon_line
       path, line = *to_s.match(PROC_PATTERN)[1..2]
       path = File.expand_path(path)
-      pwd = Dir.pwd
-      path = path[pwd.length+1..-1]
+      pwd = File.expand_path(Dir.pwd)
+      if path.index(pwd)
+        path = path[pwd.length+1..-1]
+      elsif path =~ /.*\/gems\/(.*\.rb)$/
+        path = $1
+      end
       "#{path}:#{line}"
     end
   else

data/lib/cucumber/rake/task.rb

@@ -64,8 +64,12 @@ module Cucumber
           ['"%s"' % cucumber_bin]
         end
 
+        def runner
+          File.exist?("./Gemfile") ? ["bundle", "exec", RUBY] : [RUBY]
+        end
+
         def run
-          ruby(args.join(" ")) # ruby(*args) is broken on Windows
+          sh((runner + args).join(" "))
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +02:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
         - 2
         - 1
-        - 1
-        version: 2.1.1
+        - 4
+        version: 2.1.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -424,6 +424,7 @@ files:
 - examples/ramaze/features/support/env.rb
 - examples/ramaze/layout/default.html.erb
 - examples/ramaze/view/index.html.erb
+- examples/rspec_doubles/Rakefile
 - examples/rspec_doubles/features/mocking.feature
 - examples/rspec_doubles/features/step_definitions/calvin_steps.rb
 - examples/rspec_doubles/features/support/env.rb
@@ -464,10 +465,6 @@ files:
 - examples/watir/features/step_definitions/search_steps.rb
 - examples/watir/features/support/env.rb
 - examples/watir/features/support/screenshots.rb
-- examples/webrat/Rakefile
-- examples/webrat/features/search.feature
-- examples/webrat/features/step_definitions/kvasir_steps.rb
-- examples/webrat/features/support/env.rb
 - features/announce.feature
 - features/around_hooks.feature
 - features/background.feature
@@ -583,6 +580,8 @@ files:
 - fixtures/tickets/features/301/filter_background_tagged_hooks_steps.rb
 - fixtures/tickets/features/306/only_background.feature
 - fixtures/tickets/features/around_timeout.feature
+- fixtures/tickets/features/gherkin_67.feature
+- fixtures/tickets/features/gherkin_68.feature
 - fixtures/tickets/features/half_manual.feature
 - fixtures/tickets/features/lib/eatting_machine.rb
 - fixtures/tickets/features/lib/pantry.rb
@@ -749,7 +748,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.8.4.
+  Thank you for installing cucumber-0.8.5.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!
   
@@ -922,5 +921,3 @@ test_files:
 - examples/watir/features/step_definitions/search_steps.rb
 - examples/watir/features/support/env.rb
 - examples/watir/features/support/screenshots.rb
-- examples/webrat/features/step_definitions/kvasir_steps.rb
-- examples/webrat/features/support/env.rb

data/examples/webrat/features/search.feature

@@ -1,12 +0,0 @@
-Feature: Search
-  In order to learn more
-  As an information seeker
-  I want to find more information
-
-  Scenario: Find what I'm looking for
-    Given I am on the Kvasir search page
-    When I search for "cucumber github"
-    Then I should see
-      """
-      GitHub
-      """

data/examples/webrat/features/step_definitions/kvasir_steps.rb

@@ -1,14 +0,0 @@
-# Google is too hard to script with Mechanize
-# Using a Norewgian search engine instead :-)
-Given /^I am on the Kvasir search page$/ do
-  visit('http://www.kvasir.no/')
-end
-
-When /^I search for "([^"]*)"$/ do |query|
-  fill_in('q', :with => query)
-  click_button('sokeKnapp')
-end
-
-Then /^I should see$/ do |text|
-  response_body.should contain(text)
-end

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

@@ -1,17 +0,0 @@
-require 'webrat'
-require 'rspec'
-
-Webrat.configure do |config|
-  config.mode = :mechanize
-end
-
-class WebratWorld
-  include RSpec::Matchers
-  include Webrat::Methods
-  include Webrat::Matchers
-end
-
-World do
-  WebratWorld.new
-end
-