ruby-changes:67455
From: David <ko1@a...>
Date: Tue, 31 Aug 2021 19:07:37 +0900 (JST)
Subject: [ruby-changes:67455] d01c3111c2 (master): [rubygems/rubygems] Remove MacOS specific extra GEM_PATH
https://git.ruby-lang.org/ruby.git/commit/?id=d01c3111c2 From d01c3111c25d618ab42b0b52b620c55a9305d0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Sun, 8 Aug 2021 10:40:11 +0200 Subject: [rubygems/rubygems] Remove MacOS specific extra GEM_PATH They should properly configure `GEM_PATH` instead. https://github.com/rubygems/rubygems/commit/3bd9ae33ca --- lib/rubygems/commands/setup_command.rb | 16 ++-------------- lib/rubygems/path_support.rb | 7 +------ test/rubygems/test_gem.rb | 35 ---------------------------------- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index 47e215c..8b1098f 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -462,20 +462,8 @@ By default, this RubyGems will install gem as: https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/setup_command.rb#L462 lib_dir = RbConfig::CONFIG[site_or_vendor] bin_dir = RbConfig::CONFIG['bindir'] else - # Apple installed RubyGems into libdir, and RubyGems <= 1.1.0 gets - # confused about installation location, so switch back to - # sitelibdir/vendorlibdir. - if defined?(APPLE_GEM_HOME) and - # just in case Apple and RubyGems don't get this patched up proper. - (prefix == RbConfig::CONFIG['libdir'] or - # this one is important - prefix == File.join(RbConfig::CONFIG['libdir'], 'ruby')) - lib_dir = RbConfig::CONFIG[site_or_vendor] - bin_dir = RbConfig::CONFIG['bindir'] - else - lib_dir = File.join prefix, 'lib' - bin_dir = File.join prefix, 'bin' - end + lib_dir = File.join prefix, 'lib' + bin_dir = File.join prefix, 'bin' end unless install_destdir.empty? diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb index 8103caf..d601e65 100644 --- a/lib/rubygems/path_support.rb +++ b/lib/rubygems/path_support.rb @@ -72,12 +72,7 @@ class Gem::PathSupport https://github.com/ruby/ruby/blob/trunk/lib/rubygems/path_support.rb#L72 # Return the default Gem path def default_path - gem_path = Gem.default_path + [@home] - - if defined?(APPLE_GEM_HOME) - gem_path << APPLE_GEM_HOME - end - gem_path + Gem.default_path + [@home] end def expand(path) diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index da154da..013daa0 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -943,44 +943,9 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L943 def test_self_path_default util_path - if defined?(APPLE_GEM_HOME) - orig_APPLE_GEM_HOME = APPLE_GEM_HOME - Object.send :remove_const, :APPLE_GEM_HOME - end - Gem.instance_variable_set :@paths, nil assert_equal [Gem.default_path, Gem.dir].flatten.uniq, Gem.path - ensure - Object.const_set :APPLE_GEM_HOME, orig_APPLE_GEM_HOME if orig_APPLE_GEM_HOME - end - - unless win_platform? - def test_self_path_APPLE_GEM_HOME - util_path - - Gem.clear_paths - apple_gem_home = File.join @tempdir, 'apple_gem_home' - - old, $-w = $-w, nil - Object.const_set :APPLE_GEM_HOME, apple_gem_home - $-w = old - - assert_includes Gem.path, apple_gem_home - ensure - Object.send :remove_const, :APPLE_GEM_HOME - end - - def test_self_path_APPLE_GEM_HOME_GEM_PATH - Gem.clear_paths - ENV['GEM_PATH'] = @gemhome - apple_gem_home = File.join @tempdir, 'apple_gem_home' - Gem.const_set :APPLE_GEM_HOME, apple_gem_home - - refute Gem.path.include?(apple_gem_home) - ensure - Gem.send :remove_const, :APPLE_GEM_HOME - end end def test_self_path_ENV_PATH -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/