cucumber 1.2.5 → 1.3.0

data/lib/cucumber/ast/step_collection.rb

@@ -9,6 +9,10 @@ module Cucumber
         @steps.each{|step| step.step_collection = self}
       end
 
+      def inspect
+        @steps.map { |s| [s.class, s.object_id] }.join(', ')
+      end
+
       def accept(visitor)
         return if Cucumber.wants_to_quit
         @steps.each do |step|
@@ -24,10 +28,18 @@ module Cucumber
         })
       end
 
+      def skip_invoke!
+        @steps.each{|step_invocation| step_invocation.skip_invoke!}
+      end
+
       def step_invocations_from_cells(cells)
         @steps.map{|step| step.step_invocation_from_cells(cells)}
       end
 
+      def +(step_invocations)
+        dup(step_invocations)
+      end
+
       # Duplicates this instance and adds +step_invocations+ to the end
       def dup(step_invocations = [])
         StepCollection.new(@steps + step_invocations)
@@ -68,6 +80,10 @@ module Cucumber
         :passed
       end
 
+      def length
+        @steps.length
+      end
+
       def to_sexp
         @steps.map{|step| step.to_sexp}
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -107,6 +107,9 @@ module Cucumber
 
       # This constant is appended to by Cuke4Duke. Do not change its name
       BACKTRACE_FILTER_PATTERNS = [/vendor\/rails|lib\/cucumber|bin\/cucumber:|lib\/rspec|gems\/|minitest|test\/unit/]
+      if(Cucumber::JRUBY)
+        BACKTRACE_FILTER_PATTERNS << /org\/jruby/
+      end
       PWD_PATTERN = /#{Regexp.escape(Dir.pwd)}\//m
 
       # This is to work around double ":in " segments in JRuby backtraces. JRuby bug?
@@ -178,7 +181,7 @@ module Cucumber
       end
 
       def language
-        @step.language
+        @step.language || raise("Language is required on #{@step}")
       end
 
       def gherkin_statement

data/lib/cucumber/ast/tree_walker.rb

@@ -9,6 +9,13 @@ module Cucumber
         @runtime, @listeners, @configuration = runtime, listeners, configuration
       end
 
+      def execute(scenario, skip_hooks)
+        runtime.with_hooks(scenario, skip_hooks) do
+          scenario.skip_invoke! if scenario.failed?
+          visit_steps(scenario.steps)
+        end
+      end
+
       def visit_features(features)
         broadcast(features) do
           features.accept(self)

data/lib/cucumber/cli/configuration.rb

@@ -68,6 +68,10 @@ module Cucumber
         @options[:dotcucumber]
       end
 
+      def snippet_type
+        @options[:snippet_type] || :regexp
+      end
+
       def build_tree_walker(runtime)
         Ast::TreeWalker.new(runtime, formatters(runtime), self)
       end
@@ -106,7 +110,7 @@ module Cucumber
       end
 
       def feature_files
-        potential_feature_files = paths.map do |path|
+        potential_feature_files = with_default_features_path(paths).map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.chomp('/')
           if File.directory?(path)
@@ -123,7 +127,9 @@ module Cucumber
       end
 
       def feature_dirs
-        paths.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
+        dirs = paths.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
+        dirs.delete('.') unless paths.include?('.')
+        with_default_features_path(dirs)
       end
 
       def log
@@ -152,9 +158,14 @@ module Cucumber
       end
 
       def paths
-        @options[:paths].empty? ? ['features'] : @options[:paths]
+        @options[:paths]
       end
     private
+      def with_default_features_path(paths)
+        return ['features'] if paths.empty?
+        paths
+      end
+
 
       def formatters(runtime)
         # TODO: We should remove the autoformat functionality. That
@@ -193,6 +204,7 @@ module Cucumber
       def arrange_formats
         @options[:formats] << ['pretty', @out_stream] if @options[:formats].empty?
         @options[:formats] = @options[:formats].sort_by{|f| f[1] == @out_stream ? -1 : 1}
+        @options[:formats].uniq!
         streams = @options[:formats].map { |(_, stream)| stream }
         if streams != streams.uniq
           raise "All but one formatter must use --out, only one can print to each stream (or STDOUT)"

