bootsnap 1.3.1-java → 1.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd5c47eb0d49337b4fbdcc59a5265f1287d07532
-  data.tar.gz: fa734ba3ca1004392713d93da4761d562d431a54
+SHA256:
+  metadata.gz: 929d3ddcf796d7d001890c5661403ce1ba3cd21dfe63fcce6986857f3c551c70
+  data.tar.gz: 5c8be3187f173b46127dc09e2fa98c83044d3a1f02a364ae3045d7d3abc85e23
 SHA512:
-  metadata.gz: 9de9aa3c282c663c6b2d7bdd1d620f5d84b5f676090a7aaa9579e046345ee8342a58e2716434fb67c2ce5875a87f678891da318b1a9654ecd16887675e5d4e33
-  data.tar.gz: 7eef7fb5e4946d5eb3b0082bedf9eb8b81561e89c61c8c9d53f6616de01c7096b72a7c673b572f807d75f18fa8107cdd45f6b56f943f930663db457049816081
+  metadata.gz: 63d4386909d722d027f355d46e719f4c843d3af2abfbd689abe55a8f20b21f01f3c25dbf3dc7bb0461d326dd69b8f0a5e849a7f8b033a7ac9b5344b1e00461f2
+  data.tar.gz: b832b7992a9b9a700fbdc1e84b1264544b207f03a172f1a95535b76f9ef8f2a8ae8585fee72dc55ad2c3873ed0b0f0122e87860baebae97b557916bbb9b1a395

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.3.2
+
+* Fix Spring + Bootsnap incompatibility when there are files with similar names.
+* Fix `YAML.load_file` monkey patch to keep accepting File objects as arguments.
+* Fix the API for `ActiveSupport::Dependencies#autoloadable_module?`.
+* Some performance improvements.
+
 # 1.3.1
 
 * Change load path scanning to more correctly follow symlinks.

data/dev.yml

@@ -2,7 +2,9 @@ env:
   BOOTSNAP_PEDANTIC: '1'
 
 up:
-  - ruby: 2.3.3
+  - ruby:
+      version: 9.0.5.0
+      engine: jruby
   - bundler
 commands:
   build: rake compile

data/ext/bootsnap/bootsnap.c

@@ -269,6 +269,8 @@ cache_key_equal(struct bs_cache_key * k1, struct bs_cache_key * k2)
 static VALUE
 bs_rb_fetch(VALUE self, VALUE cachedir_v, VALUE path_v, VALUE handler)
 {
+  FilePathValue(path_v);
+
   Check_Type(cachedir_v, T_STRING);
   Check_Type(path_v, T_STRING);
 

data/lib/bootsnap.rb

@@ -36,7 +36,7 @@ module Bootsnap
 
   def self.setup_disable_trace
     if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0')
-      warn("This method is not allowed with this Ruby version. current: #{RUBY_VERSION}, allowed version: < 2.5.0")
+      warn("from #{caller_locations(1, 1)[0]}: The 'disable_trace' method is not allowed with this Ruby version. current: #{RUBY_VERSION}, allowed version: < 2.5.0")
     else
       RubyVM::InstructionSequence.compile_option = { trace_instruction: false }
     end

data/lib/bootsnap/bundler.rb

@@ -2,11 +2,13 @@ module Bootsnap
   module_function
 
   def bundler?
+    return false unless defined?(::Bundler)
+
     # Bundler environment variable
     ['BUNDLE_BIN_PATH', 'BUNDLE_GEMFILE'].each do |current|
       return true if ENV.key?(current)
     end
-    
+
     false
   end
 end

data/lib/bootsnap/compile_cache/yaml.rb

@@ -48,7 +48,7 @@ module Bootsnap
         klass.send(:define_method, :load_file) do |path|
           Bootsnap::CompileCache::Native.fetch(
             cache_dir,
-            path.to_s,
+            path,
             Bootsnap::CompileCache::YAML
           )
         end

data/lib/bootsnap/load_path_cache/cache.rb

@@ -14,10 +14,10 @@ module Bootsnap
         reinitialize
       end
 
-      # Does this directory exist as a child of one of the path items?
-      # e.g. given "/a/b/c/d" exists, and the path is ["/a/b"], has_dir?("c/d")
-      # is true.
-      def has_dir?(dir)
+      # What is the path item that contains the dir as child?
+      # e.g. given "/a/b/c/d" exists, and the path is ["/a/b"], load_dir("c/d")
+      # is "/a/b".
+      def load_dir(dir)
         reinitialize if stale?
         @mutex.synchronize { @dirs[dir] }
       end
@@ -108,7 +108,7 @@ module Bootsnap
           @path_obj = path_obj
           ChangeObserver.register(self, @path_obj)
           @index = {}
-          @dirs = Hash.new(false)
+          @dirs = {}
           @generated_at = now
           push_paths_locked(*@path_obj)
         end
@@ -132,10 +132,11 @@ module Bootsnap
             p = Path.new(path)
             @has_relative_paths = true if p.relative?
             next if p.non_directory?
+            expanded_path = p.expanded_path
             entries, dirs = p.entries_and_dirs(@store)
             # push -> low precedence -> set only if unset
-            dirs.each    { |dir| @dirs[dir]  ||= true }
-            entries.each { |rel| @index[rel] ||= p.expanded_path }
+            dirs.each    { |dir| @dirs[dir]  ||= path }
+            entries.each { |rel| @index[rel] ||= expanded_path }
           end
         end
       end
@@ -145,10 +146,11 @@ module Bootsnap
           paths.map(&:to_s).reverse_each do |path|
             p = Path.new(path)
             next if p.non_directory?
+            expanded_path = p.expanded_path
             entries, dirs = p.entries_and_dirs(@store)
             # unshift -> high precedence -> unconditional set
-            dirs.each    { |dir| @dirs[dir]  = true }
-            entries.each { |rel| @index[rel] = p.expanded_path }
+            dirs.each    { |dir| @dirs[dir]  = path }
+            entries.each { |rel| @index[rel] = expanded_path }
           end
         end
       end

data/lib/bootsnap/load_path_cache/change_observer.rb

@@ -25,6 +25,14 @@ module Bootsnap
           super
         end
 
+        # uniq! keeps the first occurance of each path, otherwise preserving
+        # order, preserving the effective load path
+        def uniq!(*args)
+          ret = super
+          @lpc_observer.reinitialize if block_given? || !args.empty?
+          ret
+        end
+
         # For each method that modifies the array more aggressively, override
         # the method to also have the observer completely reconstruct its state
         # after the modification. Many of these could be made to modify the
@@ -34,7 +42,7 @@ module Bootsnap
         %i(
           []= clear collect! compact! delete delete_at delete_if fill flatten!
           insert keep_if map! pop reject! replace reverse! rotate! select!
-          shift shuffle! slice! sort! sort_by! uniq!
+          shift shuffle! slice! sort! sort_by!
         ).each do |method_name|
           define_method(method_name) do |*args, &block|
             ret = super(*args, &block)

data/lib/bootsnap/load_path_cache/core_ext/active_support.rb

@@ -10,6 +10,14 @@ module Bootsnap
           Thread.current[:without_bootsnap_cache] = prev
         end
 
+        def self.allow_bootsnap_retry(allowed)
+          prev = Thread.current[:without_bootsnap_retry] || false
+          Thread.current[:without_bootsnap_retry] = !allowed
+          yield
+        ensure
+          Thread.current[:without_bootsnap_retry] = prev
+        end
+
         module ClassMethods
           def autoload_paths=(o)
             super
@@ -26,13 +34,19 @@ module Bootsnap
           end
 
           def autoloadable_module?(path_suffix)
-            Bootsnap::LoadPathCache.autoload_paths_cache.has_dir?(path_suffix)
+            Bootsnap::LoadPathCache.autoload_paths_cache.load_dir(path_suffix)
           end
 
           def remove_constant(const)
             CoreExt::ActiveSupport.without_bootsnap_cache { super }
           end
 
+          def require_or_load(*)
+            CoreExt::ActiveSupport.allow_bootsnap_retry(true) do
+              super
+            end
+          end
+
           # If we can't find a constant using the patched implementation of
           # search_for_file, try again with the default implementation.
           #
@@ -40,8 +54,15 @@ module Bootsnap
           # behaviour.  The gymnastics here are a bit awkward, but it prevents
           # 200+ lines of monkeypatches.
           def load_missing_constant(from_mod, const_name)
-            super
+            CoreExt::ActiveSupport.allow_bootsnap_retry(false) do
+              super
+            end
           rescue NameError => e
+            # This function can end up called recursively, we only want to
+            # retry at the top-level.
+            raise if Thread.current[:without_bootsnap_retry]
+            # If we already had cache disabled, there's no use retrying
+            raise if Thread.current[:without_bootsnap_cache]
             # NoMethodError is a NameError, but we only want to handle actual
             # NameError instances.
             raise unless e.class == NameError
@@ -58,6 +79,8 @@ module Bootsnap
           def depend_on(*)
             super
           rescue LoadError
+            # If we already had cache disabled, there's no use retrying
+            raise if Thread.current[:without_bootsnap_cache]
             CoreExt::ActiveSupport.without_bootsnap_cache { super }
           end
         end

data/lib/bootsnap/load_path_cache/loaded_features_index.rb

@@ -84,7 +84,7 @@ module Bootsnap
 
       private
 
-      STRIP_EXTENSION = /\..*?$/
+      STRIP_EXTENSION = /\.[^.]*?$/
       private_constant :STRIP_EXTENSION
 
       def strip_extension(f)

data/lib/bootsnap/version.rb

@@ -1,3 +1,3 @@
 module Bootsnap
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: java
 authors:
 - Burke Libbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Boot large ruby/rails apps faster