kosmas58-cucumber 0.1.99.23 → 0.1.100.5

data/lib/cucumber/formatter/pretty.rb

@@ -23,7 +23,7 @@ module Cucumber
 
       def visit_features(features)
         super
-        print_summary(features) unless @options[:autoformat]
+        print_summary unless @options[:autoformat]
       end
 
       def visit_feature(feature)
@@ -34,14 +34,10 @@ module Cucumber
           mkdir_p(dir) unless File.directory?(dir)
           File.open(file, Cucumber.file_mode('w')) do |io|
             @io = io
-            with_color do
-              feature.accept(self)
-            end
+            super
           end
         else
-          with_color do
-            feature.accept(self)
-          end
+          super
         end
       end
 
@@ -79,21 +75,22 @@ module Cucumber
 
       def visit_feature_element(feature_element)
         @indent = 2
-        @last_undefined = feature_element.undefined?
-        feature_element.accept(self)
+        super
         @io.puts
         @io.flush
       end
 
-     def visit_background(background)
+      def visit_background(background)
         @indent = 2
-        background_already_visible = background.already_visited_steps?
-        background.accept(self)
-        @io.puts unless background_already_visible
+        @in_background = true
+        super
+        @in_background = nil
+        @io.puts
+        @io.flush
       end
 
-      def visit_examples(examples)
-        examples.accept(self)
+      def visit_background_name(keyword, name, file_colon_line, source_indent)
+        visit_feature_element_name(keyword, name, file_colon_line, source_indent)
       end
 
       def visit_examples_name(keyword, name)
@@ -102,12 +99,15 @@ module Cucumber
         @indent = 4
       end
 
-      def visit_scenario_name(keyword, name, file_line, source_indent)
+      def visit_scenario_name(keyword, name, file_colon_line, source_indent)
+        visit_feature_element_name(keyword, name, file_colon_line, source_indent)
+      end
+
+      def visit_feature_element_name(keyword, name, file_colon_line, source_indent)
         line = "  #{keyword} #{name}"
-        line = format_string(line, :undefined) if @last_undefined
         @io.print(line)
         if @options[:source]
-          line_comment = " # #{file_line}".indent(source_indent)
+          line_comment = " # #{file_colon_line}".indent(source_indent)
           @io.print(format_string(line_comment, :comment))
         end
         @io.puts
@@ -116,27 +116,39 @@ module Cucumber
 
       def visit_step(step)
         @indent = 6
-        exception = step.accept(self)
-        print_exception(exception, @indent) if exception
+        super
       end
 
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
-        source_indent = nil unless @options[:source]
-        formatted_step_name = format_step(keyword, step_name, status, step_definition, source_indent)
-        @io.puts("    " + formatted_step_name)
-        @io.flush
+      def visit_step_name(keyword, step_match, status, source_indent, background)
+        @step_matches ||= []
+        
+        non_failed_background_step_outside_background = !@in_background && background && (status != :failed)
+        @skip_step = @step_matches.index(step_match) || non_failed_background_step_outside_background
+        
+        unless(@skip_step)
+          source_indent = nil unless @options[:source]
+          formatted_step_name = format_step(keyword, step_match, status, source_indent)
+          @io.puts("    " + formatted_step_name)
+        end
+        @step_matches << step_match
+      end
+
+      def visit_multiline_arg(multiline_arg)
+        return if @options[:no_multiline] || @skip_step
+        super
       end
 
-      def visit_multiline_arg(multiline_arg, status)
-        return if @options[:no_multiline]
-        multiline_arg.accept(self, status)
+      def visit_exception(exception, status)
+        return if @skip_step
+        print_exception(exception, status, @indent)
+        @io.flush
       end
 
-      def visit_table_row(table_row, status)
+      def visit_table_row(table_row)
         @io.print @delim.indent(@indent)
-        exception = table_row.accept(self, status)
+        super
         @io.puts
-        print_exception(exception, 6) if exception
+        print_exception(table_row.exception, :failed, @indent) if table_row.exception
       end
 
       def visit_py_string(string, status)
@@ -146,8 +158,8 @@ module Cucumber
         @io.flush
       end
 
-      def visit_table_cell(table_cell, status)
-        table_cell.accept(self, status)
+      def visit_table_cell(table_cell)
+        super
       end
 
       def visit_table_cell_value(value, width, status)
@@ -157,9 +169,9 @@ module Cucumber
 
       private
 
-      def print_summary(features)
-        print_counts(features)
-        print_snippets(features, @options)
+      def print_summary
+        print_counts
+        print_snippets(@options)
       end
 
     end

data/lib/cucumber/formatter/profile.rb

@@ -17,17 +17,17 @@ module Cucumber
         super
       end
 
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
+      def visit_step_name(keyword, step_match, status, source_indent, background)
         duration = Time.now - @step_duration
         super
 
-        if step_definition # nil for outline steps
-          description = format_step(keyword, step_name, status, step_definition, nil)
-          @step_definition_durations[step_definition] << [duration, description, @step.file_line]
+        if step_match.step_definition
+          description = format_step(keyword, step_match, status, nil)
+          @step_definition_durations[step_match.step_definition] << [duration, description, @step.file_colon_line]
         end
       end
 
-      def print_summary(features)
+      def print_summary
         super
         @io.puts "\n\nTop #{NUMBER_OF_STEP_DEFINITONS_TO_SHOW} average slowest steps with #{NUMBER_OF_STEP_INVOCATIONS_TO_SHOW} slowest matches:\n"
 
@@ -60,7 +60,7 @@ module Cucumber
 
       def print_step_definition(step_definition, mean_duration)
         duration = sprintf("%.7f",  mean_duration)
-        @io.puts format_string("#{duration} #{step_definition.to_backtrace_line}", :failed)
+        @io.puts format_string("#{duration} #{step_definition.backtrace_line}", :failed)
       end
 
       def print_step_definitions(duration_description_location, step_definition)

data/lib/cucumber/formatter/progress.rb

@@ -12,41 +12,33 @@ module Cucumber
       end
 
       def visit_features(features)
-        with_color do
-          super
-          @io.puts
-          @io.puts
-          print_summary(features)
-        end
+        super
+        @io.puts
+        @io.puts
+        print_summary
       end
 
-      def visit_multiline_arg(multiline_arg, status)
+      def visit_multiline_arg(multiline_arg)
         @multiline_arg = true
         super
         @multiline_arg = false
       end
 
-      def visit_feature_element(feature_element)
-        progress(:undefined) if feature_element.undefined?
-        super
-      end
-
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
+      def visit_step_name(keyword, step_match, status, source_indent, background)
         progress(status) unless status == :outline
       end
 
       def visit_table_cell_value(value, width, status)
         progress(status) if (status != :thead) && !@multiline_arg
       end
-      
+
       private
 
-      def print_summary(features)
-        print_undefined_scenarios(features)
-        print_steps(features, :pending)
-        print_steps(features, :failed)
-        print_counts(features)
-        print_snippets(features, @options)
+      def print_summary
+        print_steps(:pending)
+        print_steps(:failed)
+        print_counts
+        print_snippets(@options)
       end
 
       CHARS = {
@@ -54,7 +46,7 @@ module Cucumber
         :failed    => 'F',
         :undefined => 'U',
         :pending   => 'P',
-        :skipped   => 'S'
+        :skipped   => '-'
       }
 
       def progress(status)
@@ -65,4 +57,4 @@ module Cucumber
       
     end
   end
-end
+end

data/lib/cucumber/formatter/rerun.rb

@@ -5,13 +5,13 @@ module Cucumber
         super(step_mother)
         @io = io
         @file_names = []
-        @file_lines = Hash.new{|h,k| h[k] = []}
+        @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
 
       def visit_features(features)
         super
         files = @file_names.uniq.map do |file|
-          lines = @file_lines[file]
+          lines = @file_colon_lines[file]
           "#{file}:#{lines.join(':')}"
         end
         @io.puts files.join(' ')
@@ -21,15 +21,15 @@ module Cucumber
         @rerun = false
         super
         if @rerun
-          file, line = *feature_element.file_line.split(':')
-          @file_lines[file] << line
+          file, line = *feature_element.file_colon_line.split(':')
+          @file_colon_lines[file] << line
           @file_names << file
         end
       end
 
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
+      def visit_step_name(keyword, step_match, status, source_indent, background)
         @rerun = true if [:failed].index(status)
       end
     end
   end
-end
+end

data/lib/cucumber/jbehave.rb

@@ -23,65 +23,60 @@ if defined?(JRUBY_VERSION)
         def initialize(jbehave_steps, jbehave_candidate_step)
           @jbehave_steps = jbehave_steps
           @jbehave_candidate_step = jbehave_candidate_step
+          @regexp = Regexp.new(jbehave_candidate_step.pattern.pattern)
         end
-      
-        def match(step_name)
-          full_text = "Given #{step_name}" # JBehave doesn't distinguish GWT internally :-)
-          @jbehave_candidate_step.matches(full_text)
+
+        def step_match(name_to_match, name_to_report)
+          if(match = name_to_match.match(@regexp))
+            StepMatch.new(self, name_to_match, name_to_report, match.captures)
+          else
+            nil
+          end
         end
-      
+
         def file_colon_line
           @jbehave_steps.java_class.name
         end
 
         def format_args(step_name, format)
-          java_pattern = @jbehave_candidate_step.pattern.pattern
-          regexp = Regexp.new(java_pattern)
-          step_name.gzub(regexp, format)
+          step_name.gzub(@regexp, format)
         end
 
-        def matched_args(step_name)
-          java_pattern = @jbehave_candidate_step.pattern.pattern
-          regexp = Regexp.new(java_pattern)
-          step_name.match(regexp).captures
-        end
+        def invoke(world, args, step_name)
+          step = @jbehave_candidate_step.createFrom("Given #{step_name}") # JBehave doesn't care about the adverb.
+          step = @jbehave_candidate_step.__send__(:createStep, "Given #{step_name}", args) # JBehave doesn't care about the adverb.
 
-        def execute(step_name, world, *args)
-          step = @jbehave_candidate_step.createFrom("Given #{step_name}")
           result = step.perform
-          result.describeTo(JBehave::REPORTER)
+          result.describeTo(Reporter)
         end
       end
 
-      class JBehaveException < Exception
-      end
-
       # Implements the org.jbehave.scenario.reporters.ScenarioReporter methods
       class Reporter
-        def successful(step_text)
+        def self.successful(step_text)
           # noop
         end
 
-        def failed(step, java_exception)
+        def self.failed(step, java_exception)
           raise java_exception_to_ruby_exception(java_exception)
         end
 
         private
       
-        def java_exception_to_ruby_exception(java_exception)
+        def self.java_exception_to_ruby_exception(java_exception)
           # OK, this is a little funky - JRuby weirdness
           ruby_exception = org.jruby.NativeException.new(JRuby.runtime, JBehaveException, java_exception)
           ruby_exception.set_backtrace([]) # work around backtrace bug in jruby
-        
-          exception = JBehaveException.new(java_exception.getMessage)
+          exception = JBehaveException.new("#{java_exception.getClass.getName}: #{java_exception.getMessage}")
           bt = ruby_exception.backtrace
           Exception.cucumber_strip_backtrace!(bt, nil, nil)
           exception.set_backtrace(bt)
           exception
         end
       end
-    
-      REPORTER = Reporter.new
+
+      class JBehaveException < Exception
+      end
 
       def self.snippet_text(step_keyword, step_name)
         camel = step_name.gsub(/(\s.)/) {$1.upcase.strip}

data/lib/cucumber/languages.yml

@@ -20,6 +20,7 @@
   then: Then
   and: And
   but: But
+
 # Please help us keeping the languages below uptodate. The parsers for a language
 # that is missing a keyword will expect the English word until the missing word(s)
 # are added.
@@ -94,6 +95,20 @@
   then: Dann
   and: Und
   but: Aber
+"en-au":
+  name: Australian
+  native: Australian
+  encoding: UTF-8
+  feature: Crikey
+  background: Background
+  scenario: Mate
+  scenario_outline: Blokes
+  examples: Cobber
+  given: Ya know how
+  when: When
+  then: Ya gotta
+  and: N
+  but: Cept
 "en-lol":
   name: LOLCAT
   native: LOLCAT
@@ -103,7 +118,7 @@
   scenario: MISHUN
   scenario_outline: MISHUN SRSLY
   examples: EXAMPLZ
-  given: GIVN
+  given: I CAN HAZ
   when: WEN
   then: DEN
   and: AN
@@ -115,7 +130,7 @@
   feature: Feature
   background: Background
   scenario: Scenario
-  scenario_outline: Scenario Outline
+  scenario_outline: All y'all
   examples: Examples
   given: Given y'all
   when: When y'all

data/lib/cucumber/parser/feature.rb

@@ -45,7 +45,7 @@ module Cucumber
           elements[5]
         end
 
-        def background
+        def bg
           elements[6]
         end
 
@@ -57,11 +57,14 @@ module Cucumber
 
       module Feature2
         def build
-          if background.respond_to?(:build)
-            Ast::Feature.new(comment.build, tags.build, header.text_value, feature_elements.build, background.build)
-          else
-            Ast::Feature.new(comment.build, tags.build, header.text_value, feature_elements.build)
-          end
+          background = bg.respond_to?(:build) ? bg.build : nil
+          Ast::Feature.new(
+            background, 
+            comment.build, 
+            tags.build, 
+            header.text_value, 
+            feature_elements.build(background)
+          )
         end
       end
 
@@ -311,7 +314,7 @@ module Cucumber
         if r1
           s2, i2 = [], index
           loop do
-            if input.index(Regexp.new('[^@\\n\\t ]'), index) == index
+            if input.index(Regexp.new('[^@\\r\\n\\t ]'), index) == index
               r3 = (SyntaxNode).new(input, index...(index + 1))
               @index += 1
             else
@@ -548,8 +551,8 @@ module Cucumber
       end
 
       module FeatureElements0
-        def build
-          elements.map{|s| s.build}
+        def build(background)
+          elements.map{|s| s.build(background)}
         end
       end
 
@@ -611,6 +614,10 @@ module Cucumber
           elements[5]
         end
 
+        def white
+          elements[6]
+        end
+
         def steps
           elements[7]
         end
@@ -621,8 +628,9 @@ module Cucumber
       end
 
       module Scenario1
-        def build
+        def build(background)
           Ast::Scenario.new(
+            background,
             comment.build, 
             tags.build,
             scenario_keyword.line,
@@ -669,26 +677,14 @@ module Cucumber
                   r7 = _nt_line_to_eol
                   s0 << r7
                   if r7
-                    i8 = index
-                    r9 = _nt_white
-                    if r9
-                      r8 = r9
-                    else
-                      r10 = _nt_eof
-                      if r10
-                        r8 = r10
-                      else
-                        self.index = i8
-                        r8 = nil
-                      end
-                    end
+                    r8 = _nt_white
                     s0 << r8
                     if r8
-                      r11 = _nt_steps
-                      s0 << r11
-                      if r11
-                        r12 = _nt_white
-                        s0 << r12
+                      r9 = _nt_steps
+                      s0 << r9
+                      if r9
+                        r10 = _nt_white
+                        s0 << r10
                       end
                     end
                   end
@@ -750,8 +746,9 @@ module Cucumber
       end
 
       module ScenarioOutline1
-        def build
+        def build(background)
           Ast::ScenarioOutline.new(
+            background,
             comment.build, 
             tags.build,
             scenario_outline_keyword.line,