cucumber 0.10.6 → 0.10.7

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "features/cucumber-features"]
+	path = features/cucumber-features
+	url = https://github.com/cucumber/cucumber-features

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cucumber (0.10.6)
+    cucumber (0.10.7)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.4.0)
@@ -11,12 +11,16 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.3.7)
+    aruba (0.4.1)
+      bcat (>= 0.6.1)
       childprocess (>= 0.1.9)
-      cucumber (>= 0.10.5)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
       rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
     builder (3.0.0)
-    capybara (1.0.0.rc1)
+    capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -31,10 +35,10 @@ GEM
       json (>= 1.4.6)
     innate (2011.04)
       rack (>= 1.1.0)
-    json (1.5.1)
-    json_pure (1.5.1)
+    json (1.5.2)
+    json_pure (1.5.2)
     mime-types (1.16)
-    nokogiri (1.4.4)
+    nokogiri (1.4.5)
     prawn (0.8.4)
       prawn-core (< 0.9, >= 0.8.4)
       prawn-layout (< 0.9, >= 0.8.4)
@@ -85,7 +89,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (>= 0.3.7)
+  aruba (>= 0.4.1)
+  bcat (= 0.6.1)
   capybara (>= 1.0.0.rc1)
   cucumber!
   nokogiri (>= 1.4.4)

data/History.md

@@ -1,3 +1,9 @@
+## [v0.10.7](https://github.com/cucumber/cucumber/compare/v0.10.6...v0.10.7)
+
+### New Features
+* Rake task exits with an error if rcov is true and we're on Ruby 1.9.x (Aslak Hellesøy)
+* Started implementation of cucumber-features (Mike Sassak, Julien Biezemans, Aslak Hellesøy)
+
 ## [v0.10.6](https://github.com/cucumber/cucumber/compare/v0.10.5...v0.10.6)
 
 ### New Features

data/README.md

@@ -16,10 +16,9 @@ The documentation is at https://wiki.github.com/cucumber/cucumber/
 
     gem install bundler
     bundle install
+    git submodule update --init --recursive
     rake
 
-If you get errors about missing gems - just install them.
-
 ## Copyright
 
 Copyright (c) 2008,2009,2010,2011 Aslak Hellesøy. See LICENSE for details.

data/cucumber.gemspec

@@ -29,7 +29,7 @@ for important information about this release. Happy cuking!
   s.add_dependency 'diff-lcs', '>= 1.1.2'
   s.add_dependency 'json', '>= 1.4.6'
   
-  s.add_development_dependency 'aruba', '>= 0.3.7'
+  s.add_development_dependency 'aruba', '>= 0.4.1'
   s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'nokogiri', '>= 1.4.4'
@@ -38,16 +38,18 @@ for important information about this release. Happy cuking!
   s.add_development_dependency 'syntax', '>= 1.0.0'
   s.add_development_dependency 'spork', '>= 0.9.0.rc7'
   s.add_development_dependency 'simplecov', '>= 0.4.2'
+
   # For Documentation:
   s.add_development_dependency('yard', '= 0.7.1')
   s.add_development_dependency('rdiscount', '= 1.6.8')
+  s.add_development_dependency('bcat', '= 0.6.1')
     
   # Needed for examples (rake examples)
   s.add_development_dependency 'ramaze'
   s.add_development_dependency 'rack-test', '>= 0.5.7'
   s.add_development_dependency 'webrat', '>= 0.7.3'
   s.add_development_dependency 'sinatra', '>= 1.2.6'
-  s.add_development_dependency 'capybara', '>= 1.0.0.rc1'
+  s.add_development_dependency 'capybara', '>= 1.0.0'
 
   s.rubygems_version = ">= 1.6.1"
   s.files            = `git ls-files`.split("\n")

data/features/bootstrap.feature

@@ -3,6 +3,7 @@ Feature: Bootstrapping a new project
   As a new cucumber user
   I want cucumber to give helpful error messages in basic situations
 
+ @announce
  Scenario: running cucumber against a non-existing feature file
   Given a directory without standard Cucumber project directory structure
     When I run `cucumber`

data/features/step_definitions/cucumber-features/core_steps.rb

@@ -0,0 +1,143 @@
+require 'erb'
+CUCUMBER = File.dirname(__FILE__) + '/../../../bin/cucumber'
+
+# TODO: Move all of this (except the ruby stepdef specific stepdefs) into cucumber-features
+# This way all Cucumber implementations can use Aruba/Cucumber 1.x to for testing, and have Aruba reports. 
+module CucumberCoreHelpers
+  def scenario_with_steps(scenario_name, steps)
+      write_file("features/a_feature.feature", <<-EOF)
+Feature: A feature
+  Scenario: #{scenario_name}
+#{steps.gsub(/^/, '    ')}
+EOF
+  end
+
+  def write_feature(feature)
+    write_file("features/a_feature.feature", feature)
+  end
+
+  def write_mappings(mappings)
+    mapping_code = mappings.raw.map do |pattern, result|
+      erb = ERB.new(<<-EOF, nil, '-')
+Given /<%= pattern -%>/ do
+<% if result == 'passing' -%>
+  File.open("<%= step_file(pattern) %>", "w")
+<% elsif result == 'pending' -%>
+  File.open("<%= step_file(pattern) %>", "w")
+  pending
+<% else -%>
+  File.open("<%= step_file(pattern) %>", "w")
+  raise "bang!"
+<% end -%>
+end
+EOF
+      erb.result(binding)
+    end.join("\n")
+    write_file("features/step_definitions/some_stepdefs.rb", mapping_code)
+  end
+
+  def write_mappings_for_calculator
+    mapping_code = <<-EOF
+Given /^a calculator$/ do
+end
+
+When /^the calculator computes PI$/ do
+end
+
+When /^the calculator adds up ([\\d\\.]+) and ([\\d\\.]+)$/ do |arg1, arg2|
+end
+
+When /^the calculator adds up "([^"]*)" and "([^"]*)"$/ do |arg1, arg2|
+end
+
+When /^the calculator adds up "([^"]*)", "([^"]*)" and "([^"]*)"$/ do |arg1, arg2, arg3|
+end
+
+When /^the calculator adds up the following numbers:$/ do |string|
+end
+
+Then /^the calculator returns PI$/ do
+end
+
+Then /^the calculator returns "([^"]*)"$/ do |arg1|
+end
+
+Then /^the calculator does not return ([\\d\\.]+)$/ do |arg1|
+end
+
+EOF
+    write_file("features/step_definitions/calculator_mappings.rb", mapping_code)
+  end
+
+  def step_file(pattern)
+    pattern.gsub(/ /, '_') + '.step'
+  end
+
+  def run_scenario(scenario_name)
+    run_simple "#{CUCUMBER} features/a_feature.feature --name '#{scenario_name}'", false
+  end
+
+  def run_feature
+    run_simple "#{CUCUMBER} features/a_feature.feature", false
+  end
+
+  def assert_skipped(pattern)
+    if File.exist?(File.join(current_dir, step_file(pattern)))
+      raise "#{pattern} was not skipped"
+    end
+  end
+end
+
+World(CucumberCoreHelpers)
+
+Given /^a scenario "([^"]*)" with:$/ do |scenario_name, steps|
+  @scenario_name = scenario_name
+  scenario_with_steps(scenario_name, steps)
+end
+
+Given /^the following feature:$/ do |feature|
+  write_feature(feature)
+end
+
+When /^Cucumber executes "([^"]*)" with these step mappings:$/ do |scenario_name, mappings|
+  write_mappings(mappings)
+  run_scenario(scenario_name)
+end
+
+When /^Cucumber runs the feature$/ do
+  run_feature
+end
+
+When /^Cucumber runs the scenario with steps for a calculator$/ do
+  write_mappings_for_calculator
+  run_scenario(@scenario_name)
+end
+
+Then /^the scenario passes$/ do
+  assert_partial_output("1 scenario (1 passed)", all_stdout)
+  assert_success true
+end
+
+Then /^the scenario fails$/ do
+  assert_partial_output("1 scenario (1 failed)", all_stdout)
+  assert_success false
+end
+
+Then /^the scenario is pending$/ do
+  assert_partial_output("1 scenario (1 pending)", all_stdout)
+  assert_success true
+end
+
+Then /^the scenario is undefined$/ do
+  assert_partial_output("1 scenario (1 undefined)", all_stdout)
+  assert_success true
+end
+
+Then /^the step "([^"]*)" is skipped$/ do |pattern|
+  assert_skipped(pattern)
+end
+
+Then /^the feature passes$/ do
+  assert_no_partial_output("failed", all_stdout)
+  assert_success true
+end

