Much better support for line numbers

features/cucumber_cli_outlines.feature

@@ -3,37 +3,35 @@ Feature: Cucumber command line
   Developers should be able to execute requirements as tests
 
   Scenario: Run scenario outline steps only
-    When I run cucumber -q features/outline_sample.feature:3
-    Then it should pass with
-      """
-      Feature: Outline Sample
-        Scenario Outline: Test state
-          Given <state> without a table
-
-          |state  |
-
-      1 scenario
-    
-      """
-
-  Scenario: Run single scenario outline table row with missing step definition
     When I run cucumber -q features/outline_sample.feature:7
-    Then it should pass with
+    Then it should fail with
       """
       Feature: Outline Sample
+
         Scenario Outline: Test state
           Given <state> without a table
+          Given <other_state> without a table
 
-          |state  |
-          |missing|
+        Examples: 
+          | state   | other_state |
+          | missing | passing     |
+          | passing | passing     |
+          | failing | passing     |
+            FAIL (RuntimeError)
+            ./features/step_definitions/sample_steps.rb:2:in `flunker'
+            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
+            features/outline_sample.feature:12:in `Given failing without a table'
 
-      2 scenarios
-      1 step pending (1 with no step definition)
+      3 scenarios
+      1 step failed
+      2 steps skipped
+      1 step undefined
+      2 steps passed
       
       """
 
   Scenario: Run single failing scenario outline table row
-    When I run cucumber features/outline_sample.feature:5
+    When I run cucumber features/outline_sample.feature:12
     Then it should fail with
       """
       Feature: Outline Sample
@@ -44,19 +42,15 @@ Feature: Cucumber command line
 
         Examples: 
           | state   | other_state |
-          | missing | passing     |
-          | passing | passing     |
           | failing | passing     |
             FAIL (RuntimeError)
             ./features/step_definitions/sample_steps.rb:2:in `flunker'
             ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
             features/outline_sample.feature:12:in `Given failing without a table'
 
-      3 scenarios
+      1 scenario
       1 step failed
-      2 steps skipped
-      1 step undefined
-      2 steps passed
+      1 step skipped
 
       """
 

lib/cucumber/ast/examples.rb

@@ -1,7 +1,7 @@
 module Cucumber
   module Ast
     class Examples
-      def initialize(keyword, name, outline_table)
+      def initialize(line, keyword, name, outline_table)
         @keyword, @name, @outline_table = keyword, name, outline_table
       end
 
@@ -10,6 +10,10 @@ def accept(visitor)
         @outline_table.accept(visitor, nil)
       end
 
+      def at_lines?(*lines)
+        lines.empty? || lines.index(@line) || @outline_table.at_lines?(*lines)
+      end
+
       def to_sexp
         [:examples, @keyword, @name, @outline_table.to_sexp]
       end

lib/cucumber/ast/feature.rb

@@ -3,19 +3,21 @@ module Ast
     # Represents the root node of a parsed feature.
     class Feature
       attr_accessor :file
-      attr_writer :lines, :features
+      attr_writer :features, :lines
 
       def initialize(comment, tags, name, feature_elements)
         @comment, @tags, @name, @feature_elements = comment, tags, name, feature_elements
         feature_elements.each{|feature_element| feature_element.feature = self}
+        @lines = []
       end
 
       def accept(visitor)
+        visitor.current_feature_lines = @lines
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
         visitor.visit_feature_name(@name)
         @feature_elements.each do |feature_element|
-          visitor.visit_feature_element(feature_element) if @lines.nil? || feature_element.at_any_line?(@lines)
+          visitor.visit_feature_element(feature_element) if feature_element.at_lines?(*@lines)
         end
       end
 

lib/cucumber/ast/outline_table.rb

@@ -7,6 +7,19 @@ def initialize(raw, scenario_outline)
         @cells_class = ExampleCells
       end
 
+      def accept(visitor, status)
+        rows.each_with_index do |row, n|
+          should_visit = n == 0 || 
+            row.at_lines?(*visitor.current_feature_lines) ||
+            @scenario_outline.at_header_or_step_lines?(*visitor.current_feature_lines)
+
+          if should_visit
+            visitor.visit_table_row(row, status)
+          end
+        end
+        nil
+      end
+
       def execute_row(cells, visitor, &proc)
         @scenario_outline.execute_row(cells, visitor, &proc)
       end

lib/cucumber/ast/scenario.rb

@@ -38,18 +38,12 @@ def text_length
         @keyword.jlength + @name.jlength
       end
 
-      def at_any_line?(lines)
-        lines.each {|line| return true if at_line?(line)}
-        false
+      def at_lines?(*lines)
+        lines.empty? || lines.index(@line) || at_header_or_step_lines?(*lines)
       end
 
-      def at_line?(line)
-        if @line == line
-          true
-        else
-          @steps.each {|step| return true if step.at_line?(line)}
-          false
-        end
+      def at_header_or_step_lines?(*lines)
+        @steps.detect {|step| step.at_lines?(*lines)}
       end
 
       def undefined?

lib/cucumber/ast/scenario_outline.rb

@@ -12,15 +12,20 @@ def initialize(comment, tags, line, keyword, name, steps, example_sections)
         steps.each {|step| step.status = :outline}
 
         @examples_array = example_sections.map do |example_section|
-          examples_keyword    = example_section[0]
-          examples_name       = example_section[1]
-          examples_matrix     = example_section[2]
+          examples_line       = example_section[0]
+          examples_keyword    = example_section[1]
+          examples_name       = example_section[2]
+          examples_matrix     = example_section[3]
 
           examples_table = OutlineTable.new(examples_matrix, self)
-          Examples.new(examples_keyword, examples_name, examples_table)
+          Examples.new(examples_line, examples_keyword, examples_name, examples_table)
         end
       end
 
+      def at_lines?(*lines)
+        super || @examples_array.detect { |examples| examples.at_lines?(*lines) }
+      end
+
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)

lib/cucumber/ast/step.rb

@@ -35,8 +35,8 @@ def to_sexp
         [:step, @line, @gwt, @name, *@multiline_args.map{|arg| arg.to_sexp}]
       end
 
-      def at_line?(line)
-        @line == line
+      def at_lines?(*lines)
+        lines.empty? || lines.index(@line)
       end
 
       def source_indent

lib/cucumber/ast/table.rb

@@ -18,8 +18,12 @@ def initialize(raw)
         @cell_class = Cell
       end
 
+      def at_lines?(*lines)
+        rows.detect { |row| row.at_lines?(*lines) }
+      end
+
       def accept(visitor, status)
-        each do |row|
+        rows.each do |row|
           visitor.visit_table_row(row, status)
         end
         nil
@@ -93,16 +97,16 @@ def arguments_replaced(arguments) #:nodoc:
         Table.new(raw_with_replaced_args)
       end
 
+      def at_lines?(*lines)
+        rows.detect{|row| row.at_lines?(*lines)}
+      end
+
       private
 
       def col_width(col)
         columns[col].__send__(:width)
       end
 
-      def each(&proc)
-        rows.each(&proc)
-      end
-
       def rows
         @rows ||= cell_matrix.map do |cell_row|
           @cells_class.new(self, cell_row)
@@ -161,7 +165,11 @@ def [](n)
         end
 
         def line
-          @cells.line
+          @cells[0].line
+        end
+
+        def at_lines?(*lines)
+          lines.empty? || lines.index(line)
         end
 
         private

lib/cucumber/ast/visitor.rb

@@ -16,6 +16,14 @@ def step_definition(step_name)
         @step_mother.step_definition(step_name)
       end
 
+      def current_feature_lines=(lines)
+        @current_feature_lines = lines
+      end
+
+      def current_feature_lines
+        @current_feature_lines || []
+      end
+
       def visit_features(features)
         features.accept(self)
       end

lib/cucumber/parser/feature.rb

@@ -896,7 +896,7 @@ def table
 
       module Examples1
         def build
-          [examples_keyword.text_value, "", table.raw]
+          [examples_keyword.line, examples_keyword.text_value, "", table.raw]
         end
       end
 

lib/cucumber/parser/feature.tt

@@ -107,7 +107,7 @@ module Cucumber
       rule examples
         space* examples_keyword white table {
           def build
-            [examples_keyword.text_value, "", table.raw]
+            [examples_keyword.line, examples_keyword.text_value, "", table.raw]
           end
         }
       end

lib/cucumber/parser/file_parser.rb

@@ -10,6 +10,7 @@ def parse_file(file)
           lines = lines.split(':').map { |line| line.to_i }
         else
           path = file
+          lines = []
         end
         feature = parse_or_fail(IO.read(path), path)
         feature.lines = lines

spec/cucumber/ast/feature_spec.rb

@@ -44,9 +44,9 @@ module Ast
 
         f.lines = [33]
 
-        s1.should_receive(:at_any_line?).and_return(false)
-        s2.should_receive(:at_any_line?).and_return(true)
-        s3.should_receive(:at_any_line?).and_return(false)
+        s1.should_receive(:at_lines?).and_return(false)
+        s2.should_receive(:at_lines?).and_return(true)
+        s3.should_receive(:at_lines?).and_return(false)
 
         s2.should_receive(:accept)
 

spec/cucumber/ast/scenario_outline_spec.rb

@@ -34,7 +34,8 @@ module Ast
             Step.new(23, 'And',   'I should have <eat> cucumbers in my belly')
           ],
           [
-            [ 
+            [
+              24,
               'Examples:',
               'First table',
               [