bootsnap 1.3.2-java → 1.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 929d3ddcf796d7d001890c5661403ce1ba3cd21dfe63fcce6986857f3c551c70
-  data.tar.gz: 5c8be3187f173b46127dc09e2fa98c83044d3a1f02a364ae3045d7d3abc85e23
+  metadata.gz: b52dcf497cc21a7ce9e7a90d1ce3356c90bfecb2dca0075e9ed18ccd5bd85f46
+  data.tar.gz: 848f3b1c68bc8aff09e7f33990d2d25d64fd0e4349ce5ba5ad99696b06eb69bd
 SHA512:
-  metadata.gz: 63d4386909d722d027f355d46e719f4c843d3af2abfbd689abe55a8f20b21f01f3c25dbf3dc7bb0461d326dd69b8f0a5e849a7f8b033a7ac9b5344b1e00461f2
-  data.tar.gz: b832b7992a9b9a700fbdc1e84b1264544b207f03a172f1a95535b76f9ef8f2a8ae8585fee72dc55ad2c3873ed0b0f0122e87860baebae97b557916bbb9b1a395
+  metadata.gz: 68f89030acc8fca5f2abaf210ed33cb3cb6f02bf587197f87db2869421496dfc504e0ed1ab04dfc44b3ce1d6d0a5f60fbc4a4520082b833c3cc3d12dcc4751b3
+  data.tar.gz: e4fbeab4eae5e93bbde91b95274cb54521733a06780e1f6d677eb212124ae248370f29e941ed89bcb72cb4ffaa88e4c71a73572f6371376102bd97df89751a9c

data/.travis.yml

@@ -8,6 +8,17 @@ os:
 rvm:
   - ruby-2.4
   - ruby-2.5
+  - ruby-head
 
-before_script: rake
-script: bundle exec bin/testunit
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  include:
+    - rvm: jruby
+      os: linux
+      env: MINIMAL_SUPPORT=1
+    - rvm: truffleruby
+      os: linux
+      env: MINIMAL_SUPPORT=1
+
+script: bin/ci

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 1.4.0
+
+* When running in development mode, always fall back to a full path scan on LoadError, making
+  bootsnap more able to detect newly-created files. (#230)
+* Respect `$LOADED_FEATURES.delete` in order to support code reloading, for integration with
+  Zeitwerk. (#230)
+* Minor performance improvement: flow-control exceptions no longer generate backtraces.
+* Better support for requiring from environments where some features are not supported (especially
+  JRuby). (#226)k
+* More robust handling of OS errors when creating files. (#225)
+
 # 1.3.2
 
 * Fix Spring + Bootsnap incompatibility when there are files with similar names.

data/README.jp.md

@@ -12,7 +12,7 @@ Bootsnap は RubyVM におけるバイトコード生成やファイルルック
 
 ## 使用方法
 
-この gem は MacOS と Linux で作動します。まずは、`bootsnap` を `Gemfile` に追加します:
+この gem は macOS と Linux で作動します。まずは、`bootsnap` を `Gemfile` に追加します:
 
 ```ruby
 gem 'bootsnap', require: false
@@ -24,6 +24,8 @@ Rails を使用している場合は、以下のコードを、`config/boot.rb`
 require 'bootsnap/setup'
 ```
 
+単に `gem 'bootsnap', require: 'bootsnap/setup'` と指定することも技術的には可能ですが、最大限のパフォーマンス改善を得るためには Bootsnap をできるだけ早く読み込むことが重要です。
+
 この require の仕組みは[こちら](https://github.com/Shopify/bootsnap/blob/master/lib/bootsnap/setup.rb)で確認できます。
 
 Rails を使用していない場合、または、より多くの設定を変更したい場合は、以下のコードを `require 'bundler/setup'` の直後に追加してください(早く読み込まれるほど、より多くのものを最適化することができます）。
@@ -67,7 +69,7 @@ Bootsnap は、処理に時間のかかるメソッドの結果をキャッシ
 _(このライブラリは [bootscale](https://github.com/byroot/bootscale) という別のライブラリを元に開発されました)_
 
 Bootsnap の初期化時、あるいはパス(例えば、`$LOAD_PATH`)の変更時に、`Bootsnap::LoadPathCache` がキャッシュから必要なエントリーのリストを読み込みます。または、必要に応じてフルスキャンを実行し結果をキャッシュします。
-その後、たとえば `require 'foo'` を評価する場合, Ruby は `$LOAD_PATH` `['x', 'y', ...]` のすべてのエントリーを繰り返し評価することで `x/foo.rb`, `y/foo.rb` などを探索します。これに対して Bootsnap は、キャッシュされた reuiqre 可能なファイルと `$LOAD_PATH` を見ることで、Rubyが最終的に選択するであろうパスで置き換えます。
+その後、たとえば `require 'foo'` を評価する場合, Ruby は `$LOAD_PATH` `['x', 'y', ...]` のすべてのエントリーを繰り返し評価することで `x/foo.rb`, `y/foo.rb` などを探索します。これに対して Bootsnap は、キャッシュされた require 可能なファイルと `$LOAD_PATH` を見ることで、Rubyが最終的に選択するであろうパスで置き換えます。
 
 この動作によって生成された syscall を見ると、最終的な結果は以前なら次のようになります。
 

data/Rakefile

@@ -1,5 +1,5 @@
-require 'rake/extensiontask'
-require 'bundler/gem_tasks'
+require('rake/extensiontask')
+require('bundler/gem_tasks')
 
 gemspec = Gem::Specification.load('bootsnap.gemspec')
 Rake::ExtensionTask.new do |ext|

data/bin/ci

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+if [[ "${MINIMAL_SUPPORT-0}" -eq 1 ]]; then
+  exec bin/test-minimal-support
+else
+  rake
+  exec bin/testunit
+fi

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "bootsnap"
+require("bundler/setup")
+require("bootsnap")
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "bootsnap"
 # require "pry"
 # Pry.start
 
-require "irb"
+require("irb")
 IRB.start(__FILE__)

data/bin/test-minimal-support

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+cd test/minimal_support
+bundle
+BOOTSNAP_CACHE_DIR=/tmp bundle exec ruby -w -I ../../lib bootsnap_setup.rb

data/bootsnap.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'bootsnap/version'
+require('bootsnap/version')
 
 Gem::Specification.new do |spec|
   spec.name          = "bootsnap"
@@ -15,10 +15,16 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/Shopify/bootsnap"
 
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+  spec.metadata = {
+    'bug_tracker_uri' => 'https://github.com/Shopify/bootsnap/issues',
+    'changelog_uri' => 'https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/Shopify/bootsnap',
+  }
+
+  spec.files = %x(git ls-files -z).split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.require_paths = ["lib"]
+  spec.require_paths = %w(lib)
 
   spec.required_ruby_version = '>= 2.0.0'
 
@@ -29,11 +35,11 @@ Gem::Specification.new do |spec|
     spec.extensions  = ['ext/bootsnap/extconf.rb']
   end
 
-  spec.add_development_dependency "bundler", '~> 1'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rake-compiler', '~> 0'
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "mocha", "~> 1.2"
+  spec.add_development_dependency("bundler")
+  spec.add_development_dependency('rake', '~> 10.0')
+  spec.add_development_dependency('rake-compiler', '~> 0')
+  spec.add_development_dependency("minitest", "~> 5.0")
+  spec.add_development_dependency("mocha", "~> 1.2")
 
-  spec.add_runtime_dependency "msgpack", "~> 1.0"
+  spec.add_runtime_dependency("msgpack", "~> 1.0")
 end

data/dev.yml

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

data/ext/bootsnap/extconf.rb

@@ -1,4 +1,4 @@
-require "mkmf"
+require("mkmf")
 $CFLAGS << ' -O3 '
 $CFLAGS << ' -std=c99'
 
@@ -12,6 +12,7 @@ unless ['0', '', nil].include?(ENV['BOOTSNAP_PEDANTIC'])
 
   $CFLAGS << ' -Wno-unused-parameter' # VALUE self has to be there but we don't care what it is.
   $CFLAGS << ' -Wno-keyword-macro' # hiding return
+  $CFLAGS << ' -Wno-gcc-compat' # ruby.h 2.6.0 on macos 10.14, dunno
 end
 
 create_makefile("bootsnap/bootsnap")

data/lib/bootsnap.rb

@@ -1,7 +1,7 @@
-require_relative 'bootsnap/version'
-require_relative 'bootsnap/bundler'
-require_relative 'bootsnap/load_path_cache'
-require_relative 'bootsnap/compile_cache'
+require_relative('bootsnap/version')
+require_relative('bootsnap/bundler')
+require_relative('bootsnap/load_path_cache')
+require_relative('bootsnap/compile_cache')
 
 module Bootsnap
   InvalidConfiguration = Class.new(StandardError)
@@ -16,7 +16,7 @@ module Bootsnap
     compile_cache_yaml: true
   )
     if autoload_paths_cache && !load_path_cache
-      raise InvalidConfiguration, "feature 'autoload_paths_cache' depends on feature 'load_path_cache'"
+      raise(InvalidConfiguration, "feature 'autoload_paths_cache' depends on feature 'load_path_cache'")
     end
 
     setup_disable_trace if disable_trace
@@ -36,7 +36,10 @@ module Bootsnap
 
   def self.setup_disable_trace
     if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('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")
+      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

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

data/lib/bootsnap/compile_cache.rb

@@ -2,14 +2,29 @@ module Bootsnap
   module CompileCache
     def self.setup(cache_dir:, iseq:, yaml:)
       if iseq
-        require_relative 'compile_cache/iseq'
-        Bootsnap::CompileCache::ISeq.install!(cache_dir)
+        if supported?
+          require_relative('compile_cache/iseq')
+          Bootsnap::CompileCache::ISeq.install!(cache_dir)
+        elsif $VERBOSE
+          warn("[bootsnap/setup] bytecode caching is not supported on this implementation of Ruby")
+        end
       end
 
       if yaml
-        require_relative 'compile_cache/yaml'
-        Bootsnap::CompileCache::YAML.install!(cache_dir)
+        if supported?
+          require_relative('compile_cache/yaml')
+          Bootsnap::CompileCache::YAML.install!(cache_dir)
+        elsif $VERBOSE
+          warn("[bootsnap/setup] YAML parsing caching is not supported on this implementation of Ruby")
+        end
       end
     end
+
+    def self.supported?
+      # only enable on 'ruby' (MRI), POSIX (darwin, linux, *bsd), and >= 2.3.0
+      RUBY_ENGINE == 'ruby' &&
+      RUBY_PLATFORM =~ /darwin|linux|bsd/ &&
+      Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.3.0")
+    end
   end
 end

data/lib/bootsnap/compile_cache/iseq.rb

@@ -1,25 +1,25 @@
-require 'bootsnap/bootsnap'
-require 'zlib'
+require('bootsnap/bootsnap')
+require('zlib')
 
 module Bootsnap
   module CompileCache
     module ISeq
       class << self
-        attr_accessor :cache_dir
+        attr_accessor(:cache_dir)
       end
 
       def self.input_to_storage(_, path)
         RubyVM::InstructionSequence.compile_file(path).to_binary
       rescue SyntaxError
-        raise Uncompilable, 'syntax error'
+        raise(Uncompilable, 'syntax error')
       end
 
       def self.storage_to_output(binary)
         RubyVM::InstructionSequence.load_from_binary(binary)
       rescue RuntimeError => e
         if e.message == 'broken binary format'
-          STDERR.puts "[Bootsnap::CompileCache] warning: rejecting broken binary"
-          return nil
+          STDERR.puts("[Bootsnap::CompileCache] warning: rejecting broken binary")
+          nil
         else
           raise
         end
@@ -41,7 +41,7 @@ module Bootsnap
           )
         rescue RuntimeError => e
           if e.message =~ /unmatched platform/
-            puts "unmatched platform for file #{path}"
+            puts("unmatched platform for file #{path}")
           end
           raise
         end
@@ -62,7 +62,7 @@ module Bootsnap
         Bootsnap::CompileCache::ISeq.cache_dir = cache_dir
         Bootsnap::CompileCache::ISeq.compile_option_updated
         class << RubyVM::InstructionSequence
-          prepend InstructionSequenceMixin
+          prepend(InstructionSequenceMixin)
         end
       end
     end

data/lib/bootsnap/compile_cache/yaml.rb

@@ -1,21 +1,21 @@
-require 'bootsnap/bootsnap'
+require('bootsnap/bootsnap')
 
 module Bootsnap
   module CompileCache
     module YAML
       class << self
-        attr_accessor :msgpack_factory
+        attr_accessor(:msgpack_factory)
       end
 
       def self.input_to_storage(contents, _)
-        raise Uncompilable if contents.index("!ruby/object")
+        raise(Uncompilable) if contents.index("!ruby/object")
         obj = ::YAML.load(contents)
         msgpack_factory.packer.write(obj).to_s
       rescue NoMethodError, RangeError
         # if the object included things that we can't serialize, fall back to
         # Marshal. It's a bit slower, but can encode anything yaml can.
         # NoMethodError is unexpected types; RangeError is Bignums
-        return Marshal.dump(obj)
+        Marshal.dump(obj)
       end
 
       def self.storage_to_output(data)
@@ -34,8 +34,8 @@ module Bootsnap
       end
 
       def self.install!(cache_dir)
-        require 'yaml'
-        require 'msgpack'
+        require('yaml')
+        require('msgpack')
 
         # MessagePack serializes symbols as strings by default.
         # We want them to roundtrip cleanly, so we use a custom factory.

data/lib/bootsnap/explicit_require.rb

@@ -5,7 +5,7 @@ module Bootsnap
     DLEXT      = RbConfig::CONFIG['DLEXT']
 
     def self.from_self(feature)
-      require_relative "../#{feature}"
+      require_relative("../#{feature}")
     end
 
     def self.from_rubylibdir(feature)

data/lib/bootsnap/load_path_cache.rb

@@ -21,38 +21,51 @@ module Bootsnap
     CACHED_EXTENSIONS = DLEXT2 ? [DOT_RB, DLEXT, DLEXT2] : [DOT_RB, DLEXT]
 
     class << self
-      attr_reader :load_path_cache, :autoload_paths_cache,
-                  :loaded_features_index, :realpath_cache
+      attr_reader(:load_path_cache, :autoload_paths_cache,
+        :loaded_features_index, :realpath_cache)
 
       def setup(cache_path:, development_mode:, active_support: true)
+        unless supported?
+          warn("[bootsnap/setup] Load path caching is not supported on this implementation of Ruby") if $VERBOSE
+          return
+        end
+
         store = Store.new(cache_path)
 
         @loaded_features_index = LoadedFeaturesIndex.new
         @realpath_cache = RealpathCache.new
 
         @load_path_cache = Cache.new(store, $LOAD_PATH, development_mode: development_mode)
-        require_relative 'load_path_cache/core_ext/kernel_require'
+        require_relative('load_path_cache/core_ext/kernel_require')
+        require_relative('load_path_cache/core_ext/loaded_features')
 
         if active_support
           # this should happen after setting up the initial cache because it
           # loads a lot of code. It's better to do after +require+ is optimized.
-          require 'active_support/dependencies'
+          require('active_support/dependencies')
           @autoload_paths_cache = Cache.new(
             store,
             ::ActiveSupport::Dependencies.autoload_paths,
             development_mode: development_mode
           )
-          require_relative 'load_path_cache/core_ext/active_support'
+          require_relative('load_path_cache/core_ext/active_support')
         end
       end
+
+      def supported?
+        RUBY_ENGINE == 'ruby' &&
+        RUBY_PLATFORM =~ /darwin|linux|bsd/
+      end
     end
   end
 end
 
-require_relative 'load_path_cache/path_scanner'
-require_relative 'load_path_cache/path'
-require_relative 'load_path_cache/cache'
-require_relative 'load_path_cache/store'
-require_relative 'load_path_cache/change_observer'
-require_relative 'load_path_cache/loaded_features_index'
-require_relative 'load_path_cache/realpath_cache'
+if Bootsnap::LoadPathCache.supported?
+  require_relative('load_path_cache/path_scanner')
+  require_relative('load_path_cache/path')
+  require_relative('load_path_cache/cache')
+  require_relative('load_path_cache/store')
+  require_relative('load_path_cache/change_observer')
+  require_relative('load_path_cache/loaded_features_index')
+  require_relative('load_path_cache/realpath_cache')
+end

data/lib/bootsnap/load_path_cache/cache.rb

@@ -1,4 +1,4 @@
-require_relative '../explicit_require'
+require_relative('../explicit_require')
 
 module Bootsnap
   module LoadPathCache
@@ -56,7 +56,7 @@ module Bootsnap
           # returns false as if it were already loaded; however, there is no
           # file to find on disk. We've pre-built a list of these, and we
           # return false if any of them is loaded.
-          raise LoadPathCache::ReturnFalse if BUILTIN_FEATURES.key?(feature)
+          raise(LoadPathCache::ReturnFalse, '', []) if BUILTIN_FEATURES.key?(feature)
 
           # The feature wasn't found on our preliminary search through the index.
           # We resolve this differently depending on what the extension was.
@@ -73,14 +73,21 @@ module Bootsnap
             x = search_index(feature[0..-4] + DLEXT)
             return x if x
             if DLEXT2
-              search_index(feature[0..-4] + DLEXT2)
+              x = search_index(feature[0..-4] + DLEXT2)
+              return x if x
             end
           else
             # other, unknown extension. For example, `.rake`. Since we haven't
             # cached these, we legitimately need to run the load path search.
-            raise LoadPathCache::FallbackScan
+            raise(LoadPathCache::FallbackScan, '', [])
           end
         end
+
+        # In development mode, we don't want to confidently return failures for
+        # cases where the file doesn't appear to be on the load path. We should
+        # be able to detect newly-created files without rebooting the
+        # application.
+        raise(LoadPathCache::FallbackScan, '', []) if @development_mode
       end
 
       if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
@@ -174,7 +181,7 @@ module Bootsnap
       end
 
       def try_index(f)
-        if p = @index[f]
+        if (p = @index[f])
           p + '/' + f
         end
       end

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

@@ -30,6 +30,8 @@ module Bootsnap
               Bootsnap::LoadPathCache.autoload_paths_cache.find(path)
             rescue Bootsnap::LoadPathCache::ReturnFalse
               nil # doesn't really apply here
+            rescue Bootsnap::LoadPathCache::FallbackScan
+              nil # doesn't really apply here
             end
           end
 
@@ -92,7 +94,7 @@ end
 module ActiveSupport
   module Dependencies
     class << self
-      prepend Bootsnap::LoadPathCache::CoreExt::ActiveSupport::ClassMethods
+      prepend(Bootsnap::LoadPathCache::CoreExt::ActiveSupport::ClassMethods)
     end
   end
 end

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

@@ -11,9 +11,9 @@ module Bootsnap
 end
 
 module Kernel
-  module_function
+  module_function # rubocop:disable Style/ModuleFunction
 
-  alias_method :require_without_bootsnap, :require
+  alias_method(:require_without_bootsnap, :require)
 
   # Note that require registers to $LOADED_FEATURES while load does not.
   def require_with_bootsnap_lfi(path, resolved = nil)
@@ -25,18 +25,18 @@ module Kernel
   def require(path)
     return false if Bootsnap::LoadPathCache.loaded_features_index.key?(path)
 
-    if resolved = Bootsnap::LoadPathCache.load_path_cache.find(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)
+    raise(Bootsnap::LoadPathCache::CoreExt.make_load_error(path))
   rescue Bootsnap::LoadPathCache::ReturnFalse
-    return false
+    false
   rescue Bootsnap::LoadPathCache::FallbackScan
     require_with_bootsnap_lfi(path)
   end
 
-  alias_method :require_relative_without_bootsnap, :require_relative
+  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
@@ -44,9 +44,9 @@ module Kernel
     require(realpath)
   end
 
-  alias_method :load_without_bootsnap, :load
+  alias_method(:load_without_bootsnap, :load)
   def load(path, wrap = false)
-    if resolved = Bootsnap::LoadPathCache.load_path_cache.find(path)
+    if (resolved = Bootsnap::LoadPathCache.load_path_cache.find(path))
       return load_without_bootsnap(resolved, wrap)
     end
 
@@ -55,16 +55,16 @@ module Kernel
       return load_without_bootsnap(relative, wrap)
     end
 
-    raise Bootsnap::LoadPathCache::CoreExt.make_load_error(path)
+    raise(Bootsnap::LoadPathCache::CoreExt.make_load_error(path))
   rescue Bootsnap::LoadPathCache::ReturnFalse
-    return false
+    false
   rescue Bootsnap::LoadPathCache::FallbackScan
     load_without_bootsnap(path, wrap)
   end
 end
 
 class Module
-  alias_method :autoload_without_bootsnap, :autoload
+  alias_method(:autoload_without_bootsnap, :autoload)
   def autoload(const, path)
     # NOTE: This may defeat LoadedFeaturesIndex, but it's not immediately
     # obvious how to make it work. This feels like a pretty niche case, unclear
@@ -75,7 +75,7 @@ class Module
     # since it's done in C-land.
     autoload_without_bootsnap(const, Bootsnap::LoadPathCache.load_path_cache.find(path) || path)
   rescue Bootsnap::LoadPathCache::ReturnFalse
-    return false
+    false
   rescue Bootsnap::LoadPathCache::FallbackScan
     autoload_without_bootsnap(const, path)
   end

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

@@ -0,0 +1,7 @@
+class << $LOADED_FEATURES
+  alias_method(:delete_without_bootsnap, :delete)
+  def delete(key)
+    Bootsnap::LoadPathCache.loaded_features_index.purge(key)
+    delete_without_bootsnap(key)
+  end
+end

data/lib/bootsnap/load_path_cache/loaded_features_index.rb

@@ -32,17 +32,29 @@ module Bootsnap
         # parallel the work done with ChangeObserver on $LOAD_PATH to mirror
         # updates to our @lfi.
         $LOADED_FEATURES.each do |feat|
+          hash = feat.hash
           $LOAD_PATH.each do |lpe|
             next unless feat.start_with?(lpe)
             # /a/b/lib/my/foo.rb
             #          ^^^^^^^^^
             short = feat[(lpe.length + 1)..-1]
-            @lfi[short] = true
-            @lfi[strip_extension(short)] = true
+            stripped = strip_extension(short)
+            @lfi[short] = hash
+            @lfi[stripped] = hash
           end
         end
       end
 
+      # We've optimized for initialize and register to be fast, and purge to be tolerable.
+      # If access patterns make this not-okay, we can lazy-invert the LFI on
+      # first purge and work from there.
+      def purge(feature)
+        @mutex.synchronize do
+          feat_hash = feature.hash
+          @lfi.reject! { |_, hash| hash == feat_hash }
+        end
+      end
+
       def key?(feature)
         @mutex.synchronize { @lfi.key?(feature) }
       end
@@ -62,21 +74,30 @@ module Bootsnap
       # 2. Inspect $LOADED_FEATURES upon return from yield to find the matching
       #    entry.
       def register(short, long = nil)
-        ret = yield
+        if long.nil?
+          pat = %r{/#{Regexp.escape(short)}(\.[^/]+)?$}
+          len = $LOADED_FEATURES.size
+          ret = yield
+          long = $LOADED_FEATURES[len..-1].detect { |feat| feat =~ pat }
+        else
+          ret = yield
+        end
+
+        hash = long.hash
 
         # do we have 'bundler' or 'bundler.rb'?
         altname = if File.extname(short) != ''
           # strip the path from 'bundler.rb' -> 'bundler'
           strip_extension(short)
-        elsif long && ext = File.extname(long)
+        elsif long && (ext = File.extname(long))
           # get the extension from the expanded path if given
           # 'bundler' + '.rb'
           short + ext
         end
 
         @mutex.synchronize do
-          @lfi[short] = true
-          (@lfi[altname] = true) if altname
+          @lfi[short] = hash
+          (@lfi[altname] = hash) if altname
         end
 
         ret
@@ -85,7 +106,7 @@ module Bootsnap
       private
 
       STRIP_EXTENSION = /\.[^.]*?$/
-      private_constant :STRIP_EXTENSION
+      private_constant(:STRIP_EXTENSION)
 
       def strip_extension(f)
         f.sub(STRIP_EXTENSION, '')

data/lib/bootsnap/load_path_cache/path.rb

@@ -1,4 +1,4 @@
-require_relative 'path_scanner'
+require_relative('path_scanner')
 
 module Bootsnap
   module LoadPathCache
@@ -17,7 +17,7 @@ module Bootsnap
         stability == VOLATILE
       end
 
-      attr_reader :path
+      attr_reader(:path)
 
       def initialize(path)
         @path = path.to_s
@@ -26,7 +26,7 @@ module Bootsnap
       # True if the path exists, but represents a non-directory object
       def non_directory?
         !File.stat(path).directory?
-      rescue Errno::ENOENT
+      rescue Errno::ENOENT, Errno::ENOTDIR
         false
       end
 
@@ -76,8 +76,8 @@ module Bootsnap
         ["", *dirs].each do |dir|
           curr = begin
             File.mtime("#{path}/#{dir}").to_i
-          rescue Errno::ENOENT
-            -1
+                 rescue Errno::ENOENT, Errno::ENOTDIR
+                   -1
           end
           max = curr if curr > max
         end

data/lib/bootsnap/load_path_cache/path_scanner.rb

@@ -1,4 +1,4 @@
-require_relative '../explicit_require'
+require_relative('../explicit_require')
 
 module Bootsnap
   module LoadPathCache
@@ -7,8 +7,12 @@ module Bootsnap
       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? ?
-        (Bundler.bundle_path.cleanpath.to_s << LoadPathCache::SLASH).freeze : ''.freeze
+
+      BUNDLE_PATH = if Bootsnap.bundler?
+        (Bundler.bundle_path.cleanpath.to_s << LoadPathCache::SLASH).freeze
+      else
+        ''.freeze
+      end
 
       def self.call(path)
         path = path.to_s

data/lib/bootsnap/load_path_cache/store.rb

@@ -1,6 +1,6 @@
-require_relative '../explicit_require'
+require_relative('../explicit_require')
 
-Bootsnap::ExplicitRequire.with_gems('msgpack') { require 'msgpack' }
+Bootsnap::ExplicitRequire.with_gems('msgpack') { require('msgpack') }
 Bootsnap::ExplicitRequire.from_rubylibdir('fileutils')
 
 module Bootsnap
@@ -21,7 +21,7 @@ module Bootsnap
       end
 
       def fetch(key)
-        raise SetOutsideTransactionNotAllowed unless @in_txn
+        raise(SetOutsideTransactionNotAllowed) unless @in_txn
         v = get(key)
         unless v
           @dirty = true
@@ -32,7 +32,7 @@ module Bootsnap
       end
 
       def set(key, value)
-        raise SetOutsideTransactionNotAllowed unless @in_txn
+        raise(SetOutsideTransactionNotAllowed) unless @in_txn
         if value != @data[key]
           @dirty = true
           @data[key] = value
@@ -40,7 +40,7 @@ module Bootsnap
       end
 
       def transaction
-        raise NestedTransactionError if @in_txn
+        raise(NestedTransactionError) if @in_txn
         @in_txn = true
         yield
       ensure
@@ -60,9 +60,9 @@ module Bootsnap
       def load_data
         @data = begin
           MessagePack.load(File.binread(@store_path))
-        # handle malformed data due to upgrade incompatability
-        rescue Errno::ENOENT, MessagePack::MalformedFormatError, MessagePack::UnknownExtTypeError, EOFError
-          {}
+                # handle malformed data due to upgrade incompatability
+                rescue Errno::ENOENT, MessagePack::MalformedFormatError, MessagePack::UnknownExtTypeError, EOFError
+                  {}
         end
       end
 

data/lib/bootsnap/setup.rb

@@ -1,14 +1,8 @@
-require_relative '../bootsnap'
+require_relative('../bootsnap')
 
 env = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || ENV['ENV']
 development_mode = ['', nil, 'development'].include?(env)
 
-# only enable on 'ruby' (MRI), POSIX (darwin, linux, *bsd), and >= 2.3.0
-enable_cc =
-  RUBY_ENGINE == 'ruby' &&
-  RUBY_PLATFORM =~ /darwin|linux|bsd/ &&
-  Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.3.0")
-
 cache_dir = ENV['BOOTSNAP_CACHE_DIR']
 unless cache_dir
   config_dir_frame = caller.detect do |line|
@@ -16,11 +10,11 @@ unless cache_dir
   end
 
   unless config_dir_frame
-    $stderr.puts "[bootsnap/setup] couldn't infer cache directory! Either:"
-    $stderr.puts "[bootsnap/setup]   1. require bootsnap/setup from your application's config directory; or"
-    $stderr.puts "[bootsnap/setup]   2. Define the environment variable BOOTSNAP_CACHE_DIR"
+    $stderr.puts("[bootsnap/setup] couldn't infer cache directory! Either:")
+    $stderr.puts("[bootsnap/setup]   1. require bootsnap/setup from your application's config directory; or")
+    $stderr.puts("[bootsnap/setup]   2. Define the environment variable BOOTSNAP_CACHE_DIR")
 
-    raise "couldn't infer bootsnap cache directory"
+    raise("couldn't infer bootsnap cache directory")
   end
 
   path = config_dir_frame.split(/:\d+:/).first
@@ -36,6 +30,6 @@ Bootsnap.setup(
   load_path_cache:      true,
   autoload_paths_cache: true, # assume rails. open to PRs to impl. detection
   disable_trace:        false,
-  compile_cache_iseq:   enable_cc,
-  compile_cache_yaml:   enable_cc
+  compile_cache_iseq:   true,
+  compile_cache_yaml:   true,
 )

data/lib/bootsnap/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: java
 authors:
 - Burke Libbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   name: bundler
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -112,8 +112,10 @@ files:
 - README.jp.md
 - README.md
 - Rakefile
+- bin/ci
 - bin/console
 - bin/setup
+- bin/test-minimal-support
 - bin/testunit
 - bootsnap.gemspec
 - dev.yml
@@ -131,6 +133,7 @@ files:
 - lib/bootsnap/load_path_cache/change_observer.rb
 - lib/bootsnap/load_path_cache/core_ext/active_support.rb
 - lib/bootsnap/load_path_cache/core_ext/kernel_require.rb
+- lib/bootsnap/load_path_cache/core_ext/loaded_features.rb
 - lib/bootsnap/load_path_cache/loaded_features_index.rb
 - lib/bootsnap/load_path_cache/path.rb
 - lib/bootsnap/load_path_cache/path_scanner.rb
@@ -142,7 +145,10 @@ files:
 homepage: https://github.com/Shopify/bootsnap
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/Shopify/bootsnap/issues
+  changelog_uri: https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/Shopify/bootsnap
 post_install_message:
 rdoc_options: []
 require_paths: