summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2023-12-22 18:16:54 +0100
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2024-01-11 13:51:52 +0900
commitab1936faf9197e0466a581de19f4023fdfe10204 (patch)
treeeb678e69695aef22ac453ad8f9d3d1307e23e624
parente90081446785273d7df8b37f0ba384c810738d0f (diff)
[rubygems/rubygems] Remove methods to clarify what they do
https://github.com/rubygems/rubygems/commit/1d15d8a8ff
-rw-r--r--lib/bundler/definition.rb4
-rw-r--r--lib/bundler/spec_set.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 316a750639..a19eb13428 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -513,7 +513,7 @@ module Bundler
private
- def should_complete_platforms?
+ def should_add_extra_platforms?
!lockfile_exists? && generic_local_platform_is_ruby? && !Bundler.settings[:force_ruby_platform]
end
@@ -600,7 +600,7 @@ module Bundler
result = SpecSet.new(resolver.start)
@resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version
- @platforms = result.complete_platforms!(platforms) if should_complete_platforms?
+ @platforms = result.add_extra_platforms!(platforms) if should_add_extra_platforms?
SpecSet.new(result.for(dependencies, false, @platforms))
end
diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb
index c8a87d0835..09bbea27c5 100644
--- a/lib/bundler/spec_set.rb
+++ b/lib/bundler/spec_set.rb
@@ -52,7 +52,7 @@ module Bundler
specs.uniq
end
- def complete_platforms!(platforms)
+ def add_extra_platforms!(platforms)
return platforms.concat([Gem::Platform::RUBY]).uniq if @specs.empty?
new_platforms = @specs.flat_map {|spec| spec.source.specs.search([spec.name, spec.version]).map(&:platform) }.uniq.select do |platform|