cucumber 0.9.4 → 0.10.0

data/{features → legacy_features}/wire_protocol.feature

@@ -296,7 +296,7 @@ Feature: Wire Protocol
       | ["step_matches",{"name_to_match":"we're all wired"}]                                             | ["success",[]]                   |
       | ["snippet_text",{"step_keyword":"Given","multiline_arg_class":"","step_name":"we're all wired"}] | ["success","foo()\n  bar;\nbaz"] |
       | ["begin_scenario"]                                                                               | ["success"]                      |
-      | ["end_scenario"]                                                                                | ["success"]                      |
+      | ["end_scenario"]                                                                                 | ["success"]                      |
     When I run cucumber -f pretty
     Then STDERR should be empty
     And it should pass with

data/lib/cucumber/ast/examples.rb

@@ -7,6 +7,11 @@ module Cucumber
         @comment, @keyword, @name, @outline_table = comment, keyword, name, outline_table
       end
 
+      attr_reader :gherkin_statement
+      def gherkin_statement(statement=nil)
+        @gherkin_statement ||= statement
+      end
+
       def accept(visitor)
         return if Cucumber.wants_to_quit
         visitor.visit_comment(@comment) unless @comment.empty?

data/lib/cucumber/ast/feature.rb

@@ -11,6 +11,11 @@ module Cucumber
         @background, @comment, @tags, @keyword, @name, @feature_elements = background, comment, tags, keyword, name.strip, feature_elements
       end
 
+      attr_reader :gherkin_statement
+      def gherkin_statement(statement=nil)
+        @gherkin_statement ||= statement
+      end
+
       def init
         @background.feature = self if @background
         @background.init if @background

data/lib/cucumber/ast/feature_element.rb

@@ -6,6 +6,11 @@ module Cucumber
     module FeatureElement #:nodoc:
       attr_accessor :feature
 
+      attr_reader :gherkin_statement, :raw_steps
+      def gherkin_statement(statement=nil)
+        @gherkin_statement ||= statement
+      end
+
       def add_step(step)
         @raw_steps << step
       end

data/lib/cucumber/ast/scenario_outline.rb

@@ -24,8 +24,8 @@ module Cucumber
         @background, @comment, @tags, @line, @keyword, @name, @raw_steps, @example_sections = background, comment, tags, line, keyword, name, raw_steps, example_sections
       end
 
-      def add_examples(example_section)
-        @example_sections << example_section
+      def add_examples(example_section, gherkin_examples)
+        @example_sections << [example_section, gherkin_examples]
       end
 
       def init
@@ -33,7 +33,10 @@ module Cucumber
         attach_steps(@raw_steps)
         @steps = StepCollection.new(@raw_steps)
 
-        @examples_array = @example_sections.map do |example_section|
+        @examples_array = @example_sections.map do |example_section_and_gherkin_examples|
+          example_section = example_section_and_gherkin_examples[0]
+          gherkin_examples = example_section_and_gherkin_examples[1]
+          
           examples_comment    = example_section[0]
           examples_line       = example_section[1]
           examples_keyword    = example_section[2]
@@ -41,7 +44,9 @@ module Cucumber
           examples_matrix     = example_section[4]
 
           examples_table = OutlineTable.new(examples_matrix, self)
-          Examples.new(examples_comment, examples_line, examples_keyword, examples_name, examples_table)
+          ex = Examples.new(examples_comment, examples_line, examples_keyword, examples_name, examples_table)
+          ex.gherkin_statement(gherkin_examples)
+          ex
         end
 
         @examples_array.extend(ExamplesArray)

data/lib/cucumber/ast/step.rb

@@ -14,6 +14,11 @@ module Cucumber
         @line, @keyword, @name, @multiline_arg = line, keyword, name, multiline_arg
       end
 
+      attr_reader :gherkin_statement
+      def gherkin_statement(statement=nil)
+        @gherkin_statement ||= statement
+      end
+
       def background?
         false
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -187,6 +187,10 @@ module Cucumber
         @step.language
       end
 