data/lib/cucumber/cli/main.rb

@@ -21,11 +21,15 @@ module Cucumber
         end
       end
 
-      def initialize(args, out_stream = STDOUT, error_stream = STDERR)
-        @args         = args
-        @out_stream   = out_stream
-
-        @error_stream = error_stream
+      def initialize(args, stdin=STDIN, out=STDOUT, err=STDERR, kernel=Kernel)
+        raise "args can't be nil" unless args
+        raise "out can't be nil" unless out
+        raise "err can't be nil" unless err
+        raise "kernel can't be nil" unless kernel
+        @args   = args
+        @out    = out
+        @err    = err
+        @kernel = kernel
         @configuration = nil
       end
 
@@ -42,16 +46,25 @@ module Cucumber
 
         runtime.run!
         runtime.write_stepdefs_json
-        runtime.results.failure? || Cucumber.wants_to_quit
+        failure = runtime.results.failure? || Cucumber.wants_to_quit
+        @kernel.exit(failure ? 1 : 0)
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
-        @error_stream.puts e.message
-        true
+        @err.puts(e.message)
+      rescue SystemExit => e
+        @kernel.exit(e.status)
+      rescue Errno::EACCES, Errno::ENOENT => e
+        @err.puts("#{e.message} (#{e.class})")
+        @kernel.exit(1)
+      rescue Exception => e
+        @err.puts("#{e.message} (#{e.class})")
+        @err.puts(e.backtrace.join("\n"))
+        @kernel.exit(1)
       end
 
       def configuration
         return @configuration if @configuration
 
-        @configuration = Configuration.new(@out_stream, @error_stream)
+        @configuration = Configuration.new(@out, @err)
         @configuration.parse!(@args)
         Cucumber.logger = @configuration.log
         @configuration
@@ -61,10 +74,10 @@ module Cucumber
 
       def run_drb_client
         return false unless configuration.drb?
-        @drb_output = DRbClient.run(@args, @error_stream, @out_stream, configuration.drb_port)
+        @drb_output = DRbClient.run(@args, @err, @out, configuration.drb_port)
         true
       rescue DRbClientError => e
-        @error_stream.puts "WARNING: #{e.message} Running features locally:"
+        @err.puts "WARNING: #{e.message} Running features locally:"
       end
 
       def trap_interrupt

data/lib/cucumber/cli/options.rb

@@ -1,5 +1,6 @@
 require 'cucumber/cli/profile_loader'
 require 'cucumber/formatter/ansicolor'
+require 'cucumber/rb_support/rb_language'
 
 module Cucumber
   module Cli
@@ -46,7 +47,8 @@ module Cucumber
       OPTIONS_WITH_ARGS = ['-r', '--require', '--i18n', '-f', '--format', '-o', '--out',
                                   '-t', '--tags', '-n', '--name', '-e', '--exclude',
                                   PROFILE_SHORT_FLAG, PROFILE_LONG_FLAG,
-                                  '-a', '--autoformat', '-l', '--lines', '--port']
+                                  '-a', '--autoformat', '-l', '--lines', '--port',
+                                  '-I', '--snippet-type']
 
       def self.parse(args, out_stream, error_stream, options = {})
         new(out_stream, error_stream, options).parse!(args)
@@ -57,10 +59,11 @@ module Cucumber
         @error_stream = error_stream
 
         @default_profile = options[:default_profile]
-        @skip_profile_information = options[:skip_profile_information]
         @profiles = []
         @overridden_paths = []
         @options = default_options
+        @profile_loader = options[:profile_loader]
+        @options[:skip_profile_information] = options[:skip_profile_information]
 
         @quiet = @disable_profile_loading = nil
       end
@@ -238,6 +241,12 @@ module Cucumber
           opts.on("-i", "--no-snippets", "Don't print snippets for pending steps.") do
             @options[:snippets] = false
           end
+          opts.on("-I", "--snippet-type TYPE",
+                  "Use different snippet type (Default: regexp). Available types:",
+                  *Cucumber::RbSupport::RbLanguage.cli_snippet_type_options) do |v|
+            @options[:snippet_type] = v.to_sym
+          end
+
           opts.on("-q", "--quiet", "Alias for --no-snippets --no-source.") do
             @quiet = true
           end
