summaryrefslogtreecommitdiff
path: root/lib/bundler/resolver
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2022-08-09 11:39:03 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2022-08-23 10:45:57 +0900
commitc21c9a29eead43364e6347c0ce2f468d26391b1b (patch)
treed654e270af6a7b47eed02b7b5395251d416283fd /lib/bundler/resolver
parenta9509068db84d6a86a718b5ae931b8d65fc15272 (diff)
[rubygems/rubygems] Refactor building metadata dependencies
https://github.com/rubygems/rubygems/commit/fa60f1fe43
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/6268
Diffstat (limited to 'lib/bundler/resolver')
-rw-r--r--lib/bundler/resolver/spec_group.rb19
1 files 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
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