Merge RubyGems-3.3.19 and Bundler-2.3.19

This commit is contained in:
Hiroshi SHIBATA 2022-08-22 11:49:38 +09:00 committed by nagachika
parent 0918783347
commit 44c926f3a9
362 changed files with 7843 additions and 7605 deletions

View file

@ -1,69 +1,69 @@
# frozen_string_literal: true
require_relative '../command'
require_relative '../security'
require_relative "../command"
require_relative "../security"
class Gem::Commands::CertCommand < Gem::Command
def initialize
super 'cert', 'Manage RubyGems certificates and signing settings',
super "cert", "Manage RubyGems certificates and signing settings",
:add => [], :remove => [], :list => [], :build => [], :sign => []
add_option('-a', '--add CERT',
'Add a trusted certificate.') do |cert_file, options|
add_option("-a", "--add CERT",
"Add a trusted certificate.") do |cert_file, options|
options[:add] << open_cert(cert_file)
end
add_option('-l', '--list [FILTER]',
'List trusted certificates where the',
'subject contains FILTER') do |filter, options|
filter ||= ''
add_option("-l", "--list [FILTER]",
"List trusted certificates where the",
"subject contains FILTER") do |filter, options|
filter ||= ""
options[:list] << filter
end
add_option('-r', '--remove FILTER',
'Remove trusted certificates where the',
'subject contains FILTER') do |filter, options|
add_option("-r", "--remove FILTER",
"Remove trusted certificates where the",
"subject contains FILTER") do |filter, options|
options[:remove] << filter
end
add_option('-b', '--build EMAIL_ADDR',
'Build private key and self-signed',
'certificate for EMAIL_ADDR') do |email_address, options|
add_option("-b", "--build EMAIL_ADDR",
"Build private key and self-signed",
"certificate for EMAIL_ADDR") do |email_address, options|
options[:build] << email_address
end
add_option('-C', '--certificate CERT',
'Signing certificate for --sign') do |cert_file, options|
add_option("-C", "--certificate CERT",
"Signing certificate for --sign") do |cert_file, options|
options[:issuer_cert] = open_cert(cert_file)
options[:issuer_cert_file] = cert_file
end
add_option('-K', '--private-key KEY',
'Key for --sign or --build') do |key_file, options|
add_option("-K", "--private-key KEY",
"Key for --sign or --build") do |key_file, options|
options[:key] = open_private_key(key_file)
end
add_option('-A', '--key-algorithm ALGORITHM',
'Select which key algorithm to use for --build') do |algorithm, options|
add_option("-A", "--key-algorithm ALGORITHM",
"Select which key algorithm to use for --build") do |algorithm, options|
options[:key_algorithm] = algorithm
end
add_option('-s', '--sign CERT',
'Signs CERT with the key from -K',
'and the certificate from -C') do |cert_file, options|
add_option("-s", "--sign CERT",
"Signs CERT with the key from -K",
"and the certificate from -C") do |cert_file, options|
raise Gem::OptionParser::InvalidArgument, "#{cert_file}: does not exist" unless
File.file? cert_file
options[:sign] << cert_file
end
add_option('-d', '--days NUMBER_OF_DAYS',
'Days before the certificate expires') do |days, options|
add_option("-d", "--days NUMBER_OF_DAYS",
"Days before the certificate expires") do |days, options|
options[:expiration_length_days] = days.to_i
end
add_option('-R', '--re-sign',
'Re-signs the certificate from -C with the key from -K') do |resign, options|
add_option("-R", "--re-sign",
"Re-signs the certificate from -C with the key from -K") do |resign, options|
options[:resign] = resign
end
end
@ -93,7 +93,7 @@ class Gem::Commands::CertCommand < Gem::Command
def open_private_key(key_file)
check_openssl
passphrase = ENV['GEM_PRIVATE_KEY_PASSPHRASE']
passphrase = ENV["GEM_PRIVATE_KEY_PASSPHRASE"]
key = OpenSSL::PKey.read File.read(key_file), passphrase
raise Gem::OptionParser::InvalidArgument,
"#{key_file}: private key not found" unless key.private?
@ -166,10 +166,10 @@ class Gem::Commands::CertCommand < Gem::Command
def build_key # :nodoc:
return options[:key] if options[:key]
passphrase = ask_for_password 'Passphrase for your Private Key:'
passphrase = ask_for_password "Passphrase for your Private Key:"
say "\n"
passphrase_confirmation = ask_for_password 'Please repeat the passphrase for your Private Key:'
passphrase_confirmation = ask_for_password "Please repeat the passphrase for your Private Key:"
say "\n"
raise Gem::CommandLineError,
@ -260,7 +260,7 @@ For further reading on signing gems see `ri Gem::Security`.
def load_default_key
key_file = File.join Gem.default_key_path
key = File.read key_file
passphrase = ENV['GEM_PRIVATE_KEY_PASSPHRASE']
passphrase = ENV["GEM_PRIVATE_KEY_PASSPHRASE"]
options[:key] = OpenSSL::PKey.read key, passphrase
rescue Errno::ENOENT