cucumber 7.0.0 → 8.0.0

data/lib/cucumber/runtime/user_interface.rb

@@ -21,8 +21,8 @@ module Cucumber
       # that makes a sound before invoking #ask.
       #
       def ask(question, timeout_seconds)
-        STDOUT.puts(question)
-        STDOUT.flush
+        $stdout.puts(question)
+        $stdout.flush
         puts(question)
 
         answer = if Cucumber::JRUBY
@@ -32,6 +32,7 @@ module Cucumber
                  end
 
         raise("Waited for input for #{timeout_seconds} seconds, then timed out.") unless answer
+
         puts(answer)
         answer
       end
@@ -48,7 +49,7 @@ module Cucumber
 
       def mri_gets(timeout_seconds)
         Timeout.timeout(timeout_seconds) do
-          STDIN.gets
+          $stdin.gets
         end
       rescue Timeout::Error
         nil
@@ -57,7 +58,7 @@ module Cucumber
       def jruby_gets(timeout_seconds)
         answer = nil
         t = java.lang.Thread.new do
-          answer = STDIN.gets
+          answer = $stdin.gets
         end
         t.start
         t.join(timeout_seconds * 1000)

data/lib/cucumber/runtime.rb

@@ -2,15 +2,17 @@
 
 require 'fileutils'
 require 'cucumber/configuration'
-require 'cucumber/create_meta'
+require 'cucumber/deprecate'
 require 'cucumber/load_path'
 require 'cucumber/formatter/duration'
 require 'cucumber/file_specs'
 require 'cucumber/filters'
 require 'cucumber/formatter/fanout'
 require 'cucumber/gherkin/i18n'
+require 'cucumber/glue/registry_wrapper'
 require 'cucumber/step_match_search'
 require 'cucumber/messages'
+require 'cucumber/runtime/meta_message_builder'
 require 'sys/uname'
 
 module Cucumber
@@ -24,8 +26,8 @@ module Cucumber
     attr_reader :path
 
     def initialize(original_exception, path)
-      super(original_exception)
       @path = path
+      super(original_exception)
     end
   end
 
@@ -35,6 +37,7 @@ module Cucumber
   class FeatureFolderNotFoundException < RuntimeError
     def initialize(path)
       @path = path
+      super
     end
 
     def message
@@ -63,21 +66,22 @@ module Cucumber
       @support_code.configure(@configuration)
     end
 
-    require 'cucumber/wire/plugin'
     def run!
       @configuration.notify :envelope, Cucumber::Messages::Envelope.new(
-        meta: Cucumber::CreateMeta.create_meta('cucumber-ruby', Cucumber::VERSION)
+        meta: MetaMessageBuilder.build_meta_message
       )
 
       load_step_definitions
-      install_wire_plugin
-      fire_after_configuration_hook
+      fire_install_plugin_hook
+      fire_before_all_hook unless dry_run?
       # TODO: can we remove this state?
       self.visitor = report
 
       receiver = Test::Runner.new(@configuration.event_bus)
       compile features, receiver, filters, @configuration.event_bus
-      @configuration.notify :test_run_finished
+      @configuration.notify :test_run_finished, !failure?
+
+      fire_after_all_hook unless dry_run?
     end
 
     def features_paths
@@ -106,10 +110,26 @@ module Cucumber
       Core::Test::DocString.new(string_without_triple_quotes, content_type)
     end
 
+    def failure?
+      if @configuration.wip?
+        summary_report.test_cases.total_passed > 0
+      else
+        !summary_report.ok?(@configuration.strict)
+      end
+    end
+
     private
 
-    def fire_after_configuration_hook #:nodoc:
-      @support_code.fire_hook(:after_configuration, @configuration)
+    def fire_install_plugin_hook # :nodoc:
+      @support_code.fire_hook(:install_plugin, @configuration, registry_wrapper)
+    end
+
+    def fire_before_all_hook # :nodoc:
+      @support_code.fire_hook(:before_all)
+    end
+
+    def fire_after_all_hook # :nodoc:
+      @support_code.fire_hook(:after_all)
     end
 
     require 'cucumber/core/gherkin/document'
@@ -130,8 +150,8 @@ module Cucumber
     end
 
     class NormalisedEncodingFile
-      COMMENT_OR_EMPTY_LINE_PATTERN = /^\s*#|^\s*$/ #:nodoc:
-      ENCODING_PATTERN = /^\s*#\s*encoding\s*:\s*([^\s]+)/ #:nodoc:
+      COMMENT_OR_EMPTY_LINE_PATTERN = /^\s*#|^\s*$/ # :nodoc:
+      ENCODING_PATTERN = /^\s*#\s*encoding\s*:\s*([^\s]+)/ # :nodoc:
 
       def self.read(path)
         new(path).read
@@ -171,6 +191,7 @@ module Cucumber
 
     def report
       return @report if @report