data/features/step_definitions/cucumber_steps.rb

@@ -4,7 +4,7 @@ end
 
 Then /^it should (pass|fail) with JSON:$/ do |pass_fail, json|
   JSON.parse(all_stdout).should == JSON.parse(json)
-  assert_exiting_with(pass_fail == 'pass')
+  assert_success(pass_fail == 'pass')
 end
 
 Given /^a directory without standard Cucumber project directory structure$/ do

data/features/support/env.rb

@@ -1,28 +1,24 @@
+ENV['FORCE_COLOR'] = 'true'
 require 'aruba/api'
+require 'aruba/cucumber'
 
 # Monkey patch aruba to filter out some stuff
 module Aruba::Api
-  alias _all_stdout all_stdout
+  alias __all_stdout all_stdout
   
   def all_stdout
-    out = _all_stdout
+    unrandom(__all_stdout)
+  end
 
-    # Remove absolute paths
-    out.gsub!(/#{Dir.pwd}\/tmp\/aruba/, '.') 
-    # Make duration predictable
-    out.gsub!(/^\d+m\d+\.\d+s$/, '0m0.012s')
-    # Remove SimpleCov message
-    out.gsub!(/Coverage report generated for Cucumber Features to #{Dir.pwd}\/coverage.*\n$/, '')
-    
+  def unrandom(out)
     out
+    .gsub(/#{Dir.pwd}\/tmp\/aruba/, '.') # Remove absolute paths
+    .gsub(/^\d+m\d+\.\d+s$/, '0m0.012s') # Make duration predictable
+    .gsub(/Coverage report generated for Cucumber Features to #{Dir.pwd}\/coverage.*\n$/, '')     # Remove SimpleCov message
   end
 end
 
-require 'aruba/cucumber'
-
-Before do |scenario|
-  @scenario = scenario
-
+Before do
   # Make sure bin/cucumber runs with SimpleCov enabled
   # set_env('SIMPLECOV', 'true')
   

data/gem_tasks/stats

@@ -0,0 +1,14 @@
+echo 'Commits'
+git log --pretty=format:'' | wc -l
+
+echo 'Contributors'
+git log --pretty=short --no-merges | git shortlog -ne | egrep -ve '^ +' | egrep -ve '^$' | wc -l
+
+echo 'Resolved bugs/feature requests'
+egrep -e '^\*' History.md | wc -l
+
+echo 'Open tickets'
+curl -s http://github.com/api/v2/json/issues/list/cucumber/cucumber/open | ruby -e "require 'json'; puts JSON.parse(STDIN.read)['issues'].length"
+
+echo 'Group members'
+curl -s http://groups.google.com/group/cukes | grep Members

data/lib/cucumber/ast/background.rb

@@ -1,13 +1,15 @@
 require 'cucumber/ast/feature_element'
+require 'cucumber/ast/names'
 
 module Cucumber
   module Ast
     class Background #:nodoc:
       include FeatureElement
-      attr_reader :feature_elements, :name
+      include Names
+      attr_reader :feature_elements
 
-      def initialize(comment, line, keyword, name, raw_steps)
-        @comment, @line, @keyword, @name, @raw_steps = comment, line, keyword, name, raw_steps
+      def initialize(comment, line, keyword, title, description, raw_steps)
+        @comment, @line, @keyword, @title, @description, @raw_steps = comment, line, keyword, title, description, raw_steps
         @feature_elements = []
       end
 
@@ -32,7 +34,7 @@ module Cucumber
         return if Cucumber.wants_to_quit
         init
         visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_background_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
+        visitor.visit_background_name(@keyword, name, file_colon_line(@line), source_indent(first_line_length))
         with_visitor(hook_context, visitor) do
           visitor.step_mother.before(hook_context)
           skip_invoke! if failed?
@@ -79,7 +81,7 @@ module Cucumber
       def to_sexp
         init
         sexp = [:background, @line, @keyword]
-        sexp += [@name] unless @name.empty?
+        sexp += [name] unless name.empty?
         comment = @comment.to_sexp
         sexp += [comment] if comment
         steps = @steps.to_sexp

data/lib/cucumber/ast/examples.rb

@@ -1,10 +1,13 @@
+require 'cucumber/ast/names'
+
 module Cucumber
   module Ast
     class Examples #:nodoc:
+      include Names
       attr_writer :outline_table
       
-      def initialize(comment, line, keyword, name, outline_table)
-        @comment, @keyword, @name, @outline_table = comment, keyword, name, outline_table
+      def initialize(comment, line, keyword, title, description, outline_table)
+        @comment, @keyword, @title, @description, @outline_table = comment, keyword, title, description, outline_table
       end
 
       attr_reader :gherkin_statement
@@ -15,7 +18,7 @@ module Cucumber
       def accept(visitor)
         return if Cucumber.wants_to_quit
         visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_examples_name(@keyword, @name)
+        visitor.visit_examples_name(@keyword, name)
         visitor.visit_outline_table(@outline_table)
       end
 
@@ -32,7 +35,7 @@ module Cucumber
       end
 
       def to_sexp
-        sexp = [:examples, @keyword, @name]
+        sexp = [:examples, @keyword, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         sexp += [@outline_table.to_sexp]

data/lib/cucumber/ast/feature.rb

@@ -1,14 +1,17 @@
+require 'cucumber/ast/names'
+
 module Cucumber
   module Ast
     # Represents the root node of a parsed feature.
     class Feature #:nodoc:
+      include Names
+      
       attr_accessor :language
       attr_writer :features, :background
       attr_reader :file
-      attr_reader :name
 
-      def initialize(background, comment, tags, keyword, name, feature_elements)
-        @background, @comment, @tags, @keyword, @name, @feature_elements = background, comment, tags, keyword, name.strip, feature_elements
+      def initialize(background, comment, tags, keyword, title, description, feature_elements)
+        @background, @comment, @tags, @keyword, @title, @description, @feature_elements = background, comment, tags, keyword, title, description, feature_elements
       end
 
       attr_reader :gherkin_statement
@@ -43,7 +46,7 @@ module Cucumber
 
       def indented_name
         indent = ""
-        @name.split("\n").map do |l|
+        name.split("\n").map do |l|
           s = "#{indent}#{l}"
           indent = "  "
           s
@@ -89,7 +92,7 @@ module Cucumber
 
       def to_sexp
         init
-        sexp = [:feature, @file, @name]
+        sexp = [:feature, @file, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/feature_element.rb

@@ -6,7 +6,7 @@ module Cucumber
     module FeatureElement #:nodoc:
       attr_accessor :feature
 
-      attr_reader :gherkin_statement, :raw_steps
+      attr_reader :gherkin_statement, :raw_steps, :title, :description
       def gherkin_statement(statement=nil)
         @gherkin_statement ||= statement
       end
@@ -32,10 +32,10 @@ module Cucumber
       end
 
       def name_line_lengths
-        if @name.strip.empty?
+        if name.strip.empty?
           [Ast::Step::INDENT + @keyword.unpack('U*').length + ': '.length]
         else
-          @name.split("\n").enum_for(:each_with_index).map do |line, line_number|
+          name.split("\n").enum_for(:each_with_index).map do |line, line_number|
             if line_number == 0
               Ast::Step::INDENT + @keyword.unpack('U*').length + ': '.length + line.unpack('U*').length
             else
@@ -46,10 +46,10 @@ module Cucumber
       end
 
       def matches_scenario_names?(scenario_name_regexps)
-        scenario_name_regexps.detect{|name| name =~ @name}
+        scenario_name_regexps.detect{|n| n =~ name}
       end
 
-      def backtrace_line(name = "#{@keyword}: #{@name}", line = @line)
+      def backtrace_line(name = "#{@keyword}: #{name}", line = @line)
         @feature.backtrace_line(name, line) if @feature
       end
 

data/lib/cucumber/ast/names.rb

@@ -0,0 +1,13 @@
+module Cucumber
+  module Ast
+    module Names
+      attr_reader :title, :description
+      
+      def name
+        s = @title
+        s += "\n#{@description}" if @description != ""
+        s
+      end
+    end
+  end
+end

data/lib/cucumber/ast/scenario.rb

@@ -1,11 +1,13 @@
 require 'cucumber/ast/feature_element'
+require 'cucumber/ast/names'
 
 module Cucumber
   module Ast
     class Scenario #:nodoc:
       include FeatureElement
+      include Names
       
-      attr_reader :name, :line
+      attr_reader :line
       
       class EmptyBackground 
         def failed?
@@ -24,9 +26,9 @@ module Cucumber
         end
       end
       
-      def initialize(background, comment, tags, line, keyword, name, raw_steps)
+      def initialize(background, comment, tags, line, keyword, title, description, raw_steps)
         @background = background || EmptyBackground.new
-        @comment, @tags, @line, @keyword, @name, @raw_steps = comment, tags, line, keyword, name, raw_steps
+        @comment, @tags, @line, @keyword, @title, @description, @raw_steps = comment, tags, line, keyword, title, description, raw_steps
         @exception = @executed = nil
       end
 
@@ -45,7 +47,7 @@ module Cucumber
         with_visitor(visitor) do
           visitor.visit_comment(@comment) unless @comment.empty?
           visitor.visit_tags(@tags)
-          visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
+          visitor.visit_scenario_name(@keyword, name, file_colon_line(@line), source_indent(first_line_length))
 
           skip_invoke! if @background.failed?
           visitor.step_mother.with_hooks(self, skip_hooks?) do
@@ -90,7 +92,7 @@ module Cucumber
       end
 
       def to_sexp
-        sexp = [:scenario, @line, @keyword, @name]
+        sexp = [:scenario, @line, @keyword, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/scenario_outline.rb

@@ -1,10 +1,12 @@
+require 'cucumber/ast/feature_element'
+require 'cucumber/ast/names'
+
 module Cucumber
   module Ast
     class ScenarioOutline #:nodoc:
       include FeatureElement
+      include Names
       
-      attr_reader :name
-
       module ExamplesArray #:nodoc:
         def accept(visitor)
           return if Cucumber.wants_to_quit
@@ -20,8 +22,8 @@ module Cucumber
       # * Examples keyword
       # * Examples section name
       # * Raw matrix
-      def initialize(background, comment, tags, line, keyword, name, raw_steps, example_sections)
-        @background, @comment, @tags, @line, @keyword, @name, @raw_steps, @example_sections = background, comment, tags, line, keyword, name, raw_steps, example_sections
+      def initialize(background, comment, tags, line, keyword, title, description, raw_steps, example_sections)
+        @background, @comment, @tags, @line, @keyword, @title, @description, @raw_steps, @example_sections = background, comment, tags, line, keyword, title, description, raw_steps, example_sections
       end
 
       def add_examples(example_section, gherkin_examples)
@@ -37,14 +39,15 @@ module Cucumber
           example_section = example_section_and_gherkin_examples[0]
           gherkin_examples = example_section_and_gherkin_examples[1]
           
-          examples_comment    = example_section[0]
-          examples_line       = example_section[1]
-          examples_keyword    = example_section[2]
-          examples_name       = example_section[3]
-          examples_matrix     = example_section[4]
+          examples_comment     = example_section[0]
+          examples_line        = example_section[1]
+          examples_keyword     = example_section[2]
+          examples_title       = example_section[3]
+          examples_description = example_section[4]
+          examples_matrix      = example_section[5]
 
           examples_table = OutlineTable.new(examples_matrix, self)
-          ex = Examples.new(examples_comment, examples_line, examples_keyword, examples_name, examples_table)
+          ex = Examples.new(examples_comment, examples_line, examples_keyword, examples_title, examples_description, examples_table)
           ex.gherkin_statement(gherkin_examples)
           ex
         end
@@ -58,7 +61,7 @@ module Cucumber
         return if Cucumber.wants_to_quit
         visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
-        visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
+        visitor.visit_scenario_name(@keyword, name, file_colon_line(@line), source_indent(first_line_length))
         visitor.visit_steps(@steps)
 
         skip_invoke! if @background && @background.failed?
@@ -107,7 +110,7 @@ module Cucumber
 
       def to_sexp
         init
-        sexp = [:scenario_outline, @keyword, @name]
+        sexp = [:scenario_outline, @keyword, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/table.rb

@@ -74,7 +74,6 @@ module Cucumber
       def initialize(raw, conversion_procs = NULL_CONVERSIONS.dup)
         @cells_class = Cells
         @cell_class = Cell
-
         raw = ensure_array_of_array(rubify(raw))
         # Verify that it's square
         transposed = raw.transpose

data/lib/cucumber/formatter/ansicolor.rb

@@ -22,6 +22,7 @@ if Cucumber::WINDOWS_MRI
 end
 
 Term::ANSIColor.coloring = false if !STDOUT.tty? && !ENV.has_key?("AUTOTEST")
+Term::ANSIColor.coloring = true if ENV.has_key?("FORCE_COLOR")
 
 module Cucumber
   module Formatter

data/lib/cucumber/formatter/rerun.rb

@@ -21,17 +21,21 @@ module Cucumber
         @file_names = []
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
-
-      # features() is never executed at all... ?
-      def after_features(features)
-        files = @file_names.uniq.map do |file|
-          lines = @file_colon_lines[file]
-          "#{file}:#{lines.join(':')}"
+      
+      def before_feature(*)
+        @lines = []
+        @file = nil
+      end
+      
+      def after_feature(*)
+        after_first_time do
+          @io.print ' '
         end
-        @io.puts files.join(' ')
-        
-        # Flusing output to rerun tempfile here...
+        @io.print "#{@file}:#{@lines.join(':')}"
         @io.flush
+      end
+
+      def after_features(features)
         @io.close
       end
 
@@ -42,14 +46,21 @@ module Cucumber
       def after_feature_element(feature_element)
         if @rerun
           file, line = *feature_element.file_colon_line.split(':')
-          @file_colon_lines[file] << line
-          @file_names << file
+          @lines << line
+          @file = file
         end
       end
 
       def step_name(keyword, step_match, status, source_indent, background)
         @rerun = true if [:failed, :pending, :undefined].index(status)
       end
+      
+    private
+    
+      def after_first_time
+        yield if @not_first_time
+        @not_first_time = true
+      end
     end
   end
 end

data/lib/cucumber/parser/gherkin_builder.rb

@@ -19,7 +19,8 @@ module Cucumber
           Ast::Comment.new(feature.comments.map{|comment| comment.value}.join("\n")), 
           Ast::Tags.new(nil, feature.tags.map{|tag| tag.name}),
           feature.keyword,
-          legacy_name_for(feature.name, feature.description),
+          feature.name.lstrip,
+          feature.description.rstrip,
           []
         )
         @feature.gherkin_statement(feature)
@@ -31,7 +32,8 @@ module Cucumber
           Ast::Comment.new(background.comments.map{|comment| comment.value}.join("\n")), 
           background.line, 
           background.keyword, 
-          legacy_name_for(background.name, background.description), 
+          background.name, 
+          background.description,
           steps=[]
         )
         @feature.background = @background
@@ -47,7 +49,8 @@ module Cucumber
           Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}), 
           statement.line, 
           statement.keyword, 
-          legacy_name_for(statement.name, statement.description), 
+          statement.name,
+          statement.description, 
           steps=[]
         )
         @feature.add_feature_element(scenario)
@@ -63,7 +66,8 @@ module Cucumber
           Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}), 
           statement.line, 
           statement.keyword, 
-          legacy_name_for(statement.name, statement.description), 
+          statement.name, 
+          statement.description, 
           steps=[],
           example_sections=[]
         )
