archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge RubyGems-3.3.1 and Bundler-2.3.1

Browse source
This commit is contained in:
Hiroshi SHIBATA 2021-12-23 09:21:36 +09:00
parent feaf4fbc3f
commit fb1ab27f53
Notes: git 2021-12-23 09:45:05 +09:00
38 changed files with 171 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/rubygems/dependency.rb
View file

@ -277,7 +277,7 @@ class Gem::Dependency
requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version)
end.map(&:to_spec)
Gem::BundlerVersionFinder.filter!(matches) if filters_bundler?
Gem::BundlerVersionFinder.prioritize!(matches) if prioritizes_bundler?
if platform_only
matches.reject! do |spec|
@ -295,7 +295,7 @@ class Gem::Dependency
@requirement.specific?
end
def filters_bundler?
def prioritizes_bundler?
name == "bundler".freeze && !specific?
end
@ -325,11 +325,11 @@ class Gem::Dependency
active = matches.find {|spec| spec.activated? }
return active if active
return matches.first if prerelease?
# Move prereleases to the end of the list for >= 0 requirements
pre, matches = matches.partition {|spec| spec.version.prerelease? }
matches += pre if requirement == Gem::Requirement.default
unless prerelease?
# Move prereleases to the end of the list for >= 0 requirements
pre, matches = matches.partition {|spec| spec.version.prerelease? }
matches += pre if requirement == Gem::Requirement.default
end
matches.first
end