deep-cover-core 0.7.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbe41efeca9abba7b516658844fb4517fdc0a2c06ca55f4001e2226ba0f896d2
-  data.tar.gz: 0caf291ac3b17a9331f81a8834b3e62c383ba2df48ae7593461e366220a8d1db
+  metadata.gz: 7e54c0b378f86ce59192fb96bf48ab337224c393b0fd8001aca282e0cd6089b4
+  data.tar.gz: 0b2e4d4be1a54115f0246faf36aa3de60c9f223f615bf6346e183f502308dd80
 SHA512:
-  metadata.gz: dc9f2a11db1a305236bc244ef66178bed2763b2e3608872412719560576fd8c9db680ce4a58c37f9bc49c82a003777bce3c534df7fc7a845bfaa604814f2c81a
-  data.tar.gz: f1ad943d6d731465e73dbca9964fe253723c684e4905e2434f122f53c402b384f47b4e48f63fa503bfa24626ddc142e49926e1866f7eab593d9dc852b00e0d97
+  metadata.gz: ec49f79fe4432b3bf3f70567561226c9834b7f456afe03f820a4ee1c25b52f770c8303e5869be09f55db8ab3361a44c25aa1facb6881a67d1276992d695c83e2
+  data.tar.gz: ef087d944754939b47106482ef6a9813783f5fb8f55608a45e27533fc2263fa9a965555f01f85618e7e41d8981c676515339f81300733e911b3adbee57851066

data/deep_cover_core.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1.0'
 
   # Main dependency
-  spec.add_runtime_dependency 'parser', '>= 2.5', '< 2.7'
+  spec.add_runtime_dependency 'parser', '>= 2.5'
 
   # Support
   spec.add_runtime_dependency 'backports', '>= 3.11.0'
@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
   # About every single release breaks something
   # Ruby 2.1 is no longer supported
   if RUBY_VERSION >= '2.3.0'
-    spec.add_development_dependency 'rubocop', '~> 0.74.0'
+    spec.add_development_dependency 'rubocop', '~> 0.81.0'
     spec.add_development_dependency 'rubocop-performance'
   end
 end

data/lib/deep_cover/analyser/per_line.rb

@@ -35,7 +35,7 @@ module DeepCover
     end
 
     def missed_empty_branch?(node)
-      node.is_a?(Node::Branch) && node.branches.any? { |b| b.is_a?(Node::EmptyBody) && !Tools.covered?(node_runs(b)) }
+      node.is_a?(Node::Branch) && node.branches.any? { |b| b.is_a?(Node::EmptyBody) && node_runs(b) == 0 }
     end
   end
 end

data/lib/deep_cover/analyser/stats.rb

@@ -48,7 +48,7 @@ module DeepCover
     memoize :percent
 
     def percent
-      Analyser::StatsBase.new(to_h.transform_values { |v| (100 * v).fdiv(total).round(DECIMALS) })
+      Analyser::StatsBase.new(**to_h.transform_values { |v| (100 * v).fdiv(total).round(DECIMALS) })
     end
   end
 end

data/lib/deep_cover/backports.rb

@@ -17,6 +17,7 @@ require 'backports/2.4.0/false_class/dup'
 require 'backports/2.4.0/true_class/dup'
 require 'backports/2.4.0/hash/transform_values'
 require 'backports/2.4.0/enumerable/sum'
+require 'backports/2.4.0/regexp/match'
 require 'backports/2.5.0/hash/slice'
 require 'backports/2.5.0/hash/transform_keys'
 require 'backports/2.5.0/kernel/yield_self'

data/lib/deep_cover/base.rb

@@ -38,7 +38,9 @@ module DeepCover
     end
 
     def line_coverage(filename)
-      coverage.line_coverage(handle_relative_filename(filename), **config.to_h)
+      filename = handle_relative_filename(filename)
+      return unless coverage.covered_code?(filename)
+      coverage.line_coverage(filename, **config.to_h)
     end
 
     def covered_code(filename)
@@ -62,6 +64,9 @@ module DeepCover
       when :paths
         warn "Changing DeepCover's paths after starting coverage is highly discouraged" if running?
         @lookup_globs = @all_tracked_file_paths = nil
+      when :excluded_paths
+        warn "Changing DeepCover's excluded_paths after starting coverage is highly discouraged" if running?
+        @all_tracked_file_paths = nil
       when :tracker_global
         raise NotImplementedError, "Changing DeepCover's tracker global after starting coverage is not supported" if running?
         @coverage = nil
@@ -79,8 +84,13 @@ module DeepCover
       @coverage ||= Coverage.new
     end
 
+    def lookup_exclusion
+      @lookup_exclusion ||= Regexp.union(*
+        config.exclude_paths.map { |x| Tools.to_regexp(x) })
+    end
+
     def lookup_globs
-      return @lookup_globs if @lookup_globs
+      return @lookup_globs if defined?(@lookup_globs) && @lookup_globs
       paths = Array(config.paths || :auto_detect).dup
       paths.concat(auto_detected_paths) if paths.delete(:auto_detect)
 
@@ -143,6 +153,7 @@ module DeepCover
     end
 
     def tracked_file_path?(path)
+      return false if lookup_exclusion.match?(path)
       # The flags are to make fnmatch match the same things as Dir.glob... This doesn't seem to be documented anywhere
       # EXTGLOB: allow matching {lib,app} as either lib or app
       # PATHNAME: Makes wildcard match not match /, and make /**/ (and pattern starting with **/) be any number of nested directory
@@ -155,6 +166,7 @@ module DeepCover
       paths_found.select! { |path| path.end_with?('.rb') }
       paths_found.select! { |path| File.file?(path) }
       paths_found.uniq!
+      paths_found.reject! { |path| lookup_exclusion.match?(path) }
       @all_tracked_file_paths = paths_found
       @all_tracked_file_paths.dup
     end
@@ -178,7 +190,7 @@ module DeepCover
         relative_to = File.dirname(caller(2..2).first.partition(/\.rb:\d/).first)
         filename = File.absolute_path(filename, relative_to)
       end
-      filename += '.rb' unless filename =~ /\.rb$/
+      filename += '.rb' unless filename.end_with? 'rb'
       filename
     end
   end

data/lib/deep_cover/basics.rb

@@ -10,6 +10,7 @@ module DeepCover
 
   DEFAULTS = {
                paths: [:auto_detect].freeze,
+               exclude_paths: [].freeze,
                allow_partial: false,
                tracker_global: '$_cov',
                reporter: :html,

data/lib/deep_cover/config.rb

@@ -20,7 +20,7 @@ module DeepCover
       hash = to_hash
       # TODO: (Max) I don't like mixup of configs being partly on DeepCover and Config like that...
       hash[:paths] = DeepCover.lookup_globs
-      hash[:output] = hash[:output] ? File.expand_path(hash[:output]) : hash[:output]
+      hash[:output] &&= File.expand_path(hash[:output])
       hash[:cache_directory] = File.expand_path(hash[:cache_directory])
       hash
     end
@@ -42,7 +42,7 @@ module DeepCover
       end
       unless keywords.empty?
         keywords = check_uncovered(keywords)
-        set(keywords.to_h { |kind| [FILTER_NAME[kind], true] })
+        set(**keywords.to_h { |kind| [FILTER_NAME[kind], true] })
       end
       Config.options_to_ignored(**@options)
     end
@@ -51,7 +51,7 @@ module DeepCover
       raise ArgumentError, 'No block is accepted' if block_given?
       unless keywords.empty?
         keywords = check_uncovered(keywords)
-        set(keywords.to_h { |kind| [FILTER_NAME[kind], false] })
+        set(**keywords.to_h { |kind| [FILTER_NAME[kind], false] })
       end
       OPTIONALLY_COVERED - Config.options_to_ignored(**@options)
     end
@@ -65,13 +65,18 @@ module DeepCover
         end
       end
 
-      %i[paths tracker_global reporter output cache_directory allow_partial]
+      %i[paths exclude_paths tracker_global reporter output cache_directory allow_partial]
         .concat(OPTIONALLY_COVERED.map { |filter| FILTER_NAME[filter] })
         .each { |attr| define_accessor(attr) }
     end
 
     include AttributeAccessors
 
+    def exclude_paths(paths = NOT_SPECIFIED)
+      paths = Array(paths).dup unless paths == NOT_SPECIFIED
+      super
+    end
+
     def paths(paths = NOT_SPECIFIED)
       paths = Array(paths).dup unless paths == NOT_SPECIFIED
       super

data/lib/deep_cover/coverage.rb

@@ -3,12 +3,12 @@
 module DeepCover
   bootstrap
 
-  require_relative_dir 'coverage'
-
   # A collection of CoveredCode
   class Coverage
     include Enumerable
 
+    DeepCover.require_relative_dir 'coverage'
+
     def initialize
       @covered_code_per_path = {}
     end

data/lib/deep_cover/coverage/analysis.rb

@@ -2,7 +2,7 @@
 
 module DeepCover
   class Coverage
-    class Analysis < Struct.new(:covered_codes, :options)
+    class Analysis < StructWithOptions.new(:covered_codes)
       include Memoize
       memoize :analyser_map, :stat_map
 

data/lib/deep_cover/node/mixin/execution_location.rb

@@ -13,6 +13,7 @@ module DeepCover
         def executed_loc_keys(*loc_keys)
           # #flatten allows passing an empty array to be explicit
           loc_keys = loc_keys.flatten
+          undef_method :executed_loc_keys
           define_method :executed_loc_keys do
             loc_keys
           end

data/lib/deep_cover/persistence.rb

@@ -31,10 +31,7 @@ module top_level_module::DeepCover # rubocop:disable Naming/ClassAndModuleCamelC
     # returns a TrackerHitsPerPath
     def load_trackers
       tracker_hits_per_path_hashes = tracker_files.map do |full_path|
-        JSON.parse(full_path.binread).transform_keys(&:to_sym).yield_self do |version:, tracker_hits_per_path:|
-          raise "dump version mismatch: #{version}, currently #{VERSION}" unless version == VERSION
-          tracker_hits_per_path
-        end
+        check_tracker_file(**JSON.parse(full_path.binread).transform_keys(&:to_sym))
       end
 
       self.class.merge_tracker_hits_per_paths(*tracker_hits_per_path_hashes)
@@ -56,7 +53,7 @@ module top_level_module::DeepCover # rubocop:disable Naming/ClassAndModuleCamelC
       delete_trackers
       begin
         dir_path.rmdir
-      rescue SystemCallError # rubocop:disable Lint/HandleExceptions
+      rescue SystemCallError # rubocop:disable Lint/SuppressedException
       end
     end
 
@@ -88,6 +85,11 @@ module top_level_module::DeepCover # rubocop:disable Naming/ClassAndModuleCamelC
 
     private
 
+    def check_tracker_file(version:, tracker_hits_per_path:)
+      raise "dump version mismatch: #{version}, currently #{VERSION}" unless version == VERSION
+      tracker_hits_per_path
+    end
+
     def create_directory_if_needed
       dir_path.mkpath
     end

data/lib/deep_cover/reporter/istanbul.rb

@@ -68,7 +68,7 @@ module DeepCover
         end
       end
 
-      class CoveredCodeConverter < Struct.new(:covered_code, :options)
+      class CoveredCodeConverter < StructWithOptions.new(:covered_code)
         include Converters
 
         def node_analyser
@@ -172,7 +172,7 @@ module DeepCover
 
       class << self
         def report(coverage, **options)
-          new(coverage, options).report
+          new(coverage, **options).report
         end
 
         def available?

data/lib/deep_cover/tools/struct_with_options.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module DeepCover
+  module StructWithOptions
+    module Initializer
+      def initialize(*args, **options)
+        super(*args, options)
+      end
+    end
+
+    def self.new(*args)
+      Struct.new(*args, :options).tap do |klass|
+        klass.include Initializer
+        class << klass
+          undef_method :new
+        end
+        klass.define_singleton_method(:new, Class.method(:new))
+      end
+    end
+  end
+end

data/lib/deep_cover/tools/to_regexp.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module DeepCover
+  module Tools::ToRegexp
+    def to_regexp(regexp_or_str)
+      case regexp_or_str
+      when Regexp
+        regexp_or_str
+      when String
+        Regexp.new(Regexp.quote(regexp_or_str))
+      else
+        raise TypeError
+      end
+    end
+  end
+end

data/lib/deep_cover/version.rb

@@ -3,5 +3,5 @@
 top_level_module = Thread.current['_deep_cover_top_level_module'] || Object
 
 module top_level_module::DeepCover # rubocop:disable Naming/ClassAndModuleCamelCase
-  VERSION = '0.7.9'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover-core
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Marc-André Lafortune
 - Maxime Lapointe
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -149,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +303,8 @@ files:
 - lib/deep_cover/tools/silence_warnings.rb
 - lib/deep_cover/tools/slice.rb
 - lib/deep_cover/tools/strip_heredoc.rb
+- lib/deep_cover/tools/struct_with_options.rb
+- lib/deep_cover/tools/to_regexp.rb
 - lib/deep_cover/tools/truncate_backtrace.rb
 - lib/deep_cover/tools/with_unbundled_env.rb
 - lib/deep_cover/version.rb
@@ -316,7 +312,7 @@ homepage: https://github.com/deep-cover/deep-cover
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -331,8 +327,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: In depth coverage of your Ruby code.
 test_files: []