ruby-changes:72876
From: Hiroshi <ko1@a...>
Date: Tue, 9 Aug 2022 12:05:40 +0900 (JST)
Subject: [ruby-changes:72876] 44264b4fee (master): Merge rubygems/bundler HEAD.
https://git.ruby-lang.org/ruby.git/commit/?id=44264b4fee From 44264b4fee1e208e759710c39271186ff9856b40 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Tue, 9 Aug 2022 11:16:07 +0900 Subject: Merge rubygems/bundler HEAD. Pick from https://github.com/rubygems/rubygems/commit/dfbb5a38114640e0d8d616861607f3de73ee0199 --- lib/bundler/cli.rb | 2 +- lib/bundler/definition.rb | 8 ++-- lib/bundler/fetcher.rb | 12 +++--- lib/bundler/ruby_dsl.rb | 2 +- lib/rubygems.rb | 14 +++---- lib/rubygems/available_set.rb | 6 +-- lib/rubygems/basic_specification.rb | 4 +- lib/rubygems/command.rb | 12 +++--- lib/rubygems/commands/cert_command.rb | 2 +- lib/rubygems/commands/cleanup_command.rb | 2 +- lib/rubygems/commands/contents_command.rb | 2 +- lib/rubygems/commands/dependency_command.rb | 8 ++-- lib/rubygems/commands/fetch_command.rb | 4 +- lib/rubygems/commands/generate_index_command.rb | 4 +- lib/rubygems/commands/install_command.rb | 14 +++---- lib/rubygems/commands/pristine_command.rb | 10 ++--- lib/rubygems/commands/setup_command.rb | 8 ++-- lib/rubygems/commands/sources_command.rb | 6 +-- lib/rubygems/commands/specification_command.rb | 4 +- lib/rubygems/commands/uninstall_command.rb | 8 ++-- lib/rubygems/commands/update_command.rb | 10 ++--- lib/rubygems/commands/which_command.rb | 2 +- lib/rubygems/config_file.rb | 12 +++--- lib/rubygems/core_ext/kernel_warn.rb | 2 +- lib/rubygems/defaults.rb | 2 +- lib/rubygems/dependency.rb | 10 ++--- lib/rubygems/dependency_installer.rb | 10 ++--- lib/rubygems/dependency_list.rb | 8 ++-- lib/rubygems/doctor.rb | 8 ++-- lib/rubygems/exceptions.rb | 2 +- lib/rubygems/ext/ext_conf_builder.rb | 4 +- lib/rubygems/gemcutter_utilities.rb | 2 +- lib/rubygems/indexer.rb | 6 +-- lib/rubygems/installer.rb | 8 ++-- lib/rubygems/name_tuple.rb | 6 +-- lib/rubygems/package.rb | 6 +-- lib/rubygems/package/tar_header.rb | 34 +++++++-------- lib/rubygems/package/tar_writer.rb | 2 +- lib/rubygems/platform.rb | 30 +++++++------- lib/rubygems/query_utils.rb | 12 +++--- lib/rubygems/remote_fetcher.rb | 6 +-- lib/rubygems/request.rb | 2 +- lib/rubygems/request/connection_pools.rb | 4 +- lib/rubygems/request/http_pool.rb | 2 +- lib/rubygems/request_set.rb | 6 +-- lib/rubygems/request_set/gem_dependency_api.rb | 6 +-- lib/rubygems/request_set/lockfile/parser.rb | 24 +++++------ lib/rubygems/request_set/lockfile/tokenizer.rb | 4 +- lib/rubygems/requirement.rb | 2 +- lib/rubygems/resolver.rb | 8 ++-- lib/rubygems/resolver/api_specification.rb | 8 ++-- lib/rubygems/resolver/best_set.rb | 6 +-- lib/rubygems/resolver/conflict.rb | 6 +-- lib/rubygems/resolver/git_specification.rb | 6 +-- lib/rubygems/resolver/installed_specification.rb | 4 +- lib/rubygems/resolver/installer_set.rb | 19 ++++----- lib/rubygems/resolver/lock_set.rb | 2 +- lib/rubygems/resolver/lock_specification.rb | 2 +- lib/rubygems/resolver/vendor_specification.rb | 6 +-- lib/rubygems/security.rb | 2 +- lib/rubygems/security/policy.rb | 12 +++--- lib/rubygems/security/signer.rb | 2 +- lib/rubygems/source.rb | 2 +- lib/rubygems/source/git.rb | 8 ++-- lib/rubygems/spec_fetcher.rb | 2 +- lib/rubygems/specification.rb | 48 +++++++++++----------- lib/rubygems/specification_policy.rb | 8 ++-- lib/rubygems/uninstaller.rb | 8 ++-- lib/rubygems/user_interaction.rb | 4 +- lib/rubygems/version.rb | 2 +- test/rubygems/helper.rb | 10 ++--- test/rubygems/test_gem_dependency_installer.rb | 4 +- .../custom_name/build.rb | 2 +- .../rust_ruby_example/build.rb | 2 +- test/rubygems/test_gem_installer.rb | 4 +- test/rubygems/test_gem_package_tar_reader.rb | 2 +- test/rubygems/test_gem_resolver_installer_set.rb | 31 ++++++++++++++ test/rubygems/test_gem_specification.rb | 4 +- test/rubygems/test_require.rb | 2 +- test/rubygems/utilities.rb | 8 ++-- 80 files changed, 312 insertions(+), 286 deletions(-) diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 0fa646c8ea..5bf0f4fa3a 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -238,7 +238,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli.rb#L238 "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application" method_option "trust-policy", :alias => "P", :type => :string, :banner => "Gem trust policy (like gem install -P). Must be one of " + - Bundler.rubygems.security_policy_keys.join("|") + Bundler.rubygems.security_policy_keys.join("|") method_option "without", :type => :array, :banner => "Exclude gems that are part of the specified named group." method_option "with", :type => :array, :banner => diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 38bd01f08f..21c06e55ba 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -885,10 +885,10 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L885 def remove_ruby_from_platforms_if_necessary!(dependencies) return if Bundler.frozen_bundle? || - Bundler.local_platform == Gem::Platform::RUBY || - !platforms.include?(Gem::Platform::RUBY) || - (@new_platform && platforms.last == Gem::Platform::RUBY) || - !@originally_locked_specs.incomplete_ruby_specs?(dependencies) + Bundler.local_platform == Gem::Platform::RUBY || + !platforms.include?(Gem::Platform::RUBY) || + (@new_platform && platforms.last == Gem::Platform::RUBY) || + !@originally_locked_specs.incomplete_ruby_specs?(dependencies) remove_platform(Gem::Platform::RUBY) add_current_platform diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index e9d5dd505c..e399a50cfd 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -240,8 +240,8 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/fetcher.rb#L240 def connection @connection ||= begin needs_ssl = remote_uri.scheme == "https" || - Bundler.settings[:ssl_verify_mode] || - Bundler.settings[:ssl_client_cert] + Bundler.settings[:ssl_verify_mode] || + Bundler.settings[:ssl_client_cert] raise SSLError if needs_ssl && !defined?(OpenSSL::SSL) con = PersistentHTTP.new :name => "bundler", :proxy => :ENV @@ -256,8 +256,8 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/fetcher.rb#L256 end ssl_client_cert = Bundler.settings[:ssl_client_cert] || - (Gem.configuration.ssl_client_cert if - Gem.configuration.respond_to?(:ssl_client_cert)) + (Gem.configuration.ssl_client_cert if + Gem.configuration.respond_to?(:ssl_client_cert)) if ssl_client_cert pem = File.read(ssl_client_cert) con.cert = OpenSSL::X509::Certificate.new(pem) @@ -288,8 +288,8 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/fetcher.rb#L288 def bundler_cert_store store = OpenSSL::X509::Store.new ssl_ca_cert = Bundler.settings[:ssl_ca_cert] || - (Gem.configuration.ssl_ca_cert if - Gem.configuration.respond_to?(:ssl_ca_cert)) + (Gem.configuration.ssl_ca_cert if + Gem.configuration.respond_to?(:ssl_ca_cert)) if ssl_ca_cert if File.directory? ssl_ca_cert store.add_path ssl_ca_cert diff --git a/lib/bundler/ruby_dsl.rb b/lib/bundler/ruby_dsl.rb index f6ba220cd5..3b3a0583a5 100644 --- a/lib/bundler/ruby_dsl.rb +++ b/lib/bundler/ruby_dsl.rb @@ -9,7 +9,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/ruby_dsl.rb#L9 raise GemfileError, "Please define :engine" if options[:engine_version] && options[:engine].nil? if options[:engine] == "ruby" && options[:engine_version] && - ruby_version != Array(options[:engine_version]) + ruby_version != Array(options[:engine_version]) raise GemfileEvalError, "ruby_version must match the :engine_version for MRI" end @ruby_version = RubyVersion.new(ruby_version, options[:patchlevel], options[:engine], options[:engine_version]) diff --git a/lib/rubygems.rb b/lib/rubygems.rb index b21f00acc7..915a899f38 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -121,7 +121,7 @@ module Gem https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L121 # When https://bugs.ruby-lang.org/issues/17259 is available, there is n (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/