Blob Blame History Raw
From 7efc7afcae6720e1af7ab49986d789b6f9d6fe0a Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 8 Mar 2021 12:17:52 +0900
Subject: [PATCH] Merge RubyGems-3.2.13 and Bundler-2.2.13

---
 lib/bundler/cli/gem.rb                        |  40 +++---
 lib/bundler/definition.rb                     |  47 ++++---
 lib/bundler/dsl.rb                            |  58 +++++---
 lib/bundler/inline.rb                         |   1 +
 lib/bundler/lockfile_parser.rb                |  20 +--
 lib/bundler/plugin.rb                         |   1 +
 lib/bundler/plugin/installer.rb               |  18 ++-
 lib/bundler/plugin/source_list.rb             |   4 +
 lib/bundler/resolver.rb                       |  70 +++++-----
 lib/bundler/source_list.rb                    |  33 ++---
 lib/bundler/templates/newgem/README.md.tt     |   8 +-
 lib/bundler/version.rb                        |   2 +-
 lib/rubygems.rb                               |   2 +-
 lib/rubygems/core_ext/tcpsocket_init.rb       |   5 +-
 lib/rubygems/platform.rb                      |  10 +-
 spec/bundler/bundler/plugin_spec.rb           |   1 +
 spec/bundler/commands/exec_spec.rb            | 131 ++++++++++++++---
 spec/bundler/commands/newgem_spec.rb          |  94 +++++--------
 .../commands/post_bundle_message_spec.rb      |  11 +-
 spec/bundler/install/gemfile/gemspec_spec.rb  |  15 +-
 spec/bundler/install/gemfile/sources_spec.rb  | 132 +++++++++++++++---
 spec/bundler/support/indexes.rb               |   2 +-
 test/rubygems/test_gem.rb                     |  10 +-
 test/rubygems/test_gem_platform.rb            |  29 ++++
 24 files changed, 477 insertions(+), 267 deletions(-)

diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 1c6d790b25e6..8b028d3495a8 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1885,15 +1885,9 @@ def test_use_gemdeps_missing_gem
       io.write 'gem "a"'
     end
 
-    platform = Bundler::GemHelpers.generic_local_platform
-    if platform == Gem::Platform::RUBY
-      platform = ''
-    else
-      platform = " #{platform}"
-    end
-
     expected = <<-EXPECTED
-Could not find gem 'a#{platform}' in any of the gem sources listed in your Gemfile.
+Could not find gem 'a' in locally installed gems.
+The source does not contain any versions of 'a'
 You may need to `gem install -g` to install missing gems
 
     EXPECTED