+      def gherkin_statement
+        @step.gherkin_statement
+      end
+
       def to_sexp
         [:step_invocation, @step.line, @step.keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end

data/lib/cucumber/ast/table.rb

@@ -276,8 +276,8 @@ module Cucumber
       #   end
       #
       def map_column!(column_name, strict=true, &conversion_proc)
-        verify_column(column_name) if strict
-        @conversion_procs[column_name] = conversion_proc
+        verify_column(column_name.to_s) if strict
+        @conversion_procs[column_name.to_s] = conversion_proc
       end
 
       # Compares +other_table+ to self. If +other_table+ contains columns
@@ -685,4 +685,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/ast/tree_walker.rb

@@ -171,48 +171,10 @@ module Cucumber
       def send_to_all(message, *args)
         @listeners.each do |listener|
           if listener.respond_to?(message)
-            if legacy_listener?(listener)
-              warn_legacy(listener)
-              legacy_invoke(listener, message, *args)
-            else
-              listener.__send__(message, *args)
-            end
+            listener.__send__(message, *args)
           end
         end
       end
-
-      def legacy_listener?(listener)
-        listener.respond_to?(:feature_name) && 
-        (listener.method(:feature_name) rescue false) && 
-        listener.method(:feature_name).arity == 1
-      end
-
-      def warn_legacy(listener)
-        @warned_listeners ||= []
-        unless @warned_listeners.index(listener)
-          warn("#{listener.class} is using a deprecated formatter API. Starting with Cucumber 0.7.0 the signatures\n" + 
-          "that have changed are:\n" +
-          "  feature_name(keyword, name)  # Two arguments. The keyword argument will not contain a colon.\n" +
-          "  scenario_name(keyword, name, file_colon_line, source_indent)  # The keyword argument will not contain a colon.\n" +
-          "  examples_name(keyword, name)  # The keyword argument will not contain a colon.\n"
-          )
-        end
-        @warned_listeners << listener
-      end
-
-      def legacy_invoke(listener, message, *args)
-        case message.to_sym
-        when :feature_name
-          listener.feature_name("#{args[0]}: #{args[1]}")
-        when :scenario_name, :examples_name
-          args_with_colon = args.dup
-          args_with_colon[0] += ':'
-          listener.__send__(message, *args_with_colon)
-        else
-          listener.__send__(message, *args)
-        end
-      end
-
       def extract_method_name_from(call_stack)
         call_stack[0].match(/in `(.*)'/).captures[0]
       end

data/lib/cucumber/cli/main.rb

@@ -9,7 +9,6 @@ require 'cucumber'
 require 'logger'
 require 'cucumber/parser'
 require 'cucumber/feature_file'
-require 'cucumber/formatter/color_io'
 require 'cucumber/cli/configuration'
 require 'cucumber/cli/drb_client'
 
@@ -24,11 +23,7 @@ module Cucumber
 
       def initialize(args, out_stream = STDOUT, error_stream = STDERR)
         @args         = args
-        if Cucumber::WINDOWS_MRI
-          @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new(Kernel, STDOUT) : out_stream
-        else
-          @out_stream   = out_stream
-        end
+        @out_stream   = out_stream
 
         @error_stream = error_stream
         @configuration = nil

data/lib/cucumber/cli/options.rb

@@ -24,8 +24,7 @@ module Cucumber
                                                               "#{INDENT}the usage formatter, except that steps are not printed."],
         'junit'       => ['Cucumber::Formatter::Junit',       'Generates a report similar to Ant+JUnit.'],
         'json'        => ['Cucumber::Formatter::Json',        'Prints the feature as JSON'],
-        'json_pretty' => ['Cucumber::Formatter::JsonPretty',  'Prints the feature as pretty JSON'],
-        'tag_cloud'   => ['Cucumber::Formatter::TagCloud',    'Prints a tag cloud of tag usage.'],
+        'json_pretty' => ['Cucumber::Formatter::JsonPretty',  'Prints the feature as prettified JSON'],
         'debug'       => ['Cucumber::Formatter::Debug',       'For developing formatters - prints the calls made to the listeners.']
       }
       max = BUILTIN_FORMATS.keys.map{|s| s.length}.max

data/lib/cucumber/formatter/ansicolor.rb

@@ -15,10 +15,8 @@ if Cucumber::IRONRUBY
 end
 
 if Cucumber::WINDOWS_MRI
-  begin
-    require 'Win32/Console/ANSI'
-  rescue LoadError
-    STDERR.puts %{*** WARNING: You must "gem install win32console" (1.2.0 or higher) to get coloured output on MRI/Windows}
+  unless ENV['ANSICON']
+    STDERR.puts %{*** WARNING: You must use ANSICON 1.31 or higher (http://adoxa.110mb.com/ansicon) to get coloured output on Windows}
     Term::ANSIColor.coloring = false
   end
 end

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -0,0 +1,84 @@
+require 'cucumber/formatter/io'
+require 'gherkin/formatter/argument'
+
+module Cucumber
+  module Formatter
+    # Adapts Cucumber formatter events to Gherkin formatter events
+    # This class will disappear when Cucumber is based on Gherkin's model.
+    class GherkinFormatterAdapter
+      def initialize(gherkin_formatter, print_emtpy_match)
+        @gf = gherkin_formatter
+        @print_emtpy_match = print_emtpy_match
+      end
+
+      def before_features(features)
+      end
+
+      def before_feature(feature)
+        @gf.uri(feature.file)
+        @gf.feature(feature.gherkin_statement)
+      end
+
+      def before_background(background)
+        @outline = false
+        @gf.steps(background.raw_steps)
+        @gf.background(background.gherkin_statement)
+      end
+
+      def before_feature_element(feature_element)
+        @gf.steps(feature_element.raw_steps)
+        case(feature_element)
+        when Ast::Scenario
+          @outline = false
+          @gf.scenario(feature_element.gherkin_statement)
+        when Ast::ScenarioOutline
+          @outline = true
+          @gf.scenario_outline(feature_element.gherkin_statement)
+        else
+          raise "Bad type: #{feature_element.class}"
+        end
+      end
+
+      def before_step(step)
+        @gf.step(step.gherkin_statement)
+        if @print_emtpy_match
+          if(@outline)
+            match = Gherkin::Formatter::Model::Match.new(step.gherkin_statement.outline_args, nil)
+          else
+            match = Gherkin::Formatter::Model::Match.new([], nil)
+          end
+          @gf.match(match)
+        end
+      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)}
+        location = step_match.file_colon_line
+        match = Gherkin::Formatter::Model::Match.new(arguments, location)
+        if @print_emtpy_match
+          # Trick the formatter to believe that's what was printed previously so we get arg highlights on #result
+          @gf.instance_variable_set('@match', match)
+        else
+          @gf.match(match)
+        end
+
+        error_message = exception ? "#{exception.message} (#{exception.class})\n#{exception.backtrace.join("\n")}" : nil
+        unless @outline
+          @gf.result(Gherkin::Formatter::Model::Result.new(status, error_message))
+        end
+      end
+
+      def before_examples(examples)
+        @gf.examples(examples.gherkin_statement)
+      end
+
+      def after_feature(feature)
+        @gf.eof
+      end
+
+      def embed(file, mime_type)
+        @gf.embedding(mime_type, File.read(file))
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/gpretty.rb

@@ -0,0 +1,24 @@
+require 'cucumber/formatter/gherkin_formatter_adapter'
+require 'cucumber/formatter/io'
+require 'gherkin/formatter/argument'
+require 'gherkin/formatter/pretty_formatter'
+
+module Cucumber
+  module Formatter
+    # The formatter used for <tt>--format gpretty</tt>
+    class Gpretty < GherkinFormatterAdapter
+      include Io
+
+      def initialize(step_mother, io, options)
+        @io = ensure_io(io, "json")
+        super(Gherkin::Formatter::PrettyFormatter.new(@io, false), true)
+      end
+
+      def after_feature(feature)
+        super
+        @io.puts
+      end
+    end
+  end
+end
+

data/lib/cucumber/formatter/html.rb

@@ -388,7 +388,7 @@ module Cucumber
       end
 
       def set_scenario_color(status)
-        if status == :undefined
+        if status == :undefined or status == :pending
           set_scenario_color_pending
         end
         if status == :failed

data/lib/cucumber/formatter/io.rb

@@ -1,11 +1,9 @@
-require 'cucumber/formatter/color_io'
-
 module Cucumber
   module Formatter
     module Io
       def ensure_io(path_or_io, name)
         return nil if path_or_io.nil?
-        return path_or_io if ColorIO === path_or_io || path_or_io.respond_to?(:write)
+        return path_or_io if path_or_io.respond_to?(:write)
         file = File.open(path_or_io, Cucumber.file_mode('w'))
         at_exit do
           unless file.closed?
@@ -30,4 +28,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/formatter/json.rb

@@ -1,166 +1,29 @@
-require "json"
-require "cucumber/formatter/io"
+require 'cucumber/formatter/gherkin_formatter_adapter'
+require 'cucumber/formatter/io'
+require 'gherkin/formatter/argument'
+require 'gherkin/formatter/json_formatter'
 
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format json</tt>
-    class Json
-      class Error < StandardError
-      end
-
+    class Json < GherkinFormatterAdapter
       include Io
 
       def initialize(step_mother, io, options)
-        @io      = ensure_io(io, "json")
-        @options = options
-      end
-
-      def before_features(features)
-        @json = {:features => []}
-      end
-
-      def before_feature(feature)
-        @current_object = {:file => feature.file, :name => feature.name}
-        @json[:features] << @current_object
-      end
-
-      def before_tags(tags)
-        @current_object[:tags] = tags.tag_names.to_a
-      end
-
-      def before_background(background)
-        background = {}
-        @current_object[:background] = background
-        @current_object = background
-      end
-
-      def after_background(background)
-        @current_object = last_feature
-      end
-
-      def before_feature_element(feature_element)
-        elements = @current_object[:elements] ||= []
-
-        # change current object to the feature_element
-        @current_object = {}
-        elements << @current_object
-      end
-
-      def scenario_name(keyword, name, file_colon_line, source_indent)
-        @current_object[:keyword] = keyword
-        @current_object[:name] = name
-        @current_object[:file_colon_line] = file_colon_line
-      end
-
-      def before_steps(steps)
-        @current_object[:steps] = []
-      end
-
-      def before_step(step)
-        @current_step = {}
-        @current_object[:steps] << @current_step
+        @io = ensure_io(io, "json")
+        @obj = {'features' => []}
+        super(Gherkin::Formatter::JSONFormatter.new(nil), false)
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        if exception
-          @current_step[:exception] = exception_hash_for(exception)
-        end
-      end
-
-      def step_name(keyword, step_match, status, source_indent, background)
-        @current_step[:status]          = status
-        @current_step[:keyword]         = keyword
-        @current_step[:name]            = "#{step_match.name || step_match.format_args}"
-        @current_step[:file_colon_line] = step_match.file_colon_line
-      end
-
-      def after_step(step)
-        @current_step = nil
-      end
-
-      def before_examples(examples)
-        @current_object[:examples] = {}
-      end
-
-      def examples_name(keyword, name)
-        @current_object[:examples][:name] = "#{keyword} #{name}"
-      end
-
-      def before_outline_table(*args)
-        @current_object[:examples][:table] = []
-      end
-
-      def before_table_row(row)
-        @current_row = {:cells => []}
-
-        if @current_object.member? :examples
-          @current_object[:examples][:table] << @current_row
-        elsif @current_step
-          (@current_step[:table] ||= []) << @current_row
-        else
-          internal_error
-        end
-      end
-
-      def table_cell_value(value, status)
-        @current_row[:cells] << {:text => value, :status => status}
-      end
-
-      def after_table_row(row)
-        if row.exception
-          @current_row[:exception] = exception_hash_for(row.exception)
-        end
-        @current_row = nil
-      end
-
-      def py_string(string)
-        @current_step[:py_string] = string
-      end
-
-      def after_feature_element(feature_element)
-        # change current object back to the last feature
-        @current_object = last_feature
+      def after_feature(feature)
+        super
+        @obj['features'] << @gf.gherkin_object
       end
 
       def after_features(features)
-        @io.write json_string
-        @io.flush
+        @io.write(@obj.to_json)
       end
-
-      def embed(file, mime_type)
-        obj = @current_step || @current_object
-        obj[:embedded] ||= []
-
-        obj[:embedded] << {
-          :file      => file,
-          :mime_type => mime_type,
-          :data      => [File.read(file)].pack("m*") # base64
-        }
-      end
-
-      private
-
-      def json_string
-        @json.to_json
-      end
-
-      def last_feature
-        @json[:features].last
-      end
-
-      def exception_hash_for(e)
-        {
-          :class     => e.class.name,
-          :message   => e.message,
-          :backtrace => e.backtrace
-        }
-      end
-
-      def internal_error
-        raise Error, "you've found a bug in the JSON formatter!"
-      end
-
-    end # Json
-  end # Formatter
-end # Cucumber
+    end
+  end
+end