kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Revert "Manually merged from https://github.com/rubygems/rubygems/pull/2636"

Browse source 
31a6eaabc1 is obsoleted with
  https://github.com/rubygems/rubygems/pull/3820
This commit is contained in:
Hiroshi SHIBATA 2020-09-23 21:59:35 +09:00
parent a46841612c
commit b717f73402
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
274 changed files with 0 additions and 672 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/rubygems.rb
View file

@ -1185,7 +1185,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
# methods, and then we switch over to `class << self` here. Pick one or the
# other.
class << self
##
# RubyGems distributors (like operating system package managers) can
# disable RubyGems update by setting this to error message printed to
@ -1308,7 +1307,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
def default_gem_load_paths
@default_gem_load_paths ||= $LOAD_PATH[load_path_insert_index..-1]
end
end
##

2
lib/rubygems/available_set.rb
View file

@ -1,6 +1,5 @@
# frozen_string_literal: true
class Gem::AvailableSet
include Enumerable
Tuple = Struct.new(:spec, :source)
@ -162,5 +161,4 @@ class Gem::AvailableSet
def inject_into_list(dep_list)
@set.each {|t| dep_list.add t.spec }
end
end

4
lib/rubygems/basic_specification.rb
View file

@ -4,7 +4,6 @@
# used by both Specification and StubSpecification.
class Gem::BasicSpecification
##
# Allows installation of extensions for git: gems.
@ -39,10 +38,8 @@ class Gem::BasicSpecification
end
class << self
extend Gem::Deprecate
rubygems_deprecate :default_specifications_dir, "Gem.default_specifications_dir"
end
##
@ -345,5 +342,4 @@ class Gem::BasicSpecification
false
end
end
end

2
lib/rubygems/command.rb
View file

@ -17,7 +17,6 @@ require_relative 'user_interaction'
# A very good example to look at is Gem::Commands::ContentsCommand
class Gem::Command
include Gem::UserInteraction
OptionParser.accept Symbol do |value|
@ -652,7 +651,6 @@ RubyGems is a package manager for Ruby.
HELP
# :startdoc:
end
##

2
lib/rubygems/command_manager.rb
View file

@ -32,7 +32,6 @@ require 'rubygems/text'
# See Gem::Command for instructions on writing gem commands.
class Gem::CommandManager
include Gem::Text
include Gem::UserInteraction
@ -231,5 +230,4 @@ class Gem::CommandManager
ui.backtrace e
end
end
end

2
lib/rubygems/commands/build_command.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/command'
require 'rubygems/package'
class Gem::Commands::BuildCommand < Gem::Command
def initialize
super 'build', 'Build a gem from a gemspec'
@ -108,5 +107,4 @@ Gems can be saved to a specified filename with the output option:
terminate_interaction 1
end
end
end

2
lib/rubygems/commands/cert_command.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/command'
require 'rubygems/security'
class Gem::Commands::CertCommand < Gem::Command
def initialize
super 'cert', 'Manage RubyGems certificates and signing settings',
:add => [], :remove => [], :list => [], :build => [], :sign => []
@ -312,5 +311,4 @@ For further reading on signing gems see `ri Gem::Security`.
# It's simple, but is all we need
email =~ /\A.+@.+\z/
end
end if defined?(OpenSSL::SSL)

2
lib/rubygems/commands/check_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/validator'
require 'rubygems/doctor'
class Gem::Commands::CheckCommand < Gem::Command
include Gem::VersionOption
def initialize
@ -90,5 +89,4 @@ specifications and will clean up gems that have been partially uninstalled.
def usage # :nodoc:
"#{program_name} [OPTIONS] [GEMNAME ...]"
end
end

2
lib/rubygems/commands/cleanup_command.rb
View file

@ -4,7 +4,6 @@ require 'rubygems/dependency_list'
require 'rubygems/uninstaller'
class Gem::Commands::CleanupCommand < Gem::Command
def initialize
super 'cleanup',
'Clean up old versions of installed gems',
@ -181,5 +180,4 @@ If no gems are named all gems in GEM_HOME are cleaned.
# Restore path Gem::Uninstaller may have changed
Gem.use_paths @original_home, *@original_path
end
end

2
lib/rubygems/commands/contents_command.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/command'
require 'rubygems/version_option'
class Gem::Commands::ContentsCommand < Gem::Command
include Gem::VersionOption
def initialize
@ -186,5 +185,4 @@ prefix or only the files that are requireable.
[i, File.join(i, "specifications")]
end.flatten
end
end

2
lib/rubygems/commands/dependency_command.rb
View file

@ -4,7 +4,6 @@ require 'rubygems/local_remote_options'
require 'rubygems/version_option'
class Gem::Commands::DependencyCommand < Gem::Command
include Gem::LocalRemoteOptions
include Gem::VersionOption
@ -215,5 +214,4 @@ use with other commands.
/\A#{Regexp.union(*args)}/
end
end
end

2
lib/rubygems/commands/environment_command.rb
View file

@ -2,7 +2,6 @@
require 'rubygems/command'
class Gem::Commands::EnvironmentCommand < Gem::Command
def initialize
super 'environment', 'Display information about the RubyGems environment'
end
@ -172,5 +171,4 @@ lib/rubygems/defaults/operating_system.rb
return nil
end
end

2
lib/rubygems/commands/fetch_command.rb
View file

@ -4,7 +4,6 @@ require 'rubygems/local_remote_options'
require 'rubygems/version_option'
class Gem::Commands::FetchCommand < Gem::Command
include Gem::LocalRemoteOptions
include Gem::VersionOption
@ -73,5 +72,4 @@ then repackaging it.
say "Downloaded #{spec.full_name}"
end
end
end

2
lib/rubygems/commands/generate_index_command.rb
View file

@ -8,7 +8,6 @@ require 'rubygems/indexer'
# See `gem help generate_index`
class Gem::Commands::GenerateIndexCommand < Gem::Command
def initialize
super 'generate_index',
'Generates the index files for a gem server directory',
@ -83,5 +82,4 @@ Marshal::MINOR_VERSION constants. It is used to ensure compatibility.
end
end
end
end

2
lib/rubygems/commands/help_command.rb
View file

@ -2,7 +2,6 @@
require 'rubygems/command'
class Gem::Commands::HelpCommand < Gem::Command
# :stopdoc:
EXAMPLES = <<-EOF.freeze
Some examples of 'gem' usage.
@ -370,5 +369,4 @@ platform.
alert_warning "Unknown command #{command_name}. Try: gem help commands"
end
end
end

2
lib/rubygems/commands/info_command.rb
View file

@ -4,7 +4,6 @@ require 'rubygems/command'
require 'rubygems/query_utils'
class Gem::Commands::InfoCommand < Gem::Command
include Gem::QueryUtils
def initialize
@ -36,5 +35,4 @@ class Gem::Commands::InfoCommand < Gem::Command
def defaults_str
"--local"
end
end

2
lib/rubygems/commands/install_command.rb
View file

@ -12,7 +12,6 @@ require 'rubygems/version_option'
# See `gem help install`
class Gem::Commands::InstallCommand < Gem::Command
attr_reader :installed_specs # :nodoc:
include Gem::VersionOption
@ -270,5 +269,4 @@ You can use `i` command instead of `install`.
gems = @installed_specs.length == 1 ? 'gem' : 'gems'
say "#{@installed_specs.length} #{gems} installed"
end
end

2
lib/rubygems/commands/list_command.rb
View file

@ -6,7 +6,6 @@ require 'rubygems/query_utils'
# Searches for gems starting with the supplied argument.
class Gem::Commands::ListCommand < Gem::Command
include Gem::QueryUtils
def initialize
@ -39,5 +38,4 @@ To search for remote gems use the search command.
def usage # :nodoc:
"#{program_name} [REGEXP ...]"
end
end

2
lib/rubygems/commands/lock_command.rb
View file

@ -2,7 +2,6 @@
require 'rubygems/command'
class Gem::Commands::LockCommand < Gem::Command
def initialize
super 'lock', 'Generate a lockdown list of gems',
:strict => false
@ -106,5 +105,4 @@ lock it down to the exact version.
gemspecs.find {|path| File.exist? path }
end
end

2
lib/rubygems/commands/mirror_command.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/command'
unless defined? Gem::Commands::MirrorCommand
class Gem::Commands::MirrorCommand < Gem::Command
def initialize
super('mirror', 'Mirror all gem files (requires rubygems-mirror)')
begin
@ -22,6 +21,5 @@ The mirror command has been moved to the rubygems-mirror gem.
def execute
alert_error "Install the rubygems-mirror gem for the mirror command"
end
end
end

2
lib/rubygems/commands/open_command.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/command'
require 'rubygems/version_option'
class Gem::Commands::OpenCommand < Gem::Command
include Gem::VersionOption
def initialize
@ -82,5 +81,4 @@ class Gem::Commands::OpenCommand < Gem::Command
say "Unable to find gem '#{name}'"
end
end

2
lib/rubygems/commands/outdated_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/spec_fetcher'
require 'rubygems/version_option'
class Gem::Commands::OutdatedCommand < Gem::Command
include Gem::LocalRemoteOptions
include Gem::VersionOption
@ -30,5 +29,4 @@ update the gems with the update or install commands.
say "#{spec.name} (#{spec.version} < #{remote_version})"
end
end
end

2
lib/rubygems/commands/owner_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/gemcutter_utilities'
require 'rubygems/text'
class Gem::Commands::OwnerCommand < Gem::Command
include Gem::Text
include Gem::LocalRemoteOptions
include Gem::GemcutterUtilities
@ -109,5 +108,4 @@ permission to.
request.add_field "OTP", options[:otp] if options[:otp]
end
end
end

2
lib/rubygems/commands/pristine_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/installer'
require 'rubygems/version_option'
class Gem::Commands::PristineCommand < Gem::Command
include Gem::VersionOption
def initialize
@ -188,5 +187,4 @@ extensions will be restored.
say "Restored #{spec.full_name}"
end
end
end

2
lib/rubygems/commands/push_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/gemcutter_utilities'
require 'rubygems/package'
class Gem::Commands::PushCommand < Gem::Command
include Gem::LocalRemoteOptions
include Gem::GemcutterUtilities
@ -104,5 +103,4 @@ The push command will use ~/.gem/credentials to authenticate to a server, but yo
gem_metadata["allowed_push_host"]
]
end
end

2
lib/rubygems/commands/query_command.rb
View file

@ -4,7 +4,6 @@ require 'rubygems/query_utils'
require 'rubygems/deprecate'
class Gem::Commands::QueryCommand < Gem::Command
extend Gem::Deprecate
rubygems_deprecate_command
@ -24,5 +23,4 @@ class Gem::Commands::QueryCommand < Gem::Command
add_query_options
end
end

2
lib/rubygems/commands/rdoc_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/rdoc'
require 'fileutils'
class Gem::Commands::RdocCommand < Gem::Command
include Gem::VersionOption
def initialize
@ -93,5 +92,4 @@ Use --overwrite to force rebuilding of documentation.
end
end
end
end

