simplecov 0.6.3 → 0.6.4

data/.gitignore

@@ -23,6 +23,7 @@ rdoc
 pkg
 tmp
 capybara*.html
+.rvmrc
 
 ## PROJECT::SPECIFIC
 

data/CHANGELOG.md

@@ -1,28 +1,39 @@
-v0.6.3 (2012-05-10)
-===================
+v0.6.4, 2012-05-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.3...v0.6.4))
+-------------------
 
-  * Modified the API-changes for newer multi_json versions introduced with #122 and v0.6.2 so
+  * [BUGFIX] Encoding issues with ISO-8859-encoded source files fixed.
+    See https://github.com/colszowka/simplecov/pull/117. (thanks to @Deradon)
+  * [BUGFIX] Ensure ZeroDivisionErrors won't occur when calculating the coverage result, which previously
+    could happen in certain cases. See https://github.com/colszowka/simplecov/pull/128. (thanks to @japgolly)
+  * [REFACTORING] Changed a couple instance variable lookups so SimpleCov does not cause a lot of warnings when
+    running ruby at a higher warning level. See https://github.com/colszowka/simplecov/issues/106 and
+    https://github.com/colszowka/simplecov/pull/119. (thanks to @mvz and @gioele)
+
+
+v0.6.3, 2012-05-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.2...v0.6.3))
+-------------------
+
+  * [BUGFIX] Modified the API-changes for newer multi_json versions introduced with #122 and v0.6.2 so
     they are backwards-compatible with older multi_json gems in order to avoid simplecov polluting
     the multi_json minimum version requirement for entire applications.
     See https://github.com/colszowka/simplecov/issues/132
   * Added appraisal gem to the test setup in order to run the test suite against both 1.0 and 1.3
     multi_json gems and ensure the above actually works :)
 
-v0.6.2 (2012-04-20)
-===================
-**Note: Yanked 2012-05-10 because of backwards-incompatibilty of the updated multi_json api**
+v0.6.2, 2012-04-20 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.1...v0.6.2))
+-------------------
 
-  * Updated to latest version of MultiJSON and its new API (thanks to @sferik and @ronen).
+  * [Updated to latest version of MultiJSON and its new API (thanks to @sferik and @ronen).
     See https://github.com/colszowka/simplecov/pull/122
 
-v0.6.1 (2012-02-24)
-===================
+v0.6.1, 2012-02-24 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.0...v0.6.1))
+-------------------
 
   * [BUGFIX] Don't force-load Railtie on Rails < 3. Fixes regression introduced with
     #83. See https://github.com/colszowka/simplecov/issues/113
 
-v0.6.0 (2012-02-22)
-===================
+v0.6.0, 2012-02-22 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.4...v0.6.0))
+-------------------
 
   * [FEATURE] Auto-magic `rake simplecov` task for rails
     (see https://github.com/colszowka/simplecov/pull/83, thanks @sunaku)
@@ -37,8 +48,8 @@ v0.6.0 (2012-02-22)
   * Some refactorings and cleanups as usual. Please refer to the github compare view for a full
     list of changes: https://github.com/colszowka/simplecov/compare/v0.5.4...v0.6.0
 
-v0.5.4 (2011-10-12)
-===================
+v0.5.4, 2011-10-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.3...v0.5.4))
+-------------------
 
   * Do not give exit code 0 when there are exceptions prior to tests
     (see https://github.com/colszowka/simplecov/issues/41, thanks @nbogie)
@@ -50,8 +61,8 @@ v0.5.4 (2011-10-12)
     (see https://github.com/colszowka/simplecov/issues/86)
   * Readme formatted in Markdown :)
 
-v0.5.3 (2011-09-13)
-===================
+v0.5.3, 2011-09-13 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.2...v0.5.3))
+-------------------
 
   * Fix for encoding issues that came from the nocov processing mechanism
     (see https://github.com/colszowka/simplecov/issues/71)
@@ -65,14 +76,14 @@ v0.5.3 (2011-09-13)
   * Refactored nocov processing and made it configurable using SimpleCov.ncov_token (or it's
     alias SimpleCov.skip_token)
 
-v0.5.2 (2011-09-12)
-===================
+v0.5.2, 2011-09-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.1...v0.5.2))
+-------------------
 
   * Another fix for a bug in JSON processing introduced with MultiJSON in 0.5.1
     (see https://github.com/colszowka/simplecov/pull/75, thanks @sferik)
 
-v0.5.1 (2011-09-12)
-===================
+v0.5.1, 2011-09-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.0...v0.5.1))
+-------------------
 **Note: Yanked 2011-09-12 because the MultiJSON-patch had a crucial bug**
 
   * Fix for invalid gemspec dependency string (see https://github.com/colszowka/simplecov/pull/70,
@@ -82,8 +93,8 @@ v0.5.1 (2011-09-12)
     is unavailable (see https://github.com/colszowka/simplecov/issues/72
     and https://github.com/colszowka/simplecov/pull/74, thanks @sferik)
 
-v0.5.0 (2011-09-09)
-===================
+v0.5.0, 2011-09-09 ([changes](https://github.com/colszowka/simplecov/compare/v0.4.2...v0.5.4))
+-------------------
 **Note: Yanked 2011-09-09 because of trouble with the gemspec.**
 
   * JSON is now used instead of YAML for resultset caching (used for merging). Should resolve
@@ -122,10 +133,9 @@ v0.5.0 (2011-09-09)
 
   * Full compatibility with Ruby 1.9.3.preview1
 
-HTML Formatter:
----------------
+### HTML Formatter:
 
   * The display of source files has been improved a lot. Weird scrolling trouble, out-of-scope line hit counts
     and such should be a thing of the past. Also, it is prettier now.
   * Source files are now syntax highlighted
-  * File paths no longer have that annoying './' in front of them
+  * File paths no longer have that annoying './' in front of them

data/README.md

@@ -7,7 +7,6 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
   * [Changelog]
   * [Rubygem]
   * [Continuous Integration]
-  * IRC #simplecov on Freenode
 
 [Coverage]: http://www.ruby-doc.org/ruby-1.9/classes/Coverage.html "API doc for Ruby 1.9's Coverage library"
 [Source Code]: https://github.com/colszowka/simplecov "Source Code @ GitHub"
@@ -470,9 +469,7 @@ If you want to contribute, please:
 
 ## Kudos
 
-Thanks to Aaron Patterson (http://engineering.attinteractive.com/2010/08/code-coverage-in-ruby-1-9/) for the original idea
-for this!
-
+Thanks to Aaron Patterson for the original idea for this!
 
 ## Copyright
 

data/Rakefile

@@ -10,6 +10,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.test_files = FileList['test/test_*.rb']
   test.verbose = true
+  test.warning = true
 end
 
 require 'cucumber/rake/task'

data/lib/simplecov.rb

@@ -48,7 +48,7 @@ module SimpleCov
         SimpleCov::ResultMerger.store_result(@result) if @result
         return SimpleCov::ResultMerger.merged_result
       else
-        return @result
+        return @result if defined? @result
       end
     ensure
       self.running = false

data/lib/simplecov/configuration.rb

@@ -14,7 +14,7 @@ module SimpleCov::Configuration
   # Configure with SimpleCov.root('/my/project/path')
   #
   def root(root=nil)
-    return @root if @root and root.nil?
+    return @root if defined? @root and root.nil?
     @root = File.expand_path(root || Dir.getwd)
   end
 
@@ -24,7 +24,7 @@ module SimpleCov::Configuration
   # Configure with SimpleCov.coverage_dir('cov')
   #
   def coverage_dir(dir=nil)
-    return @coverage_dir if @coverage_dir and dir.nil?
+    return @coverage_dir if defined? @coverage_dir and dir.nil?
     @coverage_dir = (dir || 'coverage')
   end
 
@@ -67,7 +67,7 @@ module SimpleCov::Configuration
   # Configure with: SimpleCov.formatter(SimpleCov::Formatter::SimpleFormatter)
   #
   def formatter(formatter=nil)
-    return @formatter if @formatter and formatter.nil?
+    return @formatter if defined? @formatter and formatter.nil?
     @formatter = formatter
     raise "No formatter configured. Please specify a formatter using SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter" unless @formatter
     @formatter
@@ -81,7 +81,7 @@ module SimpleCov::Configuration
   # Configure with SimpleCov.nocov_token('skip') or it's alias SimpleCov.skip_token('skip')
   #
   def nocov_token(nocov_token=nil)
-    return @nocov_token if @nocov_token and nocov_token.nil?
+    return @nocov_token if defined? @nocov_token and nocov_token.nil?
     @nocov_token = (nocov_token || 'nocov')
   end
   alias_method :skip_token, :nocov_token

data/lib/simplecov/result.rb

@@ -44,6 +44,7 @@ module SimpleCov
 
     # The multiple of coverage for this result
     def covered_strength
+      return 0 if total_lines.zero?
       return @covered_strength if @covered_strength
       m = 0
       @files.each do |file|
@@ -58,7 +59,7 @@ module SimpleCov
 
     # Returns the count of lines that are covered
     def covered_lines
-      return @covered_lines if @covered_lines
+      return @covered_lines if defined? @covered_lines
       @covered_lines = 0
       @files.each do |file|
         original_result[file.filename].each do |line_result|
@@ -70,7 +71,7 @@ module SimpleCov
 
     # Returns the count of missed lines
     def missed_lines
-      return @missed_lines if @missed_lines
+      return @missed_lines if defined? @missed_lines
       @missed_lines = 0
       @files.each do |file|
         original_result[file.filename].each do |line_result|

data/lib/simplecov/source_file.rb

@@ -30,6 +30,7 @@ module SimpleCov
         raise ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.kind_of?(Fixnum) or coverage.nil?
         @src, @line_number, @coverage = src, line_number, coverage
         @skipped = false
+        @src.encode!('UTF-8', 'UTF-8', :invalid => :replace) if @src.respond_to?(:encode!)
       end
 
       # Returns true if this is a line that should have been covered, but was not
@@ -84,7 +85,7 @@ module SimpleCov
     # Returns all source lines for this file as instances of SimpleCov::SourceFile::Line,
     # and thus including coverage data. Aliased as :source_lines
     def lines
-      return @lines unless @lines.nil?
+      return @lines if defined? @lines
 
       # Warning to identify condition from Issue #56
       if coverage.size > src.size
@@ -109,18 +110,30 @@ module SimpleCov
     # The coverage for this file in percent. 0 if the file has no relevant lines
     def covered_percent
       return 100.0 if lines.length == 0 or lines.length == never_lines.count
-      (covered_lines.count) * 100 / (lines.count - never_lines.count - skipped_lines.count).to_f
+      relevant_lines = lines.count - never_lines.count - skipped_lines.count
+      if relevant_lines == 0
+        0
+      else
+        (covered_lines.count) * 100 / relevant_lines.to_f
+      end
     end
 
     def covered_strength
       return 0 if lines.length == 0 or lines.length == never_lines.count
+
       lines_strength = 0
       lines.each do |c|
         lines_strength += c.coverage if c.coverage
       end
+
       effective_lines_count = (lines.count - never_lines.count - skipped_lines.count).to_f
-      strength = lines_strength / effective_lines_count
-      round_float(strength, 1)
+
+      if effective_lines_count == 0
+        0
+      else
+        strength = lines_strength / effective_lines_count
+        round_float(strength, 1)
+      end
     end
 
     # Returns all covered lines as SimpleCov::SourceFile::Line
@@ -172,3 +185,4 @@ module SimpleCov
     end
   end
 end
+

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/test/fixtures/iso-8859.rb

@@ -0,0 +1,3 @@
+
+# localized to Espa�ol thus:
+

data/test/test_source_file.rb

@@ -68,7 +68,7 @@ class TestSourceFile < Test::Unit::TestCase
           @source_file.lines
         end
 
-        assert_match /^Warning: coverage data provided/, captured_output
+        assert_match(/^Warning: coverage data provided/, captured_output)
       end
     end
 
@@ -80,7 +80,16 @@ class TestSourceFile < Test::Unit::TestCase
           source_file.process_skipped_lines!
         end
       end
+
+      should "handle iso-8859 encoded source files" do
+        source_file = SimpleCov::SourceFile.new(source_fixture('iso-8859.rb'), [nil, nil, 1])
+
+        assert_nothing_raised do
+          source_file.process_skipped_lines!
+        end
+      end
     end
 
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70307285759020 !ruby/object:Gem::Requirement
+  requirement: &70152796757480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307285759020
+  version_requirements: *70152796757480
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &70307285773100 !ruby/object:Gem::Requirement
+  requirement: &70152796756780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70307285773100
+  version_requirements: *70152796756780
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70307285790800 !ruby/object:Gem::Requirement
+  requirement: &70152796756220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307285790800
+  version_requirements: *70152796756220
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70307285820920 !ruby/object:Gem::Requirement
+  requirement: &70152796755580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307285820920
+  version_requirements: *70152796755580
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70307285819640 !ruby/object:Gem::Requirement
+  requirement: &70152796755020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307285819640
+  version_requirements: *70152796755020
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70307285818160 !ruby/object:Gem::Requirement
+  requirement: &70152796754340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *70307285818160
+  version_requirements: *70152796754340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70307285815960 !ruby/object:Gem::Requirement
+  requirement: &70152796769980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307285815960
+  version_requirements: *70152796769980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70307285831700 !ruby/object:Gem::Requirement
+  requirement: &70152796769100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307285831700
+  version_requirements: *70152796769100
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70307285827880 !ruby/object:Gem::Requirement
+  requirement: &70152796768260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307285827880
+  version_requirements: *70152796768260
 description: Code coverage for Ruby 1.9 with a powerful configuration library and
   automatic merging of coverage across test suites
 email:
@@ -119,7 +119,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - .travis.yml
 - Appraisals
 - CHANGELOG.md
@@ -203,6 +202,7 @@ files:
 - test/fixtures/frameworks/rspec_good.rb
 - test/fixtures/frameworks/testunit_bad.rb
 - test/fixtures/frameworks/testunit_good.rb
+- test/fixtures/iso-8859.rb
 - test/fixtures/resultset1.rb
 - test/fixtures/resultset2.rb
 - test/fixtures/sample.rb
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4064525278113991582
+      hash: 1802100492995601719
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4064525278113991582
+      hash: 1802100492995601719
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -305,6 +305,7 @@ test_files:
 - test/fixtures/frameworks/rspec_good.rb
 - test/fixtures/frameworks/testunit_bad.rb
 - test/fixtures/frameworks/testunit_good.rb
+- test/fixtures/iso-8859.rb
 - test/fixtures/resultset1.rb
 - test/fixtures/resultset2.rb
 - test/fixtures/sample.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3-p125