1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Allow standalone mode to work on a Windows edge case

Browse Source 
If a gem is located in a different drive than the Gemfile, standalone
mode will fail to generate the `bundler/setup` script, failing with an
error like

```
ArgumentError: different prefix: "C:/" and "D:/a/rubygems/rubygems/bundler/tmp/2/bundled_app/bundle/bundler"
  C:/hostedtoolcache/windows/Ruby/3.0.5/x64/lib/ruby/3.0.0/pathname.rb:528:in `relative_path_from'
  D:/a/rubygems/rubygems/bundler/tmp/2/gems/system/gems/bundler-2.4.20/lib/bundler/installer/standalone.rb:58:in `gem_path'
  D:/a/rubygems/rubygems/bundler/tmp/2/gems/system/gems/bundler-2.4.20/lib/bundler/installer/standalone.rb:33:in `block (2 levels) in paths'
  D:/a/rubygems/rubygems/bundler/tmp/2/gems/system/gems/bundler-2.4.20/lib/bundler/installer/standalone.rb:32:in `map'
  D:/a/rubygems/rubygems/bundler/tmp/2/gems/system/gems/bundler-2.4.20/lib/bundler/installer/standalone.rb:32:in `block in paths'
```

I'm fixing this by falling back to using a full path in this case.

This was caught by a failing spec, so I'm not adding new specs.

https://github.com/rubygems/rubygems/commit/3cb9b9ab7a
This commit is contained in:
David Rodriguez 2023-09-22 22:22:29 +02:00 committed by git
parent 7816307b30
commit 0e808183ee
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/bundler/installer/standalone.rb
View File

@ -55,13 +55,20 @@ module Bundler
if spec.source.instance_of?(Source::Path) && spec.source.path.absolute? if spec.source.instance_of?(Source::Path) && spec.source.path.absolute?
full_path full_path
else else
Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path)).to_s relative_path_from(Bundler.root.join(bundler_path), :to => full_path) || full_path
end end
rescue TypeError rescue TypeError
error_message = "#{spec.name} #{spec.version} has an invalid gemspec" error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
raise Gem::InvalidSpecificationException.new(error_message) raise Gem::InvalidSpecificationException.new(error_message)
end end
def relative_path_from(source, to:)
Pathname.new(to).relative_path_from(source).to_s
rescue ArgumentError
# on Windows, if source and destination are on different drivers, there's no relative path from one to the other
nil
end
def define_path_helpers def define_path_helpers
<<~'END' <<~'END'
unless defined?(Gem) unless defined?(Gem)