bootsnap 0.2.9 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe31f9a445fa33edd58c5f58e0f661c0e08d2004
-  data.tar.gz: e01345ff505baf0ce9aa6a104325a93092d0ab53
+  metadata.gz: fcd4e8ebf4dd23bfc40fc7050f2c514a3290942f
+  data.tar.gz: a26b06131e80497bb4c223c7db9ee7287cb03bf9
 SHA512:
-  metadata.gz: c319a87aa7d1db72c3535e0af539cd8629852238b4b88bcc1b4a7cf57ea978707aa82b879730815e293c5944b4c40d8b2531a8639780491853c58b66de01191e
-  data.tar.gz: d2d6042b09014425a6d4feb3d1abe28c1a1eaeddd1c29fff8752ba907322349129d065c38109b6d460438b667a72b04626165a59cde12f7af509c9043ba254e5
+  metadata.gz: 34d6e350baf6ba66ba9dcb3533066153f34e9303897ecea815e651624064af479eabe23075d7f36f063dc927b9570cdff26891087fde7233ada51fafecf2ca96
+  data.tar.gz: f603e54de0100b3f464a2ca9dee119db9d338f3c7f84ffe3952f5b9c83213d0371d7e0b7d54d7903423d6a787af1c51c3adc824cdf698ffd7b9994aed5a13d4e

data/dev.yml

@@ -1,3 +1,6 @@
+env:
+  BOOTSNAP_PEDANTIC: '1'
+
 up:
   - ruby: 2.3.3
   - bundler

data/ext/bootsnap/extconf.rb

@@ -1,6 +1,17 @@
 require "mkmf"
-$CFLAGS << ' -O3 -std=c99'
-$CFLAGS << ' -Wall -Wextra -Wpedantic -Werror'
-$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 << ' -O3 '
+$CFLAGS << ' -std=c99'
+
+# ruby.h has some -Wpedantic fails in some cases
+# (e.g. https://github.com/Shopify/bootsnap/issues/15)
+unless ['0', '', nil].include?(ENV['BOOTSNAP_PEDANTIC'])
+  $CFLAGS << ' -Wall'
+  $CFLAGS << ' -Werror'
+  $CFLAGS << ' -Wextra'
+  $CFLAGS << ' -Wpedantic'
+
+  $CFLAGS << ' -Wno-unused-parameter' # VALUE self has to be there but we don't care what it is.
+  $CFLAGS << ' -Wno-keyword-macro' # hiding return
+end
+
 create_makefile("bootsnap/bootsnap")

data/lib/bootsnap/load_path_cache/cache.rb

@@ -54,22 +54,20 @@ module Bootsnap
           x = search_index(feature)
           return x if x
 
+          # Ruby has some built-in features that require lies about.
+          # For example, 'enumerator' is built in. If you require it, ruby
+          # 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)
+
           # The feature wasn't found on our preliminary search through the index.
           # We resolve this differently depending on what the extension was.
           case File.extname(feature)
           # If the extension was one of the ones we explicitly cache (.rb and the
           # native dynamic extension, e.g. .bundle or .so), we know it was a
           # failure and there's nothing more we can do to find the file.
-          when *CACHED_EXTENSIONS # .rb, .bundle or .so
-            nil
-          # If no extension was specified, it's the same situation, since we
-          # try appending both cachable extensions in search_index. However,
-          # there's a special-case for 'enumerator'. Before ruby 1.9, you had
-          # to `require 'enumerator'` to use it. In 1.9+, it's pre-loaded, but
-          # doesn't correspond to any entry on the filesystem. Ruby lies. So we
-          # lie too, forcing our monkeypatch to return false like ruby would.
-          when ""
-            raise LoadPathCache::ReturnFalse if BUILTIN_FEATURES.key?(feature)
+          when '', *CACHED_EXTENSIONS # no extension, .rb, (.bundle or .so)
             nil
           # Ruby allows specifying native extensions as '.so' even when DLEXT
           # is '.bundle'. This is where we handle that case.
@@ -122,6 +120,7 @@ module Bootsnap
         @store.transaction do
           paths.map(&:to_s).each do |path|
             p = Path.new(path)
+            next if p.non_directory?
             entries, dirs = p.entries_and_dirs(@store)
             # push -> low precedence -> set only if unset
             dirs.each    { |dir| @dirs[dir]  ||= true }
@@ -134,6 +133,7 @@ module Bootsnap
         @store.transaction do
           paths.map(&:to_s).reverse.each do |path|
             p = Path.new(path)
+            next if p.non_directory?
             entries, dirs = p.entries_and_dirs(@store)
             # unshift -> high precedence -> unconditional set
             dirs.each    { |dir| @dirs[dir]  = true }

data/lib/bootsnap/load_path_cache/path.rb

@@ -23,6 +23,13 @@ module Bootsnap
         @path = path.to_s
       end
 
+      # True if the path exists, but represents a non-directory object
+      def non_directory?
+        !File.stat(path).directory?
+      rescue Errno::ENOENT
+        false
+      end
+
       # Return a list of all the requirable files and all of the subdirectories
       # of this +Path+.
       def entries_and_dirs(store)

data/lib/bootsnap/version.rb

@@ -1,3 +1,3 @@
 module Bootsnap
-  VERSION = "0.2.9"
+  VERSION = "0.2.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.12
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler