ci_reporter 1.6.4 → 1.6.5

data/History.txt

@@ -1,3 +1,10 @@
+== 1.6.5 (06/14/11)
+
+- Works with RSpec up to 2.6.x
+- GH #31: Better output formatting for RSpec 2 (Michael Giambalvo)
+- Better ruby-test/TestUnit version support (amfranz)
+- Prevent XML files from being overwritten (dpree)
+
 == 1.6.4 (12/21/10)
 
 - RSpec 2.2+ support (thanks emi)

data/Rakefile

@@ -4,6 +4,7 @@ MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "LICENSE.txt",
 begin
   File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
   require 'hoe'
+  Hoe.plugin :rubyforge
   require File.dirname(__FILE__) + '/lib/ci/reporter/version'
   hoe = Hoe.spec("ci_reporter") do |p|
     p.version = CI::Reporter::VERSION
@@ -19,7 +20,6 @@ begin
     p.extra_deps << ['builder', ">= 2.1.2"]
   end
   hoe.spec.files = MANIFEST
-  hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
   hoe.spec.rdoc_options += ["-SHN", "-f", "darkfish"]
 
   task :gemspec do

data/lib/ci/reporter/cucumber.rb

@@ -101,7 +101,12 @@ module CI
       end
 
       def before_table_row(table_row)
-        @test_case = TestCase.new("#@scenario (outline: #{table_row.name})")
+        row = table_row # shorthand for table_row
+        # check multiple versions of the row and try to find the best fit
+        outline = (row.respond_to? :name)             ? row.name :
+                  (row.respond_to? :scenario_outline) ? row.scenario_outline :
+                                                        row.to_s
+        @test_case = TestCase.new("#@scenario (outline: #{outline})")
         @test_case.start
       end
 

data/lib/ci/reporter/rake/test_unit_loader.rb

@@ -5,6 +5,7 @@
 $: << File.dirname(__FILE__) + "/../../.."
 require 'ci/reporter/test_unit'
 
+# Intercepts mediator creation in ruby-test < 2.1
 module Test #:nodoc:all
   module Unit
     module UI
@@ -19,3 +20,17 @@ module Test #:nodoc:all
     end
   end
 end
+
+# Intercepts mediator creation in ruby-test >= 2.1
+module Test #:nodoc:all
+  module Unit
+    module UI
+      class TestRunner
+        def setup_mediator
+          # swap in our custom mediator
+          @mediator = CI::Reporter::TestUnit.new(@suite)
+        end
+      end
+    end
+  end
+end

data/lib/ci/reporter/report_manager.rb

@@ -14,10 +14,44 @@ module CI #:nodoc:
       end
       
       def write_report(suite)
-        File.open("#{@basename}-#{suite.name.gsub(/[^a-zA-Z0-9]+/, '-')}.xml", "w") do |f|
+        File.open(filename_for(suite), "w") do |f|
           f << suite.to_xml
         end
       end
+      
+    private
+    
+
+      # creates a uniqe filename per suite
+      # to prevent results from being overwritten
+      # if a result file is already written, it appends an index
+      # e.g.
+      #   SPEC-MailsController.xml
+      #   SPEC-MailsController.0.xml
+      #   SPEC-MailsController.1.xml
+      #   SPEC-MailsController...xml
+      #   SPEC-MailsController.N.xml
+      #
+      # with N < 100000, to prevent endless sidestep loops
+      MAX_SIDESTEPS = 100000
+      #
+      def filename_for(suite)
+        basename = "#{@basename}-#{suite.name.gsub(/[^a-zA-Z0-9]+/, '-')}"
+        suffix = "xml"
+        
+        # the initial filename, e.g. SPEC-MailsController.xml
+        filename = [basename, suffix].join(".")
+        
+        # if the initial filename is already in use
+        # do sidesteps, beginning with SPEC-MailsController.0.xml
+        i = 0
+        while File.exists?(filename) && i < MAX_SIDESTEPS
+          filename = [basename, i, suffix].join(".")
+          i += 1
+        end
+        
+        filename
+      end
     end
   end
 end

data/lib/ci/reporter/rspec.rb

@@ -49,7 +49,8 @@ module CI
     end
 
     class RSpec2Failure < RSpecFailure
-      def initialize(example)
+      def initialize(example, formatter)
+        @formatter = formatter
         @example = example
         @exception = @example.execution_result[:exception] || @example.execution_result[:exception_encountered]
       end
@@ -57,6 +58,17 @@ module CI
       def failure?
         exception.is_a?(::RSpec::Expectations::ExpectationNotMetError)
       end
+
+      def location() 
+        output = []
+        output.push "#{exception.class.name << ":"}" unless exception.class.name =~ /RSpec/
+        output.push @exception.message
+
+        @formatter.format_backtrace(@exception.backtrace, @example).each do |backtrace_info|
+          output.push "     #{backtrace_info}"
+        end
+        output.join "\n"
+      end
     end
 
     # Custom +RSpec+ formatter used to hook into the spec runs and capture results.
@@ -91,6 +103,10 @@ module CI
         @formatter.example_group_started(example_group)
         new_suite(description_for(example_group))
       end
+      
+      def example_group_finished(example_group)
+        @formatter.example_group_finished(example_group)
+      end
 
       def example_started(name_or_example)
         @formatter.example_started(name_or_example)
@@ -106,7 +122,7 @@ module CI
         example_started(name_or_example) if @suite.testcases.empty?
 
         if name_or_example.respond_to?(:execution_result) # RSpec 2
-          failure = RSpec2Failure.new(name_or_example)
+          failure = RSpec2Failure.new(name_or_example, @formatter)
         else
           failure = RSpecFailure.new(rest[1]) # example_failed(name, counter, failure) in RSpec 1
         end
@@ -137,6 +153,10 @@ module CI
         @formatter.start_dump
       end
 
+      def dump_failures(*args)
+        @formatter.dump_failures(*args)
+      end
+
       def dump_failure(*args)
         @formatter.dump_failure(*args)
       end

data/lib/ci/reporter/test_unit.rb

@@ -14,6 +14,7 @@ module CI
       def self.new(fault)
         return TestUnitFailure.new(fault) if fault.kind_of?(Test::Unit::Failure)
         return TestUnitSkipped.new(fault) if Test::Unit.constants.include?("Omission") && (fault.kind_of?(Test::Unit::Omission) || fault.kind_of?(Test::Unit::Pending))
+        return TestUnitNotification.new(fault) if Test::Unit.constants.include?("Notification") && fault.kind_of?(Test::Unit::Notification)
         TestUnitError.new(fault)
       end
     end
@@ -48,6 +49,16 @@ module CI
       def location() @fault.location.join("\n") end
     end
 
+    # Wrapper around a <code>Test::Unit</code> 2.0 notification.
+    class TestUnitNotification
+      def initialize(fault) @fault = fault end
+      def failure?() false end
+      def error?() false end
+      def name() Test::Unit::Notification.name end
+      def message() @fault.message end
+      def location() @fault.location.join("\n") end
+    end
+
     # Replacement Mediator that adds listeners to capture the results of the <code>Test::Unit</code> runs.
     class TestUnit < Test::Unit::UI::TestRunnerMediator
       def initialize(suite, report_mgr = nil)

data/lib/ci/reporter/version.rb

@@ -1,5 +1,5 @@
 module CI
   module Reporter
-    VERSION = "1.6.4"
+    VERSION = "1.6.5"
   end
 end

data/spec/ci/reporter/rspec_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2010 Nick Sieger <nicksieger@gmail.com>
+# Copyright (c) 2006-2011 Nick Sieger <nicksieger@gmail.com>
 # See the file LICENSE.txt included with the distribution for
 # software license details.
 
@@ -123,21 +123,23 @@ describe "The RSpec reporter" do
     @fmt.example_failed("should fail", 1, @error)
     @fmt.dump_summary(0.1, 1, 0, 0)
   end
-  
+
   describe 'RSpec2Failure' do
     before(:each) do
+      @formatter = mock "formatter"
+      @formatter.should_receive(:format_backtrace).and_return("backtrace")
       @rspec20_example = mock('RSpec2.0 Example', :execution_result => {:exception_encountered => StandardError.new('rspec2.0 ftw')})
       @rspec22_example = mock('RSpec2.2 Example', :execution_result => {:exception => StandardError.new('rspec2.2 ftw')})
     end
 
     it 'should handle rspec (< 2.2) execution results' do
-      failure = CI::Reporter::RSpec2Failure.new(@rspec20_example)
+      failure = CI::Reporter::RSpec2Failure.new(@rspec20_example, @formatter)
       failure.name.should_not be_nil
       failure.message.should == 'rspec2.0 ftw'
       failure.location.should_not be_nil
     end
     it 'should handle rspec (>= 2.2) execution results' do
-      failure = CI::Reporter::RSpec2Failure.new(@rspec22_example)
+      failure = CI::Reporter::RSpec2Failure.new(@rspec22_example, @formatter)
       failure.name.should_not be_nil
       failure.message.should == 'rspec2.2 ftw'
       failure.location.should_not be_nil

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ci_reporter
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 1
-    - 6
-    - 4
-  version: 1.6.4
+  prerelease: 
+  version: 1.6.5
 platform: ruby
 authors: 
   - Nick Sieger
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -06:00
+date: 2011-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 1
-              - 2
             version: 2.1.2
     type: :runtime
     version_requirements: *id001
@@ -40,13 +32,20 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 0
-              - 4
             version: 2.0.4
     type: :development
     version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: hoe
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.9.4
+    type: :development
+    version_requirements: *id003
 description: CI::Reporter is an add-on to Test::Unit, RSpec and Cucumber that allows you to generate XML reports of your test, spec and/or feature runs. The resulting files can be read by a continuous integration system that understands Ant's JUnit report XML format, thus allowing your CI system to track test/spec successes and failures.
 email: nick@nicksieger.com
 executables: []
@@ -106,21 +105,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: CI::Reporter allows you to generate reams of XML for use with continuous integration systems.