Merge RubyGems-3.2.12 and Bundler-2.2.12

3 files changed, 131 insertions, 25 deletions

diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb
index c0181a8788..8477089608 100644
--- a/spec/bundler/install/gemfile/git_spec.rb
+++ b/spec/bundler/install/gemfile/git_spec.rb
@@ -647,8 +647,6 @@ RSpec.describe "bundle install with git sources" do
     end
 
     it "installs dependencies from git even if a newer gem is available elsewhere" do
-      skip "override is not winning" if Gem.win_platform?
-
       system_gems "rack-1.0.0"
 
       build_lib "rack", "1.0", :path => lib_path("nested/bar") do |s|
diff --git a/spec/bundler/install/gemfile/path_spec.rb b/spec/bundler/install/gemfile/path_spec.rb
index 6cd981e3d3..7322d11892 100644
--- a/spec/bundler/install/gemfile/path_spec.rb
+++ b/spec/bundler/install/gemfile/path_spec.rb
@@ -136,8 +136,6 @@ RSpec.describe "bundle install with explicit source paths" do
   end
 
   it "installs dependencies from the path even if a newer gem is available elsewhere" do
-    skip "override is not winning" if Gem.win_platform?
-
     system_gems "rack-1.0.0"
 
     build_lib "rack", "1.0", :path => lib_path("nested/bar") do |s|
@@ -701,8 +699,6 @@ RSpec.describe "bundle install with explicit source paths" do
 
   describe "when there are both a gemspec and remote gems" do
     it "doesn't query rubygems for local gemspec name" do
-      skip "platform issues" if Gem.win_platform?
-
       build_lib "private_lib", "2.2", :path => lib_path("private_lib")
       gemfile = <<-G
         source "http://localgemserver.test"
diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb
index 655f91dd69..cfa8ba7dc9 100644
--- a/spec/bundler/install/gemfile/sources_spec.rb
+++ b/spec/bundler/install/gemfile/sources_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
         G
       end
 
-      it "warns about ambiguous gems, but installs anyway, prioritizing sources last to first", :bundler => "2" do
+      it "warns about ambiguous gems, but installs anyway, prioritizing sources last to first", :bundler => "< 3" do
         bundle :install
 
         expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
@@ -54,7 +54,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
         G
       end
 
-      it "warns about ambiguous gems, but installs anyway", :bundler => "2" do
+      it "warns about ambiguous gems, but installs anyway", :bundler => "< 3" do
         bundle :install
         expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
         expect(err).to include("Installed from: #{file_uri_for(gem_repo1)}")
@@ -96,7 +96,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 
       it "installs the gems without any warning" do
         bundle :install
-        expect(out).not_to include("Warning")
+        expect(err).not_to include("Warning")
         expect(the_bundle).to include_gems("rack-obama 1.0.0")
         expect(the_bundle).to include_gems("rack 1.0.0", :source => "remote1")
       end
@@ -128,7 +128,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
           end
         end
 
-        gemfile <<-G
+        install_gemfile <<-G
           source "#{file_uri_for(gem_repo3)}"
           gem "rack-obama" # should come from repo3!
           gem "rack", :source => "#{file_uri_for(gem_repo1)}"
@@ -136,8 +136,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
       end
 
       it "installs the gems without any warning" do
-        bundle :install
-        expect(out).not_to include("Warning")
+        expect(err).not_to include("Warning")
         expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0")
       end
     end
@@ -173,7 +172,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 
           it "installs from the same source without any warning" do
             bundle :install
-            expect(out).not_to include("Warning")
+            expect(err).not_to include("Warning")
             expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
           end
         end
@@ -196,15 +195,14 @@ RSpec.describe "bundle install with gems on multiple sources" do
             it "installs from the same source without any warning" do
               bundle :install
 
-              expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.")
               expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
               expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
 
+              # In https://github.com/bundler/bundler/issues/3585 this failed
               # when there is already a lock file, and the gems are missing, so try again
               system_gems []
               bundle :install
 
-              expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.")
               expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
               expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
             end
@@ -222,7 +220,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 
         context "and not in any other sources" do
           before do
-            gemfile <<-G
+            install_gemfile <<-G
               source "#{file_uri_for(gem_repo2)}"
               source "#{file_uri_for(gem_repo3)}" do
                 gem "depends_on_rack"
@@ -231,8 +229,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
           end
 
           it "installs from the other source without any warning" do
-            bundle :install
-            expect(out).not_to include("Warning")
+            expect(err).not_to include("Warning")
             expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
           end
         end
@@ -248,7 +245,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
             G
           end
 
-          it "installs from the other source and warns about ambiguous gems", :bundler => "2" do
+          it "installs from the other source and warns about ambiguous gems", :bundler => "< 3" do
             bundle :install
             expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
             expect(err).to include("Installed from: #{file_uri_for(gem_repo2)}")
@@ -280,7 +277,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
             G
           end
 
-          it "installs the dependency from the pinned source without warning", :bundler => "2" do
+          it "installs the dependency from the pinned source without warning", :bundler => "< 3" do
             bundle :install
 
             expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
@@ -381,6 +378,123 @@ RSpec.describe "bundle install with gems on multiple sources" do
           end
         end
       end
+
+      context "when the lockfile has aggregated rubygems sources and newer versions of dependencies are available" do
+        before do
+          build_repo gem_repo2 do
+            build_gem "activesupport", "6.0.3.4" do |s|
+              s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
+              s.add_dependency "i18n", ">= 0.7", "< 2"
+              s.add_dependency "minitest", "~> 5.1"
+              s.add_dependency "tzinfo", "~> 1.1"
+              s.add_dependency "zeitwerk", "~> 2.2", ">= 2.2.2"
+            end
+
+            build_gem "activesupport", "6.1.2.1" do |s|
+              s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
+              s.add_dependency "i18n", ">= 1.6", "< 2"
+              s.add_dependency "minitest", ">= 5.1"
+              s.add_dependency "tzinfo", "~> 2.0"
+              s.add_dependency "zeitwerk", "~> 2.3"
+            end
+
+            build_gem "concurrent-ruby", "1.1.8"
+            build_gem "concurrent-ruby", "1.1.9"
+            build_gem "connection_pool", "2.2.3"
+
+            build_gem "i18n", "1.8.9" do |s|
+              s.add_dependency "concurrent-ruby", "~> 1.0"
+            end
+
+            build_gem "minitest", "5.14.3"
+            build_gem "rack", "2.2.3"
+            build_gem "redis", "4.2.5"
+
+            build_gem "sidekiq", "6.1.3" do |s|
+              s.add_dependency "connection_pool", ">= 2.2.2"
+              s.add_dependency "rack", "~> 2.0"
+              s.add_dependency "redis", ">= 4.2.0"
+            end
+
+            build_gem "thread_safe", "0.3.6"
+
+            build_gem "tzinfo", "1.2.9" do |s|
+              s.add_dependency "thread_safe", "~> 0.1"
+            end
+
+            build_gem "tzinfo", "2.0.4" do |s|
+              s.add_dependency "concurrent-ruby", "~> 1.0"
+            end
+
+            build_gem "zeitwerk", "2.4.2"
+          end
+
+          build_repo gem_repo3 do
+            build_gem "sidekiq-pro", "5.2.1" do |s|
+              s.add_dependency "connection_pool", ">= 2.2.3"
+              s.add_dependency "sidekiq", ">= 6.1.0"
+            end
+          end
+
+          gemfile <<-G
+            # frozen_string_literal: true
+
+            source "#{file_uri_for(gem_repo2)}"
+
+            gem "activesupport"
+
+            source "#{file_uri_for(gem_repo3)}" do
+              gem "sidekiq-pro"
+            end
+          G
+
+          lockfile <<~L
+            GEM
+              remote: #{file_uri_for(gem_repo2)}/
+              remote: #{file_uri_for(gem_repo3)}/
+              specs:
+                activesupport (6.0.3.4)
+                  concurrent-ruby (~> 1.0, >= 1.0.2)
+                  i18n (>= 0.7, < 2)
+                  minitest (~> 5.1)
+                  tzinfo (~> 1.1)
+                  zeitwerk (~> 2.2, >= 2.2.2)
+                concurrent-ruby (1.1.8)
+                connection_pool (2.2.3)
+                i18n (1.8.9)
+                  concurrent-ruby (~> 1.0)
+                minitest (5.14.3)
+                rack (2.2.3)
+                redis (4.2.5)
+                sidekiq (6.1.3)
+                  connection_pool (>= 2.2.2)
+                  rack (~> 2.0)
+                  redis (>= 4.2.0)
+                sidekiq-pro (5.2.1)
+                  connection_pool (>= 2.2.3)
+                  sidekiq (>= 6.1.0)
+                thread_safe (0.3.6)
+                tzinfo (1.2.9)
+                  thread_safe (~> 0.1)
+                zeitwerk (2.4.2)
+
+            PLATFORMS
+              #{specific_local_platform}
+
+            DEPENDENCIES
+              activesupport
+              sidekiq-pro!
+
+            BUNDLED WITH
+               #{Bundler::VERSION}
+          L
+        end
+
+        it "upgrades gems when running bundle update, without printing any warnings or errors" do
+          bundle "update --all"
+          expect(err).to be_empty
+        end
+      end
     end
 
     context "with a gem that is only found in the wrong source" do
@@ -389,14 +503,13 @@ RSpec.describe "bundle install with gems on multiple sources" do
           build_gem "not_in_repo1", "1.0.0"
         end
 
-        gemfile <<-G
+        install_gemfile <<-G, :raise_on_error => false
           source "#{file_uri_for(gem_repo3)}"
           gem "not_in_repo1", :source => "#{file_uri_for(gem_repo1)}"
         G
       end
 
       it "does not install the gem" do
-        bundle :install, :raise_on_error => false
         expect(err).to include("Could not find gem 'not_in_repo1'")
       end
     end
@@ -457,14 +570,13 @@ RSpec.describe "bundle install with gems on multiple sources" do
     before do
       system_gems "rack-0.9.1"
 
-      gemfile <<-G
+      install_gemfile <<-G
         source "#{file_uri_for(gem_repo1)}"
         gem "rack" # shoud come from repo1!
       G
     end
 
     it "installs the gems without any warning" do
-      bundle :install
       expect(err).not_to include("Warning")
       expect(the_bundle).to include_gems("rack 1.0.0")
     end
@@ -615,7 +727,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
       G
     end
 
-    it "keeps the old version", :bundler => "2" do
+    it "keeps the old version", :bundler => "< 3" do
       expect(the_bundle).to include_gems("rack 1.0.0")
     end