ruby-changes:67435
From: David <ko1@a...>
Date: Tue, 31 Aug 2021 19:07:26 +0900 (JST)
Subject: [ruby-changes:67435] 19d77a1cfc (master): [rubygems/rubygems] Remove unnecessary spec manipulation
https://git.ruby-lang.org/ruby.git/commit/?id=19d77a1cfc From 19d77a1cfc8efa1d03083689f7de78a52ef05be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Mon, 28 Oct 2019 18:08:07 +0100 Subject: [rubygems/rubygems] Remove unnecessary spec manipulation https://github.com/rubygems/rubygems/commit/c7c00c280f --- lib/rubygems.rb | 1 - test/rubygems/test_gem.rb | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 60a599e..271f4d2 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -1121,7 +1121,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]} https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L1121 ensure Gem::DefaultUserInteraction.ui.close end - @gemdeps.requested_specs.map(&:to_spec).sort_by(&:name) end rescue => e diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 12612bd..608c6ba 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -674,7 +674,9 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L674 begin Dir.chdir 'detect/a/b' - assert_equal add_bundler_full_name([]), Gem.use_gemdeps.map(&:full_name) + Gem.use_gemdeps + + assert_equal add_bundler_full_name([]), loaded_spec_names ensure Dir.chdir @tempdir end @@ -1713,8 +1715,11 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1715 ENV['RUBYGEMS_GEMDEPS'] = "-" - expected_specs = [a, b, util_spec("bundler", Bundler::VERSION), c].compact - assert_equal expected_specs, Gem.use_gemdeps.sort_by {|s| s.name } + expected_specs = [a, b, util_spec("bundler", Bundler::VERSION), c].compact.map(&:full_name) + + Gem.use_gemdeps + + assert_equal expected_specs, loaded_spec_names end BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) } -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/