simplecov 0.9.1 → 0.10.0

data/lib/simplecov/file_list.rb

@@ -1,46 +1,48 @@
 # An array of SimpleCov SourceFile instances with additional collection helper
 # methods for calculating coverage across them etc.
-class SimpleCov::FileList < Array
-  # Returns the count of lines that have coverage
-  def covered_lines
-    return 0.0 if empty?
-    map {|f| f.covered_lines.count }.inject(&:+)
-  end
+module SimpleCov
+  class FileList < Array
+    # Returns the count of lines that have coverage
+    def covered_lines
+      return 0.0 if empty?
+      map { |f| f.covered_lines.count }.inject(&:+)
+    end
 
-  # Returns the count of lines that have been missed
-  def missed_lines
-    return 0.0 if empty?
-    map {|f| f.missed_lines.count }.inject(&:+)
-  end
+    # Returns the count of lines that have been missed
+    def missed_lines
+      return 0.0 if empty?
+      map { |f| f.missed_lines.count }.inject(&:+)
+    end
 
-  # Returns the count of lines that are not relevant for coverage
-  def never_lines
-    return 0.0 if empty?
-    map {|f| f.never_lines.count }.inject(&:+)
-  end
+    # Returns the count of lines that are not relevant for coverage
+    def never_lines
+      return 0.0 if empty?
+      map { |f| f.never_lines.count }.inject(&:+)
+    end
 
-  # Returns the count of skipped lines
-  def skipped_lines
-    return 0.0 if empty?
-    map {|f| f.skipped_lines.count }.inject(&:+)
-  end
+    # Returns the count of skipped lines
+    def skipped_lines
+      return 0.0 if empty?
+      map { |f| f.skipped_lines.count }.inject(&:+)
+    end
 
-  # Returns the overall amount of relevant lines of code across all files in this list
-  def lines_of_code
-    covered_lines + missed_lines
-  end
+    # Returns the overall amount of relevant lines of code across all files in this list
+    def lines_of_code
+      covered_lines + missed_lines
+    end
 
-  # Computes the coverage based upon lines covered and lines missed
-  # @return [Float]
-  def covered_percent
-    return 100.0 if empty? or lines_of_code == 0
-    Float(covered_lines * 100.0 / lines_of_code)
-  end
+    # Computes the coverage based upon lines covered and lines missed
+    # @return [Float]
+    def covered_percent
+      return 100.0 if empty? || lines_of_code.zero?
+      Float(covered_lines * 100.0 / lines_of_code)
+    end
 
-  # Computes the strength (hits / line) based upon lines covered and lines missed
-  # @return [Float]
-  def covered_strength
-    return 0.0 if empty? or lines_of_code == 0
-    Float(map {|f| f.covered_strength * f.lines_of_code }.inject(&:+) / lines_of_code)
+    # Computes the strength (hits / line) based upon lines covered and lines missed
+    # @return [Float]
+    def covered_strength
+      return 0.0 if empty? || lines_of_code.zero?
+      Float(map { |f| f.covered_strength * f.lines_of_code }.inject(&:+) / lines_of_code)
+    end
   end
 end

data/lib/simplecov/filter.rb

@@ -16,8 +16,8 @@ module SimpleCov
       @filter_argument = filter_argument
     end
 
-    def matches?(source_file)
-      raise "The base filter class is not intended for direct use"
+    def matches?(_)
+      fail "The base filter class is not intended for direct use"
     end
 
     def passes?(source_file)
@@ -41,4 +41,14 @@ module SimpleCov
       filter_argument.call(source_file)
     end
   end
+
+  class ArrayFilter < SimpleCov::Filter
+    # Returns true if any of the file paths passed in the given array matches the string
+    # configured when initializing this Filter with StringFilter.new(['some/path', 'other/path'])
+    def matches?(source_files_list)
+      filter_argument.any? do |arg|
+        source_files_list.filename =~ /#{arg}/
+      end
+    end
+  end
 end

data/lib/simplecov/formatter/simple_formatter.rb

@@ -9,7 +9,7 @@ module SimpleCov
         output = ""
         result.groups.each do |name, files|
           output << "Group: #{name}\n"
-          output << "="*40
+          output << "=" * 40
           output << "\n"
           files.each do |file|
             output << "#{file.filename} (coverage: #{file.covered_percent.round(2)}%)\n"

data/lib/simplecov/formatter.rb

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

data/lib/simplecov/jruby_fix.rb

@@ -1,6 +1,6 @@
 if defined?(JRUBY_VERSION) && JRUBY_VERSION.to_f < 1.7
-  require 'jruby'
-  java_import 'org.jruby.ast.NodeType'
+  require "jruby"
+  java_import "org.jruby.ast.NodeType"
 
   # Coverage for JRuby < 1.7.0 does not work correctly
   #
@@ -11,9 +11,9 @@ if defined?(JRUBY_VERSION) && JRUBY_VERSION.to_f < 1.7
   # This monkey patches Coverage to address those issues
   module Coverage
     class << self
