deep-cover 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b07ad13bcfdc6616d61b1a80bd632d8b41e105a942b91e526b6a794a7b0315ba
-  data.tar.gz: 12c59e6a8ae6e161e1bf93306cebae6f0281204d3dc41241f6dc20f025102eb3
+SHA1:
+  metadata.gz: a766315723e0e4a70d85a1bd0d36c75302c014f4
+  data.tar.gz: 9f65074c91b5926f6b47cbc2b5e6f7f07cd307ce
 SHA512:
-  metadata.gz: 1421c160b9eb370663025c4704ab69fb061686301d694d65554fd3cd8a10211e1376ca072a7744e3f1568bd93e851d2889ad4f1c09b8d86f0a19fe08d59b04c9
-  data.tar.gz: 0b3a75ff09297e170ffe800bcbe6fb4a0ad22e1bac1ca91d4b0d10fb8e79f96030e117845953c25f0a182708e1aace7e67ca7b97efccafbeb830d4a353df139c
+  metadata.gz: 702c3d7340ad6184f37f840568979e5c174ebcbb0c6b217238dd36ad0d246d512918e237b0fa8f5f6507c3330be554631752ea6edc81feb82bc79af40bd03e3f
+  data.tar.gz: bcc64581373f355253fc8a86fb8b74d5c830daddf36ec5c6d2c496077e03b8b3f026960972cc54c2dd6cc56c599347261ea62b0325946e867c3daeb5d79fa479

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+* `#require` is much faster in MRI Ruby 2.1 and 2.2, resulting in much faster boot time for most applications when deep-cover is enabled.
+
+## 0.6.1
+
+* Takeover now also considers branch coverage to generate the per-line output.  
+  In order to reach 100% coverage with takeover, you need 100% node coverage and 100% branch coverage.
+* Support for covering of `#load` in MRI Ruby 2.1 and 2.2
+
+## 0.6
+
+* Support for covering of `#load` in MRI Ruby 2.3+
+
 ## 0.5
 
 * Added custom filters

data/lib/deep_cover/analyser/branch.rb

@@ -21,7 +21,7 @@ module DeepCover
 
     def results
       each_node.map do |node|
-        branches_runs = node.branches.map { |jump| [jump, source.node_runs(jump)] }.to_h
+        branches_runs = node.branches.map { |jump| [jump, branch_runs(jump)] }.to_h
         [node, branches_runs]
       end.to_h
     end
@@ -29,9 +29,13 @@ module DeepCover
     private
 
     def worst_branch_runs(fork)
-      fork.branches.map { |jump| source.node_runs(jump) }
+      fork.branches.map { |jump| branch_runs(jump) }
           .sort_by { |runs| runs == 0 ? -2 : runs || -1 }
           .first
     end
+
+    def branch_runs(branch)
+      branch.flow_entry_count.nonzero? || source.node_runs(branch)
+    end
   end
 end

data/lib/deep_cover/custom_requirer.rb

@@ -8,6 +8,12 @@ module DeepCover
       @loaded_features = loaded_features
       @filter = filter
       @paths_being_required = Set.new
+
+      # A Set of the loaded_features for faster access
+      @loaded_features_set = Set.new
+      # A dup of the loaded_features as they are expected to be for the Set to be valid
+      # If this is different from loaded_features, the set should be refreshed
+      @duped_loaded_features_used_for_set = []
     end
 
     # Returns a path to an existing file or nil if none can be found.
@@ -28,11 +34,12 @@ module DeepCover
 
       paths_with_ext = extensions_to_try.map { |ext| path + ext }
 
+      refresh_loaded_features_set
+
       # Doing this check in every case instead of only for absolute_path because ruby has some
       # built-in $LOADED_FEATURES which aren't an absolute path. Ex: enumerator.so, thread.rb
-      paths_with_ext.each do |path_with_ext|
-        return path_with_ext if @loaded_features.include?(path_with_ext)
-      end
+      path_from_loaded_features = first_path_from_loaded_features_set(paths_with_ext)
+      return path_from_loaded_features if path_from_loaded_features
 
       if path == abs_path
         paths_with_ext.each do |path_with_ext|
@@ -40,9 +47,8 @@ module DeepCover
         end
       else
         possible_paths = paths_with_load_paths(paths_with_ext)
-        possible_paths.each do |possible_path|
-          return possible_path if @loaded_features.include?(possible_path)
-        end
+        path_from_loaded_features = first_path_from_loaded_features_set(possible_paths)
+        return path_from_loaded_features if path_from_loaded_features
 
         possible_paths.each do |possible_path|
           next unless File.exist?(possible_path)
@@ -78,10 +84,10 @@ module DeepCover
       end
 
       DeepCover.autoload_tracker.wrap_require(path, found_path) do
-        # Either a problem with resolve_path, or a gem that will be added to the load_path by RubyGems
-        return yield(:not_found) unless found_path
-
         begin
+          # Either a problem with resolve_path, or a gem that will be added to the load_path by RubyGems
+          return yield(:not_found) unless found_path
+
           @paths_being_required.add(found_path)
           return yield(:not_in_covered_paths) unless DeepCover.within_lookup_paths?(found_path)
           return yield(:not_supported) if found_path.end_with?('.so')
@@ -92,6 +98,7 @@ module DeepCover
           @loaded_features << found_path
         ensure
           @paths_being_required.delete(found_path)
+          add_last_loaded_feature_to_set
         end
       end
       true
@@ -127,6 +134,32 @@ module DeepCover
 
     protected
 
+    # updates the loaded_features_set if it needs it
+    def refresh_loaded_features_set
+      return if @duped_loaded_features_used_for_set == @loaded_features
+
+      @duped_loaded_features_used_for_set = @loaded_features.dup
+      @loaded_features_set = Set.new(@duped_loaded_features_used_for_set)
+    end
+
+    # Returns the first path found in the loaded_features_set
+    # Should be called after doing a #refresh_loaded_features_set
+    def first_path_from_loaded_features_set(paths)
+      paths.detect { |path| @loaded_features_set.include?(path) }
+    end
+
+    # Called after a require, adds the last entry of loaded_features to the
+    # loaded_features_set and the clone used to check for a need to refresh
+    # the loaded_features_set. Doing this allows us to never need to update
+    # the loaded_feature_set from scratch (almost? this is a safety precaution)
+    def add_last_loaded_feature_to_set
+      loaded_feature = @loaded_features.last
+      unless @loaded_features_set.include?(loaded_feature)
+        @duped_loaded_features_used_for_set << loaded_feature
+        @loaded_features_set << loaded_feature
+      end
+    end
+
     def paths_with_load_paths(paths)
       paths.flat_map do |path|
         @load_paths.map do |load_path|

data/lib/deep_cover/node/short_circuit.rb

@@ -21,7 +21,7 @@ module DeepCover
       def branches_summary(of_branches = branches)
         of_branches.map do |jump|
           if jump == conditional
-            'left-hand side'
+            'right-hand side'
           else
             "#{type == :and ? 'falsy' : 'truthy'} shortcut"
           end

data/lib/deep_cover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeepCover
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Marc-André Lafortune
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -414,7 +414,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: In depth coverage of your Ruby code.