@@ -81,7 +85,8 @@ module Cucumber
           Ast::Comment.new(examples.comments.map{|comment| comment.value}.join("\n")), 
           examples.line, 
           examples.keyword, 
-          legacy_name_for(examples.name, examples.description), 
+          examples.name, 
+          examples.description, 
           matrix(examples.rows)
         ]
         @step_container.add_examples(examples_fields, examples)
@@ -109,12 +114,6 @@ module Cucumber
       
     private
     
-      def legacy_name_for(name, description)
-        s = name
-        s += "\n#{description}" if description != ""
-        s
-      end
-
       def matrix(gherkin_table)
         gherkin_table.map do |gherkin_row|
           row = gherkin_row.cells

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '0.10.6'
+  VERSION       = '0.10.7'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/rake/task.rb

@@ -1,4 +1,5 @@
 require 'cucumber/platform'
+require 'gherkin/formatter/ansi_escapes'
 
 begin
   # Support Rake > 0.8.7
@@ -32,6 +33,8 @@ module Cucumber
     #
     # See the attributes for additional configuration possibilities.
     class Task
+      include Gherkin::Formatter::AnsiEscapes
+
       class InProcessCucumberRunner #:nodoc:
         attr_reader :args
 
@@ -137,6 +140,12 @@ module Cucumber
       # Run cucumber with RCov? Defaults to false. If you set this to
       # true, +fork+ is implicit.
       attr_accessor :rcov
+      def rcov=(flag)
+        if(flag && Cucumber::RUBY_1_9)
+          raise failed + "RCov only works on Ruby 1.8.x. You may want to use SimpleCov: https://github.com/colszowka/simplecov" + reset
+        end
+        @rcov = flag
+      end
 
       # Extra options to pass to rcov.
       # It's recommended to pass an Array, but if it's a String it will be #split by ' '.

data/spec/cucumber/ast/background_spec.rb

@@ -29,7 +29,8 @@ module Cucumber
           comment=Comment.new(''),
           line=2,
           keyword="", 
-          name="",
+          title="",
+          description="",
           steps=[
             Step.new(7, "Given", "y is 5")
           ])
@@ -40,7 +41,8 @@ module Cucumber
           tags=Tags.new(98,[]),
           line=99,
           keyword="", 
-          name="", 
+          title="",
+          description="",
           steps=[]
         )
         background.feature = @feature
@@ -55,7 +57,8 @@ module Cucumber
             comment=Comment.new(''),
             line=2,
             keyword="",
-            name="background name",
+            title="background name",
+            description="",
             steps=[])
           lambda{ background.name }.should_not raise_error
           background.name.should == 'background name'
@@ -65,7 +68,8 @@ module Cucumber
             comment=Comment.new(''),
             line=2,
             keyword="",