-      alias __broken_result__ result
+      alias_method :__broken_result__, :result
 
-      def result
+      def result # rubocop:disable Metrics/MethodLength
         fixed = {}
         __broken_result__.each do |path, executed_lines|
           next unless File.file? path

data/lib/simplecov/last_run.rb

@@ -1,20 +1,22 @@
-module SimpleCov::LastRun
-  class << self
-    def last_run_path
-      File.join(SimpleCov.coverage_path, '.last_run.json')
-    end
+require "json"
 
-    def read
-      return nil unless File.exist?(last_run_path)
+module SimpleCov
+  module LastRun
+    class << self
+      def last_run_path
+        File.join(SimpleCov.coverage_path, ".last_run.json")
+      end
 
-      SimpleCov::JSON.parse(File.read(last_run_path))
-    end
+      def read
+        return nil unless File.exist?(last_run_path)
+        JSON.parse(File.read(last_run_path))
+      end
 
-    def write(json)
-      File.open(last_run_path, "w+") do |f|
-        f.puts SimpleCov::JSON.dump(json)
+      def write(json)
+        File.open(last_run_path, "w+") do |f|
+          f.puts JSON.pretty_generate(json)
+        end
       end
     end
   end
 end
-

data/lib/simplecov/merge_helpers.rb

@@ -1,37 +1,36 @@
-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
-      else
-        local_value = element || 0
-        other_value = new_array[i] || 0
-        new_array[i] = local_value + other_value
+module SimpleCov
+  module ArrayMergeHelper
+    # Merges an array of coverage results with self
+    def merge_resultset(array)
+      new_array = dup
+      array.each_with_index do |element, i|
+        if element.nil? && new_array[i].nil?
+          new_array[i] = nil
+        else
+          local_value = element || 0
+          other_value = new_array[i] || 0
+          new_array[i] = local_value + other_value
+        end
       end
+      new_array
     end
-    new_array
   end
 end
 
-module SimpleCov::HashMergeHelper
-  # Merges the given Coverage.result hash with self
-  def merge_resultset(hash)
-    new_resultset = {}
-    (self.keys + hash.keys).each do |filename|
-      new_resultset[filename] = []
-    end
+module SimpleCov
+  module HashMergeHelper
+    # Merges the given Coverage.result hash with self
+    def merge_resultset(hash)
+      new_resultset = {}
+      (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] || [])
+      new_resultset.each_key do |filename|
+        new_resultset[filename] = (self[filename] || []).merge_resultset(hash[filename] || [])
+      end
+      new_resultset
     end
-    new_resultset
   end
 end
 

data/lib/simplecov/no_defaults.rb

@@ -1,2 +1,2 @@
-ENV['SIMPLECOV_NO_DEFAULTS'] = 'yes, no defaults'
-require 'simplecov'
+ENV["SIMPLECOV_NO_DEFAULTS"] = "yes, no defaults"
+require "simplecov"

data/lib/simplecov/profiles.rb

@@ -5,25 +5,27 @@
 #     # SimpleCov configuration here, same as in  SimpleCov.configure
 #   end
 #
-class SimpleCov::Profiles < Hash
-  #
-  # Define a SimpleCov profile:
-  #   SimpleCov.profiles.define 'rails' do
-  #     # Same as SimpleCov.configure do .. here
-  #   end
-  #
-  def define(name, &blk)
-    name = name.to_sym
-    raise "SimpleCov Profile '#{name}' is already defined" unless self[name].nil?
-    self[name] = blk
-  end
+module SimpleCov
+  class Profiles < Hash
+    #
+    # Define a SimpleCov profile:
+    #   SimpleCov.profiles.define 'rails' do
+    #     # Same as SimpleCov.configure do .. here
+    #   end
+    #
+    def define(name, &blk)
+      name = name.to_sym
+      fail "SimpleCov Profile '#{name}' is already defined" unless self[name].nil?
+      self[name] = blk
+    end
 
-  #
-  # Applies the profile of given name on SimpleCov.configure
-  #
-  def load(name)
-    name = name.to_sym
-    raise "Could not find SimpleCov Profile called '#{name}'" unless has_key?(name)
-    SimpleCov.configure(&self[name])
+    #
+    # Applies the profile of given name on SimpleCov.configure
+    #
+    def load(name)
+      name = name.to_sym
+      fail "Could not find SimpleCov Profile called '#{name}'" unless key?(name)
+      SimpleCov.configure(&self[name])
+    end
   end
 end

data/lib/simplecov/railtie.rb

@@ -1,7 +1,7 @@
 module SimpleCov
   class Railtie < ::Rails::Railtie
     rake_tasks do
-      load 'simplecov/railties/tasks.rake'
+      load "simplecov/railties/tasks.rake"
     end
   end
 end

data/lib/simplecov/railties/tasks.rake

@@ -1,11 +1,11 @@
-require 'rake/testtask'
+require "rake/testtask"
 Rake::TestTask.new do |t|
-  t.name = 'simplecov'
+  t.name = "simplecov"
   t.loader = :direct # uses require() which skips PWD in Ruby 1.9
-  t.libs.push 'test', 'spec', Dir.pwd
-  t.test_files = FileList['{test,spec}/**/*_{test,spec}.rb']
-  t.ruby_opts.push '-r', 'simplecov', '-e', 'SimpleCov.start(:rails)'.inspect
+  t.libs.push "test", "spec", Dir.pwd
+  t.test_files = FileList["{test,spec}/**/*_{test,spec}.rb"]
+  t.ruby_opts.push "-r", "simplecov", "-e", "SimpleCov.start(:rails)".inspect
 end
 
-require 'rake/clean'
-CLOBBER.include 'coverage'
+require "rake/clean"
+CLOBBER.include "coverage"

data/lib/simplecov/result.rb

@@ -1,5 +1,5 @@
-require 'digest/sha1'
-require 'forwardable'
+require "digest/sha1"
+require "forwardable"
 
 module SimpleCov
   #
@@ -57,9 +57,9 @@ module SimpleCov
       @command_name ||= SimpleCov.command_name
     end
 
-    # Returns a hash representation of this Result that can be used for marshalling it into YAML
+    # Returns a hash representation of this Result that can be used for marshalling it into JSON
     def to_hash
-      {command_name => {"coverage" => original_result.reject {|filename, result| !filenames.include?(filename) }, "timestamp" => created_at.to_i}}
+      {command_name => {"coverage" => original_result.reject { |filename, _| !filenames.include?(filename) }, "timestamp" => created_at.to_i}}
     end
 
     # Loads a SimpleCov::Result#to_hash dump
@@ -71,7 +71,7 @@ module SimpleCov
       result
     end
 
-    private
+  private
 
     # Applies all configured SimpleCov filters on this result's source files
     def filter!

data/lib/simplecov/result_merger.rb

@@ -1,85 +1,88 @@
+require "json"
+
 #
 # Singleton that is responsible for caching, loading and merging
 # SimpleCov::Results into a single result for coverage analysis based
 # upon multiple test suites.
 #
-module SimpleCov::ResultMerger
-  class << self
-    # The path to the .resultset.json cache file
-    def resultset_path
-      File.join(SimpleCov.coverage_path, '.resultset.json')
-    end
+module SimpleCov
+  module ResultMerger
+    class << self
+      # The path to the .resultset.json cache file
+      def resultset_path
+        File.join(SimpleCov.coverage_path, ".resultset.json")
+      end
 
-    def resultset_writelock
-      File.join(SimpleCov.coverage_path, '.resultset.json.lock')
-    end
+      def resultset_writelock
+        File.join(SimpleCov.coverage_path, ".resultset.json.lock")
+      end
 
-    # Loads the cached resultset from YAML and returns it as a Hash
-    def resultset
-      if stored_data
-        begin
-          SimpleCov::JSON.parse(stored_data)
-        rescue
+      # Loads the cached resultset from JSON and returns it as a Hash
+      def resultset
+        if stored_data
+          begin
+            JSON.parse(stored_data)
+          rescue
+            {}
+          end
+        else
           {}
         end
-      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
+      # Returns the contents of the resultset cache as a string or if the file is missing or empty nil
+      def stored_data
+        return unless File.exist?(resultset_path)
+        data = File.read(resultset_path)
+        return if data.nil? || data.length < 2
+        data
       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|
-        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
-          results << result
+      # 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|
+          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
+            results << result
+          end
         end
+        results
       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
-    # for the result consisting of a join on all source result's names
-    #
-    def merged_result
-      merged = {}
-      results.each do |result|
-        merged = result.original_result.merge_resultset(merged)
+      #
+      # Gets all SimpleCov::Results from cache, merges them and produces a new
+      # 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
+        merged = {}
+        results.each do |result|
+          merged = result.original_result.merge_resultset(merged)
+        end
+        result = SimpleCov::Result.new(merged)
+        # Specify the command name
+        result.command_name = results.map(&:command_name).sort.join(", ")
+        result
       end
-      result = SimpleCov::Result.new(merged)
-      # Specify the command name
-      result.command_name = results.map(&:command_name).sort.join(", ")
-      result
-    end
 
-    # Saves the given SimpleCov::Result in the resultset cache
-    def store_result(result)
-      File.open(resultset_writelock, "w+") do |f|
-        f.flock(File::LOCK_EX)
-        new_set = resultset
-        command_name, data = result.to_hash.first
-        new_set[command_name] = data
-        File.open(resultset_path, "w+") do |f_|
-          f_.puts SimpleCov::JSON.dump(new_set)
+      # Saves the given SimpleCov::Result in the resultset cache
+      def store_result(result)
+        File.open(resultset_writelock, "w+") do |f|
+          f.flock(File::LOCK_EX)
+          new_set = resultset
+          command_name, data = result.to_hash.first
+          new_set[command_name] = data
+          File.open(resultset_path, "w+") do |f_|
+            f_.puts JSON.pretty_generate(new_set)
+          end
         end
+        true
       end
-      true
     end
   end
 end