bootsnap 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3725f53309883dce83894e47eedbb4d8322eabd5
-  data.tar.gz: 81e14b1d48fc4431f6ac9bb2729cfb4a69aa0f5c
+  metadata.gz: 7c6a61ff4456f0b745e1872ed315eef0d9a644c7
+  data.tar.gz: 0515f1b08b95f0d88fb32829f6c99a07494af996
 SHA512:
-  metadata.gz: 5a2b45cb55ceffdb5751561b3a35c476ea29bcd3d3a2a68a46521240d35cc1e61cf9ac90265db751b09967655969c7a685725878b5f80a61fd38a0efd7024458
-  data.tar.gz: 7f7975023cb1856d5ccada63e8be2e3ab94a751d4b80121821f2b01df6cbb94f5172041020ebb9300b63760da3fc2776e3b9b56160b95b4b0c07f82fbce07860
+  metadata.gz: 4ce3ba2a352a495e8d8f421ca404273013fcf5ee524e224086e78c4fc106de7505e703481f664fb11068735ead27e4e4b606dc1a67c17fc138b6bf58bcf11c58
+  data.tar.gz: fb992465d5f226f6f2d26ecf7491db4d41c4061a3e0742d9991f202c9c7db209a13e4ec40e5fe9f210e4c5119ada8e1b56637f764b55ef4640d655c91587eb1e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.1
+
+* Don't whitelist paths under `RbConfig::CONFIG['prefix']` as stable; instead use `['libdir']` (#41).
+* Catch `EOFError` when reading load-path-cache and regenerate cache.
+* Support relative paths in load-path-cache.
+
 # 0.3.0
 
 * Migrate CompileCache from xattr as a cache backend to a cache directory

data/lib/bootsnap/load_path_cache/cache.rb

@@ -46,7 +46,7 @@ module Bootsnap
       # Try to resolve this feature to an absolute path without traversing the
       # loadpath.
       def find(feature)
-        reinitialize if stale?
+        reinitialize if dir_changed? || stale?
         feature = feature.to_s
         return feature if feature.start_with?(SLASH)
         return File.expand_path(feature) if feature.start_with?('./')
@@ -116,6 +116,16 @@ module Bootsnap
 
       private
 
+      def dir_changed?
+        @prev_dir ||= Dir.pwd
+        if @prev_dir == Dir.pwd
+          false
+        else
+          @prev_dir = Dir.pwd
+          true
+        end
+      end
+
       def push_paths_locked(*paths)
         @store.transaction do
           paths.map(&:to_s).each do |path|
@@ -124,7 +134,7 @@ module Bootsnap
             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] ||= path }
+            entries.each { |rel| @index[rel] ||= p.expanded_path }
           end
         end
       end
@@ -137,7 +147,7 @@ module Bootsnap
             entries, dirs = p.entries_and_dirs(@store)
             # unshift -> high precedence -> unconditional set
             dirs.each    { |dir| @dirs[dir]  = true }
-            entries.each { |rel| @index[rel] = path }
+            entries.each { |rel| @index[rel] = p.expanded_path }
           end
         end
       end

data/lib/bootsnap/load_path_cache/path.rb

@@ -30,34 +30,42 @@ module Bootsnap
         false
       end
 
+      def relative?
+        !path.start_with?(SLASH)
+      end
+
       # Return a list of all the requirable files and all of the subdirectories
       # of this +Path+.
       def entries_and_dirs(store)
         if stable?
           # the cached_mtime field is unused for 'stable' paths, but is
           # set to zero anyway, just in case we change the stability heuristics.
-          _, entries, dirs = store.get(path)
+          _, entries, dirs = store.get(expanded_path)
           return [entries, dirs] if entries # cache hit
           entries, dirs = scan!
-          store.set(path, [0, entries, dirs])
+          store.set(expanded_path, [0, entries, dirs])
           return [entries, dirs]
         end
 
-        cached_mtime, entries, dirs = store.get(path)
+        cached_mtime, entries, dirs = store.get(expanded_path)
 
-        current_mtime = latest_mtime(path, dirs || [])
+        current_mtime = latest_mtime(expanded_path, dirs || [])
         return [[], []]        if current_mtime == -1 # path does not exist
         return [entries, dirs] if cached_mtime == current_mtime
 
         entries, dirs = scan!
-        store.set(path, [current_mtime, entries, dirs])
+        store.set(expanded_path, [current_mtime, entries, dirs])
         [entries, dirs]
       end
 
+      def expanded_path
+        File.expand_path(path)
+      end
+
       private
 
       def scan! # (expensive) returns [entries, dirs]
-        PathScanner.call(path)
+        PathScanner.call(expanded_path)
       end
 
       # last time a directory was modified in this subtree. +dirs+ should be a
@@ -83,15 +91,15 @@ module Bootsnap
       VOLATILE = :volatile
 
       # Built-in ruby lib stuff doesn't change, but things can occasionally be
-      # installed into sitedir, which often lives under prefix.
-      RUBY_PREFIX = RbConfig::CONFIG['prefix']
-      SITE_DIR    = RbConfig::CONFIG['sitedir']
+      # installed into sitedir, which generally lives under libdir.
+      RUBY_LIBDIR  = RbConfig::CONFIG['libdir']
+      RUBY_SITEDIR = RbConfig::CONFIG['sitedir']
 
       def stability
         @stability ||= begin
-          if Gem.path.detect { |p| path.start_with?(p.to_s) }
+          if Gem.path.detect { |p| expanded_path.start_with?(p.to_s) }
             STABLE
-          elsif path.start_with?(RUBY_PREFIX) && !path.start_with?(SITE_DIR)
+          elsif expanded_path.start_with?(RUBY_LIBDIR) && !expanded_path.start_with?(RUBY_SITEDIR)
             STABLE
           else
             VOLATILE

data/lib/bootsnap/load_path_cache/path_scanner.rb

@@ -3,8 +3,6 @@ require_relative '../load_path_cache'
 module Bootsnap
   module LoadPathCache
     module PathScanner
-      RelativePathNotSupported = Class.new(StandardError)
-
       REQUIRABLES_AND_DIRS = "/**/*{#{DOT_RB},#{DL_EXTENSIONS.join(',')},/}"
       IS_DIR = %r{(.*)/\z}
       NORMALIZE_NATIVE_EXTENSIONS = !DL_EXTENSIONS.include?(LoadPathCache::DOT_SO)
@@ -13,7 +11,6 @@ module Bootsnap
 
       def self.call(path)
         path = path.to_s
-        raise RelativePathNotSupported unless path.start_with?(SLASH)
 
         relative_slice = (path.size + 1)..-1
         # If the bundle path is a descendent of this path, we do additional

data/lib/bootsnap/load_path_cache/store.rb

@@ -59,7 +59,7 @@ module Bootsnap
         @data = begin
           MessagePack.load(File.binread(@store_path))
         # handle malformed data due to upgrade incompatability
-        rescue Errno::ENOENT, MessagePack::MalformedFormatError, MessagePack::UnknownExtTypeError
+        rescue Errno::ENOENT, MessagePack::MalformedFormatError, MessagePack::UnknownExtTypeError, EOFError
           {}
         end
       end

data/lib/bootsnap/version.rb

@@ -1,3 +1,3 @@
 module Bootsnap
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler