[rubygems/rubygems] Move expanding dependencies with metadata to specification classes

https://github.com/rubygems/rubygems/commit/7f921aa46e
This commit is contained in:
David Rodríguez 2025-01-31 07:19:04 +01:00 committed by Hiroshi SHIBATA
parent 24f5e3010f
commit a1716e2365
2 changed files with 14 additions and 16 deletions

View File

@ -13,5 +13,18 @@ module Bundler
def matches_current_rubygems?
@required_rubygems_version.satisfied_by?(Gem.rubygems_version)
end
def expanded_dependencies
runtime_dependencies + [
metadata_dependency("Ruby", required_ruby_version),
metadata_dependency("RubyGems", required_rubygems_version),
].compact
end
def metadata_dependency(name, requirement)
return if requirement.nil? || requirement.none?
Gem::Dependency.new("#{name}\0", requirement)
end
end
end

View File

@ -39,9 +39,7 @@ module Bundler
end
def dependencies
@dependencies ||= @specs.flat_map do |spec|
spec.runtime_dependencies + metadata_dependencies(spec)
end.uniq.sort
@dependencies ||= @specs.flat_map(&:expanded_dependencies).uniq.sort
end
def ==(other)
@ -71,19 +69,6 @@ module Bundler
def exemplary_spec
@specs.first
end
def metadata_dependencies(spec)
[
metadata_dependency("Ruby", spec.required_ruby_version),
metadata_dependency("RubyGems", spec.required_rubygems_version),
].compact
end
def metadata_dependency(name, requirement)
return if requirement.nil? || requirement.none?
Gem::Dependency.new("#{name}\0", requirement)
end
end
end
end