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

[rubygems/rubygems] Simplify selecting specs with force_ruby_platform set

Browse Source 
https://github.com/rubygems/rubygems/commit/5f90a43635

Co-authored-by: Martin Emde <martin.emde@gmail.com>
This commit is contained in:
David Rodríguez 2023-10-26 20:50:06 +02:00 committed by Hiroshi SHIBATA
parent a131ea39b7
commit 9f67118d7b
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/bundler/gem_helpers.rb
View File

@ -48,6 +48,13 @@ module Bundler
end
module_function :select_best_platform_match
def force_ruby_platform(specs)
matching = specs.select {|spec| spec.match_platform(Gem::Platform::RUBY) && spec.force_ruby_platform! }
sort_best_platform_match(matching, Gem::Platform::RUBY)
end
module_function :force_ruby_platform
def sort_best_platform_match(matching, platform)
exact = matching.select {|spec| spec.platform == platform }
return exact if exact.any?

4
lib/bundler/lazy_specification.rb
View File

@ -133,6 +133,10 @@ module Bundler
" #{source.revision[0..6]}"
end
def force_ruby_platform!
@force_ruby_platform = true
end
private
def use_exact_resolved_specifications?

8
lib/bundler/spec_set.rb
View File

@ -200,9 +200,11 @@ module Bundler
def specs_for_dependency(dep, platform)
specs_for_name = lookup[dep.name]
target_platform = dep.force_ruby_platform ? Gem::Platform::RUBY : (platform || Bundler.local_platform)
matching_specs = GemHelpers.select_best_platform_match(specs_for_name, target_platform)
matching_specs.each {|s| s.force_ruby_platform = true } if dep.force_ruby_platform
matching_specs = if dep.force_ruby_platform
GemHelpers.force_ruby_platform(specs_for_name)
else
GemHelpers.select_best_platform_match(specs_for_name, platform || Bundler.local_platform)
end
matching_specs.map!(&:materialize_for_installation).compact! if platform.nil?
matching_specs
end