aslakhellesoy-cucumber 0.1.99.13 → 0.1.99.14

data/History.txt

@@ -75,7 +75,7 @@ pure Ruby users have been enjoying for a while.
 * Pending steps in > steps called from steps (#65 Aslak Hellesøy)
 
 === New features
-* Keywords can be aliased in languages.yml. See English for an example (scenarios: Scenarios|Examples)
+* Keywords can be aliased in languages.yml. See English for an example (examples: Examples|Scenarios)
 * Adding support for Background (#153 Joseph Wilk) 
 * Added Česky/Czech (Vojtech Salbaba)
 * New --no-multiline option to reduce noise. Useful if lots of features are failing.

data/Manifest.txt

@@ -117,6 +117,7 @@ examples/selenium/Rakefile
 examples/selenium/features/search.feature
 examples/selenium/features/step_definitons/stories_steps.rb
 examples/self_test/README.textile
+examples/self_test/Rakefile
 examples/self_test/features/background/failing_background.feature
 examples/self_test/features/background/failing_background_after_success.feature
 examples/self_test/features/background/multiline_args_background.feature
@@ -217,7 +218,6 @@ lib/cucumber/rake/task.rb
 lib/cucumber/step_definition.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb
-pom.xml
 rails_generators/cucumber/USAGE
 rails_generators/cucumber/cucumber_generator.rb
 rails_generators/cucumber/templates/cucumber
@@ -272,4 +272,3 @@ spec/cucumber/treetop_parser/with_tags.feature
 spec/cucumber/world/pending_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
-src/main/java/cukes/Cucumber.java

data/examples/self_test/Rakefile

@@ -0,0 +1,6 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new
+
+task :default => :features

data/features/cucumber_cli_outlines.feature

@@ -43,8 +43,8 @@ Feature: Cucumber command line
       Feature: Outline Sample
 
         Scenario Outline: Test state          # features/outline_sample.feature:5
-          Given <state> without a table
-          Given <other_state> without a table
+          Given <state> without a table       # features/step_definitions/sample_steps.rb:12
+          Given <other_state> without a table # features/step_definitions/sample_steps.rb:12
 
         Examples: Rainbow colours
           | state   | other_state |

data/gem_tasks/gemspec.rake

@@ -4,7 +4,7 @@ namespace :gemspec do
     File.open('cucumber.gemspec', 'w') {|io| io.write($hoe.spec.to_ruby)}
     puts "1) git commit -a -m \"Release #{Cucumber::VERSION::STRING}\""
     puts "2) git tag -a \"v#{Cucumber::VERSION::STRING}\" -m \"Release #{Cucumber::VERSION::STRING}\""
-    puts "3) git push --tags"
-    puts "4) Bounce the version in version.rb"
+    puts "3) git push"
+    puts "4) git push --tags"
   end
 end

data/lib/cucumber/ast/examples.rb

@@ -10,6 +10,10 @@ module Cucumber
         @outline_table.accept(visitor, nil)
       end
 
+      def each_example_row(&proc)
+        @outline_table.each_cells_row(&proc)
+      end
+
       def at_lines?(lines)
         lines.empty? || lines.index(@line) || @outline_table.at_lines?(lines)
       end

data/lib/cucumber/ast/scenario_outline.rb

@@ -39,6 +39,12 @@ module Cucumber
         end
       end
 
+      def each_example_row(&proc)
+        @examples_array.each do |examples|
+          examples.each_example_row(&proc)
+        end
+      end
+
       def execute_row(cells, visitor, &proc)
         exception = nil
         

data/lib/cucumber/ast/step.rb

@@ -26,13 +26,31 @@ module Cucumber
 
       def accept(visitor)
         execute(visitor)
-        visitor.visit_step_name(@keyword, @name, @status, @step_definition, source_indent)
+
+        if @status == :outline
+          step_definition = find_first_name_and_step_definition_from_examples(visitor)
+        else
+          step_definition = @step_definition
+        end
+        visitor.visit_step_name(@keyword, @name, @status, step_definition, source_indent)
         @multiline_args.each do |multiline_arg|
           visitor.visit_multiline_arg(multiline_arg, @status)
         end
         @exception
       end
 
+      def find_first_name_and_step_definition_from_examples(visitor)
+        # @scenario is always a ScenarioOutline in this case
+        @scenario.each_example_row do |cells|
+          argument_hash       = cells.to_hash
+          delimited_arguments = delimit_argument_names(argument_hash)
+          name                = replace_name_arguments(delimited_arguments)
+          step_definition     = visitor.step_definition(name) rescue nil
+          return step_definition if step_definition
+        end
+        nil
+      end
+
       def to_sexp
         [:step, @line, @keyword, @name, *@multiline_args.map{|arg| arg.to_sexp}]
       end

data/lib/cucumber/ast/table.rb

@@ -66,6 +66,10 @@ module Cucumber
         @raw[1..-1]
       end
 
+      def each_cells_row(&proc)
+        cells_rows.each(&proc)
+      end
+
       # For testing only
       def to_sexp #:nodoc:
         [:table, *cells_rows.map{|row| row.to_sexp}]

data/lib/cucumber/formatter/console.rb

@@ -7,17 +7,20 @@ module Cucumber
       FORMATS = Hash.new{|hash, format| hash[format] = method(format).to_proc}
 
       def format_step(keyword, step_name, status, step_definition, source_indent)
-        line = if step_definition # nil for :outline
-          comment = if source_indent
-            c = (' # ' + step_definition.file_colon_line).indent(source_indent)
-            format_string(c, :comment)
-          else
-            ''
-          end
-          keyword + " " + step_definition.format_args(step_name, format_for(status, :param)) + comment
+        comment = if source_indent
+          c = (' # ' + step_definition.file_colon_line).indent(source_indent)
+          format_string(c, :comment)
         else
-          keyword + " " + step_name
+          ''
         end
+
+        begin
+          line = keyword + " " + step_definition.format_args(step_name, format_for(status, :param)) + comment
+        rescue
+          # It didn't match. This often happens for :outline steps
+          line = keyword + " " + step_name + comment
+        end
+
         format_string(line, status)
       end
 

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 1
     TINY  = 99
-    PATCH = 13 # Set to nil for official release
+    PATCH = 14 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.13
+  version: 0.1.99.14
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -181,6 +181,7 @@ files:
 - examples/selenium/features/search.feature
 - examples/selenium/features/step_definitons/stories_steps.rb
 - examples/self_test/README.textile
+- examples/self_test/Rakefile
 - examples/self_test/features/background/failing_background.feature
 - examples/self_test/features/background/failing_background_after_success.feature
 - examples/self_test/features/background/multiline_args_background.feature