ci_reporter 1.8.1 → 1.8.2

data/Gemfile.lock

@@ -26,14 +26,14 @@ GEM
     rake (0.9.2.2)
     rcov (1.0.0)
     rdoc (3.9.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     spinach (0.1.5.3)

data/History.txt

@@ -1,3 +1,7 @@
+== 1.8.2 (12/04/12)
+
+- #80: Handle rspec-core 2.10.0 #format_backtrace regression and fix
+
 == 1.8.1 (12/03/12)
 
 - Manifest and gemspec for 1.8.0 was missing spinach files. Fixes #79.

data/README.rdoc

@@ -14,15 +14,21 @@ CI::Reporter works best with projects that use a +Rakefile+ along with the stand
 
     require 'ci/reporter/rake/rspec'     # use this if you're using RSpec
     require 'ci/reporter/rake/cucumber'  # use this if you're using Cucumber
+    require 'ci/reporter/rake/spinach'   # use this if you're using Spinach
     require 'ci/reporter/rake/test_unit' # use this if you're using Test::Unit
     require 'ci/reporter/rake/minitest'  # use this if you're using Ruby 1.9 or minitest
 
+Note: If you use both cucumber and spinach, you are likely to see strange errors, due to
+`gherkin` and `gherkin-ruby` both being loaded. So, you should choose only one of
+cucumber and spinach.
+
 2. Next, either modify your Rakefile to make the <code>ci:setup:rspec</code>, <code>ci:setup:cucumber</code>, <code>ci:setup:testunit</code> or <code>ci:setup:minitest</code> task a dependency of your test tasks, or run one of these rake tasks:
 
     rake ci:setup:testunit test
     rake ci:setup:minitest test
     rake ci:setup:rspec spec
     rake ci:setup:cucumber features
+    rake ci:setup:spinach features
 
 == Jenkins setup
 
@@ -41,6 +47,7 @@ If you don't have control over the Rakefile or don't want to modify it, CI::Repo
     rake -f GEM_PATH/stub.rake ci:setup:minitest test
     rake -f GEM_PATH/stub.rake ci:setup:rspec spec
     rake -f GEM_PATH/stub.rake ci:setup:cucumber features
+    rake -f GEM_PATH/stub.rake ci:setup:spinach features
 
 If for some reason you can't use the above technique to inject CI::Reporter (e.g., you're not using Rake), you'll have to do one of these:
 
@@ -55,6 +62,10 @@ If for some reason you can't use the above technique to inject CI::Reporter (e.g
 
     ruby -r GEM_PATH/lib/ci/reporter/rake/cucumber_loader -S cucumber --format CI::Reporter::Cucumber
 
+4. If you're using Spinach, you'll want to do this:
+
+    ruby -r GEM_PATH/lib/ci/reporter/rake/spinach_loader -S spinach
+
 There's a bit of a chicken and egg problem because rubygems needs to be loaded before you can require any CI::Reporter files.  If you cringe hard-coding a full path to a specific version of the gem, you can also copy the +cucumber_loader+ file into your project and require it directly -- the contents are version-agnostic and are not likely to change in future releases.
 
 == Environment Variables

data/acceptance/spinach/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    ci_reporter (1.7.3)
+    ci_reporter (1.8.2)
       builder (>= 2.1.2)
 
 GEM
@@ -19,7 +19,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    spinach (0.5.2)
+    spinach (0.6.0)
       colorize
       gherkin-ruby (~> 0.2.0)
 

data/ci_reporter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ci_reporter"
-  s.version = "1.8.1"
+  s.version = "1.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Sieger"]
-  s.date = "2012-12-03"
+  s.date = "2012-12-04"
   s.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."
   s.email = "nick@nicksieger.com"
   s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc"]

data/lib/ci/reporter/rspec.rb

@@ -14,6 +14,11 @@ module CI
         BaseFormatter = ::RSpec::Core::Formatters::BaseFormatter
         ProgressFormatter = ::RSpec::Core::Formatters::ProgressFormatter
         DocFormatter = ::RSpec::Core::Formatters::DocumentationFormatter
+        # See https://github.com/nicksieger/ci_reporter/issues/76 and
+        #     https://github.com/nicksieger/ci_reporter/issues/80
+        require 'rspec/version'
+        RSpec_2_12_0_bug = (::RSpec::Version::STRING == '2.12.0' &&
+                            !BaseFormatter.instance_methods(false).map(&:to_s).include?("format_backtrace"))
       rescue LoadError => first_error
         begin
           require 'spec/runner/formatter/progress_bar_formatter'
@@ -75,12 +80,8 @@ module CI
         output = []
         output.push "#{exception.class.name << ":"}" unless exception.class.name =~ /RSpec/
         output.push @exception.message
-        
-        format_metadata = if defined?(::RSpec::Core::BacktraceFormatter)
-          @example.metadata
-        else
-          @example
-        end
+
+        format_metadata = RSpecFormatters::RSpec_2_12_0_bug ? @example.metadata : @example
 
         [@formatter.format_backtrace(@exception.backtrace, format_metadata)].flatten.each do |backtrace_info|
           backtrace_info.lines.each do |line|

data/lib/ci/reporter/version.rb

@@ -6,6 +6,6 @@
 
 module CI
   module Reporter
-    VERSION = "1.8.1"
+    VERSION = "1.8.2"
   end
 end

data/spec/ci/reporter/rspec_spec.rb

@@ -132,8 +132,12 @@ describe "The RSpec reporter" 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')})
+      @rspec20_example = mock('RSpec2.0 Example',
+                              :execution_result => {:exception_encountered => StandardError.new('rspec2.0 ftw')},
+                              :metadata => {})
+      @rspec22_example = mock('RSpec2.2 Example',
+                              :execution_result => {:exception => StandardError.new('rspec2.2 ftw')},
+                              :metadata => {})
     end
 
     it 'should handle rspec (< 2.2) execution results' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci_reporter
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -238,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1579576962037098408
+      hash: 2792942240812227939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: