cucumber 0.4.0 → 0.4.1

data/features/listener_debugger_formatter.feature

@@ -0,0 +1,41 @@
+Feature: Listener Debugger
+  In order to easily visualise the listener API
+  As a developer
+  I want a formatter that prints the calls to the listener as a feature is run
+
+  Background:
+    Given a standard Cucumber project directory structure
+
+  Scenario: title
+    Given a file named "features/sample.feature" with:
+      """
+      Feature: Sample
+
+        Scenario: Sample
+          Given Sample
+
+      """
+    When I run cucumber -f debug features/sample.feature
+    Then it should pass with
+      """
+      before_features
+        before_feature
+          before_tags
+          after_tags
+          feature_name
+          before_feature_element
+            before_tags
+            after_tags
+            scenario_name
+            before_steps
+              before_step
+                before_step_result
+                  step_name
+                after_step_result
+              after_step
+            after_steps
+          after_feature_element
+        after_feature
+      after_features
+
+      """

data/features/post_configuration_hook.feature

@@ -26,7 +26,7 @@ Feature: Post Configuration Hook [#423]
     And a file named "features/support/env.rb" with:
       """
       AfterConfiguration do |config|
-        config.out_stream << "AfterConfiguration hook read feature directories: #{config.feature_dirs}" 
+        config.out_stream << "AfterConfiguration hook read feature directories: #{config.feature_dirs.join(', ')}" 
       end
       """
     When I run cucumber features

data/features/report_called_undefined_steps.feature

@@ -2,7 +2,6 @@ Feature: Cucumber command line
   In order to find out what step definitions need to be implemented
   Developers should always see what step definition is missing
 
-  @mri186
   Scenario: Get info at arbitrary levels of nesting
     When I run cucumber features/call_undefined_step_from_step_def.feature
     Then it should pass with

data/features/step_definitions/simplest_steps.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'ruby-debug'
-
 Given /^this step works$/ do
 end
 

data/features/support/env.rb

@@ -39,13 +39,17 @@ class CucumberWorld
 
   # The last standard out, with the duration line taken out (unpredictable)
   def last_stdout
-    strip_duration(@last_stdout)
+    strip_1_9_paths(strip_duration(@last_stdout))
   end
 
   def strip_duration(s)
     s.gsub(/^\d+m\d+\.\d+s\n/m, "")
   end
 
+  def strip_1_9_paths(s)
+    s.gsub(/#{Dir.pwd}\/examples\/self_test\/tmp/m, ".").gsub(/#{Dir.pwd}\/examples\/self_test/m, ".")
+  end
+
   def replace_duration(s, replacement)
     s.gsub(/\d+m\d+\.\d+s/m, replacement)
   end

data/features/transform.feature

@@ -38,7 +38,7 @@ Feature: transform
       end
 
       Transform /^'(\d+)' to a Float$/ do |integer_string|
-        Float.induced_from Transform("'#{integer_string}' to an Integer")
+        Transform("'#{integer_string}' to an Integer").to_f
       end
 
       Transform(/^('\w+') to Nil$/) {|str| nil }

data/features/usage_and_stepdefs_formatter.feature

@@ -3,7 +3,6 @@ Feature: Cucumber command line
   steps and step definitions, Cucumber must provide a way to
   display how they are related.
 
-  @mri186
   Scenario: List usage of step definitions
     When I run cucumber features --format usage --dry-run
     Then STDERR should be empty
@@ -137,8 +136,7 @@ Feature: Cucumber command line
 
       """
 
-    @mri186
-    Scenario: --format steps
+      Scenario: --format steps
       When I run cucumber features --format stepdefs --dry-run
       Then STDERR should be empty
       And it should pass with

data/features/work_in_progress.feature

@@ -49,7 +49,6 @@ Feature: Cucumber --work-in-progress switch
       end
       """
 
-  @mri186
   Scenario: Pass with Failing Scenarios
     When I run cucumber -q -w -t @failing features/wip.feature
     Then STDERR should be empty
@@ -91,7 +90,6 @@ Feature: Cucumber --work-in-progress switch
 
       """
 
-  @mri186
   Scenario: Pass with Undefined Scenarios
     When I run cucumber -q -w -t @pending features/wip.feature
     Then it should pass with

data/gem_tasks/features.rake

@@ -1,8 +1,13 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'cucumber/rake/task'
+require 'cucumber/platform'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--format progress}
+  if(Cucumber::JRUBY)
+    t.profile = 'jruby'
+  elsif(Cucumber::WINDOWS_MRI)
+    t.profile = 'windows_mri'
+  end
   t.rcov = ENV['RCOV']
 end
 

data/gem_tasks/rspec.rake

@@ -1,40 +1,8 @@
-def unable_to_load
-  STDERR.puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-    
-EOS
-  nil
-end
-
-def require_spec
+begin
   require 'spec/expectations'
-rescue LoadError
-  require_spec_with_rubygems
-end
+  require 'spec/rake/spectask'
 
-def require_spec_with_rubygems
-  require 'rubygems'
-  require 'spec/expectations'
-rescue LoadError
-  unable_to_load
-end
-
-if require_spec
-  begin
-    require 'spec/rake/spectask'
-  rescue LoadError
-    unable_to_load
-  end
-
-  def undefine_task(*names)
-    app = Rake.application
-    tasks = app.instance_variable_get('@tasks')
-    names.flatten.each { |name| tasks.delete(name) }
-  end
-  undefine_task('spec') # Hoe 1.2.12 is broken - it defines a spec task that we can't tweak.
-
-  desc "Run the Cucumber specs"
+  desc "Run RSpec"
   Spec::Rake::SpecTask.new do |t|
     t.spec_opts = ['--options', "spec/spec.opts"]
     t.spec_files = FileList['spec/**/*_spec.rb']
@@ -42,4 +10,6 @@ if require_spec
     t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
     t.verbose = true
   end
+rescue LoadError
+  task :spec
 end

data/gem_tasks/sdoc.rake

@@ -1,7 +1,12 @@
-require 'sdoc' # and use your RDoc task the same way you used it before
+begin
+  require 'rake/rdoctask'
+  require 'sdoc' # and use your RDoc task the same way you used it before
 
-Rake::RDocTask.new(:sdoc) do |rdoc|
-  rdoc.rdoc_dir = 'doc/sdoc'
-  rdoc.options += %w{--fmt shtml -N --webcvs=http://github.com/aslakhellesoy/cucumber/blob/v0.3.96/%s --title "Cucumber API" --threads 4 --main README --exclude cucumber/parser lib}
-  rdoc.template = 'direct' # lighter template used on railsapi.com
+  Rake::RDocTask.new(:sdoc) do |rdoc|
+    rdoc.rdoc_dir = 'doc/sdoc'
+    rdoc.title = "Cucumber"
+    rdoc.options += %w{--fmt shtml -N --webcvs=http://github.com/aslakhellesoy/cucumber/blob/v0.3.96/%s --title "Cucumber API" --threads 4 --main README --exclude cucumber/parser lib}
+    rdoc.template = 'direct' # lighter template used on railsapi.com
+  end
+rescue LoadError => ignore
 end

data/lib/autotest/cucumber_mixin.rb

@@ -118,6 +118,12 @@ module Autotest::CucumberMixin
     # No --color option as some IDEs (Netbeans) don't output them very well (1 failed step)
     args += %w{--format rerun --out} << dirty_features_filename
     args << (features_to_run == :all ? "features" : features_to_run)
+    
+    # Unless I do this, all the steps turn up undefined during the rerun...
+    unless features_to_run == :all
+      args << 'features/step_definitions' << 'features/support'
+    end
+    
     args = args.join(' ')
 
     return "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} #{args}"

data/lib/cucumber.rb

@@ -4,7 +4,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'yaml'
 require 'cucumber/platform'
 require 'cucumber/parser'
-require 'cucumber/version'
 require 'cucumber/step_mother'
 require 'cucumber/cli/main'
 require 'cucumber/broadcaster'

data/lib/cucumber/ast/step_invocation.rb

@@ -105,6 +105,9 @@ module Cucumber
 
       def filter_backtrace(e)
         return e if Cucumber.use_full_backtrace
+        pwd = /#{Dir.pwd}\//m
+        (e.backtrace || []).each{|line| line.gsub!(pwd, "./")}
+        
         filtered = (e.backtrace || []).reject do |line|
           BACKTRACE_FILTER_PATTERNS.detect { |p| line =~ p }
         end

data/lib/cucumber/cli/configuration.rb

@@ -135,8 +135,13 @@ module Cucumber
             unless File.directory?(out)
               out = File.open(out, Cucumber.file_mode('w'))
               at_exit do
-                out.flush
-                out.close
+                
+                # Since Spork "never" actually exits, I want to flush and close earlier...
+                unless out.closed?
+                  out.flush
+                  out.close
+                end
+                
               end
             end
           end

data/lib/cucumber/cli/options.rb

@@ -18,9 +18,10 @@ module Cucumber
                                                          "#{' ' * 51}is not shown, and step definitions are sorted by\n" +
                                                          "#{' ' * 51}filename instead."],
         'stepdefs'  => ['Cucumber::Formatter::Stepdefs', "Prints All step definitions with their locations. Same as\n" +
-                                                         "the usage formatter, except that steps are not printed."],
+                                                         "#{' ' * 51}the usage formatter, except that steps are not printed."],
         'junit'     => ['Cucumber::Formatter::Junit',    'Generates a report similar to Ant+JUnit.'],
-        'tag_cloud' => ['Cucumber::Formatter::TagCloud', 'Prints a tag cloud of tag usage.']
+        'tag_cloud' => ['Cucumber::Formatter::TagCloud', 'Prints a tag cloud of tag usage.'],
+        'debug'     => ['Cucumber::Formatter::Debug',    'For developing formatters - prints the calls made to the listeners.']
       }
       max = BUILTIN_FORMATS.keys.map{|s| s.length}.max
       FORMAT_HELP = (BUILTIN_FORMATS.keys.sort.map do |key|
@@ -232,12 +233,12 @@ module Cucumber
             @options[:drb_port] = port
           end
           opts.on_tail("--version", "Show version.") do
-            @out_stream.puts VERSION::STRING
-            Kernel.exit
+            @out_stream.puts Cucumber::VERSION
+            Kernel.exit(0)
           end
           opts.on_tail("-h", "--help", "You're looking at it.") do
             @out_stream.puts opts.help
-            Kernel.exit
+            Kernel.exit(0)
           end
         end.parse!
  
@@ -359,12 +360,12 @@ module Cucumber
           raise("No language with key #{lang}")
         end
         LanguageHelpFormatter.list_keywords(@out_stream, lang)
-        Kernel.exit
+        Kernel.exit(0)
       end
 
       def list_languages_and_exit
         LanguageHelpFormatter.list_languages(@out_stream)
-        Kernel.exit
+        Kernel.exit(0)
       end
 
       def print_profile_information

data/lib/cucumber/core_ext/proc.rb

@@ -13,6 +13,7 @@ class Proc #:nodoc:
   if Proc.new{}.to_s =~ PROC_PATTERN
     def file_colon_line
       path, line = *to_s.match(PROC_PATTERN)[1..2]
+      line = line.to_i - 1 if Cucumber::RUBY_1_9
       path = File.expand_path(path)
       pwd = Dir.pwd
       path = path[pwd.length+1..-1]

data/lib/cucumber/formatter/ansicolor.rb

@@ -1,4 +1,3 @@
-gem 'term-ansicolor'
 require 'term/ansicolor'
 
 if Cucumber::WINDOWS_MRI
@@ -9,14 +8,6 @@ if Cucumber::WINDOWS_MRI
     STDERR.puts %{*** WARNING: You must "gem install win32console" (1.2.0 or higher) to get coloured output on MRI/Windows}
     Term::ANSIColor.coloring = false
   end
-elsif Cucumber::WINDOWS && Cucumber::JRUBY
-  begin
-    gem 'aslakhellesoy-ansicolor', '>= 1.0'
-    require 'ansicolor'
-  rescue LoadError
-    STDERR.puts %{*** WARNING: You must "gem install aslakhellesoy-ansicolor --source http://gems.github.com" (1.0 or higher) to get coloured output on JRuby/Windows}
-    Term::ANSIColor.coloring = false
-  end
 end
 
 Term::ANSIColor.coloring = false if !STDOUT.tty? and not ENV.has_key?("AUTOTEST")

data/lib/cucumber/formatter/console.rb

@@ -126,26 +126,28 @@ module Cucumber
       end
 
       def print_tag_limit_warnings(options)
-        first_tag = true
-        options[:tag_names].each do |tag_name, limit|
-          unless Ast::Tags.exclude_tag?(tag_name)
-            tag_frequnecy = @tag_occurences[tag_name].size
-            if limit && tag_frequnecy > limit
-              @io.puts if first_tag
-              first_tag = false
-              @io.puts format_string("#{tag_name} occurred #{tag_frequnecy} times, but the limit was set to #{limit}", :failed)
-              @tag_occurences[tag_name].each {|location| @io.puts format_string("  #{location}", :failed)}
-              @io.flush
+        if @tag_occurrences
+          first_tag = true
+          options[:tag_names].each do |tag_name, limit|
+            unless Ast::Tags.exclude_tag?(tag_name)
+              tag_frequency = @tag_occurrences[tag_name].size
+              if limit && tag_frequency > limit
+                @io.puts if first_tag
+                first_tag = false
+                @io.puts format_string("#{tag_name} occurred #{tag_frequency} times, but the limit was set to #{limit}", :failed)
+                @tag_occurrences[tag_name].each {|location| @io.puts format_string("  #{location}", :failed)}
+                @io.flush
+              end
             end
           end
         end
       end
 
       def record_tag_occurrences(feature_element, options)
-        @tag_occurences ||= Hash.new{|k,v| k[v] = []}
+        @tag_occurrences ||= Hash.new{|k,v| k[v] = []}
         options[:tag_names].each do |tag_name, limit|
           if !Ast::Tags.exclude_tag?(tag_name) && feature_element.tag_count(tag_name) > 0
-            @tag_occurences[tag_name] << feature_element.file_colon_line
+            @tag_occurrences[tag_name] << feature_element.file_colon_line
           end
         end
       end

data/lib/cucumber/formatter/debug.rb

@@ -0,0 +1,33 @@
+require 'cucumber/formatter/progress'
+require 'cucumber/step_definition_light'
+
+module Cucumber
+  module Formatter
+    class Debug
+      def initialize(step_mother, io, options)
+        @io = io
+        @indent = 0
+      end
+      
+      def respond_to?(*args)
+        true
+      end
+      
+      def method_missing(name, *args)
+        @indent -= 2 if name.to_s =~ /^after/
+        print(name)
+        @indent += 2 if name.to_s =~ /^before/
+      end
+      
+    private
+      
+      def print(text)
+        @io.puts "#{indent}#{text}"
+      end
+      
+      def indent
+        (' ' * @indent)
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/pretty.rb

@@ -148,8 +148,8 @@ module Cucumber
       def step_name(keyword, step_match, status, source_indent, background)
         return if @hide_this_step
         source_indent = nil unless @options[:source]
-        formatted_step_name = format_step(keyword, step_match, status, source_indent)
-        @io.puts(formatted_step_name.indent(@scenario_indent + 2))
+        name_to_report = format_step(keyword, step_match, status, source_indent)
+        @io.puts(name_to_report.indent(@scenario_indent + 2))
       end
 
       def py_string(string)

data/lib/cucumber/formatter/rerun.rb

@@ -18,19 +18,22 @@ module Cucumber
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
 
-      def features(features)
-        super
+      # features() is never executed at all... ?
+      def after_features(features)
         files = @file_names.uniq.map do |file|
           lines = @file_colon_lines[file]
           "#{file}:#{lines.join(':')}"
         end
         @io.puts files.join(' ')
+        
+        # Flusing output to rerun tempfile here...
+        @io.flush
+        @io.close
       end
 
-      def feature_element(feature_element)
-        @rerun = false
-        super
-        if @rerun
+      # feature_element() is never executed at all, either... ?
+      def after_feature_element(feature_element)
+        if feature_element.failed?
           file, line = *feature_element.file_colon_line.split(':')
           @file_colon_lines[file] << line
           @file_names << file