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,67 +1,67 @@
# frozen_string_literal: true
require_relative '../command'
require_relative '../package'
require_relative '../installer'
require_relative '../version_option'
require_relative "../command"
require_relative "../package"
require_relative "../installer"
require_relative "../version_option"
class Gem::Commands::PristineCommand < Gem::Command
include Gem::VersionOption
def initialize
super 'pristine',
'Restores installed gems to pristine condition from files located in the gem cache',
super "pristine",
"Restores installed gems to pristine condition from files located in the gem cache",
:version => Gem::Requirement.default,
:extensions => true,
:extensions_set => false,
:all => false
add_option('--all',
'Restore all installed gems to pristine',
'condition') do |value, options|
add_option("--all",
"Restore all installed gems to pristine",
"condition") do |value, options|
options[:all] = value
end
add_option('--skip=gem_name',
'used on --all, skip if name == gem_name') do |value, options|
add_option("--skip=gem_name",
"used on --all, skip if name == gem_name") do |value, options|
options[:skip] ||= []
options[:skip] << value
end
add_option('--[no-]extensions',
'Restore gems with extensions',
'in addition to regular gems') do |value, options|
add_option("--[no-]extensions",
"Restore gems with extensions",
"in addition to regular gems") do |value, options|
options[:extensions_set] = true
options[:extensions] = value
end
add_option('--only-executables',
'Only restore executables') do |value, options|
add_option("--only-executables",
"Only restore executables") do |value, options|
options[:only_executables] = value
end
add_option('--only-plugins',
'Only restore plugins') do |value, options|
add_option("--only-plugins",
"Only restore plugins") do |value, options|
options[:only_plugins] = value
end
add_option('-E', '--[no-]env-shebang',
'Rewrite executables with a shebang',
'of /usr/bin/env') do |value, options|
add_option("-E", "--[no-]env-shebang",
"Rewrite executables with a shebang",
"of /usr/bin/env") do |value, options|
options[:env_shebang] = value
end
add_option('-i', '--install-dir DIR',
'Gem repository to get binstubs and plugins installed') do |value, options|
add_option("-i", "--install-dir DIR",
"Gem repository to get binstubs and plugins installed") do |value, options|
options[:install_dir] = File.expand_path(value)
end
add_option('-n', '--bindir DIR',
'Directory where executables are',
'located') do |value, options|
add_option("-n", "--bindir DIR",
"Directory where executables are",
"located") do |value, options|
options[:bin_dir] = File.expand_path(value)
end
add_version_option('restore to', 'pristine condition')
add_version_option("restore to", "pristine condition")
end
def arguments # :nodoc:
@ -69,7 +69,7 @@ class Gem::Commands::PristineCommand < Gem::Command
end
def defaults_str # :nodoc:
'--extensions'
"--extensions"
end
def description # :nodoc:
@ -143,7 +143,7 @@ extensions will be restored.
gem = spec.cache_file
unless File.exist? gem or options[:only_executables] or options[:only_plugins]
require_relative '../remote_fetcher'
require_relative "../remote_fetcher"
say "Cached gem for #{spec.full_name} not found, attempting to fetch..."
@ -163,8 +163,8 @@ extensions will be restored.
if options.include? :env_shebang
options[:env_shebang]
else
install_defaults = Gem::ConfigFile::PLATFORM_DEFAULTS['install']
install_defaults.to_s['--env-shebang']
install_defaults = Gem::ConfigFile::PLATFORM_DEFAULTS["install"]
install_defaults.to_s["--env-shebang"]
end
bin_dir = options[:bin_dir] if options[:bin_dir]