2
lib/rubygems/commands/search_command.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/command'
require 'rubygems/query_utils'
class Gem::Commands::SearchCommand < Gem::Command
include Gem::QueryUtils
def initialize
@ -38,5 +37,4 @@ To list local gems use the list command.
def usage # :nodoc:
"#{program_name} [REGEXP]"
end
end

2
lib/rubygems/commands/server_command.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/command'
require 'rubygems/server'
class Gem::Commands::ServerCommand < Gem::Command
def initialize
super 'server', 'Documentation and gem repository HTTP server',
:port => 8808, :gemdir => [], :daemon => false
@ -82,5 +81,4 @@ You can set up a shortcut to gem server documentation using the URL:
options[:gemdir] = Gem.path if options[:gemdir].empty?
Gem::Server.run options
end
end

2
lib/rubygems/commands/setup_command.rb
View file

@ -6,7 +6,6 @@ require 'rubygems/command'
# RubyGems checkout or tarball.
class Gem::Commands::SetupCommand < Gem::Command
HISTORY_HEADER = /^===\s*[\d.a-zA-Z]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
VERSION_MATCHER = /^===\s*([\d.a-zA-Z]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
@ -736,5 +735,4 @@ abort "#{deprecation_message}"
def bin_file_names
@bin_file_names ||= []
end
end

2
lib/rubygems/commands/signin_command.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/command'
require 'rubygems/gemcutter_utilities'
class Gem::Commands::SigninCommand < Gem::Command
include Gem::GemcutterUtilities
def initialize
@ -31,5 +30,4 @@ class Gem::Commands::SigninCommand < Gem::Command
def execute
sign_in options[:host]
end
end

2
lib/rubygems/commands/signout_command.rb
View file

@ -2,7 +2,6 @@
require 'rubygems/command'
class Gem::Commands::SignoutCommand < Gem::Command
def initialize
super 'signout', 'Sign out from all the current sessions.'
end
@ -29,5 +28,4 @@ class Gem::Commands::SignoutCommand < Gem::Command
say 'You have successfully signed out from all sessions.'
end
end
end

2
lib/rubygems/commands/sources_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/spec_fetcher'
require 'rubygems/local_remote_options'
class Gem::Commands::SourcesCommand < Gem::Command
include Gem::LocalRemoteOptions
def initialize
@ -220,5 +219,4 @@ To remove a source use the --remove argument:
say "*** Unable to remove #{desc} source cache ***"
end
end
end

2
lib/rubygems/commands/specification_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/version_option'
require 'rubygems/package'
class Gem::Commands::SpecificationCommand < Gem::Command
include Gem::LocalRemoteOptions
include Gem::VersionOption
@ -143,5 +142,4 @@ Specific fields in the specification can be extracted in YAML format:
say "\n"
end
end
end

2
lib/rubygems/commands/stale_command.rb
View file

@ -2,7 +2,6 @@
require 'rubygems/command'
class Gem::Commands::StaleCommand < Gem::Command
def initialize
super('stale', 'List gems along with access times')
end
@ -37,5 +36,4 @@ longer using.
say "#{name} at #{atime.strftime '%c'}"
end
end
end

2
lib/rubygems/commands/uninstall_command.rb
View file

@ -10,7 +10,6 @@ require 'fileutils'
# See `gem help uninstall`
class Gem::Commands::UninstallCommand < Gem::Command
include Gem::VersionOption
def initialize
@ -195,5 +194,4 @@ that is a dependency of an existing gem. You can use the
def uninstall(gem_name)
Gem::Uninstaller.new(gem_name, options).uninstall
end
end

2
lib/rubygems/commands/unpack_command.rb
View file

@ -13,7 +13,6 @@ module Gem::Security # :nodoc:
end
class Gem::Commands::UnpackCommand < Gem::Command
include Gem::VersionOption
include Gem::SecurityOption
@ -173,5 +172,4 @@ command help for an example.
path
end
end

2
lib/rubygems/commands/update_command.rb
View file

@ -10,7 +10,6 @@ require 'rubygems/install_message' # must come before rdoc for messaging
require 'rubygems/rdoc'
class Gem::Commands::UpdateCommand < Gem::Command
include Gem::InstallUpdateOptions
include Gem::LocalRemoteOptions
include Gem::VersionOption
@ -310,5 +309,4 @@ command to remove old versions.
result
end
end

2
lib/rubygems/commands/which_command.rb
View file

@ -2,7 +2,6 @@
require 'rubygems/command'
class Gem::Commands::WhichCommand < Gem::Command
def initialize
super 'which', 'Find the location of a library file you can require',
:search_gems_first => false, :show_all => false
@ -85,5 +84,4 @@ requiring to see why it does not behave as you expect.
def usage # :nodoc:
"#{program_name} FILE [FILE ...]"
end
end

2
lib/rubygems/commands/yank_command.rb
View file

@ -5,7 +5,6 @@ require 'rubygems/version_option'
require 'rubygems/gemcutter_utilities'
class Gem::Commands::YankCommand < Gem::Command
include Gem::LocalRemoteOptions
include Gem::VersionOption
include Gem::GemcutterUtilities
@ -97,5 +96,4 @@ data you will need to change them immediately and yank your gem.
def get_platform_from_requirements(requirements)
Gem.platforms[1].to_s if requirements.key? :added_platform
end
end

2
lib/rubygems/config_file.rb
View file

@ -37,7 +37,6 @@ require 'rbconfig'
# - per environment (gemrc files listed in the GEMRC environment variable)
class Gem::ConfigFile
include Gem::UserInteraction
DEFAULT_BACKTRACE = false
@ -497,5 +496,4 @@ if you believe they were disclosed to a third party.
end
end
end
end

2
lib/rubygems/core_ext/kernel_warn.rb
View file

@ -11,9 +11,7 @@ if RUBY_VERSION >= "2.5"
remove_method :warn
class << self
remove_method :warn
end
module_function define_method(:warn) {|*messages, **kw|

2
lib/rubygems/dependency.rb
View file

@ -3,7 +3,6 @@
# The Dependency class holds a Gem name and a Gem::Requirement.
class Gem::Dependency
##
# Valid dependency types.
#--
@ -344,5 +343,4 @@ class Gem::Dependency
:released
end
end
end

2
lib/rubygems/dependency_installer.rb
View file

@ -12,7 +12,6 @@ require 'rubygems/deprecate'
# Installs a gem along with all its dependencies from local and remote gems.
class Gem::DependencyInstaller
include Gem::UserInteraction
extend Gem::Deprecate
@ -335,5 +334,4 @@ class Gem::DependencyInstaller
request_set
end
end

2
lib/rubygems/dependency_list.rb
View file

@ -17,7 +17,6 @@ require 'rubygems/deprecate'
# this class necessary anymore? Especially #ok?, #why_not_ok?
class Gem::DependencyList
attr_reader :specs
include Enumerable
@ -240,5 +239,4 @@ class Gem::DependencyList
def active_count(specs, ignored)
specs.count {|spec| ignored[spec.full_name].nil? }
end
end

2
lib/rubygems/doctor.rb
View file

@ -12,7 +12,6 @@ require 'rubygems/user_interaction'
# removing the bogus specification.
class Gem::Doctor
include Gem::UserInteraction
##
@ -129,5 +128,4 @@ class Gem::Doctor
rescue Errno::ENOENT
# ignore
end
end

12
lib/rubygems/errors.rb
View file

@ -13,13 +13,11 @@ module Gem
# already activated gems or that RubyGems is otherwise unable to activate.
class LoadError < ::LoadError
# Name of gem
attr_accessor :name
# Version requirement of gem
attr_accessor :requirement
end
##
@ -27,7 +25,6 @@ module Gem
# system. Instead of rescuing from this class, make sure to rescue from the
# superclass Gem::LoadError to catch all types of load errors.
class MissingSpecError < Gem::LoadError
def initialize(name, requirement, extra_message=nil)
@name = name
@requirement = requirement
@ -45,7 +42,6 @@ module Gem
total = Gem::Specification.stubs.size
"Could not find '#{name}' (#{requirement}) among #{total} total gem(s)\n"
end
end
##
@ -53,7 +49,6 @@ module Gem
# not the requested version. Instead of rescuing from this class, make sure to
# rescue from the superclass Gem::LoadError to catch all types of load errors.
class MissingSpecVersionError < MissingSpecError
attr_reader :specs
def initialize(name, requirement, specs)
@ -70,13 +65,11 @@ module Gem
names = specs.map(&:full_name)
"Could not find '#{name}' (#{requirement}) - did find: [#{names.join ','}]\n"
end
end
# Raised when there are conflicting gem specs loaded
class ConflictError < LoadError
##
# A Hash mapping conflicting specifications to the dependencies that
# caused the conflict
@ -101,7 +94,6 @@ module Gem
super("Unable to activate #{target.full_name}, because #{reason}")
end
end
class ErrorReason; end
@ -113,7 +105,6 @@ module Gem
# in figuring out why a gem couldn't be installed.
#
class PlatformMismatch < ErrorReason
##
# the name of the gem
attr_reader :name
@ -151,7 +142,6 @@ module Gem
@platforms.size == 1 ? '' : 's',
@platforms.join(' ,')]
end
end
##
@ -159,7 +149,6 @@ module Gem
# data from a source
class SourceFetchProblem < ErrorReason
##
# Creates a new SourceFetchProblem for the given +source+ and +error+.
@ -190,6 +179,5 @@ module Gem
# The "exception" alias allows you to call raise on a SourceFetchProblem.
alias exception error
end
end

20
lib/rubygems/exceptions.rb
View file

@ -19,7 +19,6 @@ class Gem::DependencyRemovalException < Gem::Exception; end
# and #conflicting_dependencies
class Gem::DependencyResolutionError < Gem::DependencyError
attr_reader :conflict
def initialize(conflict)
@ -32,25 +31,20 @@ class Gem::DependencyResolutionError < Gem::DependencyError
def conflicting_dependencies
@conflict.conflicting_dependencies
end
end
##
# Raised when attempting to uninstall a gem that isn't in GEM_HOME.
class Gem::GemNotInHomeException < Gem::Exception
attr_accessor :spec
end
###
# Raised when removing a gem with the uninstall command fails
class Gem::UninstallError < Gem::Exception
attr_accessor :spec
end
class Gem::DocumentError < Gem::Exception; end
@ -64,7 +58,6 @@ class Gem::EndOfYAMLException < Gem::Exception; end
# operating on the given directory.
class Gem::FilePermissionError < Gem::Exception
attr_reader :directory
def initialize(directory)
@ -72,15 +65,12 @@ class Gem::FilePermissionError < Gem::Exception
super "You don't have write permissions for the #{directory} directory."
end
end
##
# Used to raise parsing and loading errors
class Gem::FormatException < Gem::Exception
attr_accessor :file_path
end
class Gem::GemNotFoundException < Gem::Exception; end
@ -89,7 +79,6 @@ class Gem::GemNotFoundException < Gem::Exception; end
# Raised by the DependencyInstaller when a specific gem cannot be found
class Gem::SpecificGemNotFoundException < Gem::GemNotFoundException
##
# Creates a new SpecificGemNotFoundException for a gem with the given +name+
# and +version+. Any +errors+ encountered when attempting to find the gem
@ -117,7 +106,6 @@ class Gem::SpecificGemNotFoundException < Gem::GemNotFoundException
# Errors encountered attempting to find the gem.
attr_reader :errors
end
##
@ -125,7 +113,6 @@ end
# inability to find a valid possible spec for a request.
class Gem::ImpossibleDependenciesError < Gem::Exception
attr_reader :conflicts
attr_reader :request
@ -153,17 +140,14 @@ class Gem::ImpossibleDependenciesError < Gem::Exception
def dependency
@request.dependency
end
end
class Gem::InstallError < Gem::Exception; end
class Gem::RuntimeRequirementNotMetError < Gem::InstallError
attr_accessor :suggestion
def message
[suggestion, super].compact.join("\n\t")
end
end
##
@ -205,7 +189,6 @@ class Gem::VerificationError < Gem::Exception; end
# exit_code
class Gem::SystemExitException < SystemExit
##
# The exit code for the process
@ -219,7 +202,6 @@ class Gem::SystemExitException < SystemExit
super "Exiting RubyGems with exit_code #{exit_code}"
end
end
##
@ -227,7 +209,6 @@ end
# there is no spec.
class Gem::UnsatisfiableDependencyError < Gem::DependencyError
##
# The unsatisfiable dependency. This is a
# Gem::Resolver::DependencyRequest, not a Gem::Dependency
@ -272,7 +253,6 @@ class Gem::UnsatisfiableDependencyError < Gem::DependencyError
def version
@dependency.requirement
end
end
##

2
lib/rubygems/ext/builder.rb
View file

@ -8,7 +8,6 @@
require_relative '../user_interaction'
class Gem::Ext::Builder
include Gem::UserInteraction
##
@ -227,5 +226,4 @@ EOF
destination
end
end

2
lib/rubygems/ext/cmake_builder.rb
View file

@ -2,7 +2,6 @@
require_relative '../command'
class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
unless File.exist?('Makefile')
cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}"
@ -15,5 +14,4 @@ class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
results
end
end

2
lib/rubygems/ext/configure_builder.rb
View file

@ -6,7 +6,6 @@
#++
class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
unless File.exist?('Makefile')
cmd = "sh ./configure --prefix=#{dest_path}"
@ -19,5 +18,4 @@ class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
results
end
end

2
lib/rubygems/ext/ext_conf_builder.rb
View file

@ -8,7 +8,6 @@
require 'shellwords'
class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
require 'fileutils'
require 'tempfile'
@ -92,5 +91,4 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
path[0..Dir.pwd.length - 1] = '.' if path.start_with?(Dir.pwd)
path
end
end

2
lib/rubygems/ext/rake_builder.rb
View file

@ -8,7 +8,6 @@
require "shellwords"
class Gem::Ext::RakeBuilder < Gem::Ext::Builder
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
if File.basename(extension) =~ /mkrf_conf/i
run([Gem.ruby, File.basename(extension), *args], results)
@ -31,5 +30,4 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
results
end
end

2
lib/rubygems/gem_runner.rb
View file

@ -24,7 +24,6 @@ Gem.load_env_plugins rescue nil
# classes they call directly.
class Gem::GemRunner
def initialize
@command_manager_class = Gem::CommandManager
@config_file_class = Gem::ConfigFile
@ -75,7 +74,6 @@ class Gem::GemRunner
Gem.use_paths Gem.configuration[:gemhome], Gem.configuration[:gempath]
Gem::Command.extra_args = Gem.configuration[:gem]
end
end
Gem.load_plugins

2
lib/rubygems/indexer.rb
View file

@ -8,7 +8,6 @@ require 'tmpdir'
# Top level class for building the gem repository index.
class Gem::Indexer
include Gem::UserInteraction
##
@ -424,5 +423,4 @@ class Gem::Indexer
Marshal.dump specs_index, io
end
end
end

6
lib/rubygems/installer.rb
View file

@ -28,7 +28,6 @@ require 'fileutils'
# file. See Gem.pre_install and Gem.post_install for details.
class Gem::Installer
extend Gem::Deprecate
##
@ -73,7 +72,6 @@ class Gem::Installer
@install_lock = Mutex.new
class << self
##
# True if we've warned about PATH not including Gem.bindir
@ -98,7 +96,6 @@ class Gem::Installer
def exec_format
@exec_format ||= Gem.default_exec_format
end
end
##
@ -111,7 +108,6 @@ class Gem::Installer
end
class FakePackage
attr_accessor :spec
attr_accessor :dir_mode
@ -137,7 +133,6 @@ class Gem::Installer
def copy_to(path)
end
end
##
@ -963,5 +958,4 @@ TEXT
raise Gem::FilePermissionError.new(dir) unless File.writable? dir
end
end

4
lib/rubygems/installer_test_case.rb
View file

@ -3,7 +3,6 @@ require 'rubygems/test_case'
require 'rubygems/installer'
class Gem::Installer
##
# Available through requiring rubygems/installer_test_case
@ -58,14 +57,12 @@ class Gem::Installer
# Available through requiring rubygems/installer_test_case
attr_writer :wrappers
end
##
# A test case for Gem::Installer.
class Gem::InstallerTestCase < Gem::TestCase
def setup
super
@ -246,5 +243,4 @@ class Gem::InstallerTestCase < Gem::TestCase
end
@@symlink_supported
end
end

6
lib/rubygems/mock_gem_ui.rb
View file

