simplecov 0.4.1 → 0.4.2

data/lib/simplecov/result.rb

@@ -39,21 +39,37 @@ module SimpleCov
     
     # The overall percentual coverage for this result
     def covered_percent
-      missed_lines, covered_lines = 0, 0
+      # Make sure that weird rounding error from #15, #23 and #24 does not occur again!
+      total_lines.zero? ? 0 : 100.0 * covered_lines / total_lines
+    end
+    
+    # Returns the count of lines that are covered
+    def covered_lines
+      return @covered_lines if @covered_lines
+      @covered_lines = 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
+          @covered_lines += 1 if line_result and line_result > 0
         end
       end
-      
-      total_lines = (missed_lines + covered_lines)
-      # Make sure that weird rounding error from #15, #23 and #24 does not occur again!
-      total_lines.zero? ? 0 : 100.0 * covered_lines / total_lines
+      @covered_lines
+    end
+    
+    # Returns the count of missed lines
+    def missed_lines
+      return @missed_lines if @missed_lines
+      @missed_lines = 0
+      @files.each do |file|
+        original_result[file.filename].each do |line_result|
+          @missed_lines += 1 if line_result == 0
+        end
+      end
+      @missed_lines
+    end
+    
+    # Total count of relevant lines (covered + missed)
+    def total_lines
+      @total_lines ||= (covered_lines + missed_lines)
     end
     
     # Applies the configured SimpleCov.formatter on this result

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/simplecov.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "simplecov"
   
-  s.add_dependency 'simplecov-html', "~> 0.4.3"
+  s.add_dependency 'simplecov-html', "~> 0.4.4"
   s.add_development_dependency "shoulda", "2.10.3"
   s.add_development_dependency "rspec", "~> 2.0.0"
 

data/test/test_merge_helpers.rb

@@ -83,7 +83,7 @@ class TestMergeHelpers < Test::Unit::TestCase
         
           context "with second result way above the merge_timeout" do
             setup do 
-              @result2.created_at = Time.mktime(Time.now.year, Time.now.month, Time.now.day-2)
+              @result2.created_at = Time.now - 172800 # two days ago
               assert SimpleCov::ResultMerger.store_result(@result2)
             end
           

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: simplecov
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 +01:00
+date: 2011-04-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 3
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        - 3
         version: 2.10.3
   type: :development
   version_requirements: *id002
@@ -55,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id003
@@ -128,21 +112,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: simplecov
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites