deep-cover-core 0.7.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800f64be0c9af77333d7e68f729d8c3cb4bd8b35cb965fac10422da993d6553e
-  data.tar.gz: 8333ccb194250280995ae1078b48097f2516324f9a85beabddcbca1563735a48
+  metadata.gz: 3b1e1b60b0998fa8c6f0d33fb890922467343e8360f2273dc4e49b2c9475a9a5
+  data.tar.gz: 8ad12267d8abe699a2293c49e13903fa369e7bdcc6af1f6d8659d5de5c485d1f
 SHA512:
-  metadata.gz: 2bde03af4ab23daf437f6e37d834c0ca1565043f9395955ab9a110b9e54c7f251827d3a05c2145393cfb5cf8d2b519b2ee8fe2a8a349cf3f7ed844c1b450c5b3
-  data.tar.gz: 03e57609062505285c7828d28cad3859d62e4c77a0e5a98f8336743c9d8c21e507f43afbf4c8ee126dad7903a4e71891c6311154fe71cb65f1b53009f78c3627
+  metadata.gz: 23577ccba0bb134ca3d77657eae725bf64463c7129e6bc8cb489e775dd46c6884261878302daa15553c0e9c4b2376ceafbb45da01a5f46b152aa77154fa01b70
+  data.tar.gz: f0e0941b543ab4e9d8d2f892e33c92efd3df8ecb697b7c0a0a96856e18171fc66d52f6269fe91889f2383528a48df375395e8cd355d8a228ffb534d04b817f78

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,6 +84,11 @@ 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
       paths = Array(config.paths || :auto_detect).dup
@@ -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/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/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/html/site.rb

@@ -60,7 +60,7 @@ module DeepCover
         end
       end
 
-      def self.save(coverage, output:, **options)
+      def self.save(coverage, output: DEFAULTS[:output], **options)
         Site.new(coverage, output: output, **options).save
       end
     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,18 @@
+# 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
+        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.8'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover-core
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Marc-André Lafortune
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-06-01 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
@@ -331,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: In depth coverage of your Ruby code.