kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[rubygems/rubygems] Fix upgrading RubyGems with a customized Gem.default_dir

Browse source 
https://github.com/rubygems/rubygems/commit/16d01f9486
This commit is contained in:
David Rodríguez 2022-07-16 12:09:54 +02:00 • committed by git
parent 01560e1c53
commit a74634de10
2 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/rubygems/commands/setup_command.rb
View file

@ -360,34 +360,24 @@ By default, this RubyGems will install gem as:
end
def install_default_bundler_gem(bin_dir)
specs_dir = File.join(default_dir, "specifications", "default")
current_default_spec = Gem::Specification.default_stubs.find {|s| s.name == "bundler" }
specs_dir = if current_default_spec
Gem::Specification.remove_spec current_default_spec
loaded_from = current_default_spec.loaded_from
File.delete(loaded_from)
File.dirname(loaded_from)
else
File.join(default_dir, "specifications", "default")
end
mkdir_p specs_dir, :mode => 0755
bundler_spec = Dir.chdir("bundler") { Gem::Specification.load("bundler.gemspec") }
current_default_spec = Gem::Specification.default_stubs.find {|s| s.name == "bundler" }
if current_default_spec
File.delete(current_default_spec.loaded_from)
Gem::Specification.remove_spec current_default_spec
end
default_spec_path = File.join(specs_dir, "#{bundler_spec.full_name}.gemspec")
Gem.write_binary(default_spec_path, bundler_spec.to_ruby)
bundler_spec = Gem::Specification.load(default_spec_path)
# The base_dir value for a specification is inferred by walking up from the
# folder where the spec was `loaded_from`. In the case of default gems, we
# walk up two levels, because they live at `specifications/default/`, whereas
# in the case of regular gems we walk up just one level because they live at
# `specifications/`. However, in this case, the gem we are installing is
# misdetected as a regular gem, when it's a default gem in reality. This is
# because when there's a `:destdir`, the `loaded_from` path has changed and
# doesn't match `Gem.default_specifications_dir` which is the criteria to
# tag a gem as a default gem. So, in that case, write the correct
# `@base_dir` directly.
bundler_spec.instance_variable_set(:@base_dir, File.dirname(File.dirname(specs_dir)))
# Remove gemspec that was same version of vendored bundler.
normal_gemspec = File.join(default_dir, "specifications", "bundler-#{bundler_spec.version}.gemspec")
if File.file? normal_gemspec

18
test/rubygems/test_gem_commands_setup_command.rb
View file

@ -228,6 +228,24 @@ class TestGemCommandsSetupCommand < Gem::TestCase
assert_path_exist "#{Gem.dir}/gems/bundler-audit-1.0.0"
end
def test_install_default_bundler_gem_with_default_gems_not_installed_at_default_dir
@cmd.extend FileUtils
gemhome2 = File.join(@tempdir, 'gemhome2')
Gem.instance_variable_set(:@default_dir, gemhome2)
FileUtils.mkdir_p gemhome2
bin_dir = File.join(gemhome2, 'bin')
@cmd.install_default_bundler_gem bin_dir
default_dir = Gem.default_specifications_dir
# expect to remove other versions of bundler gemspecs on default specification directory.
assert_path_not_exist File.join(default_dir, "bundler-1.15.4.gemspec")
assert_path_exist File.join(default_dir, "bundler-#{BUNDLER_VERS}.gemspec")
end
def test_install_default_bundler_gem_with_force_flag
@cmd.extend FileUtils