bootscale 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bf0e9189a33d19e8121e188f245bc738d7d2fe
-  data.tar.gz: 214e8efc673b76c1eb4fdce6a076f72ec8952d86
+  metadata.gz: b5a4eed56375a193f8dde0b4aef4bdcb5ffac59e
+  data.tar.gz: 0c9a6e16ba2aa2147d3474d7be9710d314a67c30
 SHA512:
-  metadata.gz: 07d8b865970b3bc77bb10474554dd77c0413fdd6ff2c3b386dfef0809793b9739009d13182fba426c6ac559761865ec8dad68b8d2d10ac876261f4d45933e647
-  data.tar.gz: 6702914fcce11e5344ea9ea1af2bbeee95442f4e836ed57251e78cba7e12a57f86e5caf2ee4a2581281b43b6c2fe20744b2b4a48808ebee6d5441af1c770b10e
+  metadata.gz: e863df1b2d2a400d29d770482f0b8f8a0e60e39ed4850bba500ed232eccacd2fdac3fb0de11fd28fd3be20a30d873904ece13584d0e0486ce0756204de27b16a
+  data.tar.gz: 443d742eb6f825169dd0de640bd1fb094b9c6edbad3343ef430b68a563baecfda9f0af9cbf197c1d1df35c77ddcec88a778df209fcb19ef5c7f72996d58183cb

data/lib/bootscale/entry.rb

@@ -8,26 +8,26 @@ module Bootscale
     NORMALIZE_NATIVE_EXTENSIONS = !DL_EXTENSIONS.include?(DOT_SO)
     ALTERNATIVE_NATIVE_EXTENSIONS_PATTERN = /\.(o|bundle|dylib)\z/
     SLASH = '/'.freeze
+    BUNDLE_PATH = Bundler.bundle_path.cleanpath.to_s << SLASH
 
     def initialize(path)
-      @path = path
+      @path = Pathname.new(path).cleanpath
+      @absolute = @path.absolute?
+      warn "Bootscale: Cannot speedup load for relative path #{@path}" unless @absolute
+      @relative_slice = (@path.to_s.size + 1)..-1
+      @contains_bundle_path = BUNDLE_PATH.start_with?(@path.to_s)
     end
 
     def requireables
-      unless absolute = @path.start_with?(SLASH)
-        warn "Bootscale: Cannot speedup load for relative path #{@path}"
-      end
-
-      path_prefix = (@path.end_with?(SLASH) ? @path.size : @path.size + 1)
-      relative_part = path_prefix..-1
-      Dir[File.join(@path, REQUIREABLE_FILES)].map do |absolute_path|
-        relative_path = absolute_path.slice(relative_part)
+      Dir[File.join(@path, REQUIREABLE_FILES)].each_with_object([]) do |absolute_path, all|
+        next if @contains_bundle_path && absolute_path.start_with?(BUNDLE_PATH)
+        relative_path = absolute_path.slice(@relative_slice)
 
         if NORMALIZE_NATIVE_EXTENSIONS
           relative_path.sub!(ALTERNATIVE_NATIVE_EXTENSIONS_PATTERN, DOT_SO)
         end
 
-        [relative_path, (absolute ? absolute_path : :relative)]
+        all << [relative_path, (@absolute ? absolute_path : :relative)]
       end
     end
   end

data/lib/bootscale/version.rb

@@ -1,3 +1,3 @@
 module Bootscale
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootscale
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jean Boussier