ruby-changes:73037
From: David <ko1@a...>
Date: Tue, 23 Aug 2022 10:46:23 +0900 (JST)
Subject: [ruby-changes:73037] c21c9a29ee (master): [rubygems/rubygems] Refactor building metadata dependencies
https://git.ruby-lang.org/ruby.git/commit/?id=c21c9a29ee From c21c9a29eead43364e6347c0ce2f468d26391b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Tue, 9 Aug 2022 11:39:03 +0200 Subject: [rubygems/rubygems] Refactor building metadata dependencies https://github.com/rubygems/rubygems/commit/fa60f1fe43 --- lib/bundler/resolver/spec_group.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/bundler/resolver/spec_group.rb b/lib/bundler/resolver/spec_group.rb index 4de5b91aa6..1c016fc55d 100644 --- a/lib/bundler/resolver/spec_group.rb +++ b/lib/bundler/resolver/spec_group.rb @@ -97,14 +97,17 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/resolver/spec_group.rb#L97 def metadata_dependencies(platform) spec = @specs[platform].first return [] if spec.is_a?(LazySpecification) - dependencies = [] - unless spec.required_ruby_version.none? - dependencies << DepProxy.get_proxy(Dependency.new("Ruby\0", spec.required_ruby_version), platform) - end - unless spec.required_rubygems_version.none? - dependencies << DepProxy.get_proxy(Dependency.new("RubyGems\0", spec.required_rubygems_version), platform) - end - dependencies + + [ + metadata_dependency("Ruby", spec.required_ruby_version, platform), + metadata_dependency("RubyGems", spec.required_rubygems_version, platform), + ].compact + end + + def metadata_dependency(name, requirement, platform) + return if requirement.none? + + DepProxy.get_proxy(Dependency.new("#{name}\0", requirement), platform) end end end -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/