-            name=nil,
+            title="",
+            description="",
             steps=[])
         lambda{ background.name }.should_not raise_error
         end
@@ -85,7 +89,8 @@ module Cucumber
             comment=Comment.new(''),
             line=2,
             keyword="",
-            name="",
+            title="",
+            description="",
             steps=[
               Step.new(7, "Given", "y is 5")
             ])

data/spec/cucumber/ast/feature_factory.rb

@@ -26,7 +26,7 @@ module Cucumber
         ])
         doc_string = Ast::DocString.new(%{\n I like\nCucumber sandwich\n})
         
-        background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "",
+        background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "", "",
           [
             Step.new(3, "Given", "a passing step")
           ]
@@ -38,12 +38,13 @@ module Cucumber
           Ast::Tags.new(6, ['one', 'two']),
           "Feature",
           "Pretty printing",
+          "",
           [Ast::Scenario.new(
             background,
             Ast::Comment.new("    # My scenario comment  \n# On two lines \n"),
             Ast::Tags.new(8, ['three', 'four']),
             9,
-            "Scenario:", "A Scenario",
+            "Scenario:", "A Scenario", "",
             [
               Step.new(10, "Given", "a passing step with an inline arg:", table),
               Step.new(11, "Given", "a happy step with an inline arg:", doc_string),

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -31,7 +31,7 @@ module Cucumber
           Comment.new(""),
           Tags.new(18, []),
           19,
-          "Scenario:", "My outline",
+          "Scenario:", "My outline", "",
           [
             Step.new(20, 'Given', 'there are <start> cucumbers'),
             Step.new(21, 'When',  'I eat <eat> cucumbers'),
@@ -45,6 +45,7 @@ module Cucumber
                 24,
                 'Examples:',
                 'First table',
+                '',
                 [
                   %w{start eat left},
                   %w{12 5 7},

data/spec/cucumber/ast/scenario_spec.rb

@@ -26,7 +26,8 @@ module Cucumber
           tags=Tags.new(98, []), 
           line=99,
           keyword="",
-          name="", 
+          title="",
+          description="",
           steps=[
             Step.new(7, "Given", "this is missing"),
             Step.new(8, "Given", "y is 5")

data/spec/spec_helper.rb

@@ -8,4 +8,4 @@ Bundler.setup
 
 require 'cucumber'
 $KCODE='u' unless Cucumber::RUBY_1_9
-Term::ANSIColor.coloring = true
+ENV['FORCE_COLOR'] = 'true'

metadata

@@ -2,7 +2,7 @@
 name: cucumber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 +01:00
+date: 2011-06-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.7
+        version: 0.4.1
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -190,60 +190,71 @@ dependencies:
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: ramaze
+  name: bcat
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.6.1
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: ramaze
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.7
+        version: "0"
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: webrat
+  name: rack-test
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.3
+        version: 0.5.7
   type: :development
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: webrat
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.6
+        version: 0.7.3
   type: :development
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: sinatra
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0.rc1
+        version: 1.2.6
   type: :development
   version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  version_requirements: *id022
 description: Behaviour Driven Development with elegance and joy
 email: cukes@googlegroups.com
 executables: 
@@ -255,6 +266,7 @@ extra_rdoc_files: []
 files: 
 - .gitattributes
 - .gitignore
+- .gitmodules
 - .rspec
 - .rvmrc
 - .travis.yml
@@ -523,6 +535,7 @@ files:
 - features/iso-8859-1.feature
 - features/json_formatter.feature
 - features/stats_formatters.feature
+- features/step_definitions/cucumber-features/core_steps.rb
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/iso-8859-1_steps.rb
 - features/support/env.rb
@@ -604,6 +617,7 @@ files:
 - gem_tasks/flog.rake
 - gem_tasks/rspec.rake
 - gem_tasks/sass.rake
+- gem_tasks/stats
 - gem_tasks/versions.txt
 - gem_tasks/yard.rake
 - gem_tasks/yard/default/layout/html/bubble_32x32.png
@@ -682,6 +696,7 @@ files:
 - lib/cucumber/ast/feature.rb
 - lib/cucumber/ast/feature_element.rb
 - lib/cucumber/ast/features.rb
+- lib/cucumber/ast/names.rb
 - lib/cucumber/ast/outline_table.rb
 - lib/cucumber/ast/scenario.rb
 - lib/cucumber/ast/scenario_outline.rb
@@ -797,7 +812,6 @@ files:
 - spec/cucumber/formatter/spec_helper.rb
 - spec/cucumber/rake/forked_spec.rb
 - spec/cucumber/rake/rcov_spec.rb
-- spec/cucumber/rake/task_spec.rb
 - spec/cucumber/rb_support/rb_language_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
 - spec/cucumber/rb_support/rb_transform_spec.rb
@@ -820,7 +834,7 @@ licenses: []
 
 post_install_message: "\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n\
-  Thank you for installing cucumber-0.10.6.\n\
+  Thank you for installing cucumber-0.10.7.\n\
   Please be sure to read http://wiki.github.com/cucumber/cucumber/upgrading\n\
   for important information about this release. Happy cuking!\n\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
@@ -846,7 +860,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: cucumber-0.10.6
+summary: cucumber-0.10.7
 test_files: 
 - features/background.feature
 - features/bootstrap.feature
@@ -856,6 +870,7 @@ test_files:
 - features/iso-8859-1.feature
 - features/json_formatter.feature
 - features/stats_formatters.feature
+- features/step_definitions/cucumber-features/core_steps.rb
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/iso-8859-1_steps.rb
 - features/support/env.rb
@@ -887,7 +902,6 @@ test_files:
 - spec/cucumber/formatter/spec_helper.rb
 - spec/cucumber/rake/forked_spec.rb
 - spec/cucumber/rake/rcov_spec.rb
-- spec/cucumber/rake/task_spec.rb
 - spec/cucumber/rb_support/rb_language_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
 - spec/cucumber/rb_support/rb_transform_spec.rb

data/spec/cucumber/rake/task_spec.rb

@@ -1,22 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require 'cucumber/rake/task'
-require 'rake'
-
-module Cucumber
-  module Rake
-
-    describe Task do
-
-      context "when running rcov" do
-        let(:task) { Task.new { |t| t.rcov = true } }
-
-        it "correctly builds an RCovCucumberRunner" do
-          runner = task.runner
-          runner.should be_a(Task::RCovCucumberRunner)
-        end
-
-      end
-    end
-
-  end
-end