cucumber 2.0.2 → 2.1.0

data/lib/cucumber/multiline_argument/data_table.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
-require 'gherkin/formatter/escaping'
+require 'cucumber/gherkin/data_table_parser'
+require 'cucumber/gherkin/formatter/escaping'
 require 'cucumber/core/ast/describes_itself'
 
 module Cucumber
@@ -37,7 +38,7 @@ module Cucumber
           @rows = []
         end
 
-        def row(row, line_number)
+        def row(row)
           @rows << row
         end
 
@@ -73,8 +74,8 @@ module Cucumber
         private
         def parse(text, location = Core::Ast::Location.of_caller)
           builder = Builder.new
-          lexer = Gherkin::Lexer::I18nLexer.new(builder)
-          lexer.scan(text)
+          parser = Cucumber::Gherkin::DataTableParser.new(builder)
+          parser.parse(text)
           from_array(builder.rows, location)
         end
 
@@ -639,7 +640,7 @@ module Cucumber
       # Represents a row of cells or columns of cells
       class Cells #:nodoc:
         include Enumerable
-        include Gherkin::Formatter::Escaping
+        include Cucumber::Gherkin::Formatter::Escaping
 
         attr_reader :exception
 

data/lib/cucumber/multiline_argument/doc_string.rb

@@ -2,9 +2,8 @@ module Cucumber
   module MultilineArgument
     class DocString < SimpleDelegator
       def append_to(array)
-        array << self
+        array << self.to_s
       end
     end
   end
 end
-

data/lib/cucumber/platform.rb

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

data/lib/cucumber/rake/task.rb

@@ -1,5 +1,5 @@
 require 'cucumber/platform'
-require 'gherkin/formatter/ansi_escapes'
+require 'cucumber/gherkin/formatter/ansi_escapes'
 begin
   # Support Rake > 0.8.7
   require 'rake/dsl_definition'
@@ -25,7 +25,7 @@ module Cucumber
     #
     # See the attributes for additional configuration possibilities.
     class Task
-      include Gherkin::Formatter::AnsiEscapes
+      include Cucumber::Gherkin::Formatter::AnsiEscapes
       include ::Rake::DSL if defined?(::Rake::DSL)
 
       class InProcessCucumberRunner #:nodoc:

data/lib/cucumber/rb_support/rb_hook.rb

@@ -8,12 +8,7 @@ module Cucumber
         @rb_language = rb_language
         @tag_expressions = tag_expressions
         @proc = proc
-        file, line = @proc.file_colon_line.match(/(.*):(\d+)/)[1..2]
-        @location = Core::Ast::Location.new(file, line)
-      end
-
-      def source_location
-        @proc.source_location
+        @location = Cucumber::Core::Ast::Location.from_source_location(*@proc.source_location)
       end
 
       def invoke(pseudo_method, arguments, &block)

data/lib/cucumber/rb_support/rb_language.rb

@@ -5,6 +5,7 @@ require 'cucumber/rb_support/rb_step_definition'
 require 'cucumber/rb_support/rb_hook'
 require 'cucumber/rb_support/rb_transform'
 require 'cucumber/rb_support/snippet'
+require 'cucumber/gherkin/i18n'
 require 'multi_test'
 
 module Cucumber
@@ -21,8 +22,8 @@ module Cucumber
       def initialize(first_proc, second_proc)
         message = "You can only pass a proc to #World once, but it's happening\n"
         message << "in 2 places:\n\n"
-        message << first_proc.backtrace_line('World') << "\n"
-        message << second_proc.backtrace_line('World') << "\n\n"
+        message << RbSupport.backtrace_line(first_proc, 'World') << "\n"
+        message << RbSupport.backtrace_line(second_proc, 'World') << "\n\n"
         message << "Use Ruby modules instead to extend your worlds. See the Cucumber::RbSupport::RbDsl#World RDoc\n"
         message << "or http://wiki.github.com/cucumber/cucumber/a-whole-new-world.\n\n"
         super(message)
@@ -35,8 +36,12 @@ module Cucumber
       attr_reader :current_world,
                   :step_definitions
 
-      Gherkin::I18n.code_keywords.each do |adverb|
-        RbDsl.alias_adverb(adverb)
+      all_keywords = ::Gherkin3::DIALECTS.keys.map do |dialect_name|
+        dialect = ::Gherkin3::Dialect.for(dialect_name)
+        dialect.given_keywords + dialect.when_keywords + dialect.then_keywords + dialect.and_keywords + dialect.but_keywords
+      end
+      Cucumber::Gherkin::I18n.code_keywords_for(all_keywords.flatten.uniq.sort).each do |adverb|
+        RbDsl.alias_adverb(adverb.strip)
       end
 
       def initialize(runtime)
@@ -132,7 +137,7 @@ module Cucumber
             raise NilWorld.new
           rescue NilWorld => e
             e.backtrace.clear
-            e.backtrace.push(proc.backtrace_line("World"))
+            e.backtrace.push(RbSupport.backtrace_line(proc, "World"))
             raise e
           end
         else
@@ -156,5 +161,10 @@ module Cucumber
         end
       end
     end
+
+    def self.backtrace_line(proc, name)
+      location = Cucumber::Core::Ast::Location.from_source_location(*proc.source_location)
+      "#{location.to_s}:in `#{name}'"
+    end
   end
 end

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -1,6 +1,5 @@
 require 'cucumber/step_match'
 require 'cucumber/core_ext/string'
-require 'cucumber/core_ext/proc'
 require 'cucumber/rb_support/regexp_argument_matcher'
 
 module Cucumber
@@ -51,17 +50,8 @@ module Cucumber
         end
 
         def patch_location_onto(block)
-          file, line = caller[5].match(/(.*):(\d+)/)[1..2]
-          file = File.expand_path(file)
-          pwd = File.expand_path(Dir.pwd)
-          pwd.force_encoding(file.encoding)
-          if file.index(pwd)
-            file = file[pwd.length+1..-1]
-          elsif file =~ /.*\/gems\/(.*\.rb)$/
-            file = $1
-          end
-          location = Core::Ast::Location.new(file, line)
-          block.define_singleton_method(:file_colon_line) { location.to_s }
+          location = Core::Ast::Location.of_caller(5)
+          block.define_singleton_method(:source_location) { [location.file, location.line] }
           block
         end
 
@@ -81,7 +71,7 @@ module Cucumber
 
       def initialize(rb_language, regexp, proc)
         @rb_language, @regexp, @proc = rb_language, regexp, proc
-        @rb_language.available_step_definition(regexp_source, file_colon_line)
+        @rb_language.available_step_definition(regexp_source, location)
       end
 
       def regexp_source
@@ -102,7 +92,7 @@ module Cucumber
 
       def arguments_from(step_name)
         args = RegexpArgumentMatcher.arguments_from(@regexp, step_name)
-        @rb_language.invoked_step_definition(regexp_source, file_colon_line) if args
+        @rb_language.invoked_step_definition(regexp_source, location) if args
         args
       end
 
@@ -117,20 +107,24 @@ module Cucumber
       end
 
       def backtrace_line
-        @proc.backtrace_line(regexp_source)
+        "#{location.to_s}:in `#{regexp_source}'"
       end
 
       def file_colon_line
         case @proc
         when Proc
-          @proc.file_colon_line
+          location.to_s
         when Symbol
           ":#{@proc}"
         end
       end
 
+      def location
+        @location ||= Cucumber::Core::Ast::Location.from_source_location(*@proc.source_location)
+      end
+
       def file
-        @file ||= file_colon_line.split(':')[0]
+        @file ||= location.file
       end
     end
   end

data/lib/cucumber/rb_support/rb_world.rb

@@ -1,4 +1,4 @@
-require 'gherkin/formatter/ansi_escapes'
+require 'cucumber/gherkin/formatter/ansi_escapes'
 
 module Cucumber
   module RbSupport
@@ -9,7 +9,7 @@ module Cucumber
     module RbWorld
 
       # @private
-      AnsiEscapes = Gherkin::Formatter::AnsiEscapes
+      AnsiEscapes = Cucumber::Gherkin::Formatter::AnsiEscapes
 
       # Call a Transform with a string from another Transform definition
       def Transform(arg)
@@ -48,7 +48,8 @@ module Cucumber
       #   }
       # @param [String] steps_text The Gherkin snippet to run
       def steps(steps_text)
-        @__cucumber_runtime.invoke_dynamic_steps(steps_text, @__natural_language, caller[0])
+        location = Core::Ast::Location.of_caller
+        @__cucumber_runtime.invoke_dynamic_steps(steps_text, @__natural_language, location)
       end
 
       # Parse Gherkin into a {Cucumber::Ast::Table} object.
@@ -74,6 +75,7 @@ module Cucumber
       #     puts "this is ruby code"
       #   %}, 'ruby')
       def doc_string(string_without_triple_quotes, content_type='', line_offset=0)
+        STDERR.puts AnsiEscapes.failed + "WARNING: #doc_string is deprecated. Just pass a regular String instead:" + caller[0] + AnsiEscapes.reset
         # TODO: rename this method to multiline_string
         @__cucumber_runtime.doc_string(string_without_triple_quotes, content_type, line_offset)
       end
@@ -89,7 +91,7 @@ module Cucumber
       # @note Cucumber might surprise you with the behaviour of this method. Instead
       #   of sending the output directly to STDOUT, Cucumber will intercept and cache
       #   the message until the current step has finished, and then display it.
-      #   
+      #
       #   If you'd prefer to see the message immediately, call {Kernel.puts} instead.
       def puts(*messages)
         @__cucumber_runtime.puts(*messages)

data/lib/cucumber/rb_support/regexp_argument_matcher.rb

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

data/lib/cucumber/runtime.rb

@@ -2,8 +2,6 @@
 require 'fileutils'
 require 'multi_json'
 require 'multi_test'
-require 'gherkin/rubify'
-require 'gherkin/i18n'
 require 'cucumber/configuration'
 require 'cucumber/load_path'
 require 'cucumber/language_support/language_methods'
@@ -11,6 +9,8 @@ require 'cucumber/formatter/duration'
 require 'cucumber/file_specs'
 require 'cucumber/filters'
 require 'cucumber/formatter/fanout'
+require 'cucumber/formatter/event_bus_report'
+require 'cucumber/gherkin/i18n'
 
 module Cucumber
   module FixRuby21Bug9285
@@ -46,14 +46,14 @@ module Cucumber
     include Runtime::UserInterface
 
     def initialize(configuration = Configuration.default)
-      @configuration = Configuration.parse(configuration)
+      @configuration = Configuration.new(configuration)
       @support_code = SupportCode.new(self, @configuration)
       @results = Formatter::LegacyApi::Results.new
     end
 
     # Allows you to take an existing runtime and change its configuration
     def configure(new_configuration)
-      @configuration = Configuration.parse(new_configuration)
+      @configuration = Configuration.new(new_configuration)
       @support_code.configure(@configuration)
     end
 
@@ -86,16 +86,12 @@ module Cucumber
       @results.steps(status)
     end
 
-    def step_match(step_name, name_to_report=nil) #:nodoc:
-      @support_code.step_match(step_name, name_to_report)
-    end
-
     def unmatched_step_definitions
       @support_code.unmatched_step_definitions
     end
 
     def snippet_text(step_keyword, step_name, multiline_arg) #:nodoc:
-      @support_code.snippet_text(::Gherkin::I18n.code_keyword_for(step_keyword), step_name, multiline_arg)
+      @support_code.snippet_text(Cucumber::Gherkin::I18n.code_keyword_for(step_keyword).strip, step_name, multiline_arg)
     end
 
     def begin_scenario(scenario)
@@ -180,26 +176,50 @@ module Cucumber
     require 'cucumber/formatter/legacy_api/runtime_facade'
     require 'cucumber/formatter/legacy_api/results'
     require 'cucumber/formatter/ignore_missing_messages'
+    require 'cucumber/formatter/fail_fast'
     require 'cucumber/core/report/summary'
     def report
-      @report ||= Formatter::Fanout.new([summary_report] + formatters)
+      return @report if @report
+      reports = [summary_report, event_bus_report] + formatters
+      reports << fail_fast_report if @configuration.fail_fast?
+      @report ||= Formatter::Fanout.new(reports)
     end
 
     def summary_report
       @summary_report ||= Core::Report::Summary.new
     end
 
+    def event_bus_report
+      @event_bus_report ||= Formatter::EventBusReport.new(@configuration)
+    end
+
+    def fail_fast_report
+      @fail_fast_report ||= Formatter::FailFast.new(@configuration)
+    end
+
     def formatters
       @formatters ||= @configuration.formatter_factories { |factory, path_or_io, options|
-        results = Formatter::LegacyApi::Results.new
-        runtime_facade = Formatter::LegacyApi::RuntimeFacade.new(results, @support_code, @configuration)
-        formatter = factory.new(runtime_facade, path_or_io, options)
-        Formatter::LegacyApi::Adapter.new(
-          Formatter::IgnoreMissingMessages.new(formatter),
-          results, @support_code, @configuration)
+        create_formatter(factory, path_or_io, options)
       }
     end
 
+    def create_formatter(factory, path_or_io, options)
+      if !legacy_formatter?(factory)
+        out_stream = Cucumber::Formatter::Io.ensure_io(path_or_io)
+        return factory.new(@configuration.with_options(out_stream: out_stream))
+      end
+      results = Formatter::LegacyApi::Results.new
+      runtime_facade = Formatter::LegacyApi::RuntimeFacade.new(results, @support_code, @configuration)
+      formatter = factory.new(runtime_facade, path_or_io, options)
+      Formatter::LegacyApi::Adapter.new(
+        Formatter::IgnoreMissingMessages.new(formatter),
+        results, @support_code, @configuration)
+    end
+
+    def legacy_formatter?(factory)
+      factory.instance_method(:initialize).arity > 1
+    end
+
     def failure?
       if @configuration.wip?
         summary_report.test_cases.total_passed > 0

data/lib/cucumber/runtime/support_code.rb

@@ -3,6 +3,8 @@ require 'cucumber/runtime/for_programming_languages'
 require 'cucumber/runtime/step_hooks'
 require 'cucumber/runtime/before_hooks'
 require 'cucumber/runtime/after_hooks'
+require 'cucumber/events/step_match'
+require 'cucumber/gherkin/steps_parser'
 
 module Cucumber
 
@@ -12,28 +14,29 @@ module Cucumber
 
       require 'forwardable'
       class StepInvoker
-        include Gherkin::Rubify
 
         def initialize(support_code)
           @support_code = support_code
         end
 
-        def uri(uri)
+        def steps(steps)
+          steps.each { |step| step(step) }
         end
 
         def step(step)
           location = Core::Ast::Location.of_caller
-          @support_code.invoke_dynamic_step(step.name, multiline_arg(step, location))
-        end
-
-        def eof
+          @support_code.invoke_dynamic_step(step[:text], multiline_arg(step, location))
         end
 
         def multiline_arg(step, location)
-          if argument = step.doc_string
-            MultilineArgument.doc_string(argument.value, argument.content_type, location.on_line(argument.line_range))
+          if argument = step[:argument]
+            if argument[:type] == :DocString
+              MultilineArgument.doc_string(argument[:content], argument[:content_type], location)
+            else
+              MultilineArgument::DataTable.from(argument[:rows].map { |row| row[:cells].map { |cell| cell[:value] } })
+            end
           else
-            MultilineArgument.from(step.rows, location)
+            MultilineArgument.from(nil)
           end
         end
       end
@@ -41,7 +44,7 @@ module Cucumber
       include Constantize
 
       def initialize(user_interface, configuration={})
-        @configuration = Configuration.parse(configuration)
+        @configuration = Configuration.new(configuration)
         @runtime_facade = Runtime::ForProgrammingLanguages.new(self, user_interface)
         @unsupported_programming_languages = []
         @programming_languages = []
@@ -49,7 +52,7 @@ module Cucumber
       end
 
       def configure(new_configuration)
-        @configuration = Configuration.parse(new_configuration)
+        @configuration = Configuration.new(new_configuration)
       end
 
       # Invokes a series of steps +steps_text+. Example:
@@ -58,10 +61,9 @@ module Cucumber
       #     Given I have 8 cukes in my belly
       #     Then I should not be thirsty
       #   })
-      def invoke_dynamic_steps(steps_text, i18n, file_colon_line)
-        file, line = file_colon_line.split(':')
-        parser = Gherkin::Parser::Parser.new(StepInvoker.new(self), true, 'steps', false, i18n.iso_code)
-        parser.parse(steps_text, file, line.to_i)
+      def invoke_dynamic_steps(steps_text, i18n, location)
+        parser = Cucumber::Gherkin::StepsParser.new(StepInvoker.new(self), i18n.iso_code)
+        parser.parse(steps_text)
       end
 
       # @api private
@@ -139,6 +141,8 @@ module Cucumber
         rescue Cucumber::Undefined
           return NoStepMatch.new(test_step.source.last, test_step.name)
         end
+        # TODO: move this onto Filters::ActivateSteps
+        @configuration.notify Events::StepMatch.new(test_step, match)
         if @configuration.dry_run?
           return SkippingStepMatch.new
         end