+
       reports = [summary_report] + formatters
       reports << fail_fast_report if @configuration.fail_fast?
       reports << publish_banner_printer unless @configuration.publish_quiet?
@@ -199,10 +220,12 @@ module Cucumber
     def create_formatter(factory, formatter_options, path_or_io)
       if accept_options?(factory)
         return factory.new(@configuration, formatter_options) if path_or_io.nil?
+
         factory.new(@configuration.with_options(out_stream: path_or_io),
                     formatter_options)
       else
         return factory.new(@configuration) if path_or_io.nil?
+
         factory.new(@configuration.with_options(out_stream: path_or_io))
       end
     end
@@ -211,15 +234,6 @@ module Cucumber
       factory.instance_method(:initialize).arity > 1
     end
 
-    def failure?
-      if @configuration.wip?
-        summary_report.test_cases.total_passed > 0
-      else
-        !summary_report.ok?(@configuration.strict)
-      end
-    end
-    public :failure?
-
     require 'cucumber/core/test/filters'
     def filters # rubocop:disable Metrics/AbcSize
       tag_expressions = @configuration.tag_expressions
@@ -260,8 +274,8 @@ module Cucumber
       @support_code.load_files!(files)
     end
 
-    def install_wire_plugin
-      Cucumber::Wire::Plugin.new(@configuration, @support_code.registry).install if @configuration.all_files_to_load.any? { |f| f =~ /\.wire$/ }
+    def registry_wrapper
+      Cucumber::Glue::RegistryWrapper.new(@support_code.registry)
     end
 
     def log

data/lib/cucumber/step_match.rb

@@ -4,11 +4,12 @@ require 'cucumber/multiline_argument'
 
 module Cucumber
   # Represents the match found between a Test Step and its activation
-  class StepMatch #:nodoc:
+  class StepMatch # :nodoc:
     attr_reader :step_definition, :step_arguments
 
     def initialize(step_definition, step_name, step_arguments)
       raise "step_arguments can't be nil (but it can be an empty array)" if step_arguments.nil?
+
       @step_definition = step_definition
       @name_to_match = step_name
       @step_arguments = step_arguments
@@ -90,7 +91,7 @@ module Cucumber
       s
     end
 
-    def inspect #:nodoc:
+    def inspect # :nodoc:
       "#<#{self.class}: #{location}>"
     end
   end
@@ -101,7 +102,7 @@ module Cucumber
     end
   end
 
-  class NoStepMatch #:nodoc:
+  class NoStepMatch # :nodoc:
     attr_reader :step_definition, :name
 
     def initialize(step, name)
@@ -115,6 +116,7 @@ module Cucumber
 
     def location
       raise "No location for #{@step}" unless @step.location
+
       @step.location
     end
 

data/lib/cucumber/step_match_search.rb

@@ -20,6 +20,7 @@ module Cucumber
       def call(step_name)
         result = @search.call(step_name)
         raise Cucumber::Ambiguous.new(step_name, result, @configuration.guess?) if result.length > 1
+
         result
       end
     end
@@ -35,7 +36,7 @@ module Cucumber
 
       private
 
-      def best_matches(_step_name, step_matches) #:nodoc:
+      def best_matches(_step_name, step_matches) # :nodoc:
         no_groups      = step_matches.select { |step_match| step_match.args.empty? }
         max_arg_length = step_matches.map { |step_match| step_match.args.length }.max
         top_groups     = step_matches.select { |step_match| step_match.args.length == max_arg_length }
@@ -54,7 +55,7 @@ module Cucumber
 
     require 'delegate'
     class CachesStepMatch < SimpleDelegator
-      def call(step_name) #:nodoc:
+      def call(step_name) # :nodoc:
         @match_cache ||= {}
 
         matches = @match_cache[step_name]

data/lib/cucumber/term/ansicolor.rb

@@ -2,8 +2,28 @@
 
 module Cucumber
   module Term
