cucumber 1.2.1 → 1.2.2

data/lib/cucumber/ast/tree_walker.rb

@@ -3,10 +3,10 @@ module Cucumber
     # Walks the AST, executing steps and notifying listeners
     class TreeWalker
       attr_accessor :configuration #:nodoc:
-      attr_reader   :step_mother #:nodoc:
+      attr_reader   :runtime #:nodoc:
 
-      def initialize(step_mother, listeners = [], configuration = Cucumber::Configuration.default)
-        @step_mother, @listeners, @configuration = step_mother, listeners, configuration
+      def initialize(runtime, listeners = [], configuration = Cucumber::Configuration.default)
+        @runtime, @listeners, @configuration = runtime, listeners, configuration
       end
 
       def visit_features(features)
@@ -152,9 +152,9 @@ module Cucumber
       def embed(file, mime_type, label)
         broadcast(file, mime_type, label)
       end
-      
+
       private
-      
+
       def broadcast(*args, &block)
         message = extract_method_name_from(caller)
         message.gsub!('visit_', '')
@@ -165,8 +165,9 @@ module Cucumber
         else
           send_to_all(message, *args)
         end
+        self
       end
-      
+
       def send_to_all(message, *args)
         @listeners.each do |listener|
           if listener.respond_to?(message)