@@ -293,7 +302,6 @@ module Cucumber
         @options[:paths] = @args.dup #whatver is left over
 
         merge_profiles
-        print_profile_information
 
         self
       end
@@ -343,11 +351,20 @@ module Cucumber
         @profiles << @default_profile if default_profile_should_be_used?
 
         @profiles.each do |profile|
-          profile_args = profile_loader.args_from(profile)
-          reverse_merge(
-            Options.parse(profile_args, @out_stream, @error_stream, :skip_profile_information  => true)
-          )
+          merge_with_profile(profile)
         end
+
+        @options[:profiles] = @profiles
+      end
+
+      def merge_with_profile(profile)
+        profile_args = profile_loader.args_from(profile)
+        profile_options = Options.parse(
+          profile_args, @out_stream, @error_stream,
+          :skip_profile_information => true,
+          :profile_loader => profile_loader
+        )
+        reverse_merge(profile_options)
       end
 
       def default_profile_should_be_used?
@@ -402,15 +419,6 @@ module Cucumber
         Kernel.exit(0)
       end
 
-      def print_profile_information
-        return if @skip_profile_information || @profiles.empty?
-        profiles_sentence = ''
-        profiles_sentence = @profiles.size == 1 ? @profiles.first :
-          "#{@profiles[0...-1].join(', ')} and #{@profiles.last}"
-
-        @out_stream.puts "Using the #{profiles_sentence} profile#{'s' if @profiles.size> 1}..."
-      end
-
       def default_options
         {
           :strict       => false,

data/lib/cucumber/configuration.rb

@@ -38,6 +38,10 @@ module Cucumber
       @options[:autoload_code_paths]
     end
 
+    def snippet_type
+      @options[:snippet_type]
+    end
+
   private
 
     def default_options

data/lib/cucumber/core_ext/disable_mini_and_test_unit_autorun.rb

@@ -1,39 +1,15 @@
-# Why: http://groups.google.com/group/cukes/browse_thread/thread/5682d41436e235d7
-begin
-  require 'minitest/unit'
-  # Don't attempt to monkeypatch if the require succeeded but didn't
-  # define the actual module.
-  #
-  # https://github.com/cucumber/cucumber/pull/93
-  # http://youtrack.jetbrains.net/issue/TW-17414
-  if defined?(MiniTest::Unit)
-    class MiniTest::Unit
-      class << self
-        @@installed_at_exit = true
-      end
-
-      def run(*)
-        0
-      end
-    end
-  end
-rescue LoadError => ignore
-end
-
-# Do the same for Test::Unit
 begin
   require 'test/unit'
-  # Don't attempt to monkeypatch if the require succeeded but didn't
-  # define the actual module.
-  #
-  # https://github.com/cucumber/cucumber/pull/93
-  # http://youtrack.jetbrains.net/issue/TW-17414
-  if defined?(Test::Unit)
-    module Test::Unit
-      def self.run?
-        true
-      end
-    end
+
+  if defined?(Test::Unit::AutoRunner.need_auto_run?)
+    # For test-unit gem >= 2.4.9
+    Test::Unit::AutoRunner.need_auto_run = false
+  elsif defined?(Test::Unit.run?)
+    # For test-unit gem < 2.4.9
+    Test::Unit.run = true
+  elsif defined?(Test::Unit::Runner)
+    # For test/unit bundled in Ruby >= 1.9.3
+    Test::Unit::Runner.module_eval("@@stop_auto_run = true")
   end
 rescue LoadError => ignore
 end

data/lib/cucumber/core_ext/instance_exec.rb

@@ -87,8 +87,11 @@ class Object #:nodoc:
       else
         backtrace[replacement_line].gsub!(/`.*'/, "`#{pseudo_method}'") if pseudo_method
       end
-      backtrace[replacement_line+1..-1] = nil
 
+      depth = backtrace.count { |line| line == instance_exec_invocation_line }
+      end_pos = depth > 1 ? instance_exec_pos : -1
+
+      backtrace[replacement_line+1..end_pos] = nil
       backtrace.compact!
     else
       # This happens with rails, because they screw up the backtrace

data/lib/cucumber/core_ext/proc.rb

@@ -1,4 +1,5 @@
 # Proc extension to get more location info out of a proc
+require 'cucumber/platform'
 class Proc #:nodoc:
   PROC_PATTERN = /[\d\w]+@(.+):(\d+).*>/
   PWD = Dir.pwd
@@ -16,6 +17,7 @@ class Proc #:nodoc:
       path, line = *to_s.match(PROC_PATTERN)[1..2]
       path = File.expand_path(path)
       pwd = File.expand_path(PWD)
+      pwd.force_encoding(path.encoding) unless Cucumber::RUBY_1_8_7
       if path.index(pwd)
         path = path[pwd.length+1..-1]
       elsif path =~ /.*\/gems\/(.*\.rb)$/

data/lib/cucumber/feature_file.rb

@@ -22,24 +22,21 @@ module Cucumber
       end
     end
 
-    # Parses a file and returns a Cucumber::Ast
+    # Parses a file and returns a Cucumber::Ast::Feature
     # If +configuration_filters+ contains any filters, the result will
     # be filtered.
     def parse(configuration_filters, tag_counts)
       filters = @lines || configuration_filters
 
-      builder             = Cucumber::Parser::GherkinBuilder.new
+      builder             = Cucumber::Parser::GherkinBuilder.new(@path)
       filter_formatter    = filters.empty? ? builder : Gherkin::Formatter::FilterFormatter.new(builder, filters)
       tag_count_formatter = Gherkin::Formatter::TagCountFormatter.new(filter_formatter, tag_counts)
       parser              = Gherkin::Parser::Parser.new(tag_count_formatter, true, "root", false)
 
       begin
         parser.parse(source, @path, 0)
-        ast = builder.ast
-        return nil if ast.nil? # Filter caused nothing to match
-        ast.language = parser.i18n_language
-        ast.file = @path
-        ast
+        builder.language = parser.i18n_language
+        builder.result
       rescue Gherkin::Lexer::LexingError, Gherkin::Parser::ParseError => e
         e.message.insert(0, "#{@path}: ")
         raise e
@@ -65,11 +62,7 @@ module Cucumber
           raise e
         rescue Errno::ENOENT => e
           # special-case opening features, because this could be a new user:
-          if(@path == 'features')
-            STDERR.puts("You don't have a 'features' directory.  Please create one to get started.",
-                        "See http://cukes.info/ for more information.")
-            exit 1
-          end
+          e.message << ". Please create a #{@path} directory to get started."
           raise e
         end
       end

data/lib/cucumber/formatter/console.rb

@@ -192,6 +192,16 @@ module Cucumber
         @delayed_messages = []
       end
 
+      def print_profile_information
+        return if @options[:skip_profile_information] || @options[:profiles].nil? || @options[:profiles].empty?
+        profiles = @options[:profiles]
+        profiles_sentence = ''
+        profiles_sentence = profiles.size == 1 ? profiles.first :
+          "#{profiles[0...-1].join(', ')} and #{profiles.last}"
+
+        @io.puts "Using the #{profiles_sentence} profile#{'s' if profiles.size> 1}..."
+      end
+
     private
 
     FORMATS = Hash.new{ |hash, format| hash[format] = method(format).to_proc }

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -6,9 +6,9 @@ module Cucumber
     # 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)
+      def initialize(gherkin_formatter, print_empty_match)
         @gf = gherkin_formatter
-        @print_emtpy_match = print_emtpy_match
+        @print_empty_match = print_empty_match
       end
 
       def before_feature(feature)
@@ -36,7 +36,7 @@ module Cucumber
 
       def before_step(step)
         @gf.step(step.gherkin_statement)
-        if @print_emtpy_match
+        if @print_empty_match
           if(@outline)
             match = Gherkin::Formatter::Model::Match.new(step.gherkin_statement.outline_args, nil)
           else
@@ -51,7 +51,7 @@ module Cucumber
         arguments = step_match.step_arguments.map{|a| Gherkin::Formatter::Argument.new(a.offset, a.val)}
         location = step_match.file_colon_line
         match = Gherkin::Formatter::Model::Match.new(arguments, location)
-        if @print_emtpy_match
+        if @print_empty_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