cucumber 1.1.2 → 1.1.3

data/features/issue_57.feature

@@ -0,0 +1,35 @@
+Feature: Rerun formatter: Test for Issue #57
+  details see https://github.com/cucumber/cucumber/issues/57
+
+  Background:
+    Given a file named "features/one_passing_one_failing.feature" with:
+      """
+      Feature: One passing example, one failing example
+
+        Scenario Outline:
+          Given a <certain> step
+        
+        Examples:
+          |certain|
+          |passing|
+          |failing|
+
+      """
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Given /a passing step/ do
+        #does nothing
+      end
+
+      Given /a failing step/ do
+        fail
+      end
+      """
+
+  Scenario: Handle examples with the rerun formatter
+    When I run cucumber "features/one_passing_one_failing.feature -r features -f rerun"
+    Then it should fail with:
+    """
+    features/one_passing_one_failing.feature:9
+    """
+

data/legacy_features/wire_protocol.feature

@@ -329,4 +329,4 @@ Feature: Wire Protocol
     Then STDERR should match
       """
       undefined method `handle_yikes'
-      """
+      """

data/lib/cucumber/ast/feature.rb

@@ -8,7 +8,7 @@ module Cucumber
       
       attr_accessor :language
       attr_writer :features, :background
-      attr_reader :file
+      attr_reader :file, :feature_elements
 
       def initialize(background, comment, tags, keyword, title, description, feature_elements)
         @background, @comment, @tags, @keyword, @title, @description, @feature_elements = background, comment, tags, keyword, title, description, feature_elements

data/lib/cucumber/ast/table.rb

@@ -51,7 +51,7 @@ module Cucumber
       include Enumerable
       include Gherkin::Rubify
       
-      NULL_CONVERSIONS = Hash.new(lambda{ |cell_value| cell_value }).freeze
+      NULL_CONVERSIONS = Hash.new({ :strict => false, :proc => lambda{ |cell_value| cell_value } }).freeze
 
       attr_accessor :file
 
@@ -71,7 +71,7 @@ module Cucumber
       # You don't typically create your own Table objects - Cucumber will do
       # it internally and pass them to your Step Definitions.
       #
-      def initialize(raw, conversion_procs = NULL_CONVERSIONS.dup)
+      def initialize(raw, conversion_procs = NULL_CONVERSIONS.dup, header_mappings = {}, header_conversion_proc = nil)
         @cells_class = Cells
         @cell_class = Cell
         raw = ensure_array_of_array(rubify(raw))
@@ -79,17 +79,19 @@ module Cucumber
         transposed = raw.transpose
         create_cell_matrix(raw)
         @conversion_procs = conversion_procs
+        @header_mappings = header_mappings
+        @header_conversion_proc = header_conversion_proc
       end
 
       def to_step_definition_arg
         dup
       end
 
-      # Creates a copy of this table, inheriting any column mappings.
-      # registered with #map_headers!
+      # Creates a copy of this table, inheriting any column and header mappings
+      # registered with #map_column! and #map_headers!.
       #
       def dup
-        self.class.new(raw.dup, @conversion_procs.dup)
+        self.class.new(raw.dup, @conversion_procs.dup, @header_mappings.dup, @header_conversion_proc)
       end
 
       # Returns a new, transposed table. Example:
@@ -104,9 +106,9 @@ module Cucumber
       #   | 4 | 2 |
       #
       def transpose
-        self.class.new(raw.transpose, @conversion_procs.dup)
+        self.class.new(raw.transpose, @conversion_procs.dup, @header_mappings.dup, @header_conversion_proc)
       end
-
+      
       # Converts this table into an Array of Hash where the keys of each
       # Hash are the headers in the table. For example, a Table built from
       # the following plain text:
@@ -122,9 +124,7 @@ module Cucumber
       # Use #map_column! to specify how values in a column are converted.
       #
       def hashes
-        @hashes ||= cells_rows[1..-1].map do |row|
-          row.to_hash
-        end
+        @hashes ||= build_hashes
       end
       
       # Converts this table into a Hash where the first column is
@@ -238,22 +238,8 @@ module Cucumber
       #   # => ['phone number', 'ADDRESS']
       #
       def map_headers!(mappings={}, &block)
-        header_cells = cell_matrix[0]
-
-        if block_given?
-          header_values = header_cells.map { |cell| cell.value } - mappings.keys
-          mappings = mappings.merge(Hash[*header_values.zip(header_values.map(&block)).flatten])
-        end
-
-        mappings.each_pair do |pre, post|
-          mapped_cells = header_cells.select{|cell| pre === cell.value}
-          raise "No headers matched #{pre.inspect}" if mapped_cells.empty?
-          raise "#{mapped_cells.length} headers matched #{pre.inspect}: #{mapped_cells.map{|c| c.value}.inspect}" if mapped_cells.length > 1
-          mapped_cells[0].value = post
-          if @conversion_procs.has_key?(pre)
-            @conversion_procs[post] = @conversion_procs.delete(pre)
-          end
-        end
+        @header_mappings = mappings
+        @header_conversion_proc = block
       end
 
       # Returns a new Table where the headers are redefined. See #map_headers!
@@ -276,8 +262,7 @@ module Cucumber
       #   end
       #
       def map_column!(column_name, strict=true, &conversion_proc)
-        verify_column(column_name.to_s) if strict
-        @conversion_procs[column_name.to_s] = conversion_proc
+        @conversion_procs[column_name.to_s] = { :strict => strict, :proc => conversion_proc }
         self
       end
 
@@ -319,8 +304,12 @@ module Cucumber
         options = {:missing_row => true, :surplus_row => true, :missing_col => true, :surplus_col => false}.merge(options)
 
         other_table = ensure_table(other_table)
+        other_table.convert_headers!
         other_table.convert_columns!
         ensure_green!
+                
+        convert_headers!
+        convert_columns!
 
         original_width = cell_matrix[0].length
         other_table_cell_matrix = pad!(other_table.cell_matrix)
@@ -331,7 +320,6 @@ module Cucumber
 
         require_diff_lcs
         cell_matrix.extend(Diff::LCS)
-        convert_columns!
         changes = cell_matrix.diff(other_table_cell_matrix).flatten
 
         inserted = 0
@@ -386,7 +374,8 @@ module Cucumber
           hash[key.to_s] if key.is_a?(Symbol)
         end
         column_names.each_with_index do |column_name, column_index|
-          value = @conversion_procs[column_name].call(cells.value(column_index))
+          verify_column(column_name) if @conversion_procs[column_name][:strict]
+          value = @conversion_procs[column_name][:proc].call(cells.value(column_index))
           hash[column_name] = value
         end
         hash
@@ -470,6 +459,14 @@ module Cucumber
 
       protected
 
+      def build_hashes
+        convert_headers!
+        convert_columns!
+        cells_rows[1..-1].map do |row|
+          row.to_hash
+        end
+      end
+
       def inspect_rows(missing_row, inserted_row) #:nodoc:
         missing_row.each_with_index do |missing_cell, col|
           inserted_cell = inserted_row[col]
@@ -490,14 +487,38 @@ module Cucumber
       end
 
       def convert_columns! #:nodoc:
+        @conversion_procs.each do |column_name, conversion_proc|
+          verify_column(column_name) if conversion_proc[:strict]
+        end
+        
         cell_matrix.transpose.each do |col|
-          conversion_proc = @conversion_procs[col[0].value]
+          column_name = col[0].value
+          conversion_proc = @conversion_procs[column_name][:proc]
           col[1..-1].each do |cell|
             cell.value = conversion_proc.call(cell.value)
           end
         end
       end
 
+      def convert_headers! #:nodoc:
+        header_cells = cell_matrix[0]
+
+        if @header_conversion_proc
+          header_values = header_cells.map { |cell| cell.value } - @header_mappings.keys
+          @header_mappings = @header_mappings.merge(Hash[*header_values.zip(header_values.map(&@header_conversion_proc)).flatten])
+        end
+
+        @header_mappings.each_pair do |pre, post|
+          mapped_cells = header_cells.select { |cell| pre === cell.value }
+          raise "No headers matched #{pre.inspect}" if mapped_cells.empty?
+          raise "#{mapped_cells.length} headers matched #{pre.inspect}: #{mapped_cells.map { |c| c.value }.inspect}" if mapped_cells.length > 1
+          mapped_cells[0].value = post
+          if @conversion_procs.has_key?(pre)
+            @conversion_procs[post] = @conversion_procs.delete(pre)
+          end
+        end
+      end
+
       def require_diff_lcs #:nodoc:
         begin
           require 'diff/lcs'

data/lib/cucumber/cli/configuration.rb

@@ -64,6 +64,10 @@ module Cucumber
         @options[:expand]
       end
 
+      def dotcucumber
+        @options[:dotcucumber]
+      end
+
       def build_tree_walker(step_mother)
         Ast::TreeWalker.new(step_mother, formatters(step_mother), self)
       end

data/lib/cucumber/cli/main.rb

@@ -41,6 +41,7 @@ module Cucumber
         end
 
         runtime.run!
+        runtime.write_stepdefs_json
         runtime.results.failure?
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message

data/lib/cucumber/cli/options.rb

@@ -271,6 +271,9 @@ module Cucumber
           opts.on("--port PORT", "Specify DRb port.  Ignored without --drb") do |port|
             @options[:drb_port] = port
           end
+          opts.on("--dotcucumber DIR", "Write metadata to DIR") do |dir|
+            @options[:dotcucumber] = dir
+          end
           opts.on_tail("--version", "Show version.") do
             @out_stream.puts Cucumber::VERSION
             Kernel.exit(0)

data/lib/cucumber/constantize.rb

@@ -7,7 +7,7 @@ module Cucumber
         names = camel_cased_word.split('::')
         names.shift if names.empty? || names.first.empty?
 
-        constant = Object
+        constant = ::Object
         names.each do |name|
           constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
         end

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -47,7 +47,7 @@ module Cucumber
       end
 
       def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        arguments = step_match.step_arguments.map{|a| Gherkin::Formatter::Argument.new(a.byte_offset, a.val)}
+        arguments = step_match.step_arguments.map{|a| Gherkin::Formatter::Argument.new(a.offset, a.val)}
         location = step_match.file_colon_line
         match = Gherkin::Formatter::Model::Match.new(arguments, location)
         if @print_emtpy_match

data/lib/cucumber/formatter/html.rb

@@ -311,7 +311,7 @@ module Cucumber
           @builder.tr do
             @builder.td(:colspan => @col_index.to_s, :class => 'failed') do
               @builder.pre do |pre|
-                pre << format_exception(table_row.exception)
+                pre << h(format_exception(table_row.exception))
               end
             end
           end
@@ -378,6 +378,11 @@ module Cucumber
             matches = message.match(/<code>([^(\/)]+)<\//m)
             message = matches ? matches[1] : ""
           end
+
+          unless exception.instance_of?(RuntimeError)
+            message << " (#{exception.class})"
+          end
+
           @builder.pre do 
             @builder.text!(message)
           end

data/lib/cucumber/formatter/rerun.rb

@@ -22,9 +22,9 @@ module Cucumber
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
       
-      def before_feature(*)
+      def before_feature(feature_element)
         @lines = []
-        @file = nil
+        @file = feature_element.file
       end
       
       def after_feature(*)
@@ -46,17 +46,40 @@ module Cucumber
       end
 
       def after_feature_element(feature_element)
-        if @rerun
-          file, line = *feature_element.file_colon_line.split(':')
-          @lines << line
-          @file = file
+        if (@rerun || feature_element.failed?) && !(Ast::ScenarioOutline === feature_element)
+          @lines << feature_element.line
         end
       end
 
+      def after_table_row(table_row)
+        return unless @in_examples and Cucumber::Ast::OutlineTable::ExampleRow === table_row
+        unless @header_row
+          if table_row.failed?
+            @rerun = true
+            @lines << table_row.line
+          end
+        end
+
+        @header_row = false if @header_row
+      end
+
+      def before_examples(*args)
+        @header_row = true
+        @in_examples = true
+      end
+      
+      def after_examples(*args)
+        @in_examples = false
+      end
+
+      def before_table_row(table_row)
+        return unless @in_examples
+      end
+
       def step_name(keyword, step_match, status, source_indent, background)
         @rerun = true if [:failed, :pending, :undefined].index(status)
       end
-      
+
     private
     
       def after_first_time

data/lib/cucumber/js_support/js_language.rb

@@ -97,7 +97,7 @@ module Cucumber
         @arg
       end
 
-      def byte_offset
+      def offset
       end
     end
 

data/lib/cucumber/language_support/language_methods.rb

@@ -4,10 +4,6 @@ require 'cucumber/step_definition_light'
 module Cucumber
   module LanguageSupport
     module LanguageMethods
-      def create_step_match(step_definition, step_name, name_to_report, step_arguments)
-        StepMatch.new(step_definition, step_name, name_to_report, step_arguments)
-      end
-
       def around(scenario)
         execute_around(scenario) do
           yield

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '1.1.2'
+  VERSION       = '1.1.3'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/py_support/py_language.rb

@@ -24,10 +24,6 @@ module Cucumber
       def alias_adverbs(adverbs)
       end
 
-      def step_definitions_for(py_file)
-        mod = import(py_file)
-      end
-
       def snippet_text(code_keyword, step_name, multiline_arg_class)
         "python snippet: #{code_keyword}, #{step_name}"
       end

data/lib/cucumber/rb_support/rb_language.rb

@@ -65,20 +65,6 @@ module Cucumber
         end
       end
 
-      # Gets called for each file under features (or whatever is overridden
-      # with --require).
-      def step_definitions_for(rb_file) # Looks Unused - Delete?
-        begin
-          require rb_file # This will cause self.add_step_definition and self.add_hook to be called from RbDsl
-          step_definitions
-        rescue LoadError => e
-          e.message << "\nFailed to load #{code_file}"
-          raise e
-        ensure
-          @step_definitions = nil
-        end
-      end
-      
       def step_matches(name_to_match, name_to_format)
         @step_definitions.map do |step_definition|
           if(arguments = step_definition.arguments_from(name_to_match))

data/lib/cucumber/rb_support/regexp_argument_matcher.rb

@@ -1,4 +1,4 @@
-require 'cucumber/step_argument'
+require 'gherkin/formatter/argument'
 
 module Cucumber
   module RbSupport
@@ -9,8 +9,8 @@ module Cucumber
           n = 0
           match.captures.map do |val|
             n += 1
-            start = match.offset(n)[0]
-            StepArgument.new(val, start)
+            offset = match.offset(n)[0]
+            Gherkin::Formatter::Argument.new(offset, val)
           end
         else
           nil

data/lib/cucumber/runtime.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'gherkin/rubify'
 require 'gherkin/i18n'
 require 'cucumber/configuration'
@@ -118,6 +119,42 @@ module Cucumber
       @support_code.unknown_programming_language?
     end
 
+    def write_stepdefs_json
+      if(@configuration.dotcucumber)
+        stepdefs = []
+        @support_code.step_definitions.sort{|a,b| a.to_hash['source'] <=> a.to_hash['source']}.each do |stepdef|
+          stepdef_hash = stepdef.to_hash
+          steps = []
+          features.each do |feature|
+            feature.feature_elements.each do |feature_element|
+              feature_element.raw_steps.each do |step|
+                args = stepdef.arguments_from(step.name)
+                if(args)
+                  steps << {
+                    'name' => step.name,
+                    'args' => args.map do |arg|
+                      {
+                        'offset' => arg.offset,
+                        'val' => arg.val
+                      }
+                    end
+                  }
+                end
+              end
+            end
+          end
+          stepdef_hash['steps'] = steps.uniq.sort {|a,b| a['name'] <=> b['name']}
+          stepdefs << stepdef_hash
+        end
+        if !File.directory?(@configuration.dotcucumber)
+          FileUtils.mkdir_p(@configuration.dotcucumber)
+        end
+        File.open(File.join(@configuration.dotcucumber, 'stepdefs.json'), 'w') do |io|
+          io.write(JSON.pretty_generate(stepdefs))
+        end
+      end
+    end
+
   private
 
     def fire_after_configuration_hook #:nodoc
@@ -125,11 +162,11 @@ module Cucumber
     end
 
     def features
-      loader = Runtime::FeaturesLoader.new(
+      @loader ||= Runtime::FeaturesLoader.new(
         @configuration.feature_files, 
         @configuration.filters, 
         @configuration.tag_expression)
-      loader.features
+      @loader.features
     end
 
     def load_step_definitions