uprb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c673bd86d084d70c17fdbf40a0b37752901835da0c7be9ca22e88a6800ea37
-  data.tar.gz: 518ba4cfa3fe746297837a9309091e9bc00d51ea0aa72856a1a32b43d1c16c15
+  metadata.gz: 17ee10fe8ed29c4c60bb632f03e2e57a0a7c4ffb1087131a805bb8c0ee60f50c
+  data.tar.gz: 8f2f0a5bea6df8c8441415063454a27829e7eb0eab325e39bb4dcb75e385512c
 SHA512:
-  metadata.gz: b5b3ec5ab5f74dcbc48f4ddc731f3a0ce84bfc2d3ec8a44a4189e4c45281e143492c1500f88bfd525be0ed5a7ed2cefa4e1717ba9b021001346ad13da19f9f7a
-  data.tar.gz: 425d5e42fb25f92c8405aea0f0b22d952a379925ca5a5760587e43c35f2d2da2a6bd2fa799ae5f191d12e3e9b1f515e96e5d2561d539b2f3d13bf301177fffd0
+  metadata.gz: e4738b6c3b0663bca71c87fa7d9900f8718cdca3fef8d03b12d211c99b4868eb90024868f2ccbc38d1f68f6dc791979f244b56177e7e9048493bb58df8733b23
+  data.tar.gz: 97c84c60f9c6ac5e5591adb1517c35b18601c12724220853f13e6305137c1eddd00fc3105b4f913c0af0ff3a672dca7e1bd24fd0e83a35216e82cc8e21373c88

data/lib/uprb/require_tracker.rb

@@ -71,17 +71,40 @@ module Uprb
           target_name = name
           suffixes = Uprb::SUFFIXES
         end
+
+        # A suffix-only match against $LOADED_FEATURES can confuse `set` with
+        # an unrelated rubygems/resolver/set.rb that happened to be loaded.
+        # Prefer the file Ruby would resolve for the requested feature name.
+        unless absolute_path?(name)
+          $LOAD_PATH.each do |dir|
+            suffixes.each do |suffix|
+              candidate = File.join(dir, "#{target_name}#{suffix}")
+              return candidate if File.file?(candidate)
+            end
+          end
+        end
+
         suffixes.each do |suffix|
           pattern = /(?:\A|#{File::SEPARATOR})#{target_name}#{suffix}\z/
           # Ruby appends the parent after its nested children; search from the tail to hit it first.
           entries.reverse_each do |f|
-            return f if pattern.match?(f)
+            next unless pattern.match?(f)
+            return f if absolute_path?(name) || resolves_from_load_path?(f, target_name, suffixes)
           end
         end
 
         nil
       end
 
+      def resolves_from_load_path?(path, target_name, suffixes)
+        expanded_path = File.expand_path(path)
+        $LOAD_PATH.any? do |dir|
+          suffixes.any? do |suffix|
+            expanded_path == File.expand_path("#{target_name}#{suffix}", dir)
+          end
+        end
+      end
+
       def absolute_path?(name)
         name.start_with?(File::SEPARATOR) ||
           (File::ALT_SEPARATOR && name.start_with?(File::ALT_SEPARATOR))

data/lib/uprb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uprb
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uprb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - hogelog