@@ -177,7 +178,7 @@ module Cucumber
       def extract_method_name_from(call_stack)
         call_stack[0].match(/in `(.*)'/).captures[0]
       end
-      
+
     end
   end
-end
+end

data/lib/cucumber/ast/visitor.rb

@@ -3,7 +3,7 @@ module Cucumber
     class Visitor
       DEPRECATION_WARNING = "Cucumber::Ast::Visitor is deprecated and will be removed. You no longer need to inherit from this class."
 
-      def initialize(step_mother)
+      def initialize(runtime)
         raise(DEPRECATION_WARNING)
       end
     end

data/lib/cucumber/cli/configuration.rb

@@ -68,8 +68,8 @@ module Cucumber
         @options[:dotcucumber]
       end
 
-      def build_tree_walker(step_mother)
-        Ast::TreeWalker.new(step_mother, formatters(step_mother), self)
+      def build_tree_walker(runtime)
+        Ast::TreeWalker.new(runtime, formatters(runtime), self)
       end
 
       def formatter_class(format)
@@ -133,35 +133,35 @@ module Cucumber
         logger.level = Logger::DEBUG if self.verbose?
         logger
       end
-      
+
       def tag_expression
         Gherkin::TagExpression.new(@options[:tag_expressions])
       end
-      
+
       def filters
         @options.filters
       end
-      
+
       def formats
         @options[:formats]
       end
-      
+
       def options
         warn("Deprecated: Configuration#options will be removed from the next release of Cucumber. Please use the configuration object directly instead.")
         @options
       end
-      
+
       def paths
         @options[:paths].empty? ? ['features'] : @options[:paths]
       end
     private
 
-      def formatters(step_mother)
+      def formatters(runtime)
         # TODO: We should remove the autoformat functionality. That
         # can be done with the gherkin CLI.
         if @options[:autoformat]
           require 'cucumber/formatter/pretty'
-          return [Formatter::Pretty.new(step_mother, nil, @options)]
+          return [Formatter::Pretty.new(runtime, nil, @options)]
         end
 
         @options[:formats].map do |format_and_out|
@@ -169,7 +169,7 @@ module Cucumber
           path_or_io = format_and_out[1]
           begin
             formatter_class = formatter_class(format)
-            formatter_class.new(step_mother, path_or_io, @options)
+            formatter_class.new(runtime, path_or_io, @options)
           rescue Exception => e
             e.message << "\nError creating formatter: #{format}"
             raise e

data/lib/cucumber/cli/drb_client.rb

@@ -20,7 +20,7 @@ module Cucumber
           cloned_args = [] # I have no idea why this is needed, but if the regular args are sent then DRb magically transforms it into a DRb object - not an array
           args.each { |arg| cloned_args << arg }
           feature_server.run(cloned_args, error_stream, out_stream)
-        rescue DRb::DRbConnError => e
+        rescue DRb::DRbConnError
           raise DRbClientError, "No DRb server is running."
         end
 

data/lib/cucumber/cli/main.rb

@@ -32,7 +32,7 @@ module Cucumber
       def execute!(existing_runtime = nil)
         trap_interrupt
         return @drb_output if run_drb_client
-        
+
         runtime = if existing_runtime
           existing_runtime.configure(configuration)
           existing_runtime
@@ -42,7 +42,7 @@ module Cucumber
 
         runtime.run!
         runtime.write_stepdefs_json
-        runtime.results.failure?
+        runtime.results.failure? || Cucumber.wants_to_quit
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message
         true
@@ -58,7 +58,7 @@ module Cucumber
       end
 
       private
-      
+
       def run_drb_client
         return false unless configuration.drb?
         @drb_output = DRbClient.run(@args, @error_stream, @out_stream, configuration.drb_port)

data/lib/cucumber/cli/options.rb

@@ -61,7 +61,7 @@ module Cucumber
         @profiles = []
         @overridden_paths = []
         @options = default_options
-        
+
         @quiet = @disable_profile_loading = nil
       end
 
@@ -182,7 +182,7 @@ module Cucumber
             "Beware that if you want to use several negative tags to exclude several tags",
             "you have to use logical AND: --tags ~@fixme --tags ~@buggy.",
             "\n",
-            "Positive tags can be given a threshold to limit the number of occurrences.", 
+            "Positive tags can be given a threshold to limit the number of occurrences.",
             "Example: --tags @qa:3 will fail if there are more than 3 occurrences of the @qa tag.",
             "This can be practical if you are practicing Kanban or CONWIP.") do |v|
             @options[:tag_expressions] << v
@@ -375,6 +375,7 @@ module Cucumber
         @options[:source] &= other_options[:source]
         @options[:snippets] &= other_options[:snippets]
         @options[:strict] |= other_options[:strict]
+        @options[:dry_run] |= other_options[:dry_run]
 
         @profiles += other_options.profiles
         @expanded_args += other_options.expanded_args

data/lib/cucumber/cli/profile_loader.rb

@@ -15,7 +15,7 @@ module Cucumber
 Could not find profile: '#{profile}'
 
 Defined profiles in cucumber.yml:
-  * #{cucumber_yml.keys.join("\n  * ")}
+  * #{cucumber_yml.keys.sort.join("\n  * ")}
         END_OF_ERROR
         end
 

data/lib/cucumber/configuration.rb

@@ -4,46 +4,46 @@ module Cucumber
     def self.default
       new
     end
-    
+
     def self.parse(argument)
       return new(argument) if argument.is_a?(Hash)
       argument
     end
-    
+
     def initialize(user_options = {})
       @options = default_options.merge(user_options)
     end
-    
+
     def dry_run?
       @options[:dry_run]
     end
-    
+
     def guess?
       @options[:guess]
     end
-    
+
     def strict?
       @options[:strict]
     end
-    
-    def expand? 
+
+    def expand?
       @options[:expand]
     end
-    
+
     def paths
       @options[:paths]
     end
-    
+
     def autoload_code_paths
       @options[:autoload_code_paths]
     end
-  
+
   private
-  
+
     def default_options
       {
         :autoload_code_paths => ['features/support', 'features/step_definitions']
       }
     end
   end
-end
+end

data/lib/cucumber/constantize.rb

@@ -9,7 +9,7 @@ module Cucumber
 
         constant = ::Object
         names.each do |name|
-          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+          constant = constantize_name(constant, name)
         end
         constant
       rescue NameError => e
@@ -30,5 +30,14 @@ module Cucumber
         tr("-", "_").
         downcase
     end
+
+    private
+      def constantize_name(constant, name)
+        if Cucumber::RUBY_1_8_7
+          constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+        else
+          constant.const_defined?(name, false) ? constant.const_get(name, false) : constant.const_missing(name)
+        end
+      end
   end
-end
+end

data/lib/cucumber/core_ext/disable_mini_and_test_unit_autorun.rb

@@ -22,7 +22,7 @@ end
 
 # Do the same for Test::Unit
 begin
-  require 'test/unit'  
+  require 'test/unit'
   # Don't attempt to monkeypatch if the require succeeded but didn't
   # define the actual module.
   #

data/lib/cucumber/core_ext/instance_exec.rb

@@ -54,16 +54,16 @@ class Object #:nodoc:
 
   def cucumber_arity(block)
     a = block.arity
-    Cucumber::RUBY_1_9 ? a : (a == -1 ? 0 : a)
+    Cucumber::RUBY_1_8_7 ? (a == -1 ? 0 : a) : a
   end
-  
+
   def cucumber_compatible_arity?(args, block)
     ari = cucumber_arity(block)
     len = args.length
     return true if ari == len or ari < 0 && len >= ari.abs-1
     false
   end
-  
+
   def cucumber_run_with_backtrace_filtering(pseudo_method)
     begin
       yield
@@ -74,7 +74,7 @@ class Object #:nodoc:
     end
   end
 
-  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_1_9 || Cucumber::RUBY_1_8_7 || Cucumber::JRUBY) ? -3 : -4
+  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_2_0 || Cucumber::RUBY_1_9 || Cucumber::RUBY_1_8_7 || Cucumber::JRUBY) ? -3 : -4
 
   def replace_instance_exec_invocation_line!(backtrace, instance_exec_invocation_line, pseudo_method)
     return if Cucumber.use_full_backtrace

data/lib/cucumber/core_ext/proc.rb

@@ -2,7 +2,7 @@
 class Proc #:nodoc:
   PROC_PATTERN = /[\d\w]+@(.+):(\d+).*>/
   PWD = Dir.pwd
-  
+
   def to_comment_line
     "# #{file_colon_line}"
   end
@@ -26,9 +26,9 @@ class Proc #:nodoc:
   else
     # This Ruby implementation doesn't implement Proc#to_s correctly
     STDERR.puts "*** THIS RUBY IMPLEMENTATION DOESN'T REPORT FILE AND LINE FOR PROCS ***"
-    
+
     def file_colon_line
       "UNKNOWN:-1"
     end
   end
-end 
+end

data/lib/cucumber/errors.rb

@@ -7,7 +7,7 @@ module Cucumber
       super %{Undefined step: "#{step_name}"}
       @step_name = step_name
     end
-    
+
     def nested!
       @nested = true
     end

data/lib/cucumber/feature_file.rb

@@ -76,7 +76,7 @@ module Cucumber
     end
 
     private
-    
+
     def encoding_for(source)
       encoding = DEFAULT_ENCODING
       source.each_line do |line|

data/lib/cucumber/formatter/ansicolor.rb

@@ -2,16 +2,16 @@ require 'cucumber/platform'
 require 'cucumber/term/ansicolor'
 
 if Cucumber::IRONRUBY
-	begin
-		require 'iron-term-ansicolor'
-	rescue LoadError
-		STDERR.puts %{*** WARNING: You must "igem install iron-term-ansicolor" to get coloured ouput in on IronRuby}
-	end
+  begin
+    require 'iron-term-ansicolor'
+  rescue LoadError
+    STDERR.puts %{*** WARNING: You must "igem install iron-term-ansicolor" to get coloured ouput in on IronRuby}
+  end
 end
 
 if Cucumber::WINDOWS_MRI
   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}
+    STDERR.puts %{*** WARNING: You must use ANSICON 1.31 or higher (https://github.com/adoxa/ansicon/) to get coloured output on Windows}
     Cucumber::Term::ANSIColor.coloring = false
   end
 end
@@ -44,17 +44,19 @@ module Cucumber
     #
     # For instance, if your shell has a black background and a green font (like the
     # "Homebrew" settings for OS X' Terminal.app), you may want to override passed
-    # steps to be white instead of green. Examples:
+    # steps to be white instead of green.
+    #
+    # Although not listed, you can also use <tt>grey</tt>.
+    #
+    # Examples: (On Windows, use SET instead of export.)
     #
     #   export CUCUMBER_COLORS="passed=white"
     #   export CUCUMBER_COLORS="passed=white,bold:passed_param=white,bold,underline"
     #
-    # (If you're on Windows, use SET instead of export).
     # To see what colours and effects are available, just run this in your shell:
     #
     #   ruby -e "require 'rubygems'; require 'term/ansicolor'; puts Cucumber::Term::ANSIColor.attributes"
     #
-    # Although not listed, you can also use <tt>grey</tt>
     module ANSIColor
       include Cucumber::Term::ANSIColor
 
@@ -80,28 +82,39 @@ module Cucumber
         end
       end
 
-      ALIASES.each do |method, color|
-        unless method =~ /.*_param/
+      # Eval to define the color-named methods required by Term::ANSIColor.
+      #
+      # Examples:
+      #
+      #   def failed(string=nil, &proc)
+      #     red(string, &proc)
+      #   end
+      #
+      #   def failed_param(string=nil, &proc)
+      #     red(bold(string, &proc)) + red
+      #   end
+      ALIASES.each_key do |method_name|
+        unless method_name =~ /.*_param/
           code = <<-EOF
-          def #{method}(string=nil, &proc)
-            #{ALIASES[method].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method].split(",").length}
+          def #{method_name}(string=nil, &proc)
+            #{ALIASES[method_name].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method_name].split(",").length}
           end
           # This resets the colour to the non-param colour
-          def #{method}_param(string=nil, &proc)
-            #{ALIASES[method+'_param'].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method+'_param'].split(",").length} + #{ALIASES[method].split(",").join(' + ')}
+          def #{method_name}_param(string=nil, &proc)
+            #{ALIASES[method_name+'_param'].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method_name+'_param'].split(",").length} + #{ALIASES[method_name].split(",").join(' + ')}
           end
           EOF
           eval(code)
         end
       end
-      
+
       def self.define_grey #:nodoc:
         begin
           gem 'genki-ruby-terminfo'
           require 'terminfo'
           case TermInfo.default_object.tigetnum("colors")
           when 0
-            raise "Your terminal doesn't support colours"
+            raise "Your terminal doesn't support colours."
           when 1
             ::Cucumber::Term::ANSIColor.coloring = false
             alias grey white
@@ -114,7 +127,7 @@ module Cucumber
           if e.class.name == 'TermInfo::TermInfoError'
             STDERR.puts "*** WARNING ***"
             STDERR.puts "You have the genki-ruby-terminfo gem installed, but you haven't set your TERM variable."
-            STDERR.puts "Try setting it to TERM=xterm-256color to get grey colour in output"
+            STDERR.puts "Try setting it to TERM=xterm-256color to get grey colour in output."
             STDERR.puts "\n"
             alias grey white
           else
@@ -122,17 +135,17 @@ module Cucumber
           end
         end
       end
-      
+
       def self.define_real_grey #:nodoc:
-        def grey(m) #:nodoc:
+        def grey(string) #:nodoc:
           if ::Cucumber::Term::ANSIColor.coloring?
-            "\e[90m#{m}\e[0m"
+            "\e[90m#{string}\e[0m"
           else
-            m
+            string
           end
         end
       end
-      
+
       define_grey
 
       def cukes(n)