cucumber 0.3.93 → 0.3.94

data/features/custom_formatter.feature

@@ -4,8 +4,8 @@ Feature: Custom Formatter
     When I run cucumber --format Cucumber::Formatter::TagCloud features
     Then it should fail with
       """
-      | after_file | background_tagged_before_on_outline | four | lots | one | three | two |
-      | 1          | 1                                   | 1    | 1    | 1   | 2     | 1   |
+      | after_file | background_tagged_before_on_outline | four | lots | one | sample_four | sample_one | sample_three | sample_two | three | two |
+      | 1          | 1                                   | 1    | 1    | 1   | 2           | 1          | 2            | 1          | 2     | 1   |
 
       """
     

data/features/html_formatter/a.html

@@ -178,6 +178,6 @@ features/search_sample.feature:10:in `Given failing without a table'</pre></li><
 features/search_sample.feature:13:in `Given <state> without a table'</pre></td></tr></table></div></div><div class="scenario outline"><h3><span class="keyword">Scenario Outline:</span> <span class="val">Hantu Pisang match</span></h3><ol><li class="step skipped" id="features_search_sample_feature_19"><div><span class="keyword">Given</span> <span class="step val">&lt;state&gt; without a table</span></div></li></ol><div class="examples"><h4><span class="keyword">Examples:</span> <span class="val"></span></h4><table><tr id="row_21"><th class="val skipped_param" id="row_21_0">state</th></tr><tr id="row_22"><td class="val passed" id="row_22_0">passing</td></tr></table></div></div><div class="scenario outline"><h3><span class="keyword">Scenario Outline:</span> <span class="val">no match in name but in examples</span></h3><ol><li class="step skipped" id="features_search_sample_feature_25"><div><span class="keyword">Given</span> <span class="step val">&lt;state&gt; without a table</span></div></li></ol><div class="examples"><h4><span class="keyword">Examples:</span> <span class="val">Hantu Pisang</span></h4><table><tr id="row_27"><th class="val skipped_param" id="row_27_0">state</th></tr><tr id="row_28"><td class="val passed" id="row_28_0">passing</td></tr></table></div><div class="examples"><h4><span class="keyword">Examples:</span> <span class="val">Ignore me</span></h4><table><tr id="row_31"><th class="val skipped_param" id="row_31_0">state</th></tr><tr id="row_32"><td class="val failed" id="row_32_0">failing</td></tr><tr><td class="failed" colspan="1"><pre>FAIL (RuntimeError)
 ./features/step_definitions/sample_steps.rb:2:in `flunker'
 ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-features/search_sample.feature:25:in `Given <state> without a table'</pre></td></tr></table></div></div></div><div class="feature"><span class="tag">@lots</span><h2><span class="val">Feature: Tons of cukes</span></h2><p class="narrative"></p><div class="scenario"><h3><span class="keyword">Scenario:</span> <span class="val">Lots and lots</span></h3><ol><li class="step passed" id="features_tons_of_cukes_feature_4"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step failed" id="features_tons_of_cukes_feature_5"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div><pre class="failed">We already have 2 cukes! (RuntimeError)
+features/search_sample.feature:25:in `Given <state> without a table'</pre></td></tr></table></div></div></div><div class="feature"><span class="tag">@sample_one</span><h2><span class="val">Feature: Tag samples</span></h2><p class="narrative"></p><div class="scenario"><span class="tag">@sample_two</span> <span class="tag">@sample_four</span><h3><span class="keyword">Scenario:</span> <span class="val">Passing</span></h3><ol><li class="step undefined" id="features_tags_sample_feature_6"><div><span class="keyword">Given</span> <span class="step val">missing</span></div></li></ol></div><div class="scenario outline"><span class="tag">@sample_three</span><h3><span class="keyword">Scenario Outline:</span> <span class="val"></span></h3><ol><li class="step skipped" id="features_tags_sample_feature_10"><div><span class="keyword">Given</span> <span class="step val">&lt;state&gt;</span></div></li></ol><div class="examples"><h4><span class="keyword">Examples:</span> <span class="val"></span></h4><table><tr id="row_12"><th class="val skipped_param" id="row_12_0">state</th></tr><tr id="row_13"><td class="val undefined" id="row_13_0">missing</td></tr></table></div></div><div class="scenario"><span class="tag">@sample_three</span> <span class="tag">@sample_four</span><h3><span class="keyword">Scenario:</span> <span class="val">Skipped</span></h3><ol><li class="step undefined" id="features_tags_sample_feature_17"><div><span class="keyword">Given</span> <span class="step val">missing</span></div></li></ol></div></div><div class="feature"><span class="tag">@lots</span><h2><span class="val">Feature: Tons of cukes</span></h2><p class="narrative"></p><div class="scenario"><h3><span class="keyword">Scenario:</span> <span class="val">Lots and lots</span></h3><ol><li class="step passed" id="features_tons_of_cukes_feature_4"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step failed" id="features_tons_of_cukes_feature_5"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div><pre class="failed">We already have 2 cukes! (RuntimeError)
 ./features/step_definitions/sample_steps.rb:28:in `/^'(.+)' cukes$/'
 features/tons_of_cukes.feature:5:in `Given '2' cukes'</pre></li><li class="step skipped" id="features_tons_of_cukes_feature_6"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_7"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_8"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_9"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_10"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_11"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_12"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_13"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_14"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_15"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_16"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_17"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_18"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_19"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_20"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_21"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_22"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_23"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_24"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_25"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_26"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_27"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_28"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_29"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_30"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_31"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_32"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_33"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_34"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_35"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_36"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_37"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_38"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_39"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_40"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_41"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_42"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_43"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_44"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_45"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_46"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_47"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_48"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_49"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_50"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_51"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li><li class="step skipped" id="features_tons_of_cukes_feature_52"><div><span class="keyword">Given</span> <span class="step val">'<span class="param">2</span>' cukes</span></div></li></ol></div></div><div class="feature"><h2><span class="val">Feature: undefined multiline args</span></h2><p class="narrative"></p><div class="scenario"><h3><span class="keyword">Scenario:</span> <span class="val">pystring</span></h3><ol><li class="step undefined" id="features_undefined_multiline_args_feature_4"><div><span class="keyword">Given</span> <span class="step val">a pystring</span></div><pre class="val">  example</pre></li></ol></div><div class="scenario"><h3><span class="keyword">Scenario:</span> <span class="val">table</span></h3><ol><li class="step undefined" id="features_undefined_multiline_args_feature_10"><div><span class="keyword">Given</span> <span class="step val">a table</span></div><table><tr id="row_11"><td class="val" id="row_11_0">table</td></tr><tr id="row_12"><td class="val" id="row_12_0">example</td></tr></table></li></ol></div></div><div class="duration">0m30.005s</div></div></body></html>

data/features/junit_formatter.feature

@@ -6,42 +6,49 @@ Feature: JUnit output formatter
     Given I am in junit
     And the tmp directory is empty
   
-  @mri186 @diffxml
+  @mri186
   Scenario: one feature, one passing scenario, one failing scenario
     When I run cucumber --format junit --out tmp/ features/one_passing_one_failing.feature
     Then it should fail with
       """
 
       """
-    And "examples/junit/tmp/TEST-one_passing_one_failing.xml" should contain XML
+    And "examples/junit/tmp/TEST-one_passing_one_failing.xml" with junit duration "0.005" should contain
       """
       <?xml version="1.0" encoding="UTF-8"?>
-      <testsuite errors="0" tests="2" name="One passing scenario, one failing scenario" failures="1">
-      <testcase name="Given a passing scenario" classname="One passing scenario, one failing scenario.Passing">
+      <testsuite errors="0" failures="1" name="One passing scenario, one failing scenario" tests="2" time="0.005">
+      <testcase classname="One passing scenario, one failing scenario.Passing" name="Passing" time="0.005">
       </testcase>
-      <testcase name="Given a failing scenario" classname="One passing scenario, one failing scenario.Failing">
-        <failure message="Given a failing scenario">
+      <testcase classname="One passing scenario, one failing scenario.Failing" name="Failing" time="0.005">
+        <failure message="failed Failing" type="failed">
+      Scenario: Failing
+
+      Given a failing scenario
+
+      Message:
        (RuntimeError)
       ./features/step_definitions/steps.rb:6:in `/a failing scenario/'
       features/one_passing_one_failing.feature:7:in `Given a failing scenario'  </failure>
       </testcase>
       </testsuite>
-      
+
       """
   
-  @mri186 @diffxml
+  @mri186
   Scenario: pending step
     When I run cucumber --format junit --out tmp/ features/pending.feature
     Then it should pass with
       """
       
       """
-    And "examples/junit/tmp/TEST-pending.xml" should contain XML
+    And "examples/junit/tmp/TEST-pending.xml" with junit duration "0.009" should contain
       """
       <?xml version="1.0" encoding="UTF-8"?>
-      <testsuite errors="0" tests="1" name="Pending step" failures="1">
-      <testcase name="Given a pending step" classname="Pending step.Pending">
-        <failure message="Given a pending step">
+      <testsuite errors="0" failures="1" name="Pending step" tests="1" time="0.009">
+      <testcase classname="Pending step.Pending" name="Pending" time="0.009">
+        <failure message="pending Pending" type="pending">
+      Scenario: Pending
+
       TODO (Cucumber::Pending)
       ./features/step_definitions/steps.rb:10:in `/a pending step/'
       features/pending.feature:4:in `Given a pending step'  </failure>

data/features/step_definitions/cucumber_steps.rb

@@ -39,7 +39,6 @@ Given /^I am not running (?:.*) in the background$/ do
   # no-op
 end
 
-
 When /^I run cucumber (.*)$/ do |cucumber_opts|
   run "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
 end
@@ -75,23 +74,17 @@ Then /^the output should be$/ do |text|
   last_stdout.should == text
 end
 
-Then /^"(.*)" should contain XML$/ do |file, xml|
-  t = Tempfile.new('cucumber-junit')
-  t.write(xml)
-  t.flush
-  t.close
-  cmd = "diffxml #{t.path} #{file}"
-  diff = `#{cmd}`
-  if diff =~ /<delta>/m
-    raise diff + "\nXML WAS:\n" + IO.read(file)
-  end
+Then /^"([^\"]*)" should contain$/ do |file, text|
+  strip_duration(IO.read(file)).should == text
 end
 
-Then /^"(.*)" should contain$/ do |file, text|
-  strip_duration(IO.read(file)).should == text
+Then /^"([^\"]*)" with junit duration "([^\"]*)" should contain$/ do |actual_file, duration_replacement, text|
+  actual = IO.read(actual_file)
+  actual = replace_junit_duration(actual, duration_replacement)
+  actual.should == text
 end
 
-Then /^"(.*)" should match$/ do |file, text|
+Then /^"([^\"]*)" should match$/ do |file, text|
   IO.read(file).should =~ Regexp.new(text)
 end
 
@@ -119,7 +112,7 @@ Then /^STDERR should be empty$/ do
   last_stderr.should == ""
 end
 
-Then /^"(.*)" should exist$/ do |file|
+Then /^"([^\"]*)" should exist$/ do |file|
   File.exists?(file).should be_true
   FileUtils.rm(file)
 end

data/features/support/env.rb

@@ -50,6 +50,10 @@ class CucumberWorld
     s.gsub(/\d+m\d+\.\d+s/m, replacement)
   end
 
+  def replace_junit_duration(s, replacement)
+    s.gsub(/\d+\.\d\d+/m, replacement)
+  end
+
   def create_file(file_name, file_content)
     file_content.gsub!("CUCUMBER_LIB", "'#{cucumber_lib_dir}'") # Some files, such as Rakefiles need to use the lib dir
     in_current_dir do
