ruby-changes:72015
From: David <ko1@a...>
Date: Mon, 30 May 2022 17:42:52 +0900 (JST)
Subject: [ruby-changes:72015] ea31c5bcd1 (master): [rubygems/rubygems] Fix crash when installing gems with symlinks
https://git.ruby-lang.org/ruby.git/commit/?id=ea31c5bcd1 From ea31c5bcd1bc1a019a6aee2b3f3b16813d7ff96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Fri, 27 May 2022 20:46:42 +0200 Subject: [rubygems/rubygems] Fix crash when installing gems with symlinks If BUNDLE_PATH is configured to a symlinked path, installing gems with symlinks would crash with an error like this: ``` Gem::Package::SymlinkError: installing symlink 'man/man0/README.markdown' pointing to parent path /usr/home/stevewi/srv/mail/lib/tools/.vendor/ruby/3.1.0/gems/binman-5.1.0/README.markdown of /srv/mail/lib/tools/.vendor/ruby/3.1.0/gems/binman-5.1.0 is not allowed ``` This commit fixes the problem by changing the bundle path to be the realpath of the configured value, right after we're sure the path has been created. https://github.com/rubygems/rubygems/commit/3cd3dd142a --- lib/bundler.rb | 11 +++++++++++ lib/bundler/inline.rb | 1 + lib/bundler/installer.rb | 11 +---------- lib/bundler/source/rubygems.rb | 2 +- spec/bundler/commands/install_spec.rb | 33 +++++++++++++++++++++++++++++++++ spec/bundler/support/builders.rb | 5 +++-- 6 files changed, 50 insertions(+), 13 deletions(-) diff --git a/lib/bundler.rb b/lib/bundler.rb index 0be01d1808..c99114ae64 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -97,6 +97,17 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler.rb#L97 @bundle_path ||= Pathname.new(configured_bundle_path.path).expand_path(root) end + def create_bundle_path + SharedHelpers.filesystem_access(bundle_path.to_s) do |p| + mkdir_p(p) + end unless bundle_path.exist? + + @bundle_path = bundle_path.realpath + rescue Errno::EEXIST + raise PathError, "Could not install to path `#{bundle_path}` " \ + "because a file already exists at that path. Either remove or rename the file so the directory can be created." + end + def configured_bundle_path @configured_bundle_path ||= settings.path.tap(&:validate!) end diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb index db1ca2de65..8ef580f1f0 100644 --- a/lib/bundler/inline.rb +++ b/lib/bundler/inline.rb @@ -38,6 +38,7 @@ def gemfile(install = false, options = {}, &gemfile) https://github.com/ruby/ruby/blob/trunk/lib/bundler/inline.rb#L38 raise ArgumentError, "Unknown options: #{opts.keys.join(", ")}" unless opts.empty? begin + Bundler.instance_variable_set(:@bundle_path, Pathname.new(Gem.dir)) old_gemfile = ENV["BUNDLE_GEMFILE"] Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", "Gemfile" diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb index 915a04c0dc..f195d36600 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -66,7 +66,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/installer.rb#L66 # require paths and save them in a `setup.rb` file. See `bundle standalone --help` for more # information. def run(options) - create_bundle_path + Bundler.create_bundle_path ProcessLock.lock do if Bundler.frozen_bundle? @@ -262,15 +262,6 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/installer.rb#L262 end end - def create_bundle_path - SharedHelpers.filesystem_access(Bundler.bundle_path.to_s) do |p| - Bundler.mkdir_p(p) - end unless Bundler.bundle_path.exist? - rescue Errno::EEXIST - raise PathError, "Could not install to path `#{Bundler.bundle_path}` " \ - "because a file already exists at that path. Either remove or rename the file so the directory can be created." - end - # returns whether or not a re-resolve was needed def resolve_if_needed(options) if !@definition.unlocking? && !options["force"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file? diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb index b37bfbccb9..5dceacbae4 100644 --- a/lib/bundler/source/rubygems.rb +++ b/lib/bundler/source/rubygems.rb @@ -499,7 +499,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/source/rubygems.rb#L499 end def rubygems_dir - Bundler.rubygems.gem_dir + Bundler.bundle_path end def default_cache_path_for(dir) diff --git a/spec/bundler/commands/install_spec.rb b/spec/bundler/commands/install_spec.rb index 07585237e3..4a48187db0 100644 --- a/spec/bundler/commands/install_spec.rb +++ b/spec/bundler/commands/install_spec.rb @@ -969,4 +969,37 @@ RSpec.describe "bundle install with gem sources" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/commands/install_spec.rb#L969 expect(last_command).to be_success end end + + context "with a symlinked configured as bundle path and a gem with symlinks" do + before do + symlinked_bundled_app = tmp("bundled_app-symlink") + File.symlink(bundled_app, symlinked_bundled_app) + bundle "config path #{File.join(symlinked_bundled_app, ".vendor")}" + + binman_path = tmp("binman") + FileUtils.mkdir_p binman_path + + readme_path = File.join(binman_path, "README.markdown") + FileUtils.touch(readme_path) + + man_path = File.join(binman_path, "man", "man0") + FileUtils.mkdir_p man_path + + File.symlink("../../README.markdown", File.join(man_path, "README.markdown")) + + build_repo4 do + build_gem "binman", :path => gem_repo4("gems"), :lib_path => binman_path, :no_default => true do |s| + s.files = ["README.markdown", "man/man0/README.markdown"] + end + end + end + + it "installs fine" do + install_gemfile <<~G + source "#{file_uri_for(gem_repo4)}" + + gem "binman" + G + end + end end diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb index aca31638ac..91f0106d7d 100644 --- a/spec/bundler/support/builders.rb +++ b/spec/bundler/support/builders.rb @@ -484,7 +484,7 @@ module Spec https://github.com/ruby/ruby/blob/trunk/spec/bundler/support/builders.rb#L484 end @spec.authors = ["no one"] - @spec.files = @files.keys + @spec.files += @files.keys case options[:gemspec] when false @@ -589,7 +589,8 @@ module Spec https://github.com/ruby/ruby/blob/trunk/spec/bundler/support/builders.rb#L589 class GemBuilder < LibBuilder def _build(opts) - lib_path = super(opts.merge(:path => @context.tmp(".tmp/#{@spec.full_name}"), :no_default => opts[:no_default])) + lib_path = opts[:lib_path] || @context.tmp(".tmp/#{@spec.full_name}") + lib_path = super(opts.merge(:path => lib_path, :no_default => opts[:no_default])) destination = opts[:path] || _default_path FileUtils.mkdir_p(lib_path.join(destination)) -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/