cucumber 2.1.0 → 2.2.0

data/lib/cucumber/formatter/io.rb

@@ -19,7 +19,7 @@ module Cucumber
       def ensure_file(path, name)
         raise "You *must* specify --out FILE for the #{name} formatter" unless String === path
         raise "I can't write #{name} to a directory - it has to be a file" if File.directory?(path)
-        ensure_io(path, name)
+        ensure_io(path)
       end
 
       def ensure_dir(path, name)

data/lib/cucumber/formatter/legacy_api/adapter.rb

@@ -9,9 +9,14 @@ module Cucumber
   module Formatter
     module LegacyApi
 
-      Adapter = Struct.new(:formatter, :results, :support_code, :config) do
+      Adapter = Struct.new(:formatter, :results, :config) do
         extend Forwardable
 
+        def initialize(*)
+          super
+          @matches = collect_matches
+        end
+
         def_delegators :formatter,
           :ask
 
@@ -51,7 +56,7 @@ module Cucumber
         private
 
         def printer
-          @printer ||= FeaturesPrinter.new(formatter, results, support_code, config).before
+          @printer ||= FeaturesPrinter.new(formatter, results, config, @matches).before
         end
 
         def record_test_case_result(test_case, result)
@@ -59,8 +64,16 @@ module Cucumber
           results.scenario_visited(scenario)
         end
 
+        def collect_matches
+          result = {}
+          config.on_event(:step_match) do |event|
+            result[event.test_step.source.last] = event.step_match
+          end
+          result
+        end
+
         require 'cucumber/core/test/timer'
-        FeaturesPrinter = Struct.new(:formatter, :results, :support_code, :config) do
+        FeaturesPrinter = Struct.new(:formatter, :results, :config, :matches) do
           extend Forwardable
 
           def before
@@ -89,7 +102,7 @@ module Cucumber
           def feature(node, *)
             if node != @current_feature
               @child.after if @child
-              @child = FeaturePrinter.new(formatter, results, support_code, config, node).before
+              @child = FeaturePrinter.new(formatter, results, matches, config, node).before
               @current_feature = node
             end
           end
@@ -125,6 +138,7 @@ module Cucumber
           def timer
             @timer ||= Cucumber::Core::Test::Timer.new
           end
+
         end
 
         module TestCaseSource
@@ -173,9 +187,9 @@ module Cucumber
 
           require 'ostruct'
           class StepSource < OpenStruct
-            def build_step_invocation(indent, support_code, config, messages, embeddings)
+            def build_step_invocation(indent, matches, config, messages, embeddings)
               step_result.step_invocation(
-                step_match(support_code),
+                matches.fetch(step) { NoStepMatch.new(step, step.name) },
                 step,
                 indent,
                 background,
@@ -184,14 +198,6 @@ module Cucumber
                 embeddings
               )
             end
-
-            private
-
-            def step_match(support_code)
-              support_code.step_match(step.name)
-            rescue Cucumber::Undefined
-              NoStepMatch.new(step, step.name)
-            end
           end
 
         end
@@ -203,7 +209,7 @@ module Cucumber
           end
         end
 
-        FeaturePrinter = Struct.new(:formatter, :results, :support_code, :config, :node) do
+        FeaturePrinter = Struct.new(:formatter, :results, :matches, :config, :node) do
 
           def before
             formatter.before_feature(node)
@@ -251,7 +257,7 @@ module Cucumber
             @delayed_messages = []
             @delayed_embeddings = []
 
-            @child.after_test_case if @child
+            @child.after_test_case(test_case, test_case_result) if @child
             @previous_test_case_background = @current_test_case_background
             @previous_test_case_scenario_outline = current_test_step_source && current_test_step_source.scenario_outline
           end
@@ -357,14 +363,14 @@ module Cucumber
 
             if @failed_hidden_background_step
               indent = Indent.new(@child.node)
-              step_invocation = @failed_hidden_background_step.build_step_invocation(indent, support_code, config, messages = [], embeddings = [])
+              step_invocation = @failed_hidden_background_step.build_step_invocation(indent, matches, config, messages = [], embeddings = [])
               @child.step_invocation(step_invocation, @failed_hidden_background_step)
               @failed_hidden_background_step = nil
             end
 
             unless @last_step == current_test_step_source.step
               indent ||= Indent.new(@child.node)
-              step_invocation = current_test_step_source.build_step_invocation(indent, support_code, config, @delayed_messages, @delayed_embeddings)
+              step_invocation = current_test_step_source.build_step_invocation(indent, matches, config, @delayed_messages, @delayed_embeddings)
               results.step_visited step_invocation
               @child.step_invocation(step_invocation, current_test_step_source)
               @last_step = current_test_step_source.step
@@ -523,23 +529,21 @@ module Cucumber
           def step_invocation(step_invocation, source)
             @child ||= StepsPrinter.new(formatter).before
             @child.step_invocation step_invocation
-            @last_step_result = source.step_result
           end
 
           def after_step_hook(result)
             result.accept formatter
           end
 
-          def after_test_case(*args)
+          def after_test_case(test_case, result)
+            @test_case_result = result
             after
           end
 
           def after
             return if @done
             @child.after if @child
-            # TODO - the last step result might not accurately reflect the
-            # overall scenario result.
-            scenario = last_step_result.scenario(node.name, node.location)
+            scenario = LegacyResultBuilder.new(@test_case_result).scenario(node.name, node.location)
             after_hook_results.accept(formatter)
             formatter.after_feature_element(scenario)
             @done = true
@@ -548,10 +552,6 @@ module Cucumber
 
           private
 
-          def last_step_result
-            @last_step_result || LegacyResultBuilder.new(Core::Test::Result::Unknown.new)
-          end
-
           def indent
             @indent ||= Indent.new(node)
           end
@@ -610,8 +610,8 @@ module Cucumber
             @child.examples_table_row(node, before_hook_results)
           end
 
-          def after_test_case
-            @child.after_test_case
+          def after_test_case(test_case, result)
+            @child.after_test_case(test_case, result)
           end
 
           def after
@@ -712,7 +712,7 @@ module Cucumber
           end
 
           def after_test_case(*args)
-            @child.after_test_case
+            @child.after_test_case(*args)
           end
 
           def after

data/lib/cucumber/formatter/legacy_api/runtime_facade.rb

@@ -11,11 +11,10 @@ module Cucumber
         end
 
         def snippet_text(step_keyword, step_name, multiline_arg) #:nodoc:
-          support_code.snippet_text(Cucumber::Gherkin::I18n.code_keyword_for(step_keyword).strip, step_name, multiline_arg)
-        end
-
-        def unknown_programming_language?
-          support_code.unknown_programming_language?
+          keyword = Cucumber::Gherkin::I18n.code_keyword_for(step_keyword).strip
+          configuration.snippet_generators.map { |generator|
+            generator.call(keyword, step_name, multiline_arg, configuration.snippet_type)
+          }.join("\n")
         end
 
         def scenarios(status = nil)
@@ -25,10 +24,6 @@ module Cucumber
         def steps(status = nil)
           results.steps(status)
         end
-
-        def step_match(step_name, name_to_report=nil)
-          support_code.step_match(step_name, name_to_report)
-        end
       end
 
     end

data/lib/cucumber/platform.rb

@@ -1,22 +1,17 @@
 # Detect the platform we're running on so we can tweak behaviour
 # in various places.
 require 'rbconfig'
+require 'cucumber/core/platform'
 
 module Cucumber
   unless defined?(Cucumber::VERSION)
-    VERSION       = '2.1.0'
+    VERSION       = File.read(File.expand_path("../version", __FILE__))
     BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
     LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
