cucumber 0.8.6 → 0.8.7

data/lib/cucumber/formatter/io.rb

@@ -1,9 +1,11 @@
+require 'cucumber/formatter/color_io'
+
 module Cucumber
   module Formatter
     module Io
       def ensure_io(path_or_io, name)
         return nil if path_or_io.nil?
-        return path_or_io if path_or_io.respond_to?(:write)
+        return path_or_io if ColorIO === path_or_io || path_or_io.respond_to?(:write)
         file = File.open(path_or_io, Cucumber.file_mode('w'))
         at_exit do
           unless file.closed?
@@ -28,4 +30,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/formatter/json.rb

@@ -1,29 +1,166 @@
-require 'cucumber/formatter/gherkin_formatter_adapter'
-require 'cucumber/formatter/io'
-require 'gherkin/formatter/argument'
-require 'gherkin/formatter/json_formatter'
+require "json"
+require "cucumber/formatter/io"
 
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format json</tt>
-    class Json < GherkinFormatterAdapter
+    class Json
+      class Error < StandardError
+      end
+
       include Io
 
       def initialize(step_mother, io, options)
-        @io = ensure_io(io, "json")
-        @obj = {'features' => []}
-        super(Gherkin::Formatter::JSONFormatter.new(nil), false)
+        @io      = ensure_io(io, "json")
+        @options = options
+      end
+
+      def before_features(features)
+        @json = {:features => []}
+      end
+
+      def before_feature(feature)
+        @current_object = {:file => feature.file, :name => feature.name}
+        @json[:features] << @current_object
+      end
+
+      def before_tags(tags)
+        @current_object[:tags] = tags.tag_names.to_a
+      end
+
+      def before_background(background)
+        background = {}
+        @current_object[:background] = background
+        @current_object = background
+      end
+
+      def after_background(background)
+        @current_object = last_feature
+      end
+
+      def before_feature_element(feature_element)
+        elements = @current_object[:elements] ||= []
+
+        # change current object to the feature_element
+        @current_object = {}
+        elements << @current_object
+      end
+
+      def scenario_name(keyword, name, file_colon_line, source_indent)
+        @current_object[:keyword] = keyword
+        @current_object[:name] = name
+        @current_object[:file_colon_line] = file_colon_line
+      end
+
+      def before_steps(steps)
+        @current_object[:steps] = []
+      end
+
+      def before_step(step)
+        @current_step = {}
+        @current_object[:steps] << @current_step
       end
 
-      def after_feature(feature)
-        super
-        @obj['features'] << @gf.gherkin_object
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        if exception
+          @current_step[:exception] = exception_hash_for(exception)
+        end
+      end
+
+      def step_name(keyword, step_match, status, source_indent, background)
+        @current_step[:status]          = status
+        @current_step[:keyword]         = keyword
+        @current_step[:name]            = "#{step_match.name || step_match.format_args}"
+        @current_step[:file_colon_line] = step_match.file_colon_line
+      end
+
+      def after_step(step)
+        @current_step = nil
+      end
+
+      def before_examples(examples)
+        @current_object[:examples] = {}
+      end
+
+      def examples_name(keyword, name)
+        @current_object[:examples][:name] = "#{keyword} #{name}"
+      end
+
+      def before_outline_table(*args)
+        @current_object[:examples][:table] = []
+      end
+
+      def before_table_row(row)
+        @current_row = {:cells => []}
+
+        if @current_object.member? :examples
+          @current_object[:examples][:table] << @current_row
+        elsif @current_step
+          (@current_step[:table] ||= []) << @current_row
+        else
+          internal_error
+        end
+      end
+
+      def table_cell_value(value, status)
+        @current_row[:cells] << {:text => value, :status => status}
+      end
+
+      def after_table_row(row)
+        if row.exception
+          @current_row[:exception] = exception_hash_for(row.exception)
+        end
+        @current_row = nil
+      end
+
+      def py_string(string)
+        @current_step[:py_string] = string
+      end
+
+      def after_feature_element(feature_element)
+        # change current object back to the last feature
+        @current_object = last_feature
       end
 
       def after_features(features)
-        @io.write(@obj.to_json)
+        @io.write json_string
+        @io.flush
       end
-    end
-  end
-end
+
+      def embed(file, mime_type)
+        obj = @current_step || @current_object
+        obj[:embedded] ||= []
+
+        obj[:embedded] << {
+          :file      => file,
+          :mime_type => mime_type,
+          :data      => [File.read(file)].pack("m*") # base64
+        }
+      end
+
+      private
+
+      def json_string
+        @json.to_json
+      end
+
+      def last_feature
+        @json[:features].last
+      end
+
+      def exception_hash_for(e)
+        {
+          :class     => e.class.name,
+          :message   => e.message,
+          :backtrace => e.backtrace
+        }
+      end
+
+      def internal_error
+        raise Error, "you've found a bug in the JSON formatter!"
+      end
+
+    end # Json
+  end # Formatter
+end # Cucumber
 

data/lib/cucumber/formatter/json_pretty.rb

@@ -1,13 +1,14 @@
-require 'cucumber/formatter/json'
+require "cucumber/formatter/json"
 
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format json_pretty</tt>
     class JsonPretty < Json
-      def after_features(features)
-        @io.write(JSON.pretty_generate(@obj))
+
+      def json_string
+        JSON.pretty_generate @json
       end
+
     end
   end
-end
-
+end

data/lib/cucumber/formatter/junit.rb

@@ -21,22 +21,17 @@ module Cucumber
 
       def before_feature(feature)
         @current_feature = feature
-        @failures = @errors = @tests = @skipped = 0
+        @failures = @errors = @tests = 0
         @builder = OrderedXmlMarkup.new( :indent => 2 )
         @time = 0
       end
       
-      def before_feature_element(feature_element)
-        @in_examples = Ast::ScenarioOutline === feature_element
-      end
-      
       def after_feature(feature)
         @testsuite = OrderedXmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
         @testsuite.testsuite(
           :failures => @failures,
           :errors => @errors,
-          :skipped => @skipped,
           :tests => @tests,
           :time => "%.6f" % @time,
           :name => @feature_name ) do
@@ -61,8 +56,13 @@ module Cucumber
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
-        @scenario = (name.nil? || name == "") ? "Unnamed scenario" : name.split("\n")[0]
-        @output = "#{keyword}: #{@scenario}\n\n"
+        # TODO: What's all this ugly weird code doing? Why not just use keyword and name????
+        scenario_name = name.strip.delete(".\r\n")
+        scenario_name = "Unnamed scenario" if name == ""
+        @scenario = scenario_name
+        description = "Scenario"
+        description << " outline" if keyword.include?('Scenario Outline')
+        @output = "#{description}: #{@scenario}\n\n"
       end
 
       def before_steps(steps)
@@ -96,7 +96,7 @@ module Cucumber
       end
 
       def after_table_row(table_row)
-        return unless @in_examples and Cucumber::Ast::OutlineTable::ExampleRow === table_row
+        return unless @in_examples
         duration = Time.now - @table_start
         unless @header_row
           name_suffix = " (outline example : #{table_row.name})"
@@ -116,23 +116,20 @@ module Cucumber
         @time += duration
         classname = "#{@feature_name}.#{@scenario}"
         name = "#{@scenario}#{suffix}"
-        pending = [:pending, :undefined].include?(status)
-        passed = (status == :passed || (pending && !@options[:strict]))
-
-        @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
-          unless passed
-            @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
-              @builder.cdata! @output
-              @builder.cdata!(format_exception(exception)) if exception
+        failed = (status == :failed || (status == :pending && @options[:strict]))
+        #puts "FAILED:!!#{failed}"
+        if status == :passed || failed
+          @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
+            if failed
+              @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
+                @builder.text! @output
+                @builder.text!(format_exception(exception)) if exception
+              end
+              @failures += 1
             end
-            @failures += 1
-          end
-          if passed and (status == :skipped || pending)
-            @builder.skipped
-            @skipped += 1
           end
+          @tests += 1
         end
-        @tests += 1
       end
 
       def format_exception(exception)
@@ -140,12 +137,9 @@ module Cucumber
       end
       
       def feature_result_filename(feature_file)
-        File.join(@reportdir, "TEST-#{basename(feature_file)}.xml")
-      end
-      
-      def basename(feature_file)
         ext_length = File.extname(feature_file).length
-        feature_file.gsub('features/', '').gsub(File::SEPARATOR, '_')[0...-ext_length]
+        basename = File.basename(feature_file)[0...-ext_length]
+        File.join(@reportdir, "TEST-#{basename}.xml")
       end
       
       def write_file(feature_filename, data)

data/lib/cucumber/formatter/pdf.rb

@@ -28,9 +28,9 @@ module Cucumber
         @file = ensure_file(path_or_io, "pdf")
 
         if(options[:dry_run])
-          @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK, :putsd => GREY}
+          @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK, :announced => GREY}
         else
-          @status_colors = { :passed => '055902', :skipped => GREY, :undefined => 'F27405', :failed => '730202', :putsd => GREY}
+          @status_colors = { :passed => '055902', :skipped => GREY, :undefined => 'F27405', :failed => '730202', :announced => GREY}
         end
 
         @pdf = Prawn::Document.new
@@ -71,9 +71,9 @@ module Cucumber
         end
       end
 
-      def puts(message)
-        @pdf.fill_color(@status_colors[:putsd])  
-        @pdf.text message, :size => 10
+      def announce(announcement)
+        @pdf.fill_color(@status_colors[:announced])  
+        @pdf.text announcement, :size => 10
         @pdf.fill_color BLACK
       end
 
@@ -172,7 +172,7 @@ module Cucumber
         end
       end
 
-      def before_doc_string(string)
+      def before_py_string(string)
         return if @hide_this_step
         s = %{"""\n#{string}\n"""}.indent(10)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}

data/lib/cucumber/formatter/pretty.rb

@@ -25,7 +25,7 @@ module Cucumber
         @exceptions = []
         @indent = 0
         @prefixes = options[:prefixes] || {}
-        @delayed_messages = []
+        @delayed_announcements = []
       end
 
       def after_features(features)
@@ -101,7 +101,7 @@ module Cucumber
       end
       
       def examples_name(keyword, name)
-        @io.puts unless @visiting_first_example_name
+        puts unless @visiting_first_example_name
         @visiting_first_example_name = false
         names = name.strip.empty? ? [name.strip] : name.split("\n")
         @io.puts("    #{keyword}: #{names[0]}")
@@ -150,10 +150,10 @@ module Cucumber
         source_indent = nil unless @options[:source]
         name_to_report = format_step(keyword, step_match, status, source_indent)
         @io.puts(name_to_report.indent(@scenario_indent + 2))
-        print_messages
+        print_announcements
       end
 
-      def doc_string(string)
+      def py_string(string)
         return if @hide_this_step
         s = %{"""\n#{string}\n"""}.indent(@indent)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}.join("\n")
@@ -184,7 +184,7 @@ module Cucumber
 
       def after_table_row(table_row)
         return if !@table || @hide_this_step
-        print_table_row_messages
+        print_table_row_announcements
         @io.puts
         if table_row.exception && !@exceptions.include?(table_row.exception)
           print_exception(table_row.exception, table_row.status, @indent)

data/lib/cucumber/formatter/rerun.rb

@@ -21,21 +21,17 @@ module Cucumber
         @file_names = []
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
-      
-      def before_feature(*)
-        @lines = []
-        @file = nil
-      end
-      
-      def after_feature(*)
-        after_first_time do
-          @io.print ' '
-        end
-        @io.print "#{@file}:#{@lines.join(':')}"
-        @io.flush
-      end
 
+      # 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
 
@@ -46,21 +42,14 @@ module Cucumber
       def after_feature_element(feature_element)
         if @rerun
           file, line = *feature_element.file_colon_line.split(':')
-          @lines << line
-          @file = file
+          @file_colon_lines[file] << line
+          @file_names << file
         end
       end
 
       def step_name(keyword, step_match, status, source_indent, background)
         @rerun = true if [:failed, :pending, :undefined].index(status)
       end
-      
-    private
-    
-      def after_first_time
-        yield if @not_first_time
-        @not_first_time = true
-      end
     end
   end
 end

data/lib/cucumber/formatter/tag_cloud.rb

@@ -0,0 +1,35 @@
+require 'cucumber/formatter/io'
+require 'cucumber/formatter/pretty'
+
+module Cucumber
+  module Formatter
+    # The formatter used for <tt>--format tag_cloud</tt>
+    # Custom formatter that prints a tag cloud as a table.
+    class TagCloud
+      include Io
+
+      def initialize(step_mother, path_or_io, options)
+        @io = ensure_io(path_or_io, "tag_cloud")
+        @options = options
+        @counts = Hash.new{|h,k| h[k] = 0}
+      end
+
+      def after_features(features)
+        print_summary(features)
+      end
+
+      def tag_name(tag_name)
+        @counts[tag_name] += 1
+      end
+      
+      private
+  
+      def print_summary(features)
+        matrix = @counts.to_a.sort{|paira, pairb| paira[0] <=> pairb[0]}.transpose
+        table = Cucumber::Ast::Table.new(matrix)
+        formatter = Cucumber::Formatter::Pretty.new(@step_mother, @io, {})
+        Cucumber::Ast::TreeWalker.new(@step_mother, [formatter], {}).visit_multiline_arg(table)
+      end
+    end
+  end
+end