bootsnap 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6aa25eb064ffeb1bd2e7588f6741061c1acd0647782ba830ebc872ce8997ff2
-  data.tar.gz: 981babf7f6d1dc70cd02e5b7373a1a0770d3ebca39e1488503e7aebc1665f8f2
+  metadata.gz: fc93ed69fb2f50721ee3edbd37bf5f44a617db15ad1d77cf3a675197d7b420e6
+  data.tar.gz: 370a02dfb9fcb85d3c38ffa26c5ac89720e6ac493f9cb90262da2b096e2f0457
 SHA512:
-  metadata.gz: 5dc67fe4306e38465bbcec301a169e42a7555ce5541b3d2032cfdf157bf4ff47a25b4403a450f57232f2ae27c69fee8f284fdc94588e671b33af9edff5b6fc2d
-  data.tar.gz: de7d7384d6cb6c97b7e32ebf6f00de0e7b9f7a0aa65a76897d0458a1d0a172e8d714ca3d812ed79aef9a34943ef7dcfdbff95413c95dab4d44be13971dd2cf57
+  metadata.gz: 14aee751c568fa870b4c8f694274108460a99605b32e355dfa73d25070609c06a0a9531a00f0fe66ea261428c9c0379ff39813168ffa233a5209c39e72f92779
+  data.tar.gz: e6d2bd977b56bdc5b46d7a335f3f4fef729747527dce035233f2f590c22bb88fe35d79dae68de191ff83cb98fcb7b8a0275639b3a6bc44697c26a3bed5af1b85

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.1
+
+* Change load path scanning to more correctly follow symlinks.
+
 # 1.3.0
 
 * Handle cases where load path entries are symlinked (https://github.com/Shopify/bootsnap/pull/136)

data/README.jp.md

@@ -56,11 +56,11 @@ Bootsnapのすべての機能はセットアップ時の設定に従って開発
 Bootsnap は、処理に時間のかかるメソッドの結果をキャッシュすることで最適化しています。これは、大きく分けて2つのカテゴリに分けられます。
 
 * [Path Pre-Scanning](#path-pre-scanning)
-    * `Kernel#require` と `Kernel#load` を `$LOAD_PATH` フルスキャンを行わないように変更します。
-    * `ActiveSupport::Dependencies.{autoloadable_module?,load_missing_constant,depend_on}` を `ActiveSupport::Dependencies.autoload_paths` のフルスキャンを行わないようにオーバーライドします。
+  * `Kernel#require` と `Kernel#load` を `$LOAD_PATH` フルスキャンを行わないように変更します。
+  * `ActiveSupport::Dependencies.{autoloadable_module?,load_missing_constant,depend_on}` を `ActiveSupport::Dependencies.autoload_paths` のフルスキャンを行わないようにオーバーライドします。
 * [Compilation caching](#compilation-caching)
-    * Ruby バイトコードのコンパイル結果をキャッシュするためのメソッド `RubyVM::InstructionSequence.load_iseq` が実装されています。
-    * `YAML.load_file` を YAML オブジェクトのロード結果を MessagePack でキャッシュするように変更します。 MessagePack でサポートされていないタイプが使われている場合は Marshal が使われます。
+  * Ruby バイトコードのコンパイル結果をキャッシュするためのメソッド `RubyVM::InstructionSequence.load_iseq` が実装されています。
+  * `YAML.load_file` を YAML オブジェクトのロード結果を MessagePack でキャッシュするように変更します。 MessagePack でサポートされていないタイプが使われている場合は Marshal が使われます。
 
 ### Path Pre-Scanning
 

data/lib/bootsnap.rb

@@ -35,6 +35,10 @@ module Bootsnap
   end
 
   def self.setup_disable_trace
-    RubyVM::InstructionSequence.compile_option = { trace_instruction: false }
+    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")
+    else
+      RubyVM::InstructionSequence.compile_option = { trace_instruction: false }
+    end
   end
 end

data/lib/bootsnap/load_path_cache/cache.rb

@@ -103,14 +103,6 @@ module Bootsnap
         @mutex.synchronize { push_paths_locked(*paths) }
       end
 
-      def each_requirable
-        @mutex.synchronize do
-          @index.each do |rel, entry|
-            yield "#{entry}/#{rel}"
-          end
-        end
-      end
-
       def reinitialize(path_obj = @path_obj)
         @mutex.synchronize do
           @path_obj = path_obj

data/lib/bootsnap/load_path_cache/change_observer.rb

@@ -1,37 +1,28 @@
 module Bootsnap
   module LoadPathCache
     module ChangeObserver
-      def self.register(observer, arr)
-        # Re-overriding these methods on an array that already has them would
-        # cause StackOverflowErrors
-        return if arr.respond_to?(:push_without_lpc)
-
+      module ArrayMixin
         # For each method that adds items to one end or another of the array
         # (<<, push, unshift, concat), override that method to also notify the
         # observer of the change.
-        sc = arr.singleton_class
-        sc.send(:alias_method, :shovel_without_lpc, :<<)
-        arr.define_singleton_method(:<<) do |entry|
-          observer.push_paths(self, entry.to_s)
-          shovel_without_lpc(entry)
+        def <<(entry)
+          @lpc_observer.push_paths(self, entry.to_s)
+          super
         end
 
-        sc.send(:alias_method, :push_without_lpc, :push)
-        arr.define_singleton_method(:push) do |*entries|
-          observer.push_paths(self, *entries.map(&:to_s))
-          push_without_lpc(*entries)
+        def push(*entries)
+          @lpc_observer.push_paths(self, *entries.map(&:to_s))
+          super
         end
 
-        sc.send(:alias_method, :unshift_without_lpc, :unshift)
-        arr.define_singleton_method(:unshift) do |*entries|
-          observer.unshift_paths(self, *entries.map(&:to_s))
-          unshift_without_lpc(*entries)
+        def unshift(*entries)
+          @lpc_observer.unshift_paths(self, *entries.map(&:to_s))
+          super
         end
 
-        sc.send(:alias_method, :concat_without_lpc, :concat)
-        arr.define_singleton_method(:concat) do |entries|
-          observer.push_paths(self, *entries.map(&:to_s))
-          concat_without_lpc(entries)
+        def concat(entries)
+          @lpc_observer.push_paths(self, *entries.map(&:to_s))
+          super
         end
 
         # For each method that modifies the array more aggressively, override
@@ -41,16 +32,22 @@ module Bootsnap
         # accounting cost would be greater than the hit from these, since we
         # actively discourage calling them.
         %i(
-          collect! compact! delete delete_at delete_if fill flatten! insert map!
-          reject! reverse! select! shuffle! shift slice! sort! sort_by!
-        ).each do |meth|
-          sc.send(:alias_method, :"#{meth}_without_lpc", meth)
-          arr.define_singleton_method(meth) do |*a|
-            send(:"#{meth}_without_lpc", *a)
-            observer.reinitialize
+          []= 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!
+        ).each do |method_name|
+          define_method(method_name) do |*args, &block|
+            ret = super(*args, &block)
+            @lpc_observer.reinitialize
+            ret
           end
         end
       end
+
+      def self.register(observer, arr)
+        arr.instance_variable_set(:@lpc_observer, observer)
+        arr.extend(ArrayMixin)
+      end
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Bootsnap
 end
 
 module Kernel
-  private
+  module_function
 
   alias_method :require_without_bootsnap, :require
 
@@ -63,56 +63,6 @@ module Kernel
   end
 end
 
-class << Kernel
-  alias_method :require_without_bootsnap, :require
-
-  def require_with_bootsnap_lfi(path, resolved = nil)
-    Bootsnap::LoadPathCache.loaded_features_index.register(path, resolved) do
-      require_without_bootsnap(resolved || path)
-    end
-  end
-
-  def require(path)
-    return false if Bootsnap::LoadPathCache.loaded_features_index.key?(path)
-
-    if resolved = Bootsnap::LoadPathCache.load_path_cache.find(path)
-      return require_with_bootsnap_lfi(path, resolved)
-    end
-
-    raise Bootsnap::LoadPathCache::CoreExt.make_load_error(path)
-  rescue Bootsnap::LoadPathCache::ReturnFalse
-    return false
-  rescue Bootsnap::LoadPathCache::FallbackScan
-    require_with_bootsnap_lfi(path)
-  end
-
-  alias_method :require_relative_without_bootsnap, :require_relative
-  def require_relative(path)
-    realpath = Bootsnap::LoadPathCache.realpath_cache.call(
-      caller_locations(1..1).first.absolute_path, path
-    )
-    require(realpath)
-  end
-
-  alias_method :load_without_bootsnap, :load
-  def load(path, wrap = false)
-    if resolved = Bootsnap::LoadPathCache.load_path_cache.find(path)
-      return load_without_bootsnap(resolved, wrap)
-    end
-
-    # load also allows relative paths from pwd even when not in $:
-    if File.exist?(relative = File.expand_path(path))
-      return load_without_bootsnap(relative, wrap)
-    end
-
-    raise Bootsnap::LoadPathCache::CoreExt.make_load_error(path)
-  rescue Bootsnap::LoadPathCache::ReturnFalse
-    return false
-  rescue Bootsnap::LoadPathCache::FallbackScan
-    load_without_bootsnap(path, wrap)
-  end
-end
-
 class Module
   alias_method :autoload_without_bootsnap, :autoload
   def autoload(const, path)

data/lib/bootsnap/load_path_cache/path_scanner.rb

@@ -3,16 +3,8 @@ require_relative '../explicit_require'
 module Bootsnap
   module LoadPathCache
     module PathScanner
-      # Glob pattern to find requirable files and subdirectories in given path.
-      # It expands to:
-      #
-      #   * `/*{.rb,.so,/}` - It matches requirable files, directories and
-      #     symlinks to directories at given path.
-      #   * `/*/**/*{.rb,.so,/}` - It matches requirable files and
-      #     subdirectories in any (even symlinked) directory at given path at
-      #     any directory tree depth.
-      #
-      REQUIRABLES_AND_DIRS = "/{,*/**/}*{#{DOT_RB},#{DL_EXTENSIONS.join(',')},/}"
+      ALL_FILES = "/{,**/*/**/}*"
+      REQUIRABLE_EXTENSIONS = [DOT_RB] + DL_EXTENSIONS
       NORMALIZE_NATIVE_EXTENSIONS = !DL_EXTENSIONS.include?(LoadPathCache::DOT_SO)
       ALTERNATIVE_NATIVE_EXTENSIONS_PATTERN = /\.(o|bundle|dylib)\z/
       BUNDLE_PATH = Bootsnap.bundler? ?
@@ -34,13 +26,13 @@ module Bootsnap
         dirs = []
         requirables = []
 
-        Dir.glob(path + REQUIRABLES_AND_DIRS).each do |absolute_path|
+        Dir.glob(path + ALL_FILES).each do |absolute_path|
           next if contains_bundle_path && absolute_path.start_with?(BUNDLE_PATH)
-          relative_path = absolute_path.slice!(relative_slice)
+          relative_path = absolute_path.slice(relative_slice)
 
-          if relative_path.end_with?('/')
-            dirs << relative_path[0..-2]
-          else
+          if File.directory?(absolute_path)
+            dirs << relative_path
+          elsif REQUIRABLE_EXTENSIONS.include?(File.extname(relative_path))
             requirables << relative_path
           end
         end

data/lib/bootsnap/setup.rb

@@ -3,7 +3,7 @@ require_relative '../bootsnap'
 env = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || ENV['ENV']
 development_mode = ['', nil, 'development'].include?(env)
 
-# only enable on 'ruby' (MRI), POSIX (darin, linux, *bsd), and >= 2.3.0
+# only enable on 'ruby' (MRI), POSIX (darwin, linux, *bsd), and >= 2.3.0
 enable_cc =
   RUBY_ENGINE == 'ruby' &&
   RUBY_PLATFORM =~ /darwin|linux|bsd/ &&

data/lib/bootsnap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler