deep-cover-core 0.7.1 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51497f0cad911b1a78dac991b6b89f800c5cc1b0c7b99e8502816d02842ca239
-  data.tar.gz: 932a187d2d0669c5e21a82f81b1f7337db27d077d4ab07a9b92596721731862e
+  metadata.gz: 1bf24929f7466a5ba34eb280c6ea6b65c12a49a8f17faf72dcc52e4ee2df0b07
+  data.tar.gz: dee82a216bd81089e76b607d1da044b3adb58ef5f5941c8d74e0fd65b893f6b1
 SHA512:
-  metadata.gz: dbdc66591ef576cd5f3ad7dc0898b1746d3b1f3a5670490ea67a49a7773d200ae717029aa40b5b41359b8c67dff889aa118e7a5ef9e02e224f3c2a31cabc8372
-  data.tar.gz: e52c1575a8b86dd3ea5c908407a8efcbfa1ab3a0618d0b621384d1cb004143dba4e54a0464ac98030a59a8ba62f27119cbae6ef65e8cd51c07546cbd39970ae7
+  metadata.gz: f37f3e8c56ce00fdc4e111157f7d0d1bf4ddf7d16c07974e07252d1aea3b46232ffb391a934b68776573a6a96a845324b9e5addb0e8d3cd40c797a961d686d68
+  data.tar.gz: 555bcbbfa58c144d2033dc684f8ce07a5f963424538cf236f10f1a04f9d6c92b1d146d1ac963e346ec5fe1e9245cd4a6e2a35c46922000b39b032dc996687b27

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.0'
+  spec.add_runtime_dependency 'parser', '>= 2.5', '< 2.7'
 
   # Support
   spec.add_runtime_dependency 'backports', '>= 3.11.0'
@@ -38,11 +38,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'pry'
 
   ### Dev dependencies
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
 
   # About every single release breaks something
   # Ruby 2.1 is no longer supported
-  spec.add_development_dependency 'rubocop', '0.61.1' if RUBY_VERSION >= '2.2.0'
+  if RUBY_VERSION >= '2.3.0'
+    spec.add_development_dependency 'rubocop', '~> 0.74.0'
+    spec.add_development_dependency 'rubocop-performance'
+  end
 end

data/lib/deep_cover/analyser/per_line.rb

@@ -12,8 +12,8 @@ module DeepCover
     #          same as :branch, but also:
     #          if an empty branch is not executed, the line has to be marked as not executed.
     #          This is only for empty branches because, if they are not empty, there will already
-    #          be some red from the partial node covering. We don't everything to become red,
-    #          just want 100% coverage to be as hard as branch + node coverage.
+    #          be some red from the partial node covering. We don't want everything to become red,
+    #          simply for 100% coverage to be as hard as branch + node coverage.
     def results
       allow_partial = options.fetch(:allow_partial, true)
       line_hits = Array.new(covered_code.nb_lines + covered_code.lineno - 1)

data/lib/deep_cover/analyser/stats.rb

@@ -23,7 +23,7 @@ module DeepCover
     end
 
     def +(other)
-      self.class.new(to_h.merge(other.to_h) { |k, a, b| a + b })
+      self.class.new(**to_h.merge(other.to_h) { |k, a, b| a + b })
     end
 
     def total
@@ -31,7 +31,7 @@ module DeepCover
     end
 
     def with(**values)
-      self.class.new(to_h.merge(values))
+      self.class.new(**to_h.merge(values))
     end
 
     def potentially_executable

data/lib/deep_cover/backports.rb

@@ -20,3 +20,4 @@ require 'backports/2.4.0/enumerable/sum'
 require 'backports/2.5.0/hash/slice'
 require 'backports/2.5.0/hash/transform_keys'
 require 'backports/2.5.0/kernel/yield_self'
+require 'backports/2.6.0/hash/to_h'

data/lib/deep_cover/base.rb

@@ -116,6 +116,9 @@ module DeepCover
     #
     # If no "tracked dirs" exist, fallback to everything in current directory except each of test/ spec/ bin/ exe/.
     def auto_detected_paths
+      # When taking over, just go for everything
+      return ['.'] if DeepCover.const_defined?('TAKEOVER_IS_ON') && DeepCover::TAKEOVER_IS_ON
+
       require_relative 'tools/looks_like_rails_project'
 
       gemspec_paths = Dir['./*.gemspec'] + Dir['./*/*.gemspec']

data/lib/deep_cover/builtin_takeover.rb

@@ -5,6 +5,9 @@ require_relative 'coverage'
 require_relative 'core_ext/coverage_replacement'
 
 require 'coverage'
+raise "Ruby's builtin coverage is already running, cannot do a takeover" if Coverage.respond_to?(:running?) && Coverage.running?
+
 BuiltinCoverage = Coverage
 Object.send(:remove_const, 'Coverage')
 Coverage = DeepCover::CoverageReplacement.dup
+DeepCover::TAKEOVER_IS_ON = true

data/lib/deep_cover/core_ext/coverage_replacement.rb

@@ -47,13 +47,13 @@ module DeepCover
         raise 'coverage measurement is not enabled' unless running?
         if @started_args == OLD_COVERAGE_SENTINEL
           DeepCover.coverage.covered_codes.map do |covered_code|
-            [covered_code.path.to_s, covered_code.line_coverage(allow_partial: false)]
+            [covered_code.path.to_s, covered_code.line_coverage(**DeepCover.config.to_h)]
           end.to_h
         else
           DeepCover.coverage.covered_codes.map do |covered_code|
             cov = {}
             cov[:branches] = DeepCover::Analyser::Ruby25LikeBranch.new(covered_code).results if @started_args[:branches]
