simplecov 0.4.2 → 0.5.2

data/lib/simplecov/formatter.rb

@@ -4,4 +4,4 @@ module SimpleCov
   end
 end
 
-require 'simplecov/formatter/simple_formatter'
+require 'simplecov/formatter/simple_formatter'

data/lib/simplecov/formatter/simple_formatter.rb

@@ -16,4 +16,4 @@ class SimpleCov::Formatter::SimpleFormatter
     end
     output
   end
-end
+end

data/lib/simplecov/jruby_float_fix.rb

@@ -11,4 +11,4 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby' and RUBY_VERSION == '1.9.2'
       end
     end
   end
-end
+end

data/lib/simplecov/merge_helpers.rb

@@ -2,11 +2,11 @@ module SimpleCov::ArrayMergeHelper
   # Merges an array of coverage results with self
   def merge_resultset(array)
     new_array = []
-    
+
     self.each_with_index do |element, i|
       new_array[i] = element
     end
-    
+
     array.each_with_index do |element, i|
       if element.nil? and new_array[i].nil?
         new_array[i] = nil
@@ -27,7 +27,7 @@ module SimpleCov::HashMergeHelper
     (self.keys + hash.keys).each do |filename|
       new_resultset[filename] = []
     end
-    
+
     new_resultset.each do |filename, data|
       new_resultset[filename] = (self[filename] || []).merge_resultset(hash[filename] || [])
     end
@@ -36,4 +36,4 @@ module SimpleCov::HashMergeHelper
 end
 
 Array.send :include, SimpleCov::ArrayMergeHelper
-Hash.send :include, SimpleCov::HashMergeHelper
+Hash.send :include, SimpleCov::HashMergeHelper

data/lib/simplecov/result.rb

@@ -1,5 +1,4 @@
 require 'digest/sha1'
-require 'yaml'
 
 module SimpleCov
   #
@@ -21,28 +20,42 @@ module SimpleCov
     # coverage data)
     def initialize(original_result)
       @original_result = original_result.freeze
-      @files = original_result.map {|filename, coverage|
+      @files = SimpleCov::FileList.new(original_result.map do |filename, coverage|
         SimpleCov::SourceFile.new(filename, coverage) if File.file?(filename)
-      }.compact.sort_by(&:filename)
+      end.compact.sort_by(&:filename))
       filter!
     end
-  
+
     # Returns all filenames for source files contained in this result
     def filenames
       files.map(&:filename)
     end
-    
+
     # Returns a Hash of groups for this result. Define groups using SimpleCov.add_group 'Models', 'app/models'
     def groups
       @groups ||= SimpleCov.grouped(files)
     end
-    
+
     # The overall percentual coverage for this result
     def covered_percent
       # 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
-    
+
+    # The multiple of coverage for this result
+    def covered_strength
+      return @covered_strength if @convered_strength
+      m = 0
+      @files.each do |file|
+        original_result[file.filename].each do |line_result|
+          if line_result
+            m += line_result
+          end
+        end
+      end
+      @covered_strength = m.to_f / total_lines
+    end
+
     # Returns the count of lines that are covered
     def covered_lines
       return @covered_lines if @covered_lines
@@ -54,7 +67,7 @@ module SimpleCov
       end
       @covered_lines
     end
-    
+
     # Returns the count of missed lines
     def missed_lines
       return @missed_lines if @missed_lines
@@ -66,54 +79,44 @@ module SimpleCov
       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
     def format!
       SimpleCov.formatter.new.format(self)
     end
-    
+
     # Defines when this result has been created. Defaults to Time.now
     def created_at
       @created_at ||= Time.now
     end
-    
+
     # The command name that launched this result.
-    # Retrieved from SimpleCov.command_name
+    # Delegated to SimpleCov.command_name if not set manually
     def command_name
       @command_name ||= SimpleCov.command_name
     end
-    
+
     # Returns a hash representation of this Result that can be used for marshalling it into YAML
     def to_hash
-      {command_name => {:original_result => original_result.reject {|filename, result| !filenames.include?(filename) }, :created_at => created_at}}
+      {command_name => {"coverage" => original_result.reject {|filename, result| !filenames.include?(filename) }, "timestamp" => created_at.to_i}}
     end
-    
-    # Returns a yaml dump of this result, which then can be reloaded using SimpleCov::Result.from_yaml
-    def to_yaml
-      to_hash.to_yaml
-    end
-    
+
     # Loads a SimpleCov::Result#to_hash dump
     def self.from_hash(hash)
       command_name, data = hash.first
-      result = SimpleCov::Result.new(data[:original_result])
+      result = SimpleCov::Result.new(data["coverage"])
       result.command_name = command_name
-      result.created_at = data[:created_at]
+      result.created_at = Time.at(data["timestamp"])
       result
     end
-    
-    # Loads a SimpleCov::Result#to_yaml dump
-    def self.from_yaml(yaml)
-      from_hash(YAML.load(yaml))
-    end
-    
+
     private
-  
+
     # Applies all configured SimpleCov filters on this result's source files
     def filter!
       @files = SimpleCov.filtered(files)

data/lib/simplecov/result_merger.rb

@@ -1,4 +1,5 @@
-require 'yaml'
+require 'multi_json'
+
 #
 # Singleton that is responsible for caching, loading and merging
 # SimpleCov::Results into a single result for coverage analysis based
@@ -8,22 +9,34 @@ module SimpleCov::ResultMerger
   class << self
     # The path to the resultset.yml cache file
     def resultset_path
-      File.join(SimpleCov.coverage_path, 'resultset.yml')
+      File.join(SimpleCov.coverage_path, '.resultset.json')
     end
-    
+
     # 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)) || {}
+      if stored_data
+        MultiJson.decode(stored_data)
+      else
+        {}
+      end
+    end
+
+    # Returns the contents of the resultset cache as a string or if the file is missing or empty nil
+    def stored_data
+      if File.exist?(resultset_path) and stored_data = File.read(resultset_path) and stored_data.length >= 2
+        stored_data
+      else
+        nil
+      end
     end
-    
+
     # Gets the resultset hash and re-creates all included instances
     # of SimpleCov::Result from that.
     # All results that are above the SimpleCov.merge_timeout will be
     # dropped. Returns an array of SimpleCov::Result items.
     def results
       results = []
-      resultset.each do |command_name, data| 
+      resultset.each do |command_name, data|
         result = SimpleCov::Result.from_hash(command_name => data)
         # Only add result if the timeout is above the configured threshold
         if (Time.now - result.created_at) < SimpleCov.merge_timeout
@@ -32,10 +45,10 @@ module SimpleCov::ResultMerger
       end
       results
     end
-    
+
     #
     # Gets all SimpleCov::Results from cache, merges them and produces a new
-    # SimpleCov::Result with merged coverage data and the command_name 
+    # SimpleCov::Result with merged coverage data and the command_name
     # for the result consisting of a join on all source result's names
     #
     def merged_result
@@ -45,19 +58,23 @@ module SimpleCov::ResultMerger
       end
       result = SimpleCov::Result.new(merged)
       # Specify the command name
-      result.command_name = results.map(&:command_name).join(", ")
+      result.command_name = results.map(&:command_name).sort.join(", ")
       result
     end
-    
+
     # Saves the given SimpleCov::Result in the resultset cache
     def store_result(result)
       new_set = resultset
       command_name, data = result.to_hash.first
       new_set[command_name] = data
       File.open(resultset_path, "w+") do |f|
-        f.puts new_set.to_yaml
+        if defined? ::JSON
+          f.puts JSON.pretty_generate(new_set)
+        else
+          f.puts MultiJson.encode(new_set)
+        end
       end
       true
     end
   end
-end
+end

data/lib/simplecov/source_file.rb

@@ -7,7 +7,7 @@ module SimpleCov
     # Representation of a single line in a source file including
     # this specific line's source code, line_number and code coverage,
     # with the coverage being either nil (coverage not applicable, e.g. comment
-    # line), 0 (line not covered) or >1 (the amount of times the line was 
+    # line), 0 (line not covered) or >1 (the amount of times the line was
     # executed)
     class Line
       # The source code for this line. Aliased as :source
@@ -16,34 +16,41 @@ module SimpleCov
       attr_reader :line_number
       # The coverage data for this line: either nil (never), 0 (missed) or >=1 (times covered)
       attr_reader :coverage
+      # Whether this line was skipped
+      attr_reader :skipped
+
       # Lets grab some fancy aliases, shall we?
       alias_method :source, :src
       alias_method :line, :line_number
       alias_method :number, :line_number
-    
-      def initialize(src, line_number, coverage)
+
+      def initialize(src, line_number, coverage, skipped = false)
         raise ArgumentError, "Only String accepted for source" unless src.kind_of?(String)
         raise ArgumentError, "Only Fixnum accepted for line_number" unless line_number.kind_of?(Fixnum)
         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
+        @src, @line_number, @coverage, @skipped = src, line_number, coverage, skipped
       end
-    
+
       # Returns true if this is a line that should have been covered, but was not
       def missed?
-        not never? and coverage == 0
+        not never? and not skipped? and coverage == 0
       end
-    
+
       # Returns true if this is a line that has been covered
       def covered?
-        not never? and coverage > 0
+        not never? and not skipped? and coverage > 0
       end
-    
+
       # Returns true if this line is not relevant for coverage
       def never?
-        coverage.nil?
+        not skipped? and coverage.nil?
+      end
+
+      def skipped?
+	    @skipped
       end
     end
-  
+
     # The full path to this source file (e.g. /User/colszowka/projects/simplecov/lib/simplecov/source_file.rb)
     attr_reader :filename
     # The array of coverage data received from the Coverage.result
@@ -51,50 +58,100 @@ module SimpleCov
     # The source code for this file. Aliased as :source
     attr_reader :src
     alias_method :source, :src
-  
+
     def initialize(filename, coverage)
       @filename, @coverage, @src = filename, coverage, File.readlines(filename)
+      @skipped_line_numbers = process_skipped_lines
     end
-    
+
     # 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?
+
+      # Warning to identify condition from Issue #56
+      if coverage.size > src.size
+        $stderr.puts "Warning: coverage data provided by Coverage [#{coverage.size}] exceeds number of lines in #{filename} [#{src.size}]"
+      end
+
       # Initialize lines
       @lines = []
-      coverage.each_with_index do |coverage, i|
-        @lines << SimpleCov::SourceFile::Line.new(src[i], i+1, coverage)
+      src.each_with_index do |src, i|
+        @lines << SimpleCov::SourceFile::Line.new(src, i+1, coverage[i], @skipped_line_numbers.include?(i + 1))
       end
       @lines
     end
     alias_method :source_lines, :lines
-    
+
     # Access SimpleCov::SourceFile::Line source lines by line number
     def line(number)
       lines[number-1]
     end
-  
+
     # 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).to_f
+      (covered_lines.count) * 100 / (lines.count - never_lines.count - skipped_lines.count).to_f
     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)
+    end
+
     # Returns all covered lines as SimpleCov::SourceFile::Line
     def covered_lines
       @covered_lines ||= lines.select {|c| c.covered? }
     end
-  
+
     # Returns all lines that should have been, but were not covered
     # as instances of SimpleCov::SourceFile::Line
     def missed_lines
       @missed_lines ||= lines.select {|c| c.missed? }
     end
-  
+
     # Returns all lines that are not relevant for coverage as
     # SimpleCov::SourceFile::Line instances
     def never_lines
       @never_lines ||= lines.select {|c| c.never? }
     end
+
+    # Returns all lines that were skipped as SimpleCov::SourceFile::Line instances
+    def skipped_lines
+      @skipped_lines ||= lines.select {|c| c.skipped? }
+    end
+
+    # Returns the number of relevant lines (covered + missed)
+    def lines_of_code
+      covered_lines.count + missed_lines.count
+    end
+
+    def process_skipped_lines
+      skipped_line_numbers = []
+      skipping = false
+      @src.each_with_index do |line, i|
+        if line =~ /^\s*#\:nocov\:/
+          skipping = !skipping
+        else
+          skipped_line_numbers << i + 1 if skipping
+        end
+      end
+      skipped_line_numbers
+    end
+
+    private
+
+    # ruby 1.9 could use Float#round(places) instead
+    def round_float(float, places)
+      factor = (10 * places).to_f
+      (float * factor).round / factor
+    end
   end
 end

data/lib/simplecov/version.rb

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

data/simplecov.gemspec

@@ -1,25 +1,28 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "simplecov/version"
+# encoding: utf-8
+$:.push File.expand_path('../lib', __FILE__)
+require 'simplecov/version'
 
-Gem::Specification.new do |s|
-  s.name        = "simplecov"
-  s.version     = SimpleCov::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Christoph Olszowka"]
-  s.email       = ["christoph at olszowka de"]
-  s.homepage    = "http://github.com/colszowka/simplecov"
-  s.summary     = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
-  s.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
+Gem::Specification.new do |gem|
+  gem.name        = 'simplecov'
+  gem.version     = SimpleCov::VERSION
+  gem.platform    = Gem::Platform::RUBY
+  gem.authors     = ["Christoph Olszowka"]
+  gem.email       = ['christoph at olszowka de']
+  gem.homepage    = 'http://github.com/colszowka/simplecov'
+  gem.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
+  gem.summary     = gem.description
 
-  s.rubyforge_project = "simplecov"
-  
-  s.add_dependency 'simplecov-html', "~> 0.4.4"
-  s.add_development_dependency "shoulda", "2.10.3"
-  s.add_development_dependency "rspec", "~> 2.0.0"
+  gem.add_dependency 'multi_json', '~> 1.0.3'
+  gem.add_dependency 'simplecov-html', '~> 0.5.0'
+  gem.add_development_dependency 'aruba', '~> 0.4'
+  gem.add_development_dependency 'capybara', '~> 1.0'
+  gem.add_development_dependency 'cucumber', '~> 1.0'
+  gem.add_development_dependency 'rake', '~> 0.8'
+  gem.add_development_dependency 'rspec', '~> 2.6'
+  gem.add_development_dependency 'shoulda', '~> 2.10'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.require_paths = ['lib']
+end