bootsnap 1.2.1-java → 1.3.0.beta2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be40c1a5f15f301e4f098c77ea1054c993c50894
-  data.tar.gz: 220e7faba46321071d715b79ff9e069b74257b4d
+  metadata.gz: c23429f6bae9a603329d2efa2aa686e91d305a02
+  data.tar.gz: de49aa225d4c82832cf4471692ef52661e5c7c2b
 SHA512:
-  metadata.gz: ee8e3951733ee8a92aa557fe9fc2b64c3b20a9dc444dc6a11b880ef012b7fdf60849a93b28879384bb1c66a8e348c1490d449e86c420a665dd48d695a6760804
-  data.tar.gz: b231ccd8783e0b8c7315ae01e073f714ea54bea98c717b3976bae3761ca65be351743c7cc94ec8395432e536a05dbb9bda668a520a330f309fd3ec3b21d81163
+  metadata.gz: 87b7e39d81d09380239275c22db7fd5a76bfedb5bb8e5bf1fdd2c721054cb1b705ec1bcc1edaf1b5750bb69c61af852122c8db7406df481cfda25f04d29b9421
+  data.tar.gz: 11cc3544fb2744ee6c4778b7a82ef79395762298165d48d3a88612579d01c314aa7fef01bff372e8df15d4a7b3837a6a6ac9dc990596acf27148e18d1e0092d9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.0
+
+* Handle cases where load path entries are symlinked (https://github.com/Shopify/bootsnap/pull/136)
+
 # 1.2.1
 
 * Fix method visibility of `Kernel#require`.

data/README.md

@@ -10,7 +10,7 @@ to optimize and cache expensive computations. See [How Does This Work](#how-does
 
 ## Usage
 
-This gem works on MacOS and Linux.
+This gem works on macOS and Linux.
 
 Add `bootsnap` to your `Gemfile`:
 

data/lib/bootsnap/load_path_cache.rb

@@ -21,12 +21,14 @@ 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
+      attr_reader :load_path_cache, :autoload_paths_cache,
+                  :loaded_features_index, :realpath_cache
 
       def setup(cache_path:, development_mode:, active_support: true)
         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'
@@ -53,3 +55,4 @@ 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'

data/lib/bootsnap/load_path_cache/cache.rb

@@ -9,7 +9,7 @@ module Bootsnap
         @development_mode = development_mode
         @store = store
         @mutex = defined?(::Mutex) ? ::Mutex.new : ::Thread::Mutex.new # TODO: Remove once Ruby 2.2 support is dropped.
-        @path_obj = path_obj
+        @path_obj = path_obj.map! { |f| File.exist?(f) ? File.realpath(f) : f }
         @has_relative_paths = nil
         reinitialize
       end

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

@@ -36,6 +36,14 @@ module Kernel
     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)
@@ -78,6 +86,14 @@ class << Kernel
     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)

data/lib/bootsnap/load_path_cache/realpath_cache.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Bootsnap
+  module LoadPathCache
+    class RealpathCache
+      def initialize
+        @cache = Hash.new { |h, k| h[k] = realpath(*k) }
+      end
+
+      def call(*key)
+        @cache[key]
+      end
+
+      private
+
+      def realpath(caller_location, path)
+        base = File.dirname(caller_location)
+        file = find_file(File.expand_path(path, base))
+        dir = File.dirname(file)
+        File.join(dir, File.basename(file))
+      end
+
+      def find_file(name)
+        ['', *CACHED_EXTENSIONS].each do |ext|
+          filename = "#{name}#{ext}"
+          return File.realpath(filename) if File.exist?(filename)
+        end
+        name
+      end
+    end
+  end
+end

data/lib/bootsnap/version.rb

@@ -1,3 +1,3 @@
 module Bootsnap
-  VERSION = "1.2.1"
+  VERSION = "1.3.0.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0.beta2
 platform: java
 authors:
 - Burke Libbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - lib/bootsnap/load_path_cache/loaded_features_index.rb
 - lib/bootsnap/load_path_cache/path.rb
 - lib/bootsnap/load_path_cache/path_scanner.rb
+- lib/bootsnap/load_path_cache/realpath_cache.rb
 - lib/bootsnap/load_path_cache/store.rb
 - lib/bootsnap/setup.rb
 - lib/bootsnap/version.rb
@@ -153,9 +154,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8