bundler-source-pathext 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9746323d874d99471d27cbbec67b46d871fc5076327908f4e6165ad77f61961
-  data.tar.gz: 7fb084483775bd60058988c143ec08278f334d1db030db17870c0ec0a3cc87b7
+  metadata.gz: 74f39d19bde0adf306918257f3c5fffb56084f083adbc66e56045f7662cfb445
+  data.tar.gz: 4369b733c6b795dc497f8aeaa6477bcd957b72583801a4279e63f0b2d8ca000e
 SHA512:
-  metadata.gz: c0d89393e1cf197a70eff29629f64923556ed49e5ceb3e21433b1f55150ceae3c3270489cfb490365381778d4e965dc7d6dfd6d5c2ef4b3e17fc6e3417f68ec0
-  data.tar.gz: 185fe3d552b52908b7bacab0754be883c1599efccfb9e8f73f067f9fc6f9545615ea52e157fb87731cb3ae0e850af78dd5171f128b31685c974fb40513aef65c
+  metadata.gz: b51052c526b45864b3be82804cd2647eebdf462e73e1220232362d6cf86331b3aee1ecea49c892ae789769f8823027eccb951f8f0f159e3ce09086f648bd890d
+  data.tar.gz: d46411773b33d982fb0b03608670cdbca622cb5179e23a3675929989743a7eec943eebde776c16a8e40e5c3dd74d051d86adb196a5b8d7f77949dd607b10991e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bundler-source-pathext (0.3.0)
+    bundler-source-pathext (0.4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -11,10 +11,11 @@ GEM
 PLATFORMS
   arm64-darwin-24
   x86_64-darwin-17
+  x86_64-linux
 
 DEPENDENCIES
   bundler-source-pathext!
   rake (~> 12.0)
 
 BUNDLED WITH
-   2.2.3
+  4.1.0.beta2

data/bundler-source-pathext.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "bundler-source-pathext"
-  spec.version       = "0.4.0"
+  spec.version       = "0.4.1"
   spec.authors       = ["pganalyze Team"]
   spec.email         = ["team@pganalyze.com"]
 

data/lib/bundler-source-pathext.rb

@@ -10,6 +10,27 @@ class BundlerSourcePathext < Bundler::Plugin::API
   HAS_NJOBS = Gem.rubygems_version >= Gem::Version.new("4.0.2")
 
   class PathExtSource < Bundler::Source
+    # Where each source's relative path is resolved from, keyed by its uri.
+    #
+    # Bundler builds a source twice: once from the Gemfile, and once from the
+    # lockfile, and it keeps the latter (see Definition#converge_sources). The
+    # lockfile records nothing but the relative remote, so the rebuilt source
+    # cannot tell which Gemfile that path was written in - but the Gemfile is
+    # always evaluated before the lockfile is parsed, so the copy that does know
+    # leaves the answer here for the copy that doesn't.
+    ROOT_PATHS = {}
+
+    # Bundler hands its own path source the directory that relative paths are
+    # resolved against, as "root_path", but it does not do so for plugin sources,
+    # so we work it out ourselves below. Accepting the option regardless means we
+    # pick it up for free if Bundler ever starts passing it.
+    def initialize(opts)
+      super
+      root_path = opts['root_path'] || declaring_gemfile_dir(caller_locations)
+      ROOT_PATHS[uri] = root_path if root_path
+      @root_path = ROOT_PATHS[uri] || root
+    end
+
     # Called by Bundler once per gem that gets installed from this source.
     #
     # Note that `opts` are the install options passed in by Bundler (:build_args,
@@ -31,9 +52,9 @@ class BundlerSourcePathext < Bundler::Plugin::API
 
     # Bundler plugin api, we need to return a Bundler::Index
     def specs
-      # A relative path in the Gemfile is relative to the Gemfile itself (i.e.
-      # the bundler root), and not to the directory bundler was run from
-      files = Dir.glob(File.join(File.expand_path(uri, root), '*.gemspec'))
+      # A relative path in the Gemfile is relative to the Gemfile itself, and not
+      # to the directory bundler was run from
+      files = Dir.glob(File.join(File.expand_path(uri, @root_path), '*.gemspec'))
 
       Bundler::Index.build do |index|
         files.each do |file|
@@ -62,6 +83,28 @@ class BundlerSourcePathext < Bundler::Plugin::API
 
     private
 
+    # Bundler.root is the directory of the Gemfile bundler was pointed at, which
+    # is not necessarily the one that declared this source: a wrapper Gemfile
+    # that pulls the real one in through eval_gemfile (as the Ruby LSP and
+    # Appraisal do) moves the root into its own directory, while the source path
+    # still refers to the Gemfile it was written in.
+    #
+    # Bundler evaluates every Gemfile with `instance_eval(contents, gemfile_path)`,
+    # so while a source is being declared the Gemfile is the innermost frame
+    # outside of bundler, and its caller is bundler's DSL. Requiring both keeps
+    # an ordinary bundler stack from being mistaken for a Gemfile: a source
+    # rebuilt from the lockfile has no Gemfile frame, and falls back to the root.
+    def declaring_gemfile_dir(locations)
+      dsl = Bundler::Dsl.instance_method(:eval_gemfile).source_location.first
+      bundler_lib = File.dirname(File.dirname(dsl)) + File::SEPARATOR
+
+      index = locations.index { |location| !location.path.start_with?(bundler_lib) }
+      return if index.nil? || index.zero?
+      return unless locations[index - 1].path == dsl
+
+      File.dirname(File.expand_path(locations[index].path))
+    end
+
     def build_local_extensions(spec, build_args = nil)
       # Bundler passes in whatever "bundle config build.GEM" is set to, and the
       # source options allow setting build args for all gems of a source

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bundler-source-pathext
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - pganalyze Team
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Bundler source plugin that works like a path source, but also builds
   the native extensions of the gems it provides, like a remote gem source does.
@@ -32,7 +31,6 @@ homepage: https://github.com/pganalyze/bundler-path-build-ext
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -47,8 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Bundler source plugin for local gems with native extensions
 test_files: []