1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Use a single hash to keep track of prereleases

Browse Source 
https://github.com/rubygems/rubygems/commit/9d7bd177b0
This commit is contained in:
David Rodríguez 2022-08-24 10:57:35 +02:00 committed by git
parent 03d1962703
commit 75d90cc8e5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/bundler/resolver.rb
View File

@ -42,8 +42,7 @@ module Bundler
remove_from_candidates(spec) remove_from_candidates(spec)
end end
@gem_version_promoter.prerelease_specified = @prerelease_specified = {} requirements.each {|dep| prerelease_specified[dep.name] ||= dep.prerelease? }
requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? }
verify_gemfile_dependencies_are_found!(requirements) verify_gemfile_dependencies_are_found!(requirements)
result = @resolver.resolve(requirements). result = @resolver.resolve(requirements).
@ -214,6 +213,10 @@ module Bundler
@base.base_requirements @base.base_requirements
end end
def prerelease_specified
@gem_version_promoter.prerelease_specified
end
def remove_from_candidates(spec) def remove_from_candidates(spec)
@base.delete(spec) @base.delete(spec)
@ -248,7 +251,7 @@ module Bundler
all - 1_000_000 all - 1_000_000
else else
search = search_for(dependency) search = search_for(dependency)
search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? } search = prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
search - all search - all
end end
end end