ci_reporter 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,11 @@
+== 1.3.4
+
+- Call #to_s on the object passed in as the test suite name; compatibility fix for RSpec
+  trunk which passes a Spec::DSL::Description instead of a string
+- Fix broken spec due to pending feature introduced in recent RSpec
+- Fix compatibility for JRuby
+- Add stub.rake file as another way to wrap existing Rakefile, with note in README
+
 == 1.3.3
 
 - Use SPEC_OPTS instead of RSPECOPTS (Aslak Hellesøy)

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 README.txt
 LICENSE.txt
 Rakefile
+stub.rake
 lib/ci/reporter/core.rb
 lib/ci/reporter/rake/rspec.rb
 lib/ci/reporter/rake/rspec_loader.rb

data/README.txt

@@ -33,6 +33,11 @@ Report files are written, by default, to the <code>test/reports</code> or <code>
 
 == Advanced Usage
 
+If you don't have control over the Rakefile or don't want to modify it, CI::Reporter has a substitute rake file that you can specify on the command-line.  It assumes that the main project rake file is called +Rakefile+ and lives in the current directory.  Run like so:
+
+    rake -f GEM_PATH/stub.rake ci:setup:testunit test
+    rake -f GEM_PATH/stub.rake ci:setup:rspec spec
+
 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:
 
 1. If you're using <code>Test::Unit</code>, ensure the <code>ci/reporter/rake/test_unit_loader.rb</code> file is loaded or required at some point before the tests are run.

data/Rakefile

@@ -1,11 +1,11 @@
 require 'spec/rake/spectask'
 
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "LICENSE.txt", "Rakefile",
-  "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake"]
+  "*.rake", "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake"]
 
 begin
   require 'hoe'
-  hoe = Hoe.new("ci_reporter", "1.3.3") do |p|
+  hoe = Hoe.new("ci_reporter", "1.3.4") do |p|
     p.rubyforge_name = "caldersphere"
     p.url = "http://caldersphere.rubyforge.org/ci_reporter"
     p.author = "Nick Sieger"

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

@@ -7,8 +7,8 @@ namespace :ci do
     task :rspec do
       rm_rf ENV["CI_REPORTS"] || "spec/reports"
 
-      spec_opts = ["--require", "#{File.dirname(__FILE__)}/rspec_loader.rb", 
-        "--format", "CI::Reporter::RSpec"].join(" ")      
+      spec_opts = ["--require", "#{File.dirname(__FILE__)}/rspec_loader.rb",
+        "--format", "CI::Reporter::RSpec"].join(" ")
       ENV["SPEC_OPTS"] ||= ""
       ENV["SPEC_OPTS"] += spec_opts
       # Pre RSpec 1.0.6

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

@@ -2,10 +2,5 @@
 # See the file LICENSE.txt included with the distribution for
 # software license details.
 
-require 'rubygems'
-begin
-  gem 'ci_reporter'
-rescue => e
-  $: << File.dirname(__FILE__) + "/../../../lib"
-end
+$: << File.dirname(__FILE__) + "/../../../lib"
 require 'ci/reporter/rspec'

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

@@ -2,12 +2,7 @@
 # See the file LICENSE.txt included with the distribution for
 # software license details.
 
-require 'rubygems'
-begin
-  gem 'ci_reporter'
-rescue
-  $: << File.dirname(__FILE__) + "/../../../lib"
-end
+$: << File.dirname(__FILE__) + "/../../../lib"
 require 'ci/reporter/test_unit'
 
 module Test #:nodoc:all

data/lib/ci/reporter/test_suite.rb

@@ -40,7 +40,7 @@ module CI
       attr_accessor :testcases
       attr_accessor :stdout, :stderr
       def initialize(name)
-        super
+        super(name.to_s) # RSpec passes a "description" object instead of a string
         @testcases = []
       end
 

data/spec/ci/reporter/rspec_spec.rb

@@ -16,6 +16,7 @@ describe "The RSpec reporter" do
       end
     end
     @error.stub!(:expectation_not_met?).and_return(false)
+    @error.stub!(:pending_fixed?).and_return(false)
     @report_mgr = mock("report manager")
     @fmt = CI::Reporter::RSpec.new(StringIO.new(""), false, false, @report_mgr)
   end

data/spec/ci/reporter/test_suite_spec.rb

@@ -13,7 +13,7 @@ describe "A TestSuite" do
   it "should collect timings when start and finish are invoked in sequence" do
     @suite.start
     @suite.finish
-    @suite.time.should > 0
+    @suite.time.should >= 0
   end
   
   it "should aggregate tests" do
@@ -22,6 +22,12 @@ describe "A TestSuite" do
     @suite.finish
     @suite.tests.should == 1
   end
+
+  it "should stringify the name for cases when the object passed in is not a string" do
+    name = Object.new
+    def name.to_s; "object name"; end
+    CI::Reporter::TestSuite.new(name).name.should == "object name"
+  end
   
   it "should indicate number of failures and errors" do
     failure = mock("failure")
@@ -139,6 +145,6 @@ describe "A TestCase" do
   it "should collect timings when start and finish are invoked in sequence" do
     @tc.start
     @tc.finish
-    @tc.time.should > 0
+    @tc.time.should >= 0
   end
 end

data/stub.rake

@@ -0,0 +1,13 @@
+# (c) Copyright 2006-2007 Nick Sieger <nicksieger@gmail.com>
+# See the file LICENSE.txt included with the distribution for
+# software license details.
+#
+# Use this stub rakefile as a wrapper around a regular Rakefile.  Run in the 
+# same directory as the real Rakefile.
+#
+#   rake -f /path/to/ci_reporter/lib/ci/reporter/rake/stub.rake ci:setup:rspec default
+#
+
+load File.dirname(__FILE__) + '/lib/ci/reporter/rake/rspec.rb'
+load File.dirname(__FILE__) + '/lib/ci/reporter/rake/test_unit.rb'
+load 'Rakefile'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ci_reporter
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
-date: 2007-06-18 00:00:00 -05:00
+  version: 1.3.4
+date: 2007-08-29 00:00:00 -05:00
 summary: CI::Reporter allows you to generate reams of XML for use with continuous integration systems.
 require_paths: 
 - lib
@@ -34,6 +34,7 @@ files:
 - README.txt
 - LICENSE.txt
 - Rakefile
+- stub.rake
 - lib/ci/reporter/core.rb
 - lib/ci/reporter/rake/rspec.rb
 - lib/ci/reporter/rake/rspec_loader.rb