cucumber 0.3.0 → 0.3.1

data/lib/cucumber/ast/outline_table.rb

@@ -70,6 +70,16 @@ module Cucumber
           @table.accept_hook?(hook)
         end
 
+        # Returns true if one or more steps failed
+        def failed?
+          @step_invocations.failed?
+        end
+
+        # Returns true if all steps passed
+        def passed?
+          @step_invocations.passed?
+        end
+
         private
 
         def header?

data/lib/cucumber/ast/py_string.rb

@@ -43,7 +43,11 @@ module Cucumber
         end
         PyString.new(@start_line, @end_line, string, @quotes_indent)
       end
-      
+
+      def has_text?(text)
+        @string.index(text)
+      end
+
       # For testing only
       def to_sexp #:nodoc:
         [:py_string, to_s]

data/lib/cucumber/ast/scenario.rb

@@ -12,20 +12,16 @@ module Cucumber
         step_invocations = steps.map{|step| step.step_invocation}
         if @background
           @steps = @background.step_collection(step_invocations)
+          @background.feature_elements << self
         else
           @steps = StepCollection.new(step_invocations)
         end
       end
 
-      def feature=(feature)
-        @feature = feature
-        @background.feature = feature if @background
-      end
-
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
-        visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(text_length))
+        visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
 
         skip = @background && @background.failed?
         skip_invoke! if skip
@@ -34,6 +30,21 @@ module Cucumber
         end
       end
 
+      # Returns true if one or more steps failed
+      def failed?
+        @steps.failed?
+      end
+
+      # Returns true if all steps passed
+      def passed?
+        @steps.passed?
+      end
+
+      # Returns the first exception (if any)
+      def exception
+        @steps.exception
+      end
+
       def skip_invoke!
         @steps.each{|step_invocation| step_invocation.skip_invoke!}
         @feature.next_feature_element(self) do |next_one|

data/lib/cucumber/ast/scenario_outline.rb

@@ -25,15 +25,10 @@ module Cucumber
         end
       end
 
-      def feature=(feature)
-        @feature = feature
-        @background.feature = feature if @background
-      end
-
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
-        visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(text_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?

data/lib/cucumber/ast/step.rb

@@ -8,6 +8,8 @@ module Cucumber
       attr_writer :step_collection, :options
       attr_accessor :feature_element, :exception
 
+      INDENT = 2
+      
       def initialize(line, keyword, name, multiline_arg=nil)
         @line, @keyword, @name, @multiline_arg = line, keyword, name, multiline_arg
       end
@@ -32,7 +34,7 @@ module Cucumber
 
       def accept(visitor)
         # The only time a Step is visited is when it is in a ScenarioOutline.
-        # Otherwise it's always StepInvocation that gest visited instead.
+        # Otherwise it's always StepInvocation that gets visited instead.
         visit_step_result(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
       end
       
@@ -61,7 +63,7 @@ module Cucumber
       end
 
       def text_length
-        @keyword.jlength + @name.jlength + 2 # Add 2 because steps get indented 2 more than scenarios
+        @keyword.jlength + @name.jlength + INDENT # Add indent as steps get indented more than scenarios
       end
 
       def backtrace_line
@@ -80,7 +82,8 @@ module Cucumber
 
       def matched_cells(cells)
         cells.select do |cell|
-          @name.index(delimited(cell.header_cell.value))
+          delimited = delimited(cell.header_cell.value)
+          @name.index(delimited) || (@multiline_arg && @multiline_arg.has_text?(delimited))
         end
       end
 

data/lib/cucumber/ast/step_collection.rb

@@ -54,9 +54,17 @@ module Cucumber
         @exception ||= ((failed = @steps.detect {|step| step.exception}) && failed.exception)
       end
 
+      def failed?
+        @steps.detect{|step_invocation| step_invocation.status == :failed}
+      end
+
+      def passed?
+        @steps.detect{|step_invocation| step_invocation.status != :passed}.nil?
+      end
+
       def to_sexp
         @steps.map{|step| step.to_sexp}
       end
     end
   end
-end
+end

data/lib/cucumber/ast/table.rb

@@ -191,12 +191,20 @@ module Cucumber
         Table.new(raw_with_replaced_args)
       end
 
+      def has_text?(text)
+        raw.flatten.detect{|cell_value| cell_value.index(text)}
+      end
+
       def cells_rows
         @rows ||= cell_matrix.map do |cell_row|
           @cells_class.new(self, cell_row)
         end
       end
 
+      def headers
+        @raw.first
+      end
+
       def header_cell(col)
         cells_rows[0][col]
       end

data/lib/cucumber/ast/visitor.rb

@@ -11,8 +11,8 @@ module Cucumber
       end
 
       def matches_scenario_names?(node)
-        scenario_names = options[:scenario_names] || []
-        scenario_names.empty? || node.matches_scenario_names?(scenario_names)
+        scenario_name_regexps = options[:name_regexps] || []
+        scenario_name_regexps.empty? || node.matches_scenario_names?(scenario_name_regexps)
       end
 
       def visit_features(features)

data/lib/cucumber/cli/configuration.rb

@@ -78,10 +78,11 @@ module Cucumber
             "with or without the @ prefix.") do |v|
             @options[:include_tags], @options[:exclude_tags] = *parse_tags(v)
           end
-          opts.on("-s SCENARIO", "--scenario SCENARIO", 
-            "Only execute the scenario with the given name. If this option",
-            "is given more than once, run all the specified scenarios.") do |v|
-            @options[:scenario_names] << v
+          opts.on("-n NAME", "--name NAME", 
+            "Only execute the feature elements which match part of the given name.",
+            "If this option is given more than once, it will match against all the",
+            "given names.") do |v|
+            @options[:name_regexps] << /#{v}/
           end
           opts.on("-e", "--exclude PATTERN", "Don't run feature files matching PATTERN") do |v|
             @options[:excludes] << v
@@ -334,16 +335,16 @@ Defined profiles in cucumber.yml:
     
       def default_options
         {
-          :strict         => false,
-          :require        => nil,
-          :lang           => 'en',
-          :dry_run        => false,
-          :formats        => {},
-          :excludes       => [],
-          :include_tags   => [],
-          :exclude_tags   => [],
-          :scenario_names => [],
-          :diff_enabled   => true
+          :strict       => false,
+          :require      => nil,
+          :lang         => 'en',
+          :dry_run      => false,
+          :formats      => {},
+          :excludes     => [],
+          :include_tags => [],
+          :exclude_tags => [],
+          :name_regexps => [],
+          :diff_enabled => true
         }
       end
     

data/lib/cucumber/formatter/console.rb

@@ -79,7 +79,7 @@ module Cucumber
           snippet
         end.compact.uniq
 
-        text = "\nYou can implement step definitions for missing steps with these snippets:\n\n"
+        text = "\nYou can implement step definitions for undefined steps with these snippets:\n\n"
         text += snippets.join("\n\n")
 
         @io.puts format_string(text, :undefined)

data/lib/cucumber/formatter/html.rb

@@ -114,7 +114,7 @@ module Cucumber
         unless @skip_step
           step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
           @builder.div do |div|
-            div << h("#{keyword} #{step_name}")
+            div << h("#{keyword} #{step_name}").gsub(/&lt;span&gt;/, '<span>').gsub(/&lt;\/span&gt;/, '</span>')
           end
         end
       end

data/lib/cucumber/formatter/pretty.rb

@@ -95,7 +95,9 @@ module Cucumber
       end
 
       def visit_examples_name(keyword, name)
-        @io.puts("\n  #{keyword} #{name}")
+        names = name.empty? ? [name] : name.split("\n")
+        @io.puts("\n  #{keyword} #{names[0]}")
+        names[1..-1].each {|s| @io.puts "    #{s}" }
         @io.flush
         @indent = 4
       end
@@ -105,13 +107,15 @@ module Cucumber
       end
 
       def visit_feature_element_name(keyword, name, file_colon_line, source_indent)
-        line = "  #{keyword} #{name}"
+        names = name.empty? ? [name] : name.split("\n")
+        line = "  #{keyword} #{names[0]}"
         @io.print(line)
         if @options[:source]
           line_comment = " # #{file_colon_line}".indent(source_indent)
           @io.print(format_string(line_comment, :comment))
         end
         @io.puts
+        names[1..-1].each {|s| @io.puts "    #{s}"}
         @io.flush
       end
 
@@ -126,11 +130,6 @@ module Cucumber
           @exceptions << exception
         end
         return if status != :failed && @in_background ^ background
-
-        # @step_matches ||= []
-        # return if @step_matches.index(step_match)
-        # @step_matches << step_match
-
         @status = status
         super
       end
@@ -169,7 +168,7 @@ module Cucumber
 
       def visit_table_cell_value(value, width, status)
         status ||= @status || :passed
-        @io.print(' ' + format_string((value.to_s || '').ljust(width), status) + " #{@delim}")
+        @io.print(' ' + format_string((value.to_s || '').ljust(width), status) + ::Term::ANSIColor.reset(" #{@delim}"))
         @io.flush
       end
 

data/lib/cucumber/languages.yml

@@ -206,6 +206,21 @@
   and: Et
   but: Mais
   space_after_keyword: true
+"hu":
+  name: Hungarian
+  native: magyar
+  encoding: UTF-8
+  feature: Jellemző
+  background: Háttér
+  scenario: Forgatókönyv
+  scenario_outline: Forgatókönyv vázlat
+  examples: Példák
+  given: Ha
+  when: Majd
+  then: Akkor
+  and: És
+  but: De
+  space_after_keyword: true
 "id":
   name: Indonesian
   native: Bahasa Indonesia
@@ -264,6 +279,21 @@
   and: Ir
   but: Bet
   space_after_keyword: true
+"lv":
+  name: Latvian
+  native: latviešu
+  encoding: UTF-8
+  feature: Funkcionalitāte|Fīča
+  background: Konteksts|Situācija
+  scenario: Scenārijs
+  scenario_outline: Scenārijs pēc parauga
+  examples: Piemēri|Paraugs
+  given: Kad
+  when: Ja
+  then: Tad
+  and: Un
+  but: Bet
+  space_after_keyword: true
 "nl":
   name: Dutch
   native: Nederlands

data/lib/cucumber/parser/feature.rb

@@ -61,8 +61,8 @@ module Cucumber
         end
         
         def build(filter)
-          if(filter.nil? || feature_elements.accept?(filter))
-            background = bg.respond_to?(:build) ? bg.build : nil
+          if(filter.nil? || feature_elements.accept?(filter) || (!bg.empty? && filter.accept?(bg)))
+            background = bg.respond_to?(:build) ? bg.build : nil      
             Ast::Feature.new(
               background, 
               comment.build, 
@@ -481,12 +481,22 @@ module Cucumber
       end
 
       module Background1
+
+        def matches_name?(regexp_to_match)
+          name.build =~ regexp_to_match
+        end
+
+       def has_tags?(tag_names)
+         feature_tags = self.parent.tags
+         feature_tags.has_tags?(tag_names)
+       end
+
         def build
           Ast::Background.new(
             comment.build, 
             background_keyword.line,
             background_keyword.text_value,
-            name.text_value, 
+            name.build, 
             steps.build
           )
          end
@@ -522,7 +532,7 @@ module Cucumber
               r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
               s0 << r4
               if r4
-                r7 = _nt_line_to_eol
+                r7 = _nt_lines_to_keyword
                 if r7
                   r6 = r7
                 else
@@ -678,8 +688,8 @@ module Cucumber
           tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
         end
 
-        def matches_name?(name_to_match)
-          name.text_value == name_to_match
+        def matches_name?(regexp_to_match)
+          name.build =~ regexp_to_match
         end
 
         def build(background, filter)
@@ -689,7 +699,7 @@ module Cucumber
             tags.build,
             scenario_keyword.line,
             scenario_keyword.text_value, 
-            name.text_value, 
+            name.build, 
             steps.build
           )
         end
@@ -728,7 +738,7 @@ module Cucumber
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_line_to_eol
+                  r7 = _nt_lines_to_keyword
                   s0 << r7
                   if r7
                     r8 = _nt_white
@@ -816,8 +826,8 @@ module Cucumber
           tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
         end
 
-        def matches_name?(name_to_match)
-          name.text_value == name_to_match
+        def matches_name?(regexp_to_match)
+          name.build =~ regexp_to_match
         end
 
         def build(background, filter)
@@ -827,7 +837,7 @@ module Cucumber
             tags.build,
             scenario_outline_keyword.line, 
             scenario_outline_keyword.text_value, 
-            name.text_value, 
+            name.build, 
             steps.build, 
             examples_sections.build(filter, self)
           )
@@ -867,7 +877,7 @@ module Cucumber
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_line_to_eol
+                  r7 = _nt_lines_to_keyword
                   s0 << r7
                   if r7
                     r8 = _nt_white
@@ -1148,8 +1158,12 @@ module Cucumber
           true
         end
 
+        def matches_name?(regexp_to_match)
+          name.build =~ regexp_to_match
+        end
+
         def build(filter, scenario_outline)
-          [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw(filter, scenario_outline)]
+          [examples_keyword.line, examples_keyword.text_value, name.build, table.raw(filter, scenario_outline)]
         end
       end
 
@@ -1189,7 +1203,7 @@ module Cucumber
             r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
             s0 << r4
             if r4
-              r7 = _nt_line_to_eol
+              r7 = _nt_lines_to_keyword
               if r7
                 r6 = r7
               else
@@ -1305,6 +1319,192 @@ module Cucumber
         return r0
       end
 
+      module LineToKeyword0
+      end
+
+      module LineToKeyword1
+        def white
+          elements[0]
+        end
+
+        def text
+          elements[1]
+        end
+      end
+
+      module LineToKeyword2
+        def build
+          text.text_value.strip
+        end
+      end
+
+      def _nt_line_to_keyword
+        start_index = index
+        if node_cache[:line_to_keyword].has_key?(index)
+          cached = node_cache[:line_to_keyword][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        i0, s0 = index, []
+        r1 = _nt_white
+        s0 << r1
+        if r1
+          s2, i2 = [], index
+          loop do
+            i3, s3 = index, []
+            i4 = index
+            r5 = _nt_step_keyword
+            if r5
+              r4 = nil
+            else
+              self.index = i4
+              r4 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s3 << r4
+            if r4
+              i6 = index
+              r7 = _nt_scenario_keyword
+              if r7
+                r6 = nil
+              else
+                self.index = i6
+                r6 = instantiate_node(SyntaxNode,input, index...index)
+              end
+              s3 << r6
+              if r6
+                i8 = index
+                r9 = _nt_scenario_outline_keyword
+                if r9
+                  r8 = nil
+                else
+                  self.index = i8
+                  r8 = instantiate_node(SyntaxNode,input, index...index)
+                end
+                s3 << r8
+                if r8
+                  i10 = index
+                  r11 = _nt_table
+                  if r11
+                    r10 = nil
+                  else
+                    self.index = i10
+                    r10 = instantiate_node(SyntaxNode,input, index...index)
+                  end
+                  s3 << r10
+                  if r10
+                    i12 = index
+                    r13 = _nt_tag
+                    if r13
+                      r12 = nil
+                    else
+                      self.index = i12
+                      r12 = instantiate_node(SyntaxNode,input, index...index)
+                    end
+                    s3 << r12
+                    if r12
+                      i14 = index
+                      r15 = _nt_comment_line
+                      if r15
+                        r14 = nil
+                      else
+                        self.index = i14
+                        r14 = instantiate_node(SyntaxNode,input, index...index)
+                      end
+                      s3 << r14
+                      if r14
+                        i16 = index
+                        r17 = _nt_eol
+                        if r17
+                          r16 = nil
+                        else
+                          self.index = i16
+                          r16 = instantiate_node(SyntaxNode,input, index...index)
+                        end
+                        s3 << r16
+                        if r16
+                          if index < input_length
+                            r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                            @index += 1
+                          else
+                            terminal_parse_failure("any character")
+                            r18 = nil
+                          end
+                          s3 << r18
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+            if s3.last
+              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+              r3.extend(LineToKeyword0)
+            else
+              self.index = i3
+              r3 = nil
+            end
+            if r3
+              s2 << r3
+            else
+              break
+            end
+          end
+          if s2.empty?
+            self.index = i2
+            r2 = nil
+          else
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+          end
+          s0 << r2
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(LineToKeyword1)
+          r0.extend(LineToKeyword2)
+        else
+          self.index = i0
+          r0 = nil
+        end
+
+        node_cache[:line_to_keyword][start_index] = r0
+
+        return r0
+      end
+
+      module LinesToKeyword0
+ 
+        def build
+          elements.map{|s| s.build}.join("\n")
+        end
+      end
+
+      def _nt_lines_to_keyword
+        start_index = index
+        if node_cache[:lines_to_keyword].has_key?(index)
+          cached = node_cache[:lines_to_keyword][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          r1 = _nt_line_to_keyword
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(LinesToKeyword0)
+
+        node_cache[:lines_to_keyword][start_index] = r0
+
+        return r0
+      end
+
       module PyString0
       end