simplecov 0.3.6 → 0.3.7

data/.gitignore

@@ -1,4 +1,3 @@
-.rvmrc
 .bundle
 
 ## MAC OS

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.2

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem "simplecov-html", ">= 0.3.7"
+group :development do
+  gem "shoulda", "= 2.10.3"
+  gem "rspec", "~> 2.0.0"
+  gem "jeweler", "= 1.4.0"
+end

data/Gemfile.lock

@@ -0,0 +1,34 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    shoulda (2.10.3)
+    simplecov-html (0.3.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler (= 1.4.0)
+  rspec (~> 2.0.0)
+  shoulda (= 2.10.3)
+  simplecov-html (>= 0.3.7)

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Christoph Olszowka"]
     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 "rspec", "~> 2.0.0"
     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

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/simplecov/result.rb

@@ -36,10 +36,19 @@ module SimpleCov
     end
     
     # The overall percentual coverage for this result
-    #
-    # FIXME: Kind of inaccurate - should use LOC instead of Files count!
     def covered_percent
-      files.map(&:covered_percent).inject(:+) / files.count.to_f
+      missed_lines, covered_lines = 0, 0
+      @files.each do |file|
+        original_result[file.filename].each do |line_result|
+          case line_result
+          when 0
+            missed_lines += 1
+          when 1
+            covered_lines += 1
+          end
+        end
+      end
+      100.0 * covered_lines / (missed_lines + covered_lines)
     end
     
     # Applies the configured SimpleCov.formatter on this result
@@ -89,4 +98,4 @@ module SimpleCov
       @files = SimpleCov.filtered(files)
     end
   end
-end
+end

data/simplecov.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simplecov}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]
-  s.date = %q{2010-09-16}
+  s.date = %q{2010-11-06}
   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 = [
@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rvmrc",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -85,18 +88,18 @@ 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"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
       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<rspec>, ["~> 2.0.0"])
       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<rspec>, ["~> 2.0.0"])
     s.add_dependency(%q<jeweler>, ["= 1.4.0"])
   end
 end

data/test/helper.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :development)
 require 'test/unit'
 require 'shoulda'
 

data/test/test_result.rb

@@ -27,8 +27,9 @@ class TestResult < Test::Unit::TestCase
         assert_equal @result.files, @result.source_files
       end
       
-      should "have 86.7 covered percent" do
-        assert_equal 86.7, @result.covered_percent.round(1)
+      should "have accurate covered percent" do
+        # in our fixture, there are 13 covered line (result in 1) in all 15 relevant line (result in non-nil)
+        assert_equal 100.0*13/15, @result.covered_percent
       end
       
       context "dumped with to_yaml" do
@@ -130,4 +131,4 @@ class TestResult < Test::Unit::TestCase
       end
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +02:00
+date: 2010-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,9 +59,7 @@ dependencies:
         - 2
         - 0
         - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+        version: 2.0.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -91,6 +89,9 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile