https://git.ruby-lang.org/ruby.git/commit/?id=55f574136c

From 55f574136cbcf11339531768524558e03bf7eb7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 17 Nov 2021 21:13:40 +0100
Subject: [rubygems/rubygems] Extract a converge_specs method for later reusing
 it

https://github.com/rubygems/rubygems/commit/e896e63ac3
---
 lib/bundler/definition.rb | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index d0ae4631d71..c009397b083 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -690,9 +690,27 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L690
     # commonly happen if the Gemfile has changed since the lockfile was last
     # generated
     def converge_locked_specs
+      resolve = converge_specs(@locked_specs)
+
+      diff = nil
+
+      # Now, we unlock any sources that do not have anymore gems pinned to it
+      sources.all_sources.each do |source|
+        next unless source.respond_to?(:unlock!)
+
+        unless resolve.any? {|s| s.source == source }
+          diff ||= @locked_specs.to_a - resolve.to_a
+          source.unlock! if diff.any? {|s| s.source == source }
+        end
+      end
+
+      resolve
+    end
+
+    def converge_specs(specs)
       deps = []
       converged = []
-      @locked_specs.each do |s|
+      specs.each do |s|
         # Replace the locked dependency's source with the equivalent source from the Gemfile
         dep = @dependencies.find {|d| s.satisfies?(d) }
 
@@ -717,7 +735,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L735
           rescue PathError, GitError
             # if we won't need the source (according to the lockfile),
             # don't error if the path/git source isn't available
-            next if @locked_specs.
+            next if specs.
                     for(requested_dependencies, false, true).
                     none? {|locked_spec| locked_spec.source == s.source }
 
@@ -741,20 +759,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L759
       end
 
       resolve = SpecSet.new(converged)
-      resolve = SpecSet.new(resolve.for(expand_dependencies(deps, true), false, false).reject{|s| @unlock[:gems].include?(s.name) })
-      diff    = nil
-
-      # Now, we unlock any sources that do not have anymore gems pinned to it
-      sources.all_sources.each do |source|
-        next unless source.respond_to?(:unlock!)
-
-        unless resolve.any? {|s| s.source == source }
-          diff ||= @locked_specs.to_a - resolve.to_a
-          source.unlock! if diff.any? {|s| s.source == source }
-        end
-      end
-
-      resolve
+      SpecSet.new(resolve.for(expand_dependencies(deps, true), false, false).reject{|s| @unlock[:gems].include?(s.name) })
     end
 
     def metadata_dependencies
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/