diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-11-11 10:44:07 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-11-22 10:51:35 +0900 |
| commit | e262272b6a50c1a92cdcfee684e82f9242ef8171 (patch) | |
| tree | d7baf0c94ed9670d7ef097ce0390ca543ee97b33 /lib/rubygems | |
| parent | 24f911f474e11560af5fbd0f637f4c0ded23f604 (diff) | |
Merge RubyGems 3.2.29 and Bundler 2.2.29
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/defaults.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/errors.rb | 3 | ||||
| -rw-r--r-- | lib/rubygems/specification.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/specification_policy.rb | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index e95bc06792..923b60f31f 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -73,7 +73,7 @@ module Gem # Path to specification files of default gems. def self.default_specifications_dir - File.join(Gem.default_dir, "specifications", "default") + @default_specifications_dir ||= File.join(Gem.default_dir, "specifications", "default") end ## diff --git a/lib/rubygems/errors.rb b/lib/rubygems/errors.rb index abee20651e..86f0d1da14 100644 --- a/lib/rubygems/errors.rb +++ b/lib/rubygems/errors.rb @@ -171,8 +171,7 @@ module Gem # An English description of the error. def wordy - @source.uri.password = 'REDACTED' unless @source.uri.password.nil? - "Unable to download data from #{@source.uri} - #{@error.message}" + "Unable to download data from #{Gem::Uri.new(@source.uri).redacted} - #{@error.message}" end ## diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index e31ac8ede5..aaa3b8ce7b 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -1556,8 +1556,8 @@ class Gem::Specification < Gem::BasicSpecification # the gem.build_complete file is missing. def build_extensions # :nodoc: - return if default_gem? return if extensions.empty? + return if default_gem? return if File.exist? gem_build_complete_path return if !File.writable?(base_dir) return if !File.exist?(File.join(base_dir, 'extensions')) @@ -2120,8 +2120,8 @@ class Gem::Specification < Gem::BasicSpecification # probably want to build_extensions def missing_extensions? - return false if default_gem? return false if extensions.empty? + return false if default_gem? return false if File.exist? gem_build_complete_path true diff --git a/lib/rubygems/specification_policy.rb b/lib/rubygems/specification_policy.rb index c30ec707d9..73bd31970c 100644 --- a/lib/rubygems/specification_policy.rb +++ b/lib/rubygems/specification_policy.rb @@ -381,7 +381,7 @@ http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard li end LAZY = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/, '') - LAZY_PATTERN = /^FI XME|^TO DO/x.freeze + LAZY_PATTERN = /\AFI XME|\ATO DO/x.freeze HOMEPAGE_URI_PATTERN = /\A[a-z][a-z\d+.-]*:/i.freeze def validate_lazy_metadata |