simplecov 0.9.2 → 0.10.0

data/lib/simplecov/defaults.rb

@@ -1,51 +1,57 @@
 # Load default formatter gem
-require 'simplecov-html'
+require "simplecov-html"
 
-SimpleCov.profiles.define 'root_filter' do
+SimpleCov.profiles.define "root_filter" do
   # Exclude all files outside of simplecov root
   add_filter do |src|
     !(src.filename =~ /^#{Regexp.escape(SimpleCov.root)}/i)
   end
 end
 
-SimpleCov.profiles.define 'test_frameworks' do
-  add_filter '/test/'
-  add_filter '/features/'
-  add_filter '/spec/'
-  add_filter '/autotest/'
+SimpleCov.profiles.define "test_frameworks" do
+  add_filter "/test/"
+  add_filter "/features/"
+  add_filter "/spec/"
+  add_filter "/autotest/"
 end
 
-SimpleCov.profiles.define 'rails' do
-  load_profile 'test_frameworks'
+SimpleCov.profiles.define "bundler_filter" do
+  add_filter "/vendor/bundle/"
+end
+
+SimpleCov.profiles.define "rails" do
+  load_profile "test_frameworks"
 
-  add_filter '/config/'
-  add_filter '/db/'
-  add_filter '/vendor/bundle/'
+  add_filter "/config/"
+  add_filter "/db/"
 
-  add_group 'Controllers', 'app/controllers'
-  add_group 'Models', 'app/models'
-  add_group 'Mailers', 'app/mailers'
-  add_group 'Helpers', 'app/helpers'
-  add_group 'Libraries', 'lib'
+  add_group "Controllers", "app/controllers"
+  add_group "Models", "app/models"
+  add_group "Mailers", "app/mailers"
+  add_group "Helpers", "app/helpers"
+  add_group "Libraries", "lib"
 end
 
 # Default configuration
 SimpleCov.configure do
   formatter SimpleCov::Formatter::HTMLFormatter
+  load_profile "bundler_filter"
   # Exclude files outside of SimpleCov.root
-  load_profile 'root_filter'
+  load_profile "root_filter"
 end
 
 # Gotta stash this a-s-a-p, see the CommandGuesser class and i.e. #110 for further info
-SimpleCov::CommandGuesser.original_run_command = "#{$0} #{ARGV.join(" ")}"
+SimpleCov::CommandGuesser.original_run_command = "#{$PROGRAM_NAME} #{ARGV.join(' ')}"
 
 at_exit do
+  # If we are in a different process than called start, don't interfere.
+  next if SimpleCov.pid != Process.pid
 
-  if $! # was an exception thrown?
+  if $ERROR_INFO # was an exception thrown?
     # if it was a SystemExit, use the accompanying status
     # otherwise set a non-zero status representing termination by some other exception
     # (see github issue 41)
-    @exit_status = $!.is_a?(SystemExit) ? $!.status : SimpleCov::ExitCodes::EXCEPTION
+    @exit_status = $ERROR_INFO.is_a?(SystemExit) ? $ERROR_INFO.status : SimpleCov::ExitCodes::EXCEPTION
   else
     # Store the exit status of the test run since it goes away after calling the at_exit proc...
     @exit_status = SimpleCov::ExitCodes::SUCCESS
@@ -57,18 +63,13 @@ at_exit do
     covered_percent = SimpleCov.result.covered_percent.round(2)
 
     if @exit_status == SimpleCov::ExitCodes::SUCCESS # No other errors
-      if covered_percent < SimpleCov.minimum_coverage
-        $stderr.puts "Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%)." % \
-                     [covered_percent, SimpleCov.minimum_coverage]
-
+      if covered_percent < SimpleCov.minimum_coverage # rubocop:disable Metrics/BlockNesting
+        $stderr.printf("Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%).\n", covered_percent, SimpleCov.minimum_coverage)
         @exit_status = SimpleCov::ExitCodes::MINIMUM_COVERAGE
-
-      elsif (last_run = SimpleCov::LastRun.read)
-        diff = last_run['result']['covered_percent'] - covered_percent
-        if diff > SimpleCov.maximum_coverage_drop
-          $stderr.puts "Coverage has dropped by %.2f%% since the last time (maximum allowed: %.2f%%)." % \
-                       [diff, SimpleCov.maximum_coverage_drop]
-
+      elsif (last_run = SimpleCov::LastRun.read) # rubocop:disable Metrics/BlockNesting
+        diff = last_run["result"]["covered_percent"] - covered_percent
+        if diff > SimpleCov.maximum_coverage_drop # rubocop:disable Metrics/BlockNesting
+          $stderr.printf("Coverage has dropped by %.2f%% since the last time (maximum allowed: %.2f%%).\n", diff, SimpleCov.maximum_coverage_drop)
           @exit_status = SimpleCov::ExitCodes::MAXIMUM_COVERAGE_DROP
         end
       end
@@ -83,13 +84,13 @@ at_exit do
 end
 
 # Autoload config from ~/.simplecov if present
-require 'etc'
-home_dir = File.expand_path('~') || Etc.getpwuid.dir || (user = ENV["USER"] && File.expand_path("~#{user}"))
+require "etc"
+home_dir = File.expand_path("~") || Etc.getpwuid.dir || (ENV["USER"] && File.expand_path("~#{ENV['USER']}"))
 if home_dir
-  global_config_path = File.join(home_dir, '.simplecov')
+  global_config_path = File.join(home_dir, ".simplecov")
   load global_config_path if File.exist?(global_config_path)
 end
 
 # Autoload config from .simplecov if present
-config_path = File.join(SimpleCov.root, '.simplecov')
+config_path = File.join(SimpleCov.root, ".simplecov")
 load config_path if File.exist?(config_path)

data/lib/simplecov/exit_codes.rb

@@ -1,6 +1,8 @@
-module SimpleCov::ExitCodes
-  SUCCESS = 0
-  EXCEPTION = 1
-  MINIMUM_COVERAGE = 2
-  MAXIMUM_COVERAGE_DROP = 3
+module SimpleCov
+  module ExitCodes
+    SUCCESS = 0
+    EXCEPTION = 1
+    MINIMUM_COVERAGE = 2
+    MAXIMUM_COVERAGE_DROP = 3
+  end
 end

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.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/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/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