simplecov 0.3.3 → 0.3.5

data/README.rdoc

@@ -15,7 +15,7 @@ when you do gem install simplecov. You can find it at http://github.com/colszowk
 
 Update your Gemfile with this and do a bundle install:
   group :test do
-    gem 'simplecov', '>= 0.3.2' # Will install simplecov-html as a dependency
+    gem 'simplecov', '>= 0.3.5', :require => false # Will install simplecov-html as a dependency
   end
 
 Then, add the following to your Rails test/test_helper.rb (right at the top, line 00):

data/Rakefile

@@ -7,11 +7,12 @@ begin
     gem.name = "simplecov"
     gem.summary = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
     gem.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
-    gem.email = "christoph at olszowka.de"
+    gem.email = "christoph at olszowka de"
     gem.homepage = "http://github.com/colszowka/simplecov"
     gem.authors = ["Christoph Olszowka"]
     gem.add_dependency 'simplecov-html', ">= 0.3.7"
-    gem.add_development_dependency "shoulda", "= 2.10.3"
+    gem.add_development_dependency "shoulda", "2.10.3"
+    gem.add_development_dependency "rspec", "~> 2.0.0.beta.20"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.5

data/lib/simplecov.rb

@@ -92,6 +92,7 @@ module SimpleCov
     def load_adapter(name)
       adapters.load(name)
     end
+    
   end
 end
 
@@ -116,5 +117,8 @@ SimpleCov.configure do
 end
 
 at_exit do
+  # Store the exit status of the test run since it goes away after calling the at_exit proc...
+  @exit_status = $!.status if $!.is_a?(SystemExit)
   SimpleCov.at_exit.call
+  exit @exit_status if @exit_status # Force exit with stored status (see github issue #5)
 end

data/simplecov.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simplecov}
-  s.version = "0.3.3"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2010-09-03}
   s.description = %q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
-  s.email = %q{christoph at olszowka.de}
+  s.email = %q{christoph at olszowka de}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -37,6 +37,10 @@ Gem::Specification.new do |s|
      "simplecov.gemspec",
      "test/fixtures/app/controllers/sample_controller.rb",
      "test/fixtures/app/models/user.rb",
+     "test/fixtures/frameworks/rspec_bad.rb",
+     "test/fixtures/frameworks/rspec_good.rb",
+     "test/fixtures/frameworks/testunit_bad.rb",
+     "test/fixtures/frameworks/testunit_good.rb",
      "test/fixtures/resultset1.rb",
      "test/fixtures/resultset2.rb",
      "test/fixtures/sample.rb",
@@ -45,6 +49,7 @@ Gem::Specification.new do |s|
      "test/test_filters.rb",
      "test/test_merge_helpers.rb",
      "test/test_result.rb",
+     "test/test_return_codes.rb",
      "test/test_source_file.rb",
      "test/test_source_file_line.rb"
   ]
@@ -56,6 +61,10 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/fixtures/app/controllers/sample_controller.rb",
      "test/fixtures/app/models/user.rb",
+     "test/fixtures/frameworks/rspec_bad.rb",
+     "test/fixtures/frameworks/rspec_good.rb",
+     "test/fixtures/frameworks/testunit_bad.rb",
+     "test/fixtures/frameworks/testunit_good.rb",
      "test/fixtures/resultset1.rb",
      "test/fixtures/resultset2.rb",
      "test/fixtures/sample.rb",
@@ -64,6 +73,7 @@ Gem::Specification.new do |s|
      "test/test_filters.rb",
      "test/test_merge_helpers.rb",
      "test/test_result.rb",
+     "test/test_return_codes.rb",
      "test/test_source_file.rb",
      "test/test_source_file_line.rb"
   ]
@@ -75,13 +85,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<simplecov-html>, [">= 0.3.7"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.20"])
     else
       s.add_dependency(%q<simplecov-html>, [">= 0.3.7"])
       s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.20"])
     end
   else
     s.add_dependency(%q<simplecov-html>, [">= 0.3.7"])
     s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.20"])
   end
 end
 

data/test/fixtures/frameworks/rspec_bad.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
+require 'lib/simplecov'
+require 'rspec'
+SimpleCov.start
+describe 'exit status' do
+  it "should exit with a non-zero exit status when assertion fails" do
+    1.should == 2
+  end
+end

data/test/fixtures/frameworks/rspec_good.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
+require 'lib/simplecov'
+require 'rspec'
+SimpleCov.start
+describe 'exit status' do
+  it "should exit with a zero exit status when assertion fails" do
+    1.should == 1
+  end
+end

data/test/fixtures/frameworks/testunit_bad.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
+require 'lib/simplecov'
+SimpleCov.start
+require 'test/unit'
+class FooTest < Test::Unit::TestCase
+  def test_foo
+    assert false
+  end
+end

data/test/fixtures/frameworks/testunit_good.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
+require 'lib/simplecov'
+SimpleCov.start
+require 'test/unit'
+class FooTest < Test::Unit::TestCase
+  def test_foo
+    assert true
+  end
+end

data/test/test_return_codes.rb

@@ -0,0 +1,37 @@
+require 'helper'
+
+# Make sure that exit codes of tests are propagated properly when using
+# simplecov. See github issue #5
+class TestReturnCodes < Test::Unit::TestCase
+  context "Inside fixtures/frameworks" do
+    setup do
+      @current_dir = Dir.getwd
+      Dir.chdir(File.join(File.dirname(__FILE__), 'fixtures', 'frameworks'))
+      FileUtils.rm_rf('./coverage')
+    end
+
+    should "have return code 0 when running testunit_good.rb" do
+      `ruby testunit_good.rb`
+      assert_equal 0, $?.exitstatus
+    end
+    
+    should "have return code 0 when running rspec_good.rb" do
+      `ruby rspec_good.rb`
+      assert_equal 0, $?.exitstatus
+    end
+    
+    should "have return code 1 when running testunit_bad.rb" do
+      `ruby testunit_bad.rb`
+      assert_equal 1, $?.exitstatus
+    end
+    
+    should "have return code 1 when running rspec_bad.rb" do
+      `ruby rspec_bad.rb`
+      assert_equal 1, $?.exitstatus
+    end
+    
+    teardown do
+      Dir.chdir(@current_dir)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +02:00
+date: 2010-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,8 +47,25 @@ dependencies:
         version: 2.10.3
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  type: :development
+  version_requirements: *id003
 description: Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites
-email: christoph at olszowka.de
+email: christoph at olszowka de
 executables: []
 
 extensions: []
@@ -77,6 +94,10 @@ files:
 - simplecov.gemspec
 - test/fixtures/app/controllers/sample_controller.rb
 - test/fixtures/app/models/user.rb
+- test/fixtures/frameworks/rspec_bad.rb
+- test/fixtures/frameworks/rspec_good.rb
+- test/fixtures/frameworks/testunit_bad.rb
+- test/fixtures/frameworks/testunit_good.rb
 - test/fixtures/resultset1.rb
 - test/fixtures/resultset2.rb
 - test/fixtures/sample.rb
@@ -85,6 +106,7 @@ files:
 - test/test_filters.rb
 - test/test_merge_helpers.rb
 - test/test_result.rb
+- test/test_return_codes.rb
 - test/test_source_file.rb
 - test/test_source_file_line.rb
 has_rdoc: true
@@ -122,6 +144,10 @@ summary: Code coverage for Ruby 1.9 with a powerful configuration library and au
 test_files: 
 - test/fixtures/app/controllers/sample_controller.rb
 - test/fixtures/app/models/user.rb
+- test/fixtures/frameworks/rspec_bad.rb
+- test/fixtures/frameworks/rspec_good.rb
+- test/fixtures/frameworks/testunit_bad.rb
+- test/fixtures/frameworks/testunit_good.rb
 - test/fixtures/resultset1.rb
 - test/fixtures/resultset2.rb
 - test/fixtures/sample.rb
@@ -130,5 +156,6 @@ test_files:
 - test/test_filters.rb
 - test/test_merge_helpers.rb
 - test/test_result.rb
+- test/test_return_codes.rb
 - test/test_source_file.rb
 - test/test_source_file_line.rb