@@ -118,8 +122,3 @@ end
 After do
   terminate_background_jobs
 end
-
-Before('@diffxml') do
-  `diffxml --version`
-  raise "Please install diffxml from http://diffxml.sourceforge.net/" if $? != 0
-end

data/gem_tasks/contributors.rake

@@ -0,0 +1,4 @@
+task :contributors do
+  contributors = `git log --pretty=short --no-merges | git shortlog -ne | egrep -ve '^ +' | egrep -ve '^$'`
+  puts contributors.split("\n").length
+end

data/lib/cucumber/ast/feature.rb

@@ -44,6 +44,19 @@ module Cucumber
         "#{@file}:#{line}"
       end
 
+      def tag_count(tag)
+        if @tags.respond_to?(:count)
+          @tags.count(tag) # 1.9
+        else
+          @tags.select{|t| t == tag}.length  # 1.8
+        end
+      end
+
+      def feature_and_children_tag_count(tag)
+        children_tag_count = @feature_elements.inject(0){|count, feature_element| count += feature_element.tag_count(tag)}
+        children_tag_count + tag_count(tag)
+      end
+
       def short_name
         first_line = name.split(/\n/)[0]
         if first_line =~ /#{language.keywords('feature', true)}:(.*)/

data/lib/cucumber/ast/feature_element.rb

@@ -24,7 +24,7 @@ module Cucumber
       if @name.empty?
         [@keyword.jlength]
       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|
           line_number == 0 ? @keyword.jlength + line.jlength : line.jlength + Ast::Step::INDENT - 1 # We -1 as names which are not keyword lines are missing a space between keyword and name
         end
       end
@@ -32,7 +32,7 @@ module Cucumber
 
     def matches_scenario_names?(scenario_name_regexps)
       scenario_name_regexps.detect{|name| name =~ @name}
-    end 
+    end
 
     def backtrace_line(name = "#{@keyword} #{@name}", line = @line)
       @feature.backtrace_line(name, line) if @feature
@@ -49,9 +49,13 @@ module Cucumber
     def accept_hook?(hook)
       @tags.accept_hook?(hook) || @feature.accept_hook?(hook)
     end
-    
+
+    def tag_count(tag)
+      @feature.tag_count(tag) == 0 ? @tags.count(tag) : @feature.tag_count(tag)
+    end
+
     def language
       @feature.language
     end
-  end
+   end
 end

data/lib/cucumber/ast/features.rb

@@ -30,6 +30,11 @@ module Cucumber
         end
         @duration = Time.now - start
       end
+
+      def tag_count(tag)
+        @features.inject(0){|count, feature| count += feature.feature_and_children_tag_count(tag)}
+      end
+
     end
   end
-end
+end

data/lib/cucumber/ast/table.rb

@@ -126,23 +126,30 @@ module Cucumber
         [:table, *cells_rows.map{|row| row.to_sexp}]
       end
 
-      # Redefines the table headers. This makes it
-      # possible to use prettier header names in the features. Example:
+      # Redefines the table headers. This makes it possible to use
+      # prettier and more flexible header names in the features.  The
+      # keys of +mappings+ are Strings or regular expressions
+      # (anything that responds to #=== will work) that may match
+      # column headings in the table.  The values of +mappings+ are
+      # desired names for the columns.
+      #
+      # Example:
       #
       #   | Phone Number | Address |
       #   | 123456       | xyz     |
       #   | 345678       | abc     |
       #
-      # A StepDefinition receiving this table can then map the columns:
+      # A StepDefinition receiving this table can then map the columns 
+      # with both Regexp and String:
       #
-      #   mapped_table = table.map_columns('Phone Number' => :phone, 'Address' => :address)
-      #   hashes = mapped_table.hashes
+      #   table.map_headers!(/phone( number)?/i => :phone, 'Address' => :address)
+      #   table.hashes
       #   # => [{:phone => '123456', :address => 'xyz'}, {:phone => '345678', :address => 'abc'}]
       #
       def map_headers!(mappings)
         header_cells = cell_matrix[0]
         mappings.each_pair do |pre, post|
-          header_cell = header_cells.detect{|cell| cell.value == pre}
+          header_cell = header_cells.detect{|cell| pre === cell.value}
           header_cell.value = post
           if @conversion_procs.has_key?(pre)
             @conversion_procs[post] = @conversion_procs.delete(pre)

data/lib/cucumber/ast/tags.rb

@@ -10,7 +10,7 @@ module Cucumber
       def self.strip_prefix(tag_name)
         tag_name =~ /^@(.*)/ ? $1 : tag_name
       end
-    
+
       def initialize(line, tag_names)
         @line, @tag_names = line, tag_names
       end
@@ -26,6 +26,14 @@ module Cucumber
         hook.matches_tag_names?(@tag_names)
       end
 
+      def count(tag)
+        if @tag_names.respond_to?(:count)
+          @tag_names.count(tag) # 1.9
+        else
+          @tag_names.select{|t| t == tag}.length  # 1.8
+        end
+      end
+
       def to_sexp
         @tag_names.map{|tag_name| [:tag, tag_name]}
       end

data/lib/cucumber/cli/configuration.rb

@@ -7,18 +7,6 @@ module Cucumber
     class ProfileNotFound < StandardError; end
 
     class Configuration
-      BUILTIN_FORMATS = {
-        'html'      => 'Cucumber::Formatter::Html',
-        'pretty'    => 'Cucumber::Formatter::Pretty',
-        'profile'   => 'Cucumber::Formatter::Profile',
-        'progress'  => 'Cucumber::Formatter::Progress',
-        'rerun'     => 'Cucumber::Formatter::Rerun',
-        'usage'     => 'Cucumber::Formatter::Usage',
-        'junit'     => 'Cucumber::Formatter::Junit',
-        'tag_cloud' => 'Cucumber::Formatter::TagCloud',
-        'steps'     => 'Cucumber::Formatter::Steps'
-      }
-
       attr_reader :options
 
       def initialize(out_stream = STDOUT, error_stream = STDERR)
@@ -96,8 +84,8 @@ module Cucumber
       end
 
       def formatter_class(format)
-        if(builtin = BUILTIN_FORMATS[format])
-          constantize(builtin)
+        if(builtin = Options::BUILTIN_FORMATS[format])
+          constantize(builtin[0])
         else
           constantize(format)
         end
@@ -180,7 +168,7 @@ module Cucumber
           tr("-", "_").
           downcase
       end
-
+      
     end
 
   end

data/lib/cucumber/cli/main.rb

@@ -11,6 +11,8 @@ require 'cucumber/cli/drb_client'
 module Cucumber
   module Cli
     class Main
+      FAILURE = 1
+
       class << self
         def step_mother
           @step_mother
@@ -32,7 +34,7 @@ module Cucumber
         @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new : out_stream
         @error_stream = error_stream
       end
-      
+
       def execute!(step_mother)
         trap_interrupt
         if configuration.drb?
@@ -56,17 +58,32 @@ module Cucumber
         step_mother.visitor = visitor # Needed to support World#announce
         visitor.visit_features(features)
 
-        failure = if configuration.wip?
-          step_mother.scenarios(:passed).any?
-        else
-          step_mother.scenarios(:failed).any? || 
-          (configuration.strict? && step_mother.steps(:undefined).any?)
-        end
+        failure = if exceeded_tag_limts?(features)
+            FAILURE
+          elsif configuration.wip?
+            step_mother.scenarios(:passed).any?
+          else
+            step_mother.scenarios(:failed).any? ||
+            (configuration.strict? && step_mother.steps(:undefined).any?)
+          end
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message
         true
       end
 
+      def exceeded_tag_limts?(features)
+        exceeded = false
+        configuration.options[:include_tags].each do |tag, limit|
+          unless limit.nil?
+            tag_count = features.tag_count(tag)
+            if tag_count > limit.to_i
+              exceeded = true
+            end
+          end
+        end
+        exceeded
+      end
+
       def load_plain_text_features
         features = Ast::Features.new
 
@@ -85,7 +102,7 @@ module Cucumber
 
       def configuration
         return @configuration if @configuration
-      
+
         @configuration = Configuration.new(@out_stream, @error_stream)
         @configuration.parse!(@args)
         @configuration

data/lib/cucumber/cli/options.rb

@@ -4,16 +4,28 @@ module Cucumber
 
     class Options
       BUILTIN_FORMATS = {
-        'html'      => 'Cucumber::Formatter::Html',
-        'pretty'    => 'Cucumber::Formatter::Pretty',
-        'profile'   => 'Cucumber::Formatter::Profile',
-        'progress'  => 'Cucumber::Formatter::Progress',
-        'rerun'     => 'Cucumber::Formatter::Rerun',
-        'usage'     => 'Cucumber::Formatter::Usage',
-        'junit'     => 'Cucumber::Formatter::Junit',
-        'tag_cloud' => 'Cucumber::Formatter::TagCloud',
-        'steps'     => 'Cucumber::Formatter::Steps'
+        'html'      => ['Cucumber::Formatter::Html',     'Generates a nice looking HTML report.'],
+        'pretty'    => ['Cucumber::Formatter::Pretty',   'Prints the feature as is - in colours.'],
+        'profile'   => ['Cucumber::Formatter::Profile',  'Prints the 10 slowest steps at the end.'],
+        'progress'  => ['Cucumber::Formatter::Progress', 'Prints one character per scenario.'],
+        'rerun'     => ['Cucumber::Formatter::Rerun',    'Prints failing files with line numbers.'],
+        'usage'     => ['Cucumber::Formatter::Usage',    'Prints where step definitions are used.'],
+        'junit'     => ['Cucumber::Formatter::Junit',    'Generates a report similar to Ant+JUnit.'],
+        'tag_cloud' => ['Cucumber::Formatter::TagCloud', 'Prints a tag cloud of tag usage.'],
+        'steps'     => ['Cucumber::Formatter::Steps',    'Prints location of step definitions.']
       }
+      max = BUILTIN_FORMATS.keys.map{|s| s.length}.max
+      FORMAT_HELP = (BUILTIN_FORMATS.keys.sort.map do |key|
+        "  #{key}#{' ' * (max - key.length)} : #{BUILTIN_FORMATS[key][1]}"
+      end) + ["FORMAT can also be the fully qualified class name of",
+        "your own custom formatter. If the class isn't loaded,",
+        "Cucumber will attempt to require a file with a relative",
+        "file name that is the underscore name of the class name.",
+        "Example: --format Foo::BarZap -> Cucumber will look for",
+        "foo/bar_zap.rb. You can place the file with this relative",
+        "path underneath your features/support directory or anywhere",
+        "on Ruby's LOAD_PATH, for example in a Ruby gem."
+      ]
       DRB_FLAG = '--drb'
       PROFILE_SHORT_FLAG = '-p'
       PROFILE_LONG_FLAG = '--profile'
@@ -31,6 +43,7 @@ module Cucumber
         @default_profile = options[:default_profile]
         @skip_profile_information = options[:skip_profile_information]
         @profiles = []
+        @overridden_paths = []
         @options        = default_options
       end
 
@@ -54,7 +67,7 @@ module Cucumber
               previous_flag_was_profile = true
               next true
             end
-            arg == DRB_FLAG
+            arg == DRB_FLAG || @overridden_paths.include?(arg)
           end
         )
       end
@@ -96,16 +109,8 @@ module Cucumber
             end
           end
           opts.on("-f FORMAT", "--format FORMAT",
-            "How to format features (Default: pretty)",
-            "Available formats: #{BUILTIN_FORMATS.keys.sort.join(", ")}",
-            "FORMAT can also be the fully qualified class name of",
-            "your own custom formatter. If the class isn't loaded,",
-            "Cucumber will attempt to require a file with a relative",
-            "file name that is the underscore name of the class name.",
-            "Example: --format Foo::BarZap -> Cucumber will look for",
-            "foo/bar_zap.rb. You can place the file with this relative",
-            "path underneath your features/support directory or anywhere",
-            "on Ruby's LOAD_PATH, for example in a Ruby gem.") do |v|
+            "How to format features (Default: pretty). Available formats:",
+            *FORMAT_HELP) do |v|
             @options[:formats] << [v, @out_stream]
           end
           opts.on("-o", "--out [FILE|DIR]",
@@ -118,12 +123,16 @@ module Cucumber
           end
           opts.on("-t TAGS", "--tags TAGS",
             "Only execute the features or scenarios with the specified tags.",
-            "TAGS must be comma-separated without spaces. Prefix tags with ~ to",
-            "exclude features or scenarios having that tag. Tags can be specified",
-            "with or without the @ prefix.") do |v|
+            "TAGS must be comma-separated without spaces. They can be",
+            "specified with or without the @ prefix. Example: --tags dev\n",
+            "Negative tags: Prefix tags with ~ to exclude features or scenarios",
+            "having that tag.\n",
+            "Limit WIP: Positive tags can be given a threshold to limit the",
+            "number of occurrences. Example: --tags qa:3 will fail if there",
+            "are more than 3 occurrences of the @qa tag.") do |v|
             include_tags, exclude_tags = *parse_tags(v)
-            @options[:include_tags] += include_tags
-            @options[:exclude_tags] += exclude_tags
+            @options[:include_tags].merge!(include_tags)
+            @options[:exclude_tags].merge!(exclude_tags)
           end
           opts.on("-n NAME", "--name NAME",
             "Only execute the feature elements which match part of the given name.",
@@ -261,7 +270,16 @@ module Cucumber
         # Strip @
         includes = includes.map{|tag| Ast::Tags.strip_prefix(tag)}
         excludes = excludes.map{|tag| Ast::Tags.strip_prefix(tag)}
-        [includes, excludes]
+        [parse_tag_limits(includes), parse_tag_limits(excludes)]
+      end
+ 
+      def parse_tag_limits(includes)
+        dict = {}
+        includes.each do |tag|
+          tag, limit = tag.split(':')
+          dict[tag] = limit.nil? ? limit : limit.to_i
+        end
+        dict
       end
 
       def disable_profile_loading?
@@ -298,10 +316,14 @@ module Cucumber
       def reverse_merge(other_options)
         @options = other_options.options.merge(@options)
         @options[:require] += other_options[:require]
-        @options[:include_tags] += other_options[:include_tags]
-        @options[:exclude_tags] += other_options[:exclude_tags]
+        @options[:include_tags].merge! other_options[:include_tags]
+        @options[:exclude_tags].merge! other_options[:exclude_tags]
         @options[:env_vars] = other_options[:env_vars].merge(@options[:env_vars])
-        @options[:paths] = other_options[:paths] if @options[:paths].empty?
+        if @options[:paths].empty?
+          @options[:paths] = other_options[:paths]
+        else
+          @overridden_paths += (other_options[:paths] - @options[:paths])
+        end
         @options[:source] &= other_options[:source]
         @options[:snippets] &= other_options[:snippets]
 
@@ -348,8 +370,8 @@ module Cucumber
           :dry_run      => false,
           :formats      => [],
           :excludes     => [],
-          :include_tags => [],
-          :exclude_tags => [],
+          :include_tags => {},
+          :exclude_tags => {},
           :name_regexps => [],
           :env_vars     => {},
           :diff_enabled => true