archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 04:55:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[rubygems/rubygems] gem cleanup no longer needs to reset paths

Browse source 
Since `Gem::Uninstaller` no longer changes paths either.

427059d45f
This commit is contained in:
David Rodríguez 2024-09-26 11:24:23 +02:00 • committed by git
parent d4ac5c573b
commit 82f250af45
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/rubygems/commands/cleanup_command.rb
View file

@ -38,8 +38,6 @@ class Gem::Commands::CleanupCommand < Gem::Command
@default_gems = [] @default_gems = []
@full = nil @full = nil
@gems_to_cleanup = nil @gems_to_cleanup = nil
@original_home = nil
@original_path = nil
@primary_gems = nil @primary_gems = nil
end end
@ -95,9 +93,6 @@ If no gems are named all gems in GEM_HOME are cleaned.
end end
def clean_gems def clean_gems
@original_home = Gem.dir
@original_path = Gem.path
get_primary_gems get_primary_gems
get_candidate_gems get_candidate_gems
get_gems_to_cleanup get_gems_to_cleanup
@ -112,8 +107,6 @@ If no gems are named all gems in GEM_HOME are cleaned.
deps.reverse_each do |spec| deps.reverse_each do |spec|
uninstall_dep spec uninstall_dep spec
end end
Gem::Specification.reset
end end
def get_candidate_gems def get_candidate_gems
@ -133,7 +126,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
default_gems, gems_to_cleanup = gems_to_cleanup.partition(&:default_gem?) default_gems, gems_to_cleanup = gems_to_cleanup.partition(&:default_gem?)
uninstall_from = options[:user_install] ? Gem.user_dir : @original_home uninstall_from = options[:user_install] ? Gem.user_dir : Gem.dir
gems_to_cleanup = gems_to_cleanup.select do |spec| gems_to_cleanup = gems_to_cleanup.select do |spec|
spec.base_dir == uninstall_from spec.base_dir == uninstall_from
@ -181,8 +174,5 @@ If no gems are named all gems in GEM_HOME are cleaned.
say "Unable to uninstall #{spec.full_name}:" say "Unable to uninstall #{spec.full_name}:"
say "\t#{e.class}: #{e.message}" say "\t#{e.class}: #{e.message}"
end end
ensure
# Restore path Gem::Uninstaller may have changed
Gem.use_paths @original_home, *@original_path
end end
end end