-    # The ANSIColor module can be used for namespacing and mixed into your own
-    # classes.
+    # This module allows to colorize text using ANSI escape sequences.
+    #
+    # Include the module in your class and use its methods to colorize text.
+    #
+    # Example:
+    #
+    #   require 'cucumber/term/ansicolor'
+    #
+    #   class MyFormatter
+    #     include Cucumber::Term::ANSIColor
+    #
+    #     def initialize(config)
+    #       $stdout.puts yellow("Initializing formatter")
+    #       $stdout.puts green("Coloring is active \o/") if Cucumber::Term::ANSIColor.coloring?
+    #       $stdout.puts grey("Feature path:") + blue(bold(config.feature_dirs))
+    #     end
+    #   end
+    #
+    # To see what colours and effects are available, just run this in your shell:
+    #
+    #   ruby -e "require 'rubygems'; require 'cucumber/term/ansicolor'; puts Cucumber::Term::ANSIColor.attributes"
+    #
     module ANSIColor
       # :stopdoc:
       ATTRIBUTES = [
@@ -27,6 +47,7 @@ module Cucumber
         [:magenta,       35],
         [:cyan,          36],
         [:white,         37],
+        [:grey,          90],
         [:on_black,      40],
         [:on_red,        41],
         [:on_green,      42],
@@ -40,72 +61,75 @@ module Cucumber
       ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
       # :startdoc:
 
-      # Returns true, if the coloring function of this module
-      # is switched on, false otherwise.
-      def self.coloring?
-        @coloring
-      end
-
-      # Turns the coloring on or off globally, so you can easily do
-      # this for example:
-      #  Cucumber::Term::ANSIColor::coloring = STDOUT.isatty
-      def self.coloring=(val)
-        @coloring = val
-      end
-      self.coloring = true
-
-      # rubocop:disable Security/Eval
-      ATTRIBUTES.each do |c, v|
-        eval <<-END_EVAL, binding, __FILE__, __LINE__ + 1
-            def #{c}(string = nil)
-              result = String.new
-              result << "\e[#{v}m" if Cucumber::Term::ANSIColor.coloring?
-              if block_given?
-                result << yield
-              elsif string
-                result << string
-              elsif respond_to?(:to_str)
-                result << to_str
-              else
-                return result #only switch on
-              end
-              result << "\e[0m" if Cucumber::Term::ANSIColor.coloring?
-              result
-            end
-        END_EVAL
-      end
-      # rubocop:enable Security/Eval
-
       # Regular expression that is used to scan for ANSI-sequences while
       # uncoloring strings.
       COLORED_REGEXP = /\e\[(?:[34][0-7]|[0-9])?m/
 
-      def self.included(klass)
-        return unless klass == String
-        ATTRIBUTES.delete(:clear)
-        ATTRIBUTE_NAMES.delete(:clear)
+      @coloring = true
+
+      class << self
+        # Turns the coloring on or off globally, so you can easily do
+        # this for example:
+        #  Cucumber::Term::ANSIColor::coloring = $stdout.isatty
+        attr_accessor :coloring
+
+        # Returns true, if the coloring function of this module
+        # is switched on, false otherwise.
+        alias coloring? :coloring
+
+        def included(klass)
+          return unless klass == String
+
+          ATTRIBUTES.delete(:clear)
+          ATTRIBUTE_NAMES.delete(:clear)
+        end
       end
 
-      # Returns an uncolored version of the string, that is all
+      ATTRIBUTES.each do |color_name, color_code|
+        define_method(color_name) do |text = nil, &block|
+          if block
+            colorize(block.call, color_code)
+          elsif text
+            colorize(text, color_code)
+          elsif respond_to?(:to_str)
+            colorize(to_str, color_code)
+          else
+            colorize(nil, color_code) # switch coloration on
+          end
+        end
+      end
+
+      # Returns an uncolored version of the string
       # ANSI-sequences are stripped from the string.
-      def uncolored(string = nil)
+      def uncolored(text = nil)
         if block_given?
-          yield.gsub(COLORED_REGEXP, '')
-        elsif string
-          string.gsub(COLORED_REGEXP, '')
+          uncolorize(yield)
+        elsif text
+          uncolorize(text)
         elsif respond_to?(:to_str)
-          to_str.gsub(COLORED_REGEXP, '')
+          uncolorize(to_str)
         else
           ''
         end
       end
 
-      module_function
-
       # Returns an array of all Cucumber::Term::ANSIColor attributes as symbols.
       def attributes
         ATTRIBUTE_NAMES
       end
+
+      private
+
+      def colorize(text, color_code)
+        return String.new(text || '') unless Cucumber::Term::ANSIColor.coloring?
+        return "\e[#{color_code}m" unless text
+
+        "\e[#{color_code}m#{text}\e[0m"
+      end
+
+      def uncolorize(string)
+        string.gsub(COLORED_REGEXP, '')
+      end
     end
   end
 end

data/lib/cucumber/term/banner.rb

@@ -30,6 +30,7 @@ module Cucumber
 
         def display_span(span)
           return apply_modifiers(span.shift, span) if span.is_a?(Array)
+
           span
         end
 

data/lib/cucumber/version

@@ -1 +1 @@
-7.0.0
+8.0.0

data/lib/cucumber.rb

@@ -14,7 +14,8 @@ module Cucumber
 
     def logger
       return @log if @log
-      @log = Logger.new(STDOUT)
+
+      @log = Logger.new($stdout)
       @log.level = Logger::INFO
       @log
     end

data/lib/simplecov_setup.rb

@@ -7,7 +7,7 @@ if ENV['SIMPLECOV']
 
     require 'simplecov'
 
-    SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..'))
+    SimpleCov.root(File.expand_path("#{File.dirname(__FILE__)}/.."))
     SimpleCov.start do
       add_filter 'iso-8859-1_steps.rb'
       add_filter '.-ruby-core/'