-    JRUBY         = defined?(JRUBY_VERSION)
-    WINDOWS       = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
-    OS_X          = RbConfig::CONFIG['host_os'] =~ /darwin/
-    WINDOWS_MRI   = WINDOWS && !JRUBY
     RAILS         = defined?(Rails)
     RUBY_BINARY   = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
     RUBY_2_2      = RUBY_VERSION =~ /^2\.2/
     RUBY_2_1      = RUBY_VERSION =~ /^2\.1/
-    RUBY_2_0      = RUBY_VERSION =~ /^2\.0/
-    RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
 
     class << self
       attr_accessor :use_full_backtrace

data/lib/cucumber/rb_support/rb_language.rb

@@ -7,6 +7,8 @@ require 'cucumber/rb_support/rb_transform'
 require 'cucumber/rb_support/snippet'
 require 'cucumber/gherkin/i18n'
 require 'multi_test'
+require 'cucumber/step_match'
+require 'cucumber/step_definition_light'
 
 module Cucumber
   module RbSupport
@@ -32,7 +34,6 @@ module Cucumber
 
     # The Ruby implementation of the programming language API.
     class RbLanguage
-      include LanguageSupport::LanguageMethods
       attr_reader :current_world,
                   :step_definitions
 
@@ -44,26 +45,21 @@ module Cucumber
         RbDsl.alias_adverb(adverb.strip)
       end
 
-      def initialize(runtime)
+      def initialize(runtime, configuration)
         @runtime = runtime
         @step_definitions = []
         RbDsl.rb_language = self
         @world_proc = @world_modules = nil
+        configuration.register_snippet_generator(Snippet::Generator.new)
       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))
-            StepMatch.new(step_definition, name_to_match, name_to_format, arguments)
-          else
-            nil
+      def step_matches(name_to_match)
+        @step_definitions.reduce([]) { |result, step_definition|
+          if (arguments = step_definition.arguments_from(name_to_match))
+            result << StepMatch.new(step_definition, name_to_match, arguments)
           end
-        end.compact
-      end
-
-      def snippet_text(code_keyword, step_name, multiline_arg, snippet_type = :regexp)
-        snippet_class = typed_snippet_class(snippet_type)
-        snippet_class.new(code_keyword, step_name, multiline_arg).to_s
+          result
+        }
       end
 
       def begin_rb_scenario(scenario)
@@ -96,6 +92,7 @@ module Cucumber
       end
 
       def load_code_file(code_file)
+        return unless File.extname(code_file) == ".rb"
         load File.expand_path(code_file) # This will cause self.add_step_definition, self.add_hook, and self.add_transform to be called from RbDsl
       end
 
@@ -107,8 +104,67 @@ module Cucumber
         @current_world = nil
       end
 
+      def after_configuration(configuration)
+        hooks[:after_configuration].each do |hook|
+          hook.invoke('AfterConfiguration', configuration)
+        end
+      end
+
+      def execute_transforms(args)
+        args.map do |arg|
+          matching_transform = transforms.detect {|transform| transform.match(arg) }
+          matching_transform ? matching_transform.invoke(arg) : arg
+        end
+      end
+
+      def add_hook(phase, hook)
+        hooks[phase.to_sym] << hook
+        hook
+      end
+
+      def clear_hooks
+        @hooks = nil
+      end
+
+      def add_transform(transform)
+        transforms.unshift transform
+        transform
+      end
+
+      def hooks_for(phase, scenario) #:nodoc:
+        hooks[phase.to_sym].select{|hook| scenario.accept_hook?(hook)}
+      end
+
+      def unmatched_step_definitions
+        available_step_definition_hash.keys - invoked_step_definition_hash.keys
+      end
+
+      def available_step_definition(regexp_source, file_colon_line)
+        available_step_definition_hash[StepDefinitionLight.new(regexp_source, file_colon_line)] = nil
+      end
+
+      def invoked_step_definition(regexp_source, file_colon_line)
+        invoked_step_definition_hash[StepDefinitionLight.new(regexp_source, file_colon_line)] = nil
+      end
+
       private
 
+      def available_step_definition_hash
+        @available_step_definition_hash ||= {}
+      end
+
+      def invoked_step_definition_hash
+        @invoked_step_definition_hash ||= {}
+      end
+
+      def hooks
+        @hooks ||= Hash.new{|h,k| h[k] = []}
+      end
+
+      def transforms
+        @transforms ||= []
+      end
+
       def create_world
         if(@world_proc)
           @current_world = @world_proc.call
@@ -145,19 +201,9 @@ module Cucumber
         end
       end
 
-      SNIPPET_TYPES = {
-        :regexp => Snippet::Regexp,
-        :classic => Snippet::Classic,
-        :percent => Snippet::Percent
-      }
-
-      def typed_snippet_class(type)
-        SNIPPET_TYPES.fetch(type || :regexp)
-      end
-
       def self.cli_snippet_type_options
-        SNIPPET_TYPES.keys.sort_by(&:to_s).map do |type|
-          SNIPPET_TYPES[type].cli_option_string(type)
+        Snippet::SNIPPET_TYPES.keys.sort_by(&:to_s).map do |type|
+          Snippet::SNIPPET_TYPES[type].cli_option_string(type)
         end
       end
     end

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -1,6 +1,6 @@
 require 'cucumber/step_match'
+require 'cucumber/step_argument'
 require 'cucumber/core_ext/string'
-require 'cucumber/rb_support/regexp_argument_matcher'
 
 module Cucumber
   module RbSupport
@@ -91,7 +91,7 @@ module Cucumber
       end
 
       def arguments_from(step_name)
-        args = RegexpArgumentMatcher.arguments_from(@regexp, step_name)
+        args = StepArgument.arguments_from(@regexp, step_name)
         @rb_language.invoked_step_definition(regexp_source, location) if args
         args
       end

data/lib/cucumber/rb_support/rb_world.rb

@@ -13,7 +13,7 @@ module Cucumber
 
       # Call a Transform with a string from another Transform definition
       def Transform(arg)
-        rb = @__cucumber_runtime.load_programming_language('rb')
+        rb = @__cucumber_runtime.support_code.ruby
         rb.execute_transforms([arg]).first
       end
 
@@ -94,6 +94,11 @@ module Cucumber
       #
       #   If you'd prefer to see the message immediately, call {Kernel.puts} instead.
       def puts(*messages)
+        # Even though they won't be output until later, converting the messages to
+        # strings right away will protect them from modifications to their original
+        # objects in the mean time
+        messages.collect! { |message| "#{message}" }
+
         @__cucumber_runtime.puts(*messages)
       end
 

data/lib/cucumber/rb_support/snippet.rb

@@ -4,6 +4,21 @@ module Cucumber
 
       ARGUMENT_PATTERNS = ['"([^"]*)"', '(\d+)']
 
+      class Generator
+        def self.register_on(configuration)
+          configuration.snippet_generators << new
+        end
+
+        def call(code_keyword, step_name, multiline_arg, snippet_type = :regexp)
+          snippet_class = typed_snippet_class(snippet_type)
+          snippet_class.new(code_keyword, step_name, multiline_arg).to_s
+        end
+
+        def typed_snippet_class(type)
+          SNIPPET_TYPES.fetch(type || :regexp)
+        end
+      end
+
       class BaseSnippet
 
         def initialize(code_keyword, pattern, multiline_argument)
@@ -91,6 +106,12 @@ module Cucumber
         end
       end
 
+      SNIPPET_TYPES = {
+        :regexp => Regexp,
+        :classic => Classic,
+        :percent => Percent
+      }
+
       module MultilineArgumentSnippet
 
         def self.new(multiline_argument)