cucumber 1.1.9 → 1.2.0

data/lib/cucumber/ast/tree_walker.rb

@@ -100,16 +100,16 @@ module Cucumber
         end
       end
 
-      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        broadcast(keyword, step_match, multiline_arg, status, exception, source_indent, background) do
-          visit_step_name(keyword, step_match, status, source_indent, background)
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
+        broadcast(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line) do
+          visit_step_name(keyword, step_match, status, source_indent, background, file_colon_line)
           visit_multiline_arg(multiline_arg) if multiline_arg
           visit_exception(exception, status) if exception
         end
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent, background) #:nodoc:
-        broadcast(keyword, step_match, status, source_indent, background)
+      def visit_step_name(keyword, step_match, status, source_indent, background, file_colon_line) #:nodoc:
+        broadcast(keyword, step_match, status, source_indent, background, file_colon_line)
       end
 
       def visit_multiline_arg(multiline_arg) #:nodoc:

data/lib/cucumber/cli/options.rb

@@ -9,10 +9,6 @@ module Cucumber
       BUILTIN_FORMATS = {
         'html'        => ['Cucumber::Formatter::Html',        'Generates a nice looking HTML report.'],
         'pretty'      => ['Cucumber::Formatter::Pretty',      'Prints the feature as is - in colours.'],
-        'pdf'         => ['Cucumber::Formatter::Pdf',         "Generates a PDF report. You need to have the\n" +
-                                                              "#{INDENT}prawn gem installed. Will pick up logo from\n" +
-                                                              "#{INDENT}features/support/logo.png or\n" +
-                                                              "#{INDENT}features/support/logo.jpg if present."],
         'progress'    => ['Cucumber::Formatter::Progress',    'Prints one character per scenario.'],
         'rerun'       => ['Cucumber::Formatter::Rerun',       'Prints failing files with line numbers.'],
         'usage'       => ['Cucumber::Formatter::Usage',       "Prints where step definitions are used.\n" +
@@ -42,6 +38,7 @@ module Cucumber
         "on Ruby's LOAD_PATH, for example in a Ruby gem."
       ]
       DRB_FLAG = '--drb'
+      DRB_OPTIONAL_FLAG = '--[no-]drb'
       PROFILE_SHORT_FLAG = '-p'
       NO_PROFILE_SHORT_FLAG = '-P'
       PROFILE_LONG_FLAG = '--profile'
@@ -214,7 +211,7 @@ module Cucumber
           opts.on("-c", "--[no-]color",
             "Whether or not to use ANSI color in the output. Cucumber decides",
             "based on your platform and the output destination if not specified.") do |v|
-            Term::ANSIColor.coloring = v
+            Cucumber::Term::ANSIColor.coloring = v
           end
           opts.on("-d", "--dry-run", "Invokes formatters without executing the steps.",
             "This also omits the loading of your support/env.rb file if it exists.") do
@@ -225,7 +222,7 @@ module Cucumber
             "Be careful if you choose to overwrite the originals.",
             "Implies --dry-run --format pretty.") do |directory|
             @options[:autoformat] = directory
-            Term::ANSIColor.coloring = false
+            Cucumber::Term::ANSIColor.coloring = false
             @options[:dry_run] = true
             @quiet = true
           end
@@ -265,8 +262,8 @@ module Cucumber
           opts.on("-x", "--expand", "Expand Scenario Outline Tables in output.") do
             @options[:expand] = true
           end
-          opts.on(DRB_FLAG, "Run features against a DRb server. (i.e. with the spork gem)") do
-            @options[:drb] = true
+          opts.on(DRB_OPTIONAL_FLAG, "Run features against a DRb server. (i.e. with the spork gem)") do |drb|
+            @options[:drb] = drb
           end
           opts.on("--port PORT", "Specify DRb port.  Ignored without --drb") do |port|
             @options[:drb_port] = port

data/lib/cucumber/formatter/ansicolor.rb

@@ -1,10 +1,5 @@
-begin
-  require 'term/ansicolor'
-rescue LoadError
-  require 'rubygems'
-  require 'term/ansicolor'
-end
 require 'cucumber/platform'
+require 'cucumber/term/ansicolor'
 
 if Cucumber::IRONRUBY
 	begin
@@ -17,11 +12,11 @@ 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}
-    Term::ANSIColor.coloring = false
+    Cucumber::Term::ANSIColor.coloring = false
   end
 end
 
-Term::ANSIColor.coloring = false if !STDOUT.tty? && !ENV.has_key?('AUTOTEST')
+Cucumber::Term::ANSIColor.coloring = false if !STDOUT.tty? && !ENV.has_key?("AUTOTEST")
 
 module Cucumber
   module Formatter
@@ -57,11 +52,11 @@ module Cucumber
     # (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 Term::ANSIColor.attributes"
+    #   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 Term::ANSIColor
+      include Cucumber::Term::ANSIColor
 
       ALIASES = Hash.new do |h,k|
         if k.to_s =~ /(.*)_param/
@@ -108,7 +103,7 @@ module Cucumber
           when 0
             raise "Your terminal doesn't support colours"
           when 1
-            ::Term::ANSIColor.coloring = false
+            ::Cucumber::Term::ANSIColor.coloring = false
             alias grey white
           when 2..8
             alias grey white
@@ -130,7 +125,7 @@ module Cucumber
       
       def self.define_real_grey #:nodoc:
         def grey(m) #:nodoc:
-          if ::Term::ANSIColor.coloring?
+          if ::Cucumber::Term::ANSIColor.coloring?
             "\e[90m#{m}\e[0m"
           else
             m

data/lib/cucumber/formatter/cucumber.css

@@ -21,7 +21,7 @@ body {
   float: right;
   margin: 0 0 0 10px;
 }
-.cucumber .scenario h3, td .scenario h3, th .scenario h3 {
+.cucumber .scenario h3, td .scenario h3, th .scenario h3, .background h3 {
   font-size: 11px;
   padding: 3px;
   margin: 0;
@@ -29,6 +29,12 @@ body {
   color: white;
   font-weight: bold;
 }
+
+.background h3 {
+  font-size: 1.2em;
+  background: #666;
+}
+
 .cucumber h1, td h1, th h1 {
   margin: 0px 10px 0px 10px;
   padding: 10px;

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -46,7 +46,7 @@ module Cucumber
         end
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         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)

data/lib/cucumber/formatter/html.rb

@@ -143,7 +143,7 @@ module Cucumber
   
       def background_name(keyword, name, file_colon_line, source_indent)
         @listing_background = true
-        @builder.h3 do |h3|
+        @builder.h3(:id => "background_#{@scenario_number}") do |h3|
           @builder.span(keyword, :class => 'keyword')
           @builder.text!(' ')
           @builder.span(name, :class => 'val')
@@ -221,7 +221,7 @@ module Cucumber
         move_progress
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         @step_match = step_match
         @hide_this_step = false
         if exception
@@ -241,7 +241,7 @@ module Cucumber
         @builder << "<li id='#{@step_id}' class='step #{status}'>"            
       end
 
-      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         return if @hide_this_step
         # print snippet for undefined steps
         if status == :undefined
@@ -254,7 +254,7 @@ module Cucumber
         print_messages
       end
 
-      def step_name(keyword, step_match, status, source_indent, background)
+      def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
         @step_matches ||= []
         background_in_scenario = background && !@listing_background
         @skip_step = @step_matches.index(step_match) || background_in_scenario
@@ -513,7 +513,7 @@ module Cucumber
       def inline_js_content
         <<-EOF
 
-  SCENARIOS = "h3[id^='scenario_']";
+  SCENARIOS = "h3[id^='scenario_'],h3[id^=background_]";
   
   $(document).ready(function() {
     $(SCENARIOS).css('cursor', 'pointer');

data/lib/cucumber/formatter/interceptor.rb

@@ -0,0 +1,62 @@
+
+module Cucumber
+  module Formatter
+    module Interceptor
+      class Pipe
+        attr_reader :pipe, :buffer
+        def initialize(pipe)
+          @pipe = pipe
+          @buffer = []
+          @wrapped = true
+        end
+
+        def write(str)
+          @buffer << str if @wrapped
+          return @pipe.write(str)
+        end
+
+        def unwrap!
+          @wrapped = false
+          @pipe
+        end
+
+        def method_missing(method, *args, &blk)
+          @pipe.send(method, *args, &blk)
+        end
+
+        def self.validate_pipe(pipe)
+          unless [:stdout, :stderr].include? pipe
+            raise ArgumentError, '#wrap only accepts :stderr or :stdout'
+          end
+        end
+
+        def self.unwrap!(pipe)
+          validate_pipe pipe
+          wrapped = nil
+          case pipe
+          when :stdout
+            wrapped = $stdout
+            $stdout = wrapped.unwrap!
+          when :stderr
+            wrapped = $stderr
+            $stderr = wrapped.unwrap!
+          end
+          wrapped
+        end
+
+        def self.wrap(pipe)
+          validate_pipe pipe
+
+          case pipe
+          when :stderr
+            $stderr = self.new($stderr)
+            return $stderr
+          when :stdout
+            $stdout = self.new($stdout)
+            return $stdout
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/junit.rb

@@ -1,5 +1,6 @@
 require 'cucumber/formatter/ordered_xml_markup'
 require 'cucumber/formatter/io'
+require 'cucumber/formatter/interceptor'
 require 'fileutils'
 
 module Cucumber
@@ -7,13 +8,13 @@ module Cucumber
     # The formatter used for <tt>--format junit</tt>
     class Junit
       include Io
-      
+
       class UnNamedFeatureError < StandardError
         def initialize(feature_file)
           super("The feature in '#{feature_file}' does not have a name. The JUnit XML format requires a name for the testsuite element.")
         end
       end
-      
+
       def initialize(step_mother, io, options)
         @reportdir = ensure_dir(io, "junit")
         @options = options
@@ -24,13 +25,17 @@ module Cucumber
         @failures = @errors = @tests = @skipped = 0
         @builder = OrderedXmlMarkup.new( :indent => 2 )
         @time = 0
+        # In order to fill out <system-err/> and <system-out/>, we need to
+        # intercept the $stderr and $stdout
+        @interceptedout = Interceptor::Pipe.wrap(:stdout)
+        @interceptederr = Interceptor::Pipe.wrap(:stderr)
       end
-      
+
       def before_feature_element(feature_element)
         @in_examples = Ast::ScenarioOutline === feature_element
         @steps_start = Time.now
       end
-      
+
       def after_feature(feature)
         @testsuite = OrderedXmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
@@ -42,15 +47,24 @@ module Cucumber
           :time => "%.6f" % @time,
           :name => @feature_name ) do
           @testsuite << @builder.target!
+          @testsuite.tag!('system-out') do
+            @testsuite.cdata! @interceptedout.buffer.join
+          end
+          @testsuite.tag!('system-err') do
+            @testsuite.cdata! @interceptederr.buffer.join
+          end
         end
 
         write_file(feature_result_filename(feature.file), @testsuite.target!)
+
+        Interceptor::Pipe.unwrap! :stdout
+        Interceptor::Pipe.unwrap! :stderr
       end
 
       def before_background(*args)
         @in_background = true
       end
-      
+
       def after_background(*args)
         @in_background = false
       end
@@ -68,10 +82,10 @@ module Cucumber
 
       def before_steps(steps)
       end
-      
+
       def after_steps(steps)
         return if @in_background || @in_examples
-        
+
         duration = Time.now - @steps_start
         if steps.failed?
           steps.each { |step| @output += "#{step.keyword}#{step.name}\n" }
@@ -79,12 +93,12 @@ module Cucumber
         end
         build_testcase(duration, steps.status, steps.exception)
       end
-      
+
       def before_examples(*args)
         @header_row = true
         @in_examples = true
       end
-      
+
       def after_examples(*args)
         @in_examples = false
       end
@@ -106,7 +120,7 @@ module Cucumber
           end
           build_testcase(duration, table_row.status, table_row.exception, name_suffix)
         end
-        
+
         @header_row = false if @header_row
       end
 
@@ -114,7 +128,7 @@ module Cucumber
 
       def build_testcase(duration, status, exception = nil, suffix = "")
         @time += duration
-        classname = "#{@feature_name}.#{@scenario}"
+        classname = @feature_name
         name = "#{@scenario}#{suffix}"
         pending = [:pending, :undefined].include?(status)
         passed = (status == :passed || (pending && !@options[:strict]))
@@ -131,6 +145,8 @@ module Cucumber
             @builder.skipped
             @skipped += 1
           end
+          @builder.tag!('system-out')
+          @builder.tag!('system-err')
         end
         @tests += 1
       end
@@ -138,15 +154,15 @@ module Cucumber
       def format_exception(exception)
         (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
       end
-      
+
       def feature_result_filename(feature_file)
         File.join(@reportdir, "TEST-#{basename(feature_file)}.xml")
       end
-      
+
       def basename(feature_file)
         File.basename(feature_file.gsub(/[\\\/]/, '-'), '.feature')
       end
-      
+
       def write_file(feature_filename, data)
         File.open(feature_filename, 'w') { |file| file.write(data) }
       end

data/lib/cucumber/formatter/pretty.rb

@@ -129,7 +129,7 @@ module Cucumber
         @indent = 6
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         @hide_this_step = false
         if exception
           if @exceptions.include?(exception)
@@ -145,7 +145,7 @@ module Cucumber
         @status = status
       end
 
-      def step_name(keyword, step_match, status, source_indent, background)
+      def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
         return if @hide_this_step
         source_indent = nil unless @options[:source]
         name_to_report = format_step(keyword, step_match, status, source_indent)
@@ -203,7 +203,7 @@ module Cucumber
         cell_text = escape_cell(value.to_s || '')
         padded = cell_text + (' ' * (width - cell_text.unpack('U*').length))
         prefix = cell_prefix(status)
-        @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Term::ANSIColor.reset(" |"))
+        @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Cucumber::Term::ANSIColor.reset(" |"))
         @io.flush
       end
 

data/lib/cucumber/formatter/progress.rb

@@ -37,7 +37,7 @@ module Cucumber
         @exception_raised = false
       end
 
-      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         progress(status)
         @status = status
       end

data/lib/cucumber/formatter/rerun.rb

@@ -76,7 +76,7 @@ module Cucumber
         return unless @in_examples
       end
 
-      def step_name(keyword, step_match, status, source_indent, background)
+      def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
         @rerun = true if [:failed, :pending, :undefined].index(status)
       end