[前][次][番号順一覧][スレッド一覧]

ruby-changes:68429

From: David <ko1@a...>
Date: Wed, 13 Oct 2021 21:16:51 +0900 (JST)
Subject: [ruby-changes:68429] ec5f732b7d (master): [rubygems/rubygems] Extract `locked_dependencies` helper

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

From ec5f732b7d48b557c9d8974709f7175bd9f99323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 29 Sep 2021 20:07:08 +0200
Subject: [rubygems/rubygems] Extract `locked_dependencies` helper

https://github.com/rubygems/rubygems/commit/7326d47530
---
 lib/bundler/definition.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index b4db2850fd..96c7c862d7 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -233,6 +233,10 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L233
       end
     end
 
+    def locked_dependencies
+      @locked_deps.values
+    end
+
     def specs_for(groups)
       groups = requested_groups if groups.empty?
       deps = dependencies_for(groups)
@@ -374,8 +378,8 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L378
       new_sources = gemfile_sources - @locked_sources
       deleted_sources = @locked_sources - gemfile_sources
 
-      new_deps = @dependencies - @locked_deps.values
-      deleted_deps = @locked_deps.values - @dependencies
+      new_deps = @dependencies - locked_dependencies
+      deleted_deps = locked_dependencies - @dependencies
 
       # Check if it is possible that the source is only changed thing
       if (new_deps.empty? && deleted_deps.empty?) && (!new_sources.empty? && !deleted_sources.empty?)
@@ -567,7 +571,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L571
 
     def dependencies_for_source_changed?(source, locked_source = source)
       deps_for_source = @dependencies.select {|s| s.source == source }
-      locked_deps_for_source = @locked_deps.values.select {|dep| dep.source == locked_source }
+      locked_deps_for_source = locked_dependencies.select {|dep| dep.source == locked_source }
 
       deps_for_source.uniq.sort != locked_deps_for_source.sort
     end
@@ -651,7 +655,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L655
 
     def converge_dependencies
       frozen = Bundler.frozen_bundle?
-      (@dependencies + @locked_deps.values).each do |dep|
+      (@dependencies + locked_dependencies).each do |dep|
         locked_source = @locked_deps[dep.name]
         # This is to make sure that if bundler is installing in deployment mode and
         # after locked_source and sources don't match, we still use locked_source.
-- 
cgit v1.2.1


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

[前][次][番号順一覧][スレッド一覧]