archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-27 06:56:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[rubygems/rubygems] Extract a default_source method

Browse source 
784e08348e
This commit is contained in:
David Rodríguez 2023-07-13 12:47:46 +02:00 • committed by Hiroshi SHIBATA
parent 002165f8fe
commit c57ab646cb
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/bundler/definition.rb
View file

@ -390,8 +390,8 @@ module Bundler
both_sources.each do |name, (dep, lock_dep)| both_sources.each do |name, (dep, lock_dep)|
next if dep.nil? || lock_dep.nil? next if dep.nil? || lock_dep.nil?
gemfile_source = dep.source || sources.default_source gemfile_source = dep.source || default_source
lock_source = lock_dep.source || sources.default_source lock_source = lock_dep.source || default_source
next if lock_source.include?(gemfile_source) next if lock_source.include?(gemfile_source)
gemfile_source_name = dep.source ? gemfile_source.to_gemfile : "no specified source" gemfile_source_name = dep.source ? gemfile_source.to_gemfile : "no specified source"
@ -815,7 +815,7 @@ module Bundler
# Replace the locked dependency's source with the equivalent source from the Gemfile # Replace the locked dependency's source with the equivalent source from the Gemfile
s.source = if dep s.source = if dep
gemfile_source = dep.source || sources.default_source gemfile_source = dep.source || default_source
@specs_that_changed_sources << s if gemfile_source != lockfile_source @specs_that_changed_sources << s if gemfile_source != lockfile_source
deps << dep if !dep.source || lockfile_source.include?(dep.source) deps << dep if !dep.source || lockfile_source.include?(dep.source)
@ -875,7 +875,7 @@ module Bundler
source_requirements = if precompute_source_requirements_for_indirect_dependencies? source_requirements = if precompute_source_requirements_for_indirect_dependencies?
all_requirements = source_map.all_requirements all_requirements = source_map.all_requirements
all_requirements = pin_locally_available_names(all_requirements) if @prefer_local all_requirements = pin_locally_available_names(all_requirements) if @prefer_local
{ :default => sources.default_source }.merge(all_requirements) { :default => default_source }.merge(all_requirements)
else else
{ :default => Source::RubygemsAggregate.new(sources, source_map) }.merge(source_map.direct_requirements) { :default => Source::RubygemsAggregate.new(sources, source_map) }.merge(source_map.direct_requirements)
end end
@ -884,7 +884,7 @@ module Bundler
source_requirements[dep.name] = sources.metadata_source source_requirements[dep.name] = sources.metadata_source
end end
default_bundler_source = source_requirements["bundler"] || sources.default_source default_bundler_source = source_requirements["bundler"] || default_source
if @unlocking_bundler if @unlocking_bundler
default_bundler_source.add_dependency_names("bundler") default_bundler_source.add_dependency_names("bundler")
@ -897,6 +897,10 @@ module Bundler
source_requirements source_requirements
end end
def default_source
sources.default_source
end
def verify_changed_sources! def verify_changed_sources!
@specs_that_changed_sources.each do |s| @specs_that_changed_sources.each do |s|
if s.source.specs.search(s.name).empty? if s.source.specs.search(s.name).empty?