cucumber 0.3.6 → 0.3.7

data/History.txt

@@ -1,4 +1,17 @@
-== 0.3.6
+== 0.3.7 2009-05-22
+
+This is the "Help JetBrains RubyMine" release!
+
+=== New Features
+* Added new Given alias for Catalan: Donat|Donada (Lleïr Borràs Metje)
+* New --expand option. This will print Scenario Outlines once for each Example row - with values expanded. (#327 Aslak Hellesøy)
+* You can override the formatter in Rails-generated rake tasks with the CUCUMBER_FORMAT environment variable (#335 Aslak Hellesøy)
+
+=== Bugfixes
+* 'specs' folder needs to be renamed back to 'spec' (#339 Aslak Hellesøy)
+* CUCUMBER_OPTS doesn't work for cucumber rake tasks (#336 Aslak Hellesøy)
+
+== 0.3.6 2009-05-20
 
 Kanban! With this release you can tag features or scenarios that are work in progress
 with a tag and use the new --wip switch.

data/Manifest.txt

@@ -245,6 +245,7 @@ features/cucumber_cli_diff_disabled.feature
 features/cucumber_cli_outlines.feature
 features/custom_formatter.feature
 features/exclude_files.feature
+features/expand.feature
 features/junit_formatter.feature
 features/multiline_names.feature
 features/rake_task.feature

data/examples/i18n/fr/features/addition.feature

@@ -11,7 +11,7 @@ Fonctionnalité: Addition
     Lorsque je tape sur la touche "="
     Alors le résultat affiché doit être <somme>
 
-  Exemples:
-    | a | b | somme |
-    | 2 | 2 | 4     |
-    | 2 | 3 | 5     |
+    Exemples:
+      | a | b | somme |
+      | 2 | 2 | 4     |
+      | 2 | 3 | 5     |

data/features/after_block_exceptions.feature

@@ -24,6 +24,7 @@ Feature: After Block Exceptions
       end
       """
 
+  @mri186
   Scenario: Handle Exception in standard scenario step and carry on
     Given a file named "features/naughty_step_in_scenario.feature" with:
       """
@@ -52,7 +53,8 @@ Feature: After Block Exceptions
       2 steps (2 passed)
       
       """
-  
+
+  @mri186
   Scenario: Handle Exception in scenario outline table row and carry on
     Given a file named "features/naughty_step_in_scenario_outline.feature" with:
       """

data/features/after_step_block_exceptions.feature

@@ -24,6 +24,7 @@ Feature: AfterStep Block Exceptions
       end
       """
 
+  @mri186
   Scenario: Handle Exception in standard scenario step and carry on
     Given a file named "features/naughty_step_in_scenario.feature" with:
       """
@@ -53,8 +54,9 @@ Feature: AfterStep Block Exceptions
       2 steps (1 failed, 1 passed)
       
       """
-  
-   Scenario: Handle Exception in scenario outline table row and carry on
+
+  @mri186
+  Scenario: Handle Exception in scenario outline table row and carry on
     Given a file named "features/naughty_step_in_scenario_outline.feature" with:
       """
       Feature: Sample

data/features/background.feature

@@ -90,6 +90,7 @@ Feature: backgrounds
 
     """
 
+  @mri186
   Scenario: run a feature with a background that fails
     When I run cucumber -q features/background/failing_background.feature --require features
     Then it should fail with
@@ -117,6 +118,7 @@ Feature: backgrounds
     """
     And "examples/self_test/tmp/after.txt" should exist
 
+  @mri186
   Scenario: run a feature with scenario outlines that has a background that fails
     When I run cucumber -q features/background/scenario_outline_failing_background.feature --require features
     Then it should fail with
@@ -169,6 +171,7 @@ Feature: backgrounds
 
     """
 
+  @mri186
   Scenario: background passes with first scenario but fails with second
     When I run cucumber -q features/background/failing_background_after_success.feature --require features
     Then it should fail with

data/features/cucumber_cli.feature

@@ -2,8 +2,6 @@ Feature: Cucumber command line
   In order to write better software
   Developers should be able to execute requirements as tests
 
-
-
   Scenario: Run single scenario with missing step definition
     When I run cucumber -q features/sample.feature:5
     Then it should pass with      
@@ -56,6 +54,7 @@ Feature: Cucumber command line
 
     """
 
+  @mri186
   Scenario: Specify 2 line numbers where one is a tag
     When I run cucumber -q features/sample.feature:5:14
     Then it should fail with
@@ -117,6 +116,7 @@ Feature: Cucumber command line
 
       """
 
+  @mri186
   Scenario: Run all with progress formatter
     When I run cucumber -q --format progress features/sample.feature
     Then it should fail with
@@ -406,6 +406,7 @@ Feature: Cucumber command line
 
       """
 
+  @mri186
   Scenario: Run with a tag that exists on 1 feature
     When I run cucumber -q features --tags one
     Then it should fail with

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
 
+  @mri186
   Scenario: Run single failing scenario with default diff enabled
     When I run cucumber -q features/failing_expectation.feature
     Then it should fail with
@@ -25,6 +26,7 @@ Feature: Cucumber command line
 
       """
 
+  @mri186
   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

data/features/cucumber_cli_outlines.feature

@@ -2,6 +2,7 @@ Feature: Cucumber command line
   In order to write better software
   Developers should be able to execute requirements as tests
 
+  @mri186
   Scenario: Run scenario outline with filtering on outline name
     When I run cucumber -q features --name "Test state"
     Then it should fail with
@@ -31,6 +32,7 @@ Feature: Cucumber command line
 
       """
 
+  @mri186
   Scenario: Run scenario outline steps only
     When I run cucumber -q features/outline_sample.feature:7
     Then it should fail with
@@ -60,6 +62,7 @@ Feature: Cucumber command line
 
       """
 
+  @mri186
   Scenario: Run single failing scenario outline table row
     When I run cucumber features/outline_sample.feature:12
     Then it should fail with
@@ -85,7 +88,7 @@ Feature: Cucumber command line
 
   # There are 10 characters in the progress, but only 8 reported steps. Needs investigation.
   # Looks like we're outputting too many characters.
-  @buggy
+  @mri186
   Scenario: Run all with progress formatter
     When I run cucumber -q --format progress features/outline_sample.feature
     Then it should fail with

data/features/expand.feature

@@ -0,0 +1,48 @@
+Feature: --expand option
+  In order to make it easier to writhe certain editor plugins
+  and also for some people to understand scenarios, Cucumber
+  should expand examples in outlines.
+
+  Background:
+    Given a standard Cucumber project directory structure
+    And a file named "features/expand_me.feature" with:
+      """
+      Feature: submit guess
+        Scenario Outline: submit guess
+          Given the secret code is <code>
+          When I guess <guess>
+          Then the mark should be <mark>
+
+        Examples: all colors correct
+          | code    | guess   | mark |
+          | r g y c | r g y c | bbbb |
+          | r g y c | r g c y | bbww |
+      """
+
+  Scenario: Expand the outline
+    When I run cucumber -i -q --expand features/expand_me.feature
+    Then it should pass with
+      """
+      Feature: submit guess
+
+        Scenario Outline: submit guess
+          Given the secret code is <code>
+          When I guess <guess>
+          Then the mark should be <mark>
+
+          Examples: all colors correct
+
+            Scenario: | r g y c | r g y c | bbbb |
+              Given the secret code is r g y c
+              When I guess r g y c
+              Then the mark should be bbbb
+
+            Scenario: | r g y c | r g c y | bbww |
+              Given the secret code is r g y c
+              When I guess r g c y
+              Then the mark should be bbww
+
+      2 scenarios (2 undefined)
+      6 steps (6 undefined)
+      
+      """

data/features/junit_formatter.feature

@@ -5,7 +5,8 @@ Feature: JUnit output formatter
   Background:
     Given I am in junit
     And the tmp directory is empty
-    
+  
+  @mri186 @diffxml
   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
@@ -27,6 +28,8 @@ Feature: JUnit output formatter
       </testsuite>
       
       """
+  
+  @mri186 @diffxml
   Scenario: pending step
     When I run cucumber --format junit --out tmp/ features/pending.feature
     Then it should pass with

data/features/report_called_undefined_steps.feature

@@ -2,6 +2,7 @@ Feature: Cucumber command line
   In order to find out what step definitions need to be implemented
   Developers should always see what step definition is missing
 
+  @mri186
   Scenario: Get info at arbitrary levels of nesting
     When I run cucumber features/call_undefined_step_from_step_def.feature
     Then it should pass with

data/features/step_definitions/cucumber_steps.rb

@@ -66,13 +66,13 @@ Then /^the output should be$/ do |text|
   last_stdout.should == text
 end
 
-# http://diffxml.sourceforge.net/
 Then /^"(.*)" should contain XML$/ do |file, xml|
   t = Tempfile.new('cucumber-junit')
   t.write(xml)
   t.flush
   t.close
-  diff = `diffxml #{t.path} #{file}`
+  cmd = "diffxml #{t.path} #{file}"
+  diff = `#{cmd}`
   if diff =~ /<delta>/m
     raise diff + "\nXML WAS:\n" + IO.read(file)
   end

data/features/support/env.rb

@@ -63,3 +63,8 @@ Before do
   FileUtils.rm_rf CucumberWorld.working_dir
   FileUtils.mkdir CucumberWorld.working_dir
 end
+
+Before('@diffxml') do
+  `diffxml --version`
+  raise "Please install diffxml from http://diffxml.sourceforge.net/" if $? != 0
+end

data/features/usage.feature

@@ -3,43 +3,38 @@ Feature: Cucumber command line
   steps and step definitions, Cucumber must provide a way to
   display how they are related.
 
+  @mri186
   Scenario: List usage of step definitions
     When I run cucumber features --format usage --dry-run
     Then it should pass with
       """
       /^passing without a table$/          # features/step_definitions/sample_steps.rb:12
-       Given passing without a table       # features/background/background_tagged_before_on_outline.feature:5
-       Given passing without a table       # features/background/failing_background_after_success.feature:4
-       Given passing without a table       # features/multiline_name.feature:6
-       Given passing without a table       # features/multiline_name.feature:11
+       Given <other_state> without a table # features/outline_sample.feature:7
        Given <state> without a table       # features/multiline_name.feature:16
        Given <state> without a table       # features/multiline_name.feature:22
        Given <state> without a table       # features/outline_sample.feature:6
-       Given <other_state> without a table # features/outline_sample.feature:7
-       Given passing without a table       # features/search_sample.feature:4
-       Given passing without a table       # features/search_sample.feature:7
        Given <state> without a table       # features/search_sample.feature:19
        Given <state> without a table       # features/search_sample.feature:25
+       Given passing without a table       # features/background/background_tagged_before_on_outline.feature:5
+       Given passing without a table       # features/background/failing_background_after_success.feature:4
+       Given passing without a table       # features/multiline_name.feature:11
+       Given passing without a table       # features/multiline_name.feature:6
+       Given passing without a table       # features/search_sample.feature:4
+       Given passing without a table       # features/search_sample.feature:7
       /^failing without a table$/    # features/step_definitions/sample_steps.rb:15
+       Given <state> without a table # features/search_sample.feature:13
        Given failing without a table # features/background/failing_background.feature:5
        Given failing without a table # features/background/scenario_outline_failing_background.feature:4
        Given failing without a table # features/search_sample.feature:10
-       Given <state> without a table # features/search_sample.feature:13
       /^a step definition that calls an undefined step$/    # features/step_definitions/sample_steps.rb:19
        Given a step definition that calls an undefined step # features/call_undefined_step_from_step_def.feature:4
       /^call step "(.*)"$/                                              # features/step_definitions/sample_steps.rb:23
        Given call step "a step definition that calls an undefined step" # features/call_undefined_step_from_step_def.feature:7
       /^'(.+)' cukes$/   # features/step_definitions/sample_steps.rb:27
-       Given '10' cukes  # features/background/background_with_name.feature:4
        And '10' cukes    # features/background/failing_background.feature:6
+       Given '10' cukes  # features/background/background_with_name.feature:4
        Given '10' cukes  # features/background/passing_background.feature:4
        Given '10' cukes  # features/background/scenario_outline_passing_background.feature:4
-       Given '2' cukes   # features/tons_of_cukes.feature:4
-       Given '2' cukes   # features/tons_of_cukes.feature:5
-       Given '2' cukes   # features/tons_of_cukes.feature:6
-       Given '2' cukes   # features/tons_of_cukes.feature:7
-       Given '2' cukes   # features/tons_of_cukes.feature:8
-       Given '2' cukes   # features/tons_of_cukes.feature:9
        Given '2' cukes   # features/tons_of_cukes.feature:10
        Given '2' cukes   # features/tons_of_cukes.feature:11
        Given '2' cukes   # features/tons_of_cukes.feature:12
@@ -70,6 +65,7 @@ Feature: Cucumber command line
        Given '2' cukes   # features/tons_of_cukes.feature:37
        Given '2' cukes   # features/tons_of_cukes.feature:38
        Given '2' cukes   # features/tons_of_cukes.feature:39
+       Given '2' cukes   # features/tons_of_cukes.feature:4
        Given '2' cukes   # features/tons_of_cukes.feature:40
        Given '2' cukes   # features/tons_of_cukes.feature:41
        Given '2' cukes   # features/tons_of_cukes.feature:42
@@ -80,27 +76,32 @@ Feature: Cucumber command line
        Given '2' cukes   # features/tons_of_cukes.feature:47
        Given '2' cukes   # features/tons_of_cukes.feature:48
        Given '2' cukes   # features/tons_of_cukes.feature:49
+       Given '2' cukes   # features/tons_of_cukes.feature:5
        Given '2' cukes   # features/tons_of_cukes.feature:50
        Given '2' cukes   # features/tons_of_cukes.feature:51
        Given '2' cukes   # features/tons_of_cukes.feature:52
+       Given '2' cukes   # features/tons_of_cukes.feature:6
+       Given '2' cukes   # features/tons_of_cukes.feature:7
+       Given '2' cukes   # features/tons_of_cukes.feature:8
+       Given '2' cukes   # features/tons_of_cukes.feature:9
       /^I should have '(.+)' cukes$/      # features/step_definitions/sample_steps.rb:31
-       Then I should have '<count>' cukes # features/background/background_tagged_before_on_outline.feature:8
        Then I should have '10' cukes      # features/background/background_with_name.feature:7
-       Then I should have '10' cukes      # features/background/failing_background.feature:9
        Then I should have '10' cukes      # features/background/failing_background.feature:12
-       Then I should have '10' cukes      # features/background/passing_background.feature:7
+       Then I should have '10' cukes      # features/background/failing_background.feature:9
        Then I should have '10' cukes      # features/background/passing_background.feature:10
-       Then I should have '10' cukes      # features/background/pending_background.feature:7
+       Then I should have '10' cukes      # features/background/passing_background.feature:7
        Then I should have '10' cukes      # features/background/pending_background.feature:10
-       Then I should have '<count>' cukes # features/background/scenario_outline_failing_background.feature:7
+       Then I should have '10' cukes      # features/background/pending_background.feature:7
+       Then I should have '<count>' cukes # features/background/background_tagged_before_on_outline.feature:8
        Then I should have '<count>' cukes # features/background/scenario_outline_failing_background.feature:13
-       Then I should have '<count>' cukes # features/background/scenario_outline_passing_background.feature:7
+       Then I should have '<count>' cukes # features/background/scenario_outline_failing_background.feature:7
        Then I should have '<count>' cukes # features/background/scenario_outline_passing_background.feature:13
+       Then I should have '<count>' cukes # features/background/scenario_outline_passing_background.feature:7
       /^'(.+)' global cukes$/   # features/step_definitions/sample_steps.rb:35
        And '10' global cukes    # features/background/failing_background_after_success.feature:5
       /^I should have '(.+)' global cukes$/   # features/step_definitions/sample_steps.rb:42
-       Then I should have '10' global cukes   # features/background/failing_background_after_success.feature:8
        Then I should have '10' global cukes   # features/background/failing_background_after_success.feature:11
+       Then I should have '10' global cukes   # features/background/failing_background_after_success.feature:8
       /^table$/    # features/step_definitions/sample_steps.rb:46
        Given table # features/background/multiline_args_background.feature:4
       /^multiline string$/   # features/step_definitions/sample_steps.rb:50

data/features/work_in_progress.feature

@@ -49,6 +49,7 @@ Feature: Cucumber --work-in-progress switch
       end
       """
 
+  @mri186
   Scenario: Pass with Failing Scenarios
     When I run cucumber -q -w -t @failing features/wip.feature
     Then it should pass with
@@ -82,6 +83,7 @@ Feature: Cucumber --work-in-progress switch
 
       """
 
+  @mri186
   Scenario: Pass with Undefined Scenarios
     When I run cucumber -q -w -t @pending features/wip.feature
     Then it should pass with

data/gem_tasks/rspec.rake

@@ -27,10 +27,17 @@ if require_spec
     unable_to_load
   end
 
+  def undefine_task(*names)
+    app = Rake.application
+    tasks = app.instance_variable_get('@tasks')
+    names.flatten.each { |name| tasks.delete(name) }
+  end
+  undefine_task('spec') # Hoe 1.2.12 is broken - it defines a spec task that we can't tweak.
+
   desc "Run the Cucumber specs"
   Spec::Rake::SpecTask.new do |t|
-    t.spec_opts = ['--options', "specs/spec.opts"]
-    t.spec_files = FileList['specs/**/*_spec.rb']
+    t.spec_opts = ['--options', "spec/spec.opts"]
+    t.spec_files = FileList['spec/**/*_spec.rb']
     t.rcov = ENV['RCOV']
     t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
     t.verbose = true

data/lib/cucumber.rb

@@ -39,6 +39,10 @@ module Cucumber
     def keyword_hash(lang=@lang)
       LANGUAGES[lang]
     end
+
+    def scenario_keyword
+      keyword_hash['scenario'].split('|')[0] + ':'
+    end
     
     def alias_step_definitions(lang) #:nodoc:
       keywords = %w{given when then and but}.map{|keyword| keyword_hash(lang)[keyword].split('|')}

data/lib/cucumber/ast/outline_table.rb

@@ -10,7 +10,11 @@ module Cucumber
 
       def accept(visitor)
         cells_rows.each_with_index do |row, n|
-          visitor.visit_table_row(row)
+          if(visitor.options[:expand])
+            row.accept(visitor)
+          else
+            visitor.visit_table_row(row)
+          end
         end
         nil
       end
@@ -35,6 +39,10 @@ module Cucumber
         cells_rows[1..-1]
       end
 
+      def visit_scenario_name(visitor, row)
+        @scenario_outline.visit_scenario_name(visitor, row)
+      end
+
       class ExampleCells < Cells
         
         def create_step_invocations!(scenario_outline)
@@ -49,6 +57,10 @@ module Cucumber
         end
 
         def accept(visitor)
+          visitor.options[:expand] ? accept_expand(visitor) : accept_plain(visitor)
+        end
+
+        def accept_plain(visitor)
           if header?
             @cells.each do |cell|
               cell.status = :skipped_param
@@ -70,6 +82,20 @@ module Cucumber
           end
         end
 
+        def accept_expand(visitor)
+          if header?
+          else
+            visitor.step_mother.before_and_after(self) do
+              @table.visit_scenario_name(visitor, self)
+              @step_invocations.each do |step_invocation|
+                step_invocation.invoke(visitor.step_mother, visitor.options)
+                @exception ||= step_invocation.exception
+                step_invocation.visit_step_result(visitor)
+              end
+            end
+          end
+        end
+
         def accept_hook?(hook)
           @table.accept_hook?(hook)
         end
@@ -99,10 +125,13 @@ module Cucumber
         end
 
         def backtrace_line
-          name = "| #{@cells.collect{|c| c.value }.join(' | ')} |"
           @scenario_outline.backtrace_line(name, line)
         end
 
+        def name
+          "| #{@cells.collect{|c| c.value }.join(' | ')} |"
+        end
+
         private
 
         def header?

data/lib/cucumber/ast/scenario_outline.rb

@@ -61,6 +61,10 @@ module Cucumber
         end
       end
 
+      def visit_scenario_name(visitor, row)
+        visitor.visit_scenario_name(Cucumber.scenario_keyword, row.name, file_colon_line(row.line), source_indent(first_line_length))
+      end
+
       def to_sexp
         sexp = [:scenario_outline, @keyword, @name]
         comment = @comment.to_sexp

data/lib/cucumber/ast/step.rb

@@ -51,7 +51,7 @@ module Cucumber
           step_match          = visitor.step_mother.step_match(name, @name) rescue nil
           return step_match if step_match
         end
-        NoStepMatch.new(self)
+        NoStepMatch.new(self, @name)
       end
 
       def to_sexp
@@ -62,8 +62,8 @@ module Cucumber
         @feature_element.source_indent(text_length)
       end
 
-      def text_length
-        @keyword.jlength + @name.jlength + INDENT # Add indent as steps get indented more than scenarios
+      def text_length(name=@name)
+        @keyword.jlength + name.jlength + INDENT # Add indent as steps get indented more than scenarios
       end
 
       def backtrace_line

data/lib/cucumber/ast/step_invocation.rb

@@ -20,7 +20,11 @@ module Cucumber
 
       def accept(visitor)
         invoke(visitor.step_mother, visitor.options)
-        @step.visit_step_result(visitor, @step_match, @multiline_arg, @status, @exception, @background)
+        visit_step_result(visitor)
+      end
+
+      def visit_step_result(visitor)
+        visitor.visit_step_result(keyword, @step_match, @multiline_arg, @status, @exception, source_indent, @background)
       end
 
       def invoke(step_mother, options)
@@ -52,11 +56,11 @@ module Cucumber
         rescue Undefined => e
           failed(e, true)
           status!(:undefined)
-          @step_match = NoStepMatch.new(@step)
+          @step_match = NoStepMatch.new(@step, @name)
         rescue Ambiguous => e
           failed(e, false)
           status!(:failed)
-          @step_match = NoStepMatch.new(@step)
+          @step_match = NoStepMatch.new(@step, @name)
         end
         step_mother.step_visited(self)
       end
@@ -86,8 +90,12 @@ module Cucumber
         end
       end
 
+      def source_indent
+        @step.feature_element.source_indent(text_length)
+      end
+
       def text_length
-        @step.text_length
+        @step.text_length(@name)
       end
 
       def keyword

data/lib/cucumber/cli/configuration.rb

@@ -152,6 +152,9 @@ module Cucumber
           opts.on("-g", "--guess", "Guess best match for Ambiguous steps.") do
             @options[:guess] = true
           end
+          opts.on("-x", "--expand", "Expand Scenario Outline Tables in output.") do
+            @options[:expand] = true
+          end
           opts.on("--no-diff", "Disable diff output on failing expectations.") do
             @options[:diff_enabled] = false
           end

data/lib/cucumber/formatter/pretty.rb

@@ -76,6 +76,7 @@ module Cucumber
 
       def visit_feature_element(feature_element)
         @indent = 2
+        @scenario_indent = 2
         super
         @io.puts
         @io.flush
@@ -83,6 +84,7 @@ module Cucumber
 
       def visit_background(background)
         @indent = 2
+        @scenario_indent = 2
         @in_background = true
         super
         @in_background = nil
@@ -100,6 +102,7 @@ module Cucumber
         names[1..-1].each {|s| @io.puts "      #{s}" }
         @io.flush
         @indent = 6
+        @scenario_indent = 6
       end
 
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
@@ -107,8 +110,9 @@ module Cucumber
       end
 
       def visit_feature_element_name(keyword, name, file_colon_line, source_indent)
+        @io.puts if @scenario_indent == 6
         names = name.empty? ? [name] : name.split("\n")
-        line = "  #{keyword} #{names[0]}"
+        line = "#{keyword} #{names[0]}".indent(@scenario_indent)
         @io.print(line)
         if @options[:source]
           line_comment = " # #{file_colon_line}".indent(source_indent)
@@ -137,7 +141,7 @@ module Cucumber
       def visit_step_name(keyword, step_match, status, source_indent, background)
         source_indent = nil unless @options[:source]
         formatted_step_name = format_step(keyword, step_match, status, source_indent)
-        @io.puts("    " + formatted_step_name)
+        @io.puts(formatted_step_name.indent(@scenario_indent + 2))
       end
 
       def visit_multiline_arg(multiline_arg)

data/lib/cucumber/formatter/usage.rb

@@ -56,14 +56,14 @@ module Cucumber
 
           @io.print step_definition.regexp.inspect
           @io.puts format_string("   # #{step_definition.file_colon_line}".indent(max_length - step_definition.text_length), :comment)
-          step_matches_and_descriptions.each do |step_match_and_description|
+          da = step_matches_and_descriptions.map do |step_match_and_description|
             step_match      = step_match_and_description[0]
             description     = step_match_and_description[1]
             length          = step_match_and_description[2]
             file_colon_line = step_match_and_description[3]
-            @io.print " #{description}"
-            @io.puts format_string(" # #{file_colon_line}".indent(max_length - length), :comment)
+            " #{description}" + format_string(" # #{file_colon_line}".indent(max_length - length), :comment)
           end
+          da.sort.each{|d| puts d}
         end
 
         print_unused_step_definitions

data/lib/cucumber/languages.yml

@@ -62,12 +62,12 @@
   name: Catalan
   native: català
   encoding: UTF-8
-  background: Rerefons
+  background: Rerefons|Antecedents
   feature: Característica
   scenario: Escenari
   scenario_outline: Esquema de l\'escenari
   examples: Exemples
-  given: Donat
+  given: Donat|Donada
   when: Quan
   then: Aleshores
   and: I

data/lib/cucumber/rake/task.rb

@@ -171,7 +171,7 @@ module Cucumber
       end
 
       def runner(task_args = nil) # :nodoc:
-        cucumber_opts = [(ENV['CUCUMBER_OPTS'] || cucumber_opts_with_profile)]
+        cucumber_opts = [(ENV['CUCUMBER_OPTS'] ? ENV['CUCUMBER_OPTS'].split(/\s+/) : nil) || cucumber_opts_with_profile]
         if(@rcov)
           RCovCucumberRunner.new(libs, binary, cucumber_opts, feature_files(task_args), rcov_opts)
         elsif(@fork)

data/lib/cucumber/step_match.rb

@@ -33,12 +33,13 @@ module Cucumber
   class NoStepMatch
     attr_reader :step_definition
 
-    def initialize(step)
+    def initialize(step, name)
       @step = step
+      @name = name
     end
     
     def format_args(format)
-      @step.name
+      @name
     end
 
     def file_colon_line

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 6
+    TINY  = 7
     PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')

data/rails_generators/cucumber/templates/cucumber.rake

@@ -5,7 +5,7 @@ begin
 
   Cucumber::Rake::Task.new(:features) do |t|
     t.fork = true
-    t.cucumber_opts = %w{--format pretty}
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
   end
   task :features => 'db:test:prepare'
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 +02:00
+date: 2009-05-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -322,6 +322,7 @@ files:
 - features/cucumber_cli_outlines.feature
 - features/custom_formatter.feature
 - features/exclude_files.feature
+- features/expand.feature
 - features/junit_formatter.feature
 - features/multiline_names.feature
 - features/rake_task.feature