@ -6,27 +6,22 @@ require 'rubygems/user_interaction'
# retrieval during tests.
class Gem::MockGemUi < Gem::StreamUI
##
# Raised when you haven't provided enough input to your MockGemUi
class InputEOFError < RuntimeError
def initialize(question)
super "Out of input for MockGemUi on #{question.inspect}"
end
end
class TermError < RuntimeError
attr_reader :exit_code
def initialize(exit_code)
super
@exit_code = exit_code
end
end
class SystemExitException < RuntimeError; end
@ -87,5 +82,4 @@ class Gem::MockGemUi < Gem::StreamUI
raise TermError, status if status != 0
raise SystemExitException
end
end

2
lib/rubygems/name_tuple.rb
View file

@ -5,7 +5,6 @@
# wrap the data returned from the indexes.
class Gem::NameTuple
def initialize(name, version, platform="ruby")
@name = name
@version = version
@ -119,5 +118,4 @@ class Gem::NameTuple
def hash
to_a.hash
end
end

6
lib/rubygems/package.rb
View file

@ -47,13 +47,11 @@ require 'rubygems/user_interaction'
require 'zlib'
class Gem::Package
include Gem::UserInteraction
class Error < Gem::Exception; end
class FormatError < Error
attr_reader :path
def initialize(message, source = nil)
@ -65,16 +63,13 @@ class Gem::Package
super message
end
end
class PathError < Error
def initialize(destination, destination_dir)
super "installing into parent path %s of %s is not allowed" %
[destination, destination_dir]
end
end
class NonSeekableIO < Error; end
@ -711,7 +706,6 @@ EOM
rescue Zlib::GzipFile::Error => e
raise Gem::Package::FormatError.new(e.message, entry.full_name)
end
end
require 'rubygems/package/digest_io'

2
lib/rubygems/package/digest_io.rb
View file

@ -3,7 +3,6 @@
# IO wrapper that creates digests of contents written to the IO it wraps.
class Gem::Package::DigestIO
##
# Collected digests for wrapped writes.
#
@ -60,5 +59,4 @@ class Gem::Package::DigestIO
result
end
end

2
lib/rubygems/package/file_source.rb
View file

@ -7,7 +7,6 @@
# object to `Gem::Package.new`.
class Gem::Package::FileSource < Gem::Package::Source # :nodoc: all
attr_reader :path
def initialize(path)
@ -29,5 +28,4 @@ class Gem::Package::FileSource < Gem::Package::Source # :nodoc: all
def with_read_io(&block)
File.open path, 'rb', &block
end
end

2
lib/rubygems/package/io_source.rb
View file

@ -8,7 +8,6 @@
# object to `Gem::Package.new`.
class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
attr_reader :io
def initialize(io)
@ -41,5 +40,4 @@ class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
def path
end
end

2
lib/rubygems/package/old.rb
View file

@ -12,7 +12,6 @@
# Please pretend this doesn't exist.
class Gem::Package::Old < Gem::Package
undef_method :spec=
##
@ -166,5 +165,4 @@ class Gem::Package::Old < Gem::Package
true
end
end

2
lib/rubygems/package/tar_header.rb
View file

@ -28,7 +28,6 @@
# A header for a tar file
class Gem::Package::TarHeader
##
# Fields in the tar header
@ -241,5 +240,4 @@ class Gem::Package::TarHeader
def oct(num, len)
"%0#{len}o" % num
end
end

2
lib/rubygems/package/tar_reader.rb
View file

@ -8,7 +8,6 @@
# TarReader reads tar files and allows iteration over their items
class Gem::Package::TarReader
include Enumerable
##
@ -120,7 +119,6 @@ class Gem::Package::TarReader
ensure
rewind
end
end
require 'rubygems/package/tar_reader/entry'

2
lib/rubygems/package/tar_reader/entry.rb
View file

@ -8,7 +8,6 @@
# Class for reading entries out of a tar file
class Gem::Package::TarReader::Entry
##
# Header for this tar entry
@ -165,5 +164,4 @@ class Gem::Package::TarReader::Entry
@io.pos = @orig_pos
@read = 0
end
end

2
lib/rubygems/package/tar_test_case.rb
View file

@ -6,7 +6,6 @@ require 'rubygems/package'
# A test case for Gem::Package::Tar* classes
class Gem::Package::TarTestCase < Gem::TestCase
def ASCIIZ(str, length)
str + "\0" * (length - str.length)
end
@ -137,5 +136,4 @@ class Gem::Package::TarTestCase < Gem::TestCase
def util_symlink_entry
util_entry tar_symlink_header("foo", "bar", 0, Time.now, "link")
end
end

6
lib/rubygems/package/tar_writer.rb
View file

@ -8,14 +8,12 @@
# Allows writing of tar files
class Gem::Package::TarWriter
class FileOverflow < StandardError; end
##
# IO wrapper that allows writing a limited amount of data
class BoundedStream
##
# Maximum number of bytes that can be written
@ -47,14 +45,12 @@ class Gem::Package::TarWriter
@written += data.bytesize
data.bytesize
end
end
##
# IO wrapper that provides only #write
class RestrictedStream
##
# Creates a new RestrictedStream wrapping +io+
@ -68,7 +64,6 @@ class Gem::Package::TarWriter
def write(data)
@io.write data
end
end
##
@ -330,5 +325,4 @@ class Gem::Package::TarWriter
return name, prefix
end
end

2
lib/rubygems/package_task.rb
View file

@ -57,7 +57,6 @@ require 'rake/packagetask'
# end
class Gem::PackageTask < Rake::PackageTask
##
# Ruby Gem::Specification containing the metadata for this package. The
# name, version and package_files are automatically determined from the
@ -120,5 +119,4 @@ class Gem::PackageTask < Rake::PackageTask
end
end
end
end

2
lib/rubygems/path_support.rb
View file

@ -5,7 +5,6 @@
# to the rest of RubyGems.
#
class Gem::PathSupport
##
# The default system path for managing Gems.
attr_reader :home
@ -88,5 +87,4 @@ class Gem::PathSupport
path
end
end
end

2
lib/rubygems/platform.rb
View file

@ -7,7 +7,6 @@ require "rubygems/deprecate"
# See `gem help platform` for information on platform matching.
class Gem::Platform
@local = nil
attr_accessor :cpu
@ -202,5 +201,4 @@ class Gem::Platform
# This will be replaced with Gem::Platform::local.
CURRENT = 'current'.freeze
end

2
lib/rubygems/psych_tree.rb
View file

@ -2,7 +2,6 @@
module Gem
if defined? ::Psych::Visitors
class NoAliasYAMLTree < Psych::Visitors::YAMLTree
def self.create
new({})
end unless respond_to? :create
@ -28,7 +27,6 @@ module Gem
end
private :format_time
end
end
end

4
lib/rubygems/remote_fetcher.rb
View file

@ -13,7 +13,6 @@ require 'resolv'
# a remote source.
class Gem::RemoteFetcher
include Gem::UserInteraction
include Gem::UriParsing
@ -22,7 +21,6 @@ class Gem::RemoteFetcher
# that could happen while downloading from the internet.
class FetchError < Gem::Exception
include Gem::UriParsing
##
@ -43,7 +41,6 @@ class Gem::RemoteFetcher
def to_s # :nodoc:
"#{super} (#{uri})"
end
end
##
@ -342,5 +339,4 @@ class Gem::RemoteFetcher
@pools[proxy] ||= Gem::Request::ConnectionPools.new proxy, @cert_files
end
end
end

2
lib/rubygems/request.rb
View file

@ -4,7 +4,6 @@ require 'time'
require 'rubygems/user_interaction'
class Gem::Request
extend Gem::UserInteraction
include Gem::UserInteraction
@ -285,7 +284,6 @@ class Gem::Request
ua
end
end
require 'rubygems/request/http_pool'

4
lib/rubygems/request/connection_pools.rb
View file

@ -1,13 +1,10 @@
# frozen_string_literal: true
class Gem::Request::ConnectionPools # :nodoc:
@client = Net::HTTP
class << self
attr_accessor :client
end
def initialize(proxy_uri, cert_files)
@ -95,5 +92,4 @@ class Gem::Request::ConnectionPools # :nodoc:
net_http_args
end
end
end

2
lib/rubygems/request/http_pool.rb
View file

@ -6,7 +6,6 @@
# use it.
class Gem::Request::HTTPPool # :nodoc:
attr_reader :cert_files, :proxy_uri
def initialize(http_args, cert_files, proxy_uri)
@ -44,5 +43,4 @@ class Gem::Request::HTTPPool # :nodoc:
connection.start
connection
end
end

2
lib/rubygems/request/https_pool.rb
View file

@ -1,11 +1,9 @@
# frozen_string_literal: true
class Gem::Request::HTTPSPool < Gem::Request::HTTPPool # :nodoc:
private
def setup_connection(connection)
Gem::Request.configure_connection_for_https(connection, @cert_files)
super
end
end

2
lib/rubygems/request_set.rb
View file

@ -15,7 +15,6 @@ require 'tsort'
# #=> ["nokogiri-1.6.0", "mini_portile-0.5.1", "pg-0.17.0"]
class Gem::RequestSet
include TSort
##
@ -471,7 +470,6 @@ class Gem::RequestSet
yield match
end
end
end
require 'rubygems/request_set/gem_dependency_api'

2
lib/rubygems/request_set/gem_dependency_api.rb
View file

@ -31,7 +31,6 @@
# See `gem help install` and `gem help gem_dependencies` for further details.
class Gem::RequestSet::GemDependencyAPI
ENGINE_MAP = { # :nodoc:
:jruby => %w[jruby],
:jruby_18 => %w[jruby],
@ -842,5 +841,4 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
Gem.sources << url
end
end

4
lib/rubygems/request_set/lockfile.rb
View file

@ -5,12 +5,10 @@
# constructed.
class Gem::RequestSet::Lockfile
##
# Raised when a lockfile cannot be parsed
class ParseError < Gem::Exception
##
# The column where the error was encountered
@ -36,7 +34,6 @@ class Gem::RequestSet::Lockfile
@path = path
super "#{message} (at line #{line} column #{column})"
end
end
##
@ -237,7 +234,6 @@ class Gem::RequestSet::Lockfile
def requests
@set.sorted_requests
end
end
require 'rubygems/request_set/lockfile/tokenizer'

2
lib/rubygems/request_set/lockfile/parser.rb
View file

@ -1,6 +1,5 @@
# frozen_string_literal: true
class Gem::RequestSet::Lockfile::Parser
###
# Parses lockfiles
@ -341,5 +340,4 @@ class Gem::RequestSet::Lockfile::Parser
def unget(token) # :nodoc:
@tokens.unshift token
end
end

2
lib/rubygems/request_set/lockfile/tokenizer.rb
View file

@ -2,7 +2,6 @@
require 'rubygems/request_set/lockfile/parser'
class Gem::RequestSet::Lockfile::Tokenizer
Token = Struct.new :type, :value, :column, :line
EOF = Token.new :EOF
@ -110,5 +109,4 @@ class Gem::RequestSet::Lockfile::Tokenizer
@tokens
end
end

4
lib/rubygems/requirement.rb
View file

@ -9,7 +9,6 @@ require "rubygems/deprecate"
# together in RubyGems.
class Gem::Requirement
OPS = { #:nodoc:
"=" => lambda {|v, r| v == r },
"!=" => lambda {|v, r| v != r },
@ -299,14 +298,11 @@ class Gem::Requirement
end
end
end
end
class Gem::Version
# This is needed for compatibility with older yaml
# gemspecs.
Requirement = Gem::Requirement # :nodoc:
end

2
lib/rubygems/resolver.rb
View file

@ -10,7 +10,6 @@ require 'rubygems/util/list'
# all the requirements.
class Gem::Resolver
require 'rubygems/resolver/molinillo'
##
@ -312,7 +311,6 @@ class Gem::Resolver
end
end
private :amount_constrained
end
require 'rubygems/resolver/activation_request'

2
lib/rubygems/resolver/activation_request.rb
View file

@ -4,7 +4,6 @@
# dependency that was used to introduce this activation.
class Gem::Resolver::ActivationRequest
##
# The parent request for this activation request.
@ -152,5 +151,4 @@ class Gem::Resolver::ActivationRequest
def name_tuple
@name_tuple ||= Gem::NameTuple.new(name, version, platform)
end
end

2
lib/rubygems/resolver/api_set.rb
View file

@ -4,7 +4,6 @@
# Returns instances of APISpecification.
class Gem::Resolver::APISet < Gem::Resolver::Set
##
# The URI for the dependency API this APISet uses.
@ -121,5 +120,4 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
@data[name]
end
end

2
lib/rubygems/resolver/api_specification.rb
View file

@ -6,7 +6,6 @@
# is the name, version, and dependencies.
class Gem::Resolver::APISpecification < Gem::Resolver::Specification
##
# Creates an APISpecification for the given +set+ from the rubygems.org
# +api_data+.
@ -86,5 +85,4 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
def source # :nodoc:
@set.source
end
end

2
lib/rubygems/resolver/best_set.rb
View file

@ -5,7 +5,6 @@
# It combines IndexSet and APISet
class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
##
# Creates a BestSet for the given +sources+ or Gem::sources if none are
# specified. +sources+ must be a Gem::SourceList.
@ -74,5 +73,4 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
index_set
end
end
end

2
lib/rubygems/resolver/composed_set.rb
View file

@ -9,7 +9,6 @@
# This method will eliminate nesting of composed sets.
class Gem::Resolver::ComposedSet < Gem::Resolver::Set
attr_reader :sets # :nodoc:
##
@ -62,5 +61,4 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
def prefetch(reqs)
@sets.each {|s| s.prefetch(reqs) }
end
end

2
lib/rubygems/resolver/conflict.rb
View file

@ -4,7 +4,6 @@
# with a spec that would be activated.
class Gem::Resolver::Conflict
##
# The specification that was activated prior to the conflict
@ -151,5 +150,4 @@ class Gem::Resolver::Conflict
def requester
@failed_dep.requester
end
end

2
lib/rubygems/resolver/current_set.rb
View file

@ -5,9 +5,7 @@
# for installed gems.
class Gem::Resolver::CurrentSet < Gem::Resolver::Set
def find_all(req)
req.dependency.matching_specs
end
end

2
lib/rubygems/resolver/dependency_request.rb
View file

@ -4,7 +4,6 @@
# contained the Dependency.
class Gem::Resolver::DependencyRequest
##
# The wrapped Gem::Dependency
@ -116,5 +115,4 @@ class Gem::Resolver::DependencyRequest
def to_s # :nodoc:
@dependency.to_s
end
end

2
lib/rubygems/resolver/git_set.rb
View file

@ -10,7 +10,6 @@
# set.add_git_gem 'rake', 'git://example/rake.git', tag: 'rake-10.1.0'
class Gem::Resolver::GitSet < Gem::Resolver::Set
##
# The root directory for git gems in this set. This is usually Gem.dir, the
# installation directory for regular gems.
@ -118,5 +117,4 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
end
end
end
end

2
lib/rubygems/resolver/git_specification.rb
View file

@ -5,7 +5,6 @@
# option.
class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
def ==(other) # :nodoc:
self.class === other and
@set == other.set and
@ -54,5 +53,4 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
q.pp @source
end
end
end

2
lib/rubygems/resolver/index_set.rb
View file

@ -4,7 +4,6 @@
# source index.
class Gem::Resolver::IndexSet < Gem::Resolver::Set
def initialize(source = nil) # :nodoc:
super()
@ -76,5 +75,4 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
end
end
end
end

2
lib/rubygems/resolver/index_specification.rb
View file

@ -5,7 +5,6 @@
# and +version+ are needed.
class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
##
# An IndexSpecification is created from the index format described in `gem
# help generate_index`.
@ -65,5 +64,4 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
@source.fetch_spec tuple
end
end
end

2
lib/rubygems/resolver/installed_specification.rb
View file

@ -4,7 +4,6 @@
# locally.
class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
def ==(other) # :nodoc:
self.class === other and
@set == other.set and
@ -54,5 +53,4 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
def source
@source ||= Gem::Source::Installed.new
end
end

2
lib/rubygems/resolver/installer_set.rb
View file

@ -4,7 +4,6 @@
# files
class Gem::Resolver::InstallerSet < Gem::Resolver::Set
##
# List of Gem::Specification objects that must always be installed.
@ -223,5 +222,4 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
@domain = :local unless remote
end
end
end

2
lib/rubygems/resolver/local_specification.rb
View file

@ -3,7 +3,6 @@
# A LocalSpecification comes from a .gem file on the local filesystem.
class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
##
# Returns +true+ if this gem is installable for the current platform.
@ -37,5 +36,4 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
q.text "source: #{@source.path}"
end
end
end

Some files were not shown because too many files have changed in this diff Show more