-            cov[:lines] = covered_code.line_coverage(allow_partial: false) if @started_args[:lines]
+            cov[:lines] = covered_code.line_coverage(**DeepCover.config.to_h) if @started_args[:lines]
             cov[:methods] = {} if @started_args[:methods]
             [covered_code.path.to_s, cov]
           end.to_h

data/lib/deep_cover/core_ext/exec_callbacks.rb

@@ -30,4 +30,5 @@ module top_level_module::DeepCover # rubocop:disable Naming/ClassAndModuleCamelC
     end
   end
   ::Kernel.send :private, original_exec_name
+  ::Kernel.send :private, :exec
 end

data/lib/deep_cover/coverage.rb

@@ -56,7 +56,7 @@ module DeepCover
       self
     end
 
-    # If a file wasn't required, it won't be in the trackers. This adds those mossing files
+    # If a file wasn't required, it won't be in the trackers. This adds those missing files
     def add_missing_covered_codes
       top_level_path = DeepCover.config.paths.detect do |path|
         next unless path.is_a?(String)
@@ -77,9 +77,16 @@ module DeepCover
         return
       end
 
+      skipped = []
       DeepCover.all_tracked_file_paths.each do |path|
-        covered_code(path, tracker_hits: :zeroes)
+        begin
+          covered_code(path, tracker_hits: :zeroes)
+        rescue Parser::SyntaxError
+          skipped << path
+        end
       end
+      warn "The following files could not be parsed:\n" + skipped.join("\n") unless skipped.empty?
+
       nil
     end
 

data/lib/deep_cover/custom_requirer.rb

@@ -46,7 +46,7 @@ module DeepCover
           next unless File.exist?(path_with_ext)
 
           # https://github.com/jruby/jruby/issues/5465
-          path_with_ext = File.realpath(path_with_ext) if RUBY_PLATFORM == 'java' && JRUBY_VERSION >= '9.2.5'
+          path_with_ext = File.realpath(path_with_ext) if RUBY_PLATFORM == 'java' && Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new('9.2.5')
           return path_with_ext
         end
       else

data/lib/deep_cover/flag_comment_associator.rb

@@ -11,8 +11,8 @@ module DeepCover
     # @param [Array(Parser::Source::Comment)] comments
     def initialize(covered_code, lookup = 'nocov')
       @covered_code = covered_code
-      @lookup      = /^#[\s#*-]*#{lookup}[\s#*-]*$/
-      @ranges      = nil
+      @lookup       = /^#[\s#*-]*#{lookup}[\s#*-]*$/
+      @ranges       = nil
     end
 
     def include?(range)

data/lib/deep_cover/reporter/html/index.rb

@@ -49,10 +49,9 @@ module DeepCover
 
       # {per_char: Stat, ...} => {per_char: {ignored: ...}, per_char_percent: 55.55, ...}
       def transform_data(data)
-        Tools.merge(
-            data.transform_values(&:to_h),
-            *data.map { |type, stat| {:"#{type}_percent" => stat.percent_covered} }
-        )
+        numbers = data.transform_values(&:to_h)
+        percent = data.to_h { |type, stat| [:"#{type}_percent", stat.percent_covered] }
+        numbers.merge(percent)
       end
     end
   end

data/lib/deep_cover/reporter/istanbul.rb

@@ -167,7 +167,7 @@ module DeepCover
             msg = "\nHTML coverage written to: '#{output}/index.html'"
           end
         end
-        `cd #{dir} && #{Istanbul.bin_path} report --reporter=text #{html}` + msg.to_s
+        `cd #{dir} && #{Istanbul.bin_path} report --exclude-after-remap=false --reporter=text #{html}` + msg.to_s
       end
 
       class << self

data/lib/deep_cover/tools/strip_heredoc.rb

@@ -4,7 +4,7 @@ module DeepCover
   module Tools::StripHeredoc
     # In-place implementation copied from active-support.
     IMPLEMENTATION = -> do
-      gsub(/^#{scan(/^[ \t]*(?=\S)/).min}/, ''.freeze).tap do |stripped|
+      gsub(/^#{scan(/^[ \t]*(?=\S)/).min}/, '').tap do |stripped|
         stripped.freeze if frozen?
       end
     end

data/lib/deep_cover/tools/with_unbundled_env.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module DeepCover
+  module Tools
+    module WithUnbundledEnv
+      extend self
+      # Bundler is changing from with_clean_env to with_unbundled_env in 2.0
+      def with_unbundled_env
+        if Bundler.respond_to?(:with_unbundled_env)
+          Bundler.with_unbundled_env { yield }
+        else
+          Bundler.with_clean_env { yield }
+        end
+      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.1'
+  VERSION = '0.7.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover-core
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.6
 platform: ruby
 authors:
 - Marc-André Lafortune
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -99,30 +105,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,16 +147,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.74.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.74.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: '0'
 description: Core functionality for the DeepCover gem.
 email:
 - github@marc-andre.ca
@@ -290,6 +310,7 @@ files:
 - lib/deep_cover/tools/slice.rb
 - lib/deep_cover/tools/strip_heredoc.rb
 - lib/deep_cover/tools/truncate_backtrace.rb
+- lib/deep_cover/tools/with_unbundled_env.rb
 - lib/deep_cover/version.rb
 homepage: https://github.com/deep-cover/deep-cover
 licenses:
@@ -311,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: In depth coverage of your Ruby code.