simplecov 0.3.5 → 0.3.6

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_dependency 'simplecov-html', ">= 0.3.7"
     gem.add_development_dependency "shoulda", "2.10.3"
     gem.add_development_dependency "rspec", "~> 2.0.0.beta.20"
+    gem.add_development_dependency "jeweler", "1.4.0"
     # 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.5
+0.3.6

data/lib/simplecov/adapters.rb

@@ -40,6 +40,9 @@ SimpleCov.adapters.define 'rails' do
   add_filter '/features/'
   add_filter '/spec/'
   add_filter '/config/'
+  add_filter '/db/'
+  add_filter '/autotest/'
+  add_filter '/vendor/bundle/'
   
   add_group 'Controllers', 'app/controllers'
   add_group 'Models', 'app/models'

data/lib/simplecov/result_merger.rb

@@ -14,7 +14,7 @@ module SimpleCov::ResultMerger
     # Loads the cached resultset from YAML and returns it as a Hash
     def resultset
       return {} unless File.exist?(resultset_path)
-      YAML.load(File.read(resultset_path))
+      YAML.load(File.read(resultset_path)) || {}
     end
     
     # Gets the resultset hash and re-creates all included instances

data/simplecov.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simplecov}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]
-  s.date = %q{2010-09-03}
+  s.date = %q{2010-09-16}
   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.extra_rdoc_files = [
@@ -86,15 +86,18 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<jeweler>, ["= 1.4.0"])
     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"])
+      s.add_dependency(%q<jeweler>, ["= 1.4.0"])
     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"])
+    s.add_dependency(%q<jeweler>, ["= 1.4.0"])
   end
 end
 

data/test/test_merge_helpers.rb

@@ -41,6 +41,18 @@ class TestMergeHelpers < Test::Unit::TestCase
       end
     end
     
+    # See Github issue #6
+    should "return an empty hash when the resultset cache file is empty" do
+      File.open(SimpleCov::ResultMerger.resultset_path, "w+") {|f| f.puts ""}
+      assert_equal Hash.new, SimpleCov::ResultMerger.resultset 
+    end
+
+    # See Github issue #6    
+    should "return an empty hash when the resultset cache file is not present" do
+      system "rm #{SimpleCov::ResultMerger.resultset_path}" if File.exist?(SimpleCov::ResultMerger.resultset_path)
+      assert_equal Hash.new, SimpleCov::ResultMerger.resultset 
+    end
+    
     context "and results generated from those" do
       setup do
         system "rm #{SimpleCov::ResultMerger.resultset_path}" if File.exist?(SimpleCov::ResultMerger.resultset_path)
@@ -87,6 +99,7 @@ class TestMergeHelpers < Test::Unit::TestCase
           end
         end
       end
+      
     end
   end
 end

data/test/test_return_codes.rb

@@ -16,7 +16,7 @@ class TestReturnCodes < Test::Unit::TestCase
     end
     
     should "have return code 0 when running rspec_good.rb" do
-      `ruby rspec_good.rb`
+      `rspec rspec_good.rb`
       assert_equal 0, $?.exitstatus
     end
     
@@ -26,7 +26,7 @@ class TestReturnCodes < Test::Unit::TestCase
     end
     
     should "have return code 1 when running rspec_bad.rb" do
-      `ruby rspec_bad.rb`
+      `rspec rspec_bad.rb`
       assert_equal 1, $?.exitstatus
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +02:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,21 @@ dependencies:
         version: 2.0.0.beta.20
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :development
+  version_requirements: *id004
 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
 executables: []