diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-07-13 12:01:07 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-07-31 21:07:19 +0900 |
| commit | a89665b7b1abb5bb6005fd638dc920848cc50f72 (patch) | |
| tree | f6c84f1bfb1148d203cd63c72c458de3a8f5e961 /lib/rubygems | |
| parent | a6bfc951aa9c48e2a4608a9ae84e2e3b4fd9b390 (diff) | |
Enforce no empty lines around class body in rubygems
To normalize the code style with `bundler`.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3379
Diffstat (limited to 'lib/rubygems')
138 files changed, 1 insertions, 364 deletions
diff --git a/lib/rubygems/available_set.rb b/lib/rubygems/available_set.rb index 48bf6da45d..80ef29df64 100644 --- a/lib/rubygems/available_set.rb +++ b/lib/rubygems/available_set.rb @@ -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 diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb index ce07cdcf3b..665b87fc0e 100644 --- a/lib/rubygems/basic_specification.rb +++ b/lib/rubygems/basic_specification.rb @@ -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 diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb index cfbe34cb90..bf55ce3205 100644 --- a/lib/rubygems/command.rb +++ b/lib/rubygems/command.rb @@ -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 ## diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb index f18e7771b5..1dcb577f7e 100644 --- a/lib/rubygems/command_manager.rb +++ b/lib/rubygems/command_manager.rb @@ -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 diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb index e2b5def1e8..decdca06bb 100644 --- a/lib/rubygems/commands/build_command.rb +++ b/lib/rubygems/commands/build_command.rb @@ -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 diff --git a/lib/rubygems/commands/cert_command.rb b/lib/rubygems/commands/cert_command.rb index 4ec600e17a..837cb9526f 100644 --- a/lib/rubygems/commands/cert_command.rb +++ b/lib/rubygems/commands/cert_command.rb @@ -9,7 +9,6 @@ rescue LoadError => e end class Gem::Commands::CertCommand < Gem::Command - def initialize super 'cert', 'Manage RubyGems certificates and signing settings', :add => [], :remove => [], :list => [], :build => [], :sign => [] @@ -318,5 +317,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) diff --git a/lib/rubygems/commands/check_command.rb b/lib/rubygems/commands/check_command.rb index 7905b8ab69..8b8eda53cf 100644 --- a/lib/rubygems/commands/check_command.rb +++ b/lib/rubygems/commands/check_command.rb @@ -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 diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb index 98cd203208..b9819a4f96 100644 --- a/lib/rubygems/commands/cleanup_command.rb +++ b/lib/rubygems/commands/cleanup_command.rb @@ -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 diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb index d30b62d43c..f17aed64db 100644 --- a/lib/rubygems/commands/contents_command.rb +++ b/lib/rubygems/commands/contents_command.rb @@ -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 diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb index bdb71adc3c..e472d8fa8d 100644 --- a/lib/rubygems/commands/dependency_command.rb +++ b/lib/rubygems/commands/dependency_command.rb @@ -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 diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb index c98a77ac2e..3aff503a47 100644 --- a/lib/rubygems/commands/environment_command.rb +++ b/lib/rubygems/commands/environment_command.rb @@ -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 diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb index ab77a3b26a..6a1b346dd3 100644 --- a/lib/rubygems/commands/fetch_command.rb +++ b/lib/rubygems/commands/fetch_command.rb @@ -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 diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb index 6dccdcb946..93e25ef5e4 100644 --- a/lib/rubygems/commands/generate_index_command.rb +++ b/lib/rubygems/commands/generate_index_command.rb @@ -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 diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb index 23df79f6ce..9ba8bf1293 100644 --- a/lib/rubygems/commands/help_command.rb +++ b/lib/rubygems/commands/help_command.rb @@ -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 diff --git a/lib/rubygems/commands/info_command.rb b/lib/rubygems/commands/info_command.rb index a64843405e..9ca6ae364f 100644 --- a/lib/rubygems/commands/info_command.rb +++ b/lib/rubygems/commands/info_command.rb @@ -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 diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index 6f9a8d2a08..70825b88fd 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -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 diff --git a/lib/rubygems/commands/list_command.rb b/lib/rubygems/commands/list_command.rb index f94038920f..5c99d3d73d 100644 --- a/lib/rubygems/commands/list_command.rb +++ b/lib/rubygems/commands/list_command.rb @@ -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 diff --git a/lib/rubygems/commands/lock_command.rb b/lib/rubygems/commands/lock_command.rb index ed1d5489b7..f1dc1ac586 100644 --- a/lib/rubygems/commands/lock_command.rb +++ b/lib/rubygems/commands/lock_command.rb @@ -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 diff --git a/lib/rubygems/commands/mirror_command.rb b/lib/rubygems/commands/mirror_command.rb index 4e2a41fa33..86671a93b2 100644 --- a/lib/rubygems/commands/mirror_command.rb +++ b/lib/rubygems/commands/mirror_command.rb @@ -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 diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb index e538e58d46..7d245539e1 100644 --- a/lib/rubygems/commands/open_command.rb +++ b/lib/rubygems/commands/open_command.rb @@ -4,7 +4,6 @@ require 'rubygems/version_option' require 'rubygems/util' class Gem::Commands::OpenCommand < Gem::Command - include Gem::VersionOption def initialize @@ -83,5 +82,4 @@ class Gem::Commands::OpenCommand < Gem::Command say "Unable to find gem '#{name}'" end - end diff --git a/lib/rubygems/commands/outdated_command.rb b/lib/rubygems/commands/outdated_command.rb index 035eaffcbc..3579bfc3ba 100644 --- a/lib/rubygems/commands/outdated_command.rb +++ b/lib/rubygems/commands/outdated_command.rb @@ -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 diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb index f8e68c48e7..0f01823967 100644 --- a/lib/rubygems/commands/owner_command.rb +++ b/lib/rubygems/commands/owner_command.rb @@ -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 diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb index d10060923f..db8136c9a6 100644 --- a/lib/rubygems/commands/pristine_command.rb +++ b/lib/rubygems/commands/pristine_command.rb @@ -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 diff --git a/lib/rubygems/commands/push_command.rb b/lib/rubygems/commands/push_command.rb index dadd397a2a..003b2dacc7 100644 --- a/lib/rubygems/commands/push_command.rb +++ b/lib/rubygems/commands/push_command.rb @@ -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 diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb index 7a26b55ac6..406a34e549 100644 --- a/lib/rubygems/commands/query_command.rb +++ b/lib/rubygems/commands/query_command.rb @@ -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 diff --git a/lib/rubygems/commands/rdoc_command.rb b/lib/rubygems/commands/rdoc_command.rb index ff9e1ffcfa..e8c9e84b29 100644 --- a/lib/rubygems/commands/rdoc_command.rb +++ b/lib/rubygems/commands/rdoc_command.rb @@ -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 diff --git a/lib/rubygems/commands/search_command.rb b/lib/rubygems/commands/search_command.rb index 65ee25167c..aeb2119235 100644 --- a/lib/rubygems/commands/search_command.rb +++ b/lib/rubygems/commands/search_command.rb @@ -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 diff --git a/lib/rubygems/commands/server_command.rb b/lib/rubygems/commands/server_command.rb index e91a8e5176..91d5e267f8 100644 --- a/lib/rubygems/commands/server_command.rb +++ b/lib/rubygems/commands/server_command.rb @@ -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 diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index 55b80619bd..0f213161df 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -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 diff --git a/lib/rubygems/commands/signin_command.rb b/lib/rubygems/commands/signin_command.rb index 7c4b5ceb69..2e19c8333c 100644 --- a/lib/rubygems/commands/signin_command.rb +++ b/lib/rubygems/commands/signin_command.rb @@ -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 diff --git a/lib/rubygems/commands/signout_command.rb b/lib/rubygems/commands/signout_command.rb index 2d7329c590..ebbe746cb4 100644 --- a/lib/rubygems/commands/signout_command.rb +++ b/lib/rubygems/commands/signout_command.rb @@ -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 diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb index ca9d425232..3be3a5dc79 100644 --- a/lib/rubygems/commands/sources_command.rb +++ b/lib/rubygems/commands/sources_command.rb @@ -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 diff --git a/lib/rubygems/commands/specification_command.rb b/lib/rubygems/commands/specification_command.rb index e19bfeed73..e4a8afab21 100644 --- a/lib/rubygems/commands/specification_command.rb +++ b/lib/rubygems/commands/specification_command.rb @@ -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 diff --git a/lib/rubygems/commands/stale_command.rb b/lib/rubygems/commands/stale_command.rb index 2fd4388891..badc9905c1 100644 --- a/lib/rubygems/commands/stale_command.rb +++ b/lib/rubygems/commands/stale_command.rb @@ -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 diff --git a/lib/rubygems/commands/uninstall_command.rb b/lib/rubygems/commands/uninstall_command.rb index 2aac9e975e..1540b2f0fb 100644 --- a/lib/rubygems/commands/uninstall_command.rb +++ b/lib/rubygems/commands/uninstall_command.rb @@ -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 diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb index 1091a55f37..8d90d08eb4 100644 --- a/lib/rubygems/commands/unpack_command.rb +++ b/lib/rubygems/commands/unpack_command.rb @@ -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 diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb index 612667dfd0..bac9c82fc8 100644 --- a/lib/rubygems/commands/update_command.rb +++ b/lib/rubygems/commands/update_command.rb @@ -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 diff --git a/lib/rubygems/commands/which_command.rb b/lib/rubygems/commands/which_command.rb index fca463a1ef..d42ab18395 100644 --- a/lib/rubygems/commands/which_command.rb +++ b/lib/rubygems/commands/which_command.rb @@ -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 diff --git a/lib/rubygems/commands/yank_command.rb b/lib/rubygems/commands/yank_command.rb index 3ca05756f6..6ad74de96b 100644 --- a/lib/rubygems/commands/yank_command.rb +++ b/lib/rubygems/commands/yank_command.rb @@ -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 diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb index 9f1da9e6dc..854d09ef3d 100644 --- a/lib/rubygems/config_file.rb +++ b/lib/rubygems/config_file.rb @@ -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 diff --git a/lib/rubygems/core_ext/kernel_warn.rb b/lib/rubygems/core_ext/kernel_warn.rb index dfc577df0b..8b73902d3b 100644 --- a/lib/rubygems/core_ext/kernel_warn.rb +++ b/lib/rubygems/core_ext/kernel_warn.rb @@ -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| diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb index be0bf24700..461c828d5c 100644 --- a/lib/rubygems/dependency.rb +++ b/lib/rubygems/dependency.rb @@ -6,7 +6,6 @@ require "rubygems/bundler_version_finder" require "rubygems/requirement" class Gem::Dependency - ## # Valid dependency types. #-- @@ -347,5 +346,4 @@ class Gem::Dependency :released end end - end diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index f7add4ea42..802ec307a7 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -13,7 +13,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 @@ -336,5 +335,4 @@ class Gem::DependencyInstaller request_set end - end diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb index 978d1bef82..bcf436cd03 100644 --- a/lib/rubygems/dependency_list.rb +++ b/lib/rubygems/dependency_list.rb @@ -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 diff --git a/lib/rubygems/doctor.rb b/lib/rubygems/doctor.rb index 9ac577a356..ef31aeddd0 100644 --- a/lib/rubygems/doctor.rb +++ b/lib/rubygems/doctor.rb @@ -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 diff --git a/lib/rubygems/errors.rb b/lib/rubygems/errors.rb index 362a07865f..abee20651e 100644 --- a/lib/rubygems/errors.rb +++ b/lib/rubygems/errors.rb @@ -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 diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb index 903abe0a6c..804863f693 100644 --- a/lib/rubygems/exceptions.rb +++ b/lib/rubygems/exceptions.rb @@ -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 ## diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb index 83b3ac4474..afc8cb0ee4 100644 --- a/lib/rubygems/ext/builder.rb +++ b/lib/rubygems/ext/builder.rb @@ -8,7 +8,6 @@ require_relative '../user_interaction' class Gem::Ext::Builder - include Gem::UserInteraction ## @@ -227,5 +226,4 @@ EOF destination end - end diff --git a/lib/rubygems/ext/cmake_builder.rb b/lib/rubygems/ext/cmake_builder.rb index 76a8c9e92c..519372e742 100644 --- a/lib/rubygems/ext/cmake_builder.rb +++ b/lib/rubygems/ext/cmake_builder.rb @@ -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 diff --git a/lib/rubygems/ext/configure_builder.rb b/lib/rubygems/ext/configure_builder.rb index 7d105c9bd3..209e75fe8e 100644 --- a/lib/rubygems/ext/configure_builder.rb +++ b/lib/rubygems/ext/configure_builder.rb @@ -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 diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index 1310f591b4..305e1dcfb1 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -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 diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb index 077f080c07..53507090fe 100644 --- a/lib/rubygems/ext/rake_builder.rb +++ b/lib/rubygems/ext/rake_builder.rb @@ -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 diff --git a/lib/rubygems/gem_runner.rb b/lib/rubygems/gem_runner.rb index 80aebd579a..48b8cdd13f 100644 --- a/lib/rubygems/gem_runner.rb +++ b/lib/rubygems/gem_runner.rb @@ -25,7 +25,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 @@ -76,7 +75,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 diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb index c99a6a8367..9f4bd12c46 100644 --- a/lib/rubygems/indexer.rb +++ b/lib/rubygems/indexer.rb @@ -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 diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 54e7a59bbf..33de7f2f7c 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -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 ## @@ -961,5 +956,4 @@ TEXT raise Gem::FilePermissionError.new(dir) unless File.writable? dir end - end diff --git a/lib/rubygems/installer_test_case.rb b/lib/rubygems/installer_test_case.rb index 68200d7204..d78b6a4712 100644 --- a/lib/rubygems/installer_test_case.rb +++ b/lib/rubygems/installer_test_case.rb @@ -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 diff --git a/lib/rubygems/mock_gem_ui.rb b/lib/rubygems/mock_gem_ui.rb index 9ece75881c..ec244fb7c6 100644 --- a/lib/rubygems/mock_gem_ui.rb +++ b/lib/rubygems/mock_gem_ui.rb @@ -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 diff --git a/lib/rubygems/name_tuple.rb b/lib/rubygems/name_tuple.rb index 9130282f10..a3fbe950a5 100644 --- a/lib/rubygems/name_tuple.rb +++ b/lib/rubygems/name_tuple.rb @@ -7,7 +7,6 @@ require 'rubygems/platform' class Gem::NameTuple - def initialize(name, version, platform="ruby") @name = name @version = version @@ -121,5 +120,4 @@ class Gem::NameTuple def hash to_a.hash end - end diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index d3d0345abc..46485f8c81 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -48,13 +48,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) @@ -66,16 +64,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 @@ -718,7 +713,6 @@ EOM rescue Zlib::GzipFile::Error => e raise Gem::Package::FormatError.new(e.message, entry.full_name) end - end require 'rubygems/package/digest_io' diff --git a/lib/rubygems/package/digest_io.rb b/lib/rubygems/package/digest_io.rb index d9e6c3c021..4736f76d93 100644 --- a/lib/rubygems/package/digest_io.rb +++ b/lib/rubygems/package/digest_io.rb @@ -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 diff --git a/lib/rubygems/package/file_source.rb b/lib/rubygems/package/file_source.rb index 8a4f9da6f2..114a950c77 100644 --- a/lib/rubygems/package/file_source.rb +++ b/lib/rubygems/package/file_source.rb @@ -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 diff --git a/lib/rubygems/package/io_source.rb b/lib/rubygems/package/io_source.rb index 669a859d0a..7d7383110b 100644 --- a/lib/rubygems/package/io_source.rb +++ b/lib/rubygems/package/io_source.rb @@ -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 diff --git a/lib/rubygems/package/old.rb b/lib/rubygems/package/old.rb index aeb6c999c0..25317ef23f 100644 --- a/lib/rubygems/package/old.rb +++ b/lib/rubygems/package/old.rb @@ -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 diff --git a/lib/rubygems/package/tar_header.rb b/lib/rubygems/package/tar_header.rb index 19927c0e27..f19aea549d 100644 --- a/lib/rubygems/package/tar_header.rb +++ b/lib/rubygems/package/tar_header.rb @@ -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 diff --git a/lib/rubygems/package/tar_reader.rb b/lib/rubygems/package/tar_reader.rb index b7b5e01e99..e7c5620533 100644 --- a/lib/rubygems/package/tar_reader.rb +++ b/lib/rubygems/package/tar_reader.rb @@ -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' diff --git a/lib/rubygems/package/tar_reader/entry.rb b/lib/rubygems/package/tar_reader/entry.rb index d9c67ed8f2..5865599d3a 100644 --- a/lib/rubygems/package/tar_reader/entry.rb +++ b/lib/rubygems/package/tar_reader/entry.rb @@ -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 diff --git a/lib/rubygems/package/tar_test_case.rb b/lib/rubygems/package/tar_test_case.rb index e4c408e416..5fc34d2e8c 100644 --- a/lib/rubygems/package/tar_test_case.rb +++ b/lib/rubygems/package/tar_test_case.rb @@ -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 diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb index 5289e6f1e6..87c7dc6076 100644 --- a/lib/rubygems/package/tar_writer.rb +++ b/lib/rubygems/package/tar_writer.rb @@ -10,14 +10,12 @@ require 'digest' # 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 @@ -49,14 +47,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+ @@ -70,7 +66,6 @@ class Gem::Package::TarWriter def write(data) @io.write data end - end ## @@ -333,5 +328,4 @@ class Gem::Package::TarWriter return name, prefix end - end diff --git a/lib/rubygems/package_task.rb b/lib/rubygems/package_task.rb index 4c993f1c09..d5a2885a64 100644 --- a/lib/rubygems/package_task.rb +++ b/lib/rubygems/package_task.rb @@ -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 diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb index 9e5a48df03..8103caf324 100644 --- a/lib/rubygems/path_support.rb +++ b/lib/rubygems/path_support.rb @@ -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 diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb index 868a9de3b9..34306fcf83 100644 --- a/lib/rubygems/platform.rb +++ b/lib/rubygems/platform.rb @@ -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 diff --git a/lib/rubygems/psych_tree.rb b/lib/rubygems/psych_tree.rb index b4eebf1dcc..6f399a289e 100644 --- a/lib/rubygems/psych_tree.rb +++ b/lib/rubygems/psych_tree.rb @@ -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 diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb index 58c14ae19f..fa5ed45622 100644 --- a/lib/rubygems/remote_fetcher.rb +++ b/lib/rubygems/remote_fetcher.rb @@ -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 ## @@ -341,5 +338,4 @@ class Gem::RemoteFetcher @pools[proxy] ||= Gem::Request::ConnectionPools.new proxy, @cert_files end end - end diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb index b5a14ec34d..18bd4eb564 100644 --- a/lib/rubygems/request.rb +++ b/lib/rubygems/request.rb @@ -4,7 +4,6 @@ require 'time' require 'rubygems/user_interaction' class Gem::Request - extend Gem::UserInteraction include Gem::UserInteraction @@ -291,7 +290,6 @@ class Gem::Request ua end - end require 'rubygems/request/http_pool' diff --git a/lib/rubygems/request/connection_pools.rb b/lib/rubygems/request/connection_pools.rb index 1bd823a3c1..7f3988952c 100644 --- a/lib/rubygems/request/connection_pools.rb +++ b/lib/rubygems/request/connection_pools.rb @@ -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 diff --git a/lib/rubygems/request/http_pool.rb b/lib/rubygems/request/http_pool.rb index 058094a209..9985bbafa6 100644 --- a/lib/rubygems/request/http_pool.rb +++ b/lib/rubygems/request/http_pool.rb @@ -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 diff --git a/lib/rubygems/request/https_pool.rb b/lib/rubygems/request/https_pool.rb index 1236079b7d..50f42d9e0d 100644 --- a/lib/rubygems/request/https_pool.rb +++ b/lib/rubygems/request/https_pool.rb @@ -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 diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb index 15eb9523d2..a8a06d0b95 100644 --- a/lib/rubygems/request_set.rb +++ b/lib/rubygems/request_set.rb @@ -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' diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb index 07da0927eb..9fbe3a1e44 100644 --- a/lib/rubygems/request_set/gem_dependency_api.rb +++ b/lib/rubygems/request_set/gem_dependency_api.rb @@ -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 diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb index 5af49a499a..8f8f142fff 100644 --- a/lib/rubygems/request_set/lockfile.rb +++ b/lib/rubygems/request_set/lockfile.rb @@ -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' diff --git a/lib/rubygems/request_set/lockfile/parser.rb b/lib/rubygems/request_set/lockfile/parser.rb index 1e9d2b12de..8c12b435af 100644 --- a/lib/rubygems/request_set/lockfile/parser.rb +++ b/lib/rubygems/request_set/lockfile/parser.rb @@ -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 diff --git a/lib/rubygems/request_set/lockfile/tokenizer.rb b/lib/rubygems/request_set/lockfile/tokenizer.rb index 2062334068..6918e8e1a5 100644 --- a/lib/rubygems/request_set/lockfile/tokenizer.rb +++ b/lib/rubygems/request_set/lockfile/tokenizer.rb @@ -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 diff --git a/lib/rubygems/requirement.rb b/lib/rubygems/requirement.rb index d2c1254ddf..c8c96646e3 100644 --- a/lib/rubygems/requirement.rb +++ b/lib/rubygems/requirement.rb @@ -10,7 +10,6 @@ require "rubygems/deprecate" # together in RubyGems. class Gem::Requirement - OPS = { #:nodoc: "=" => lambda {|v, r| v == r }, "!=" => lambda {|v, r| v != r }, @@ -300,14 +299,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 diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index fd5cf3d712..46b8aee3e0 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -11,7 +11,6 @@ require 'rubygems/util/list' # all the requirements. class Gem::Resolver - require 'rubygems/resolver/molinillo' ## @@ -313,7 +312,6 @@ class Gem::Resolver end end private :amount_constrained - end require 'rubygems/resolver/activation_request' diff --git a/lib/rubygems/resolver/activation_request.rb b/lib/rubygems/resolver/activation_request.rb index 2a8d6032f8..293df1efe9 100644 --- a/lib/rubygems/resolver/activation_request.rb +++ b/lib/rubygems/resolver/activation_request.rb @@ -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 diff --git a/lib/rubygems/resolver/api_set.rb b/lib/rubygems/resolver/api_set.rb index ca92bac09c..19c59a315b 100644 --- a/lib/rubygems/resolver/api_set.rb +++ b/lib/rubygems/resolver/api_set.rb @@ -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 diff --git a/lib/rubygems/resolver/api_specification.rb b/lib/rubygems/resolver/api_specification.rb index 4052846e99..a47d910331 100644 --- a/lib/rubygems/resolver/api_specification.rb +++ b/lib/rubygems/resolver/api_specification.rb @@ -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 diff --git a/lib/rubygems/resolver/best_set.rb b/lib/rubygems/resolver/best_set.rb index 8a8c15d9a4..7a708ee391 100644 --- a/lib/rubygems/resolver/best_set.rb +++ b/lib/rubygems/resolver/best_set.rb @@ -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 diff --git a/lib/rubygems/resolver/composed_set.rb b/lib/rubygems/resolver/composed_set.rb index 094cb69b04..226da1e1e0 100644 --- a/lib/rubygems/resolver/composed_set.rb +++ b/lib/rubygems/resolver/composed_set.rb @@ -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 diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb index 4245b59bee..2ce63feef2 100644 --- a/lib/rubygems/resolver/conflict.rb +++ b/lib/rubygems/resolver/conflict.rb @@ -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 diff --git a/lib/rubygems/resolver/current_set.rb b/lib/rubygems/resolver/current_set.rb index d60e46389d..c3aa3a2c37 100644 --- a/lib/rubygems/resolver/current_set.rb +++ b/lib/rubygems/resolver/current_set.rb @@ -5,9 +5,7 @@ # for installed gems. class Gem::Resolver::CurrentSet < Gem::Resolver::Set - def find_all(req) req.dependency.matching_specs end - end diff --git a/lib/rubygems/resolver/dependency_request.rb b/lib/rubygems/resolver/dependency_request.rb index 1984aa9ddc..77539c340f 100644 --- a/lib/rubygems/resolver/dependency_request.rb +++ b/lib/rubygems/resolver/dependency_request.rb @@ -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 diff --git a/lib/rubygems/resolver/git_set.rb b/lib/rubygems/resolver/git_set.rb index 6340b92fae..eac51f15ad 100644 --- a/lib/rubygems/resolver/git_set.rb +++ b/lib/rubygems/resolver/git_set.rb @@ -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 diff --git a/lib/rubygems/resolver/git_specification.rb b/lib/rubygems/resolver/git_specification.rb index f43cfba853..555dcffc22 100644 --- a/lib/rubygems/resolver/git_specification.rb +++ b/lib/rubygems/resolver/git_specification.rb @@ -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 diff --git a/lib/rubygems/resolver/index_set.rb b/lib/rubygems/resolver/index_set.rb index f1ecc7f95f..9390e34255 100644 --- a/lib/rubygems/resolver/index_set.rb +++ b/lib/rubygems/resolver/index_set.rb @@ -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 diff --git a/lib/rubygems/resolver/index_specification.rb b/lib/rubygems/resolver/index_specification.rb index ed9423791c..d80f121189 100644 --- a/lib/rubygems/resolver/index_specification.rb +++ b/lib/rubygems/resolver/index_specification.rb @@ -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 diff --git a/lib/rubygems/resolver/installed_specification.rb b/lib/rubygems/resolver/installed_specification.rb index 9d996fc1da..167ba1439e 100644 --- a/lib/rubygems/resolver/installed_specification.rb +++ b/lib/rubygems/resolver/installed_specification.rb @@ -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 diff --git a/lib/rubygems/resolver/installer_set.rb b/lib/rubygems/resolver/installer_set.rb index dad6313eba..eaa7e207b2 100644 --- a/lib/rubygems/resolver/installer_set.rb +++ b/lib/rubygems/resolver/installer_set.rb @@ -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 diff --git a/lib/rubygems/resolver/local_specification.rb b/lib/rubygems/resolver/local_specification.rb index 7418cfcc86..9c69c4ab74 100644 --- a/lib/rubygems/resolver/local_specification.rb +++ b/lib/rubygems/resolver/local_specification.rb @@ -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 diff --git a/lib/rubygems/resolver/lock_set.rb b/lib/rubygems/resolver/lock_set.rb index 12807f3957..1ab03e753b 100644 --- a/lib/rubygems/resolver/lock_set.rb +++ b/lib/rubygems/resolver/lock_set.rb @@ -3,7 +3,6 @@ # A set of gems from a gem dependencies lockfile. class Gem::Resolver::LockSet < Gem::Resolver::Set - attr_reader :specs # :nodoc: ## @@ -78,5 +77,4 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set q.pp @specs.map {|spec| spec.full_name } end end - end diff --git a/lib/rubygems/resolver/lock_specification.rb b/lib/rubygems/resolver/lock_specification.rb index 5954507dba..cdb8e4e425 100644 --- a/lib/rubygems/resolver/lock_specification.rb +++ b/lib/rubygems/resolver/lock_specification.rb @@ -6,7 +6,6 @@ # lockfile. class Gem::Resolver::LockSpecification < Gem::Resolver::Specification - attr_reader :sources def initialize(set, name, version, sources, platform) @@ -83,5 +82,4 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification s.dependencies.concat @dependencies end end - end diff --git a/lib/rubygems/resolver/requirement_list.rb b/lib/rubygems/resolver/requirement_list.rb index cf0014b0bb..5b51493c9a 100644 --- a/lib/rubygems/resolver/requirement_list.rb +++ b/lib/rubygems/resolver/requirement_list.rb @@ -7,7 +7,6 @@ # first. class Gem::Resolver::RequirementList - include Enumerable ## @@ -79,5 +78,4 @@ class Gem::Resolver::RequirementList x = @exact[0,5] x + @list[0,5 - x.size] end - end diff --git a/lib/rubygems/resolver/set.rb b/lib/rubygems/resolver/set.rb index 242f9cd3dc..8046e18ea1 100644 --- a/lib/rubygems/resolver/set.rb +++ b/lib/rubygems/resolver/set.rb @@ -4,7 +4,6 @@ # dependencies) used in resolution. This set is abstract. class Gem::Resolver::Set - ## # Set to true to disable network access for this set @@ -53,5 +52,4 @@ class Gem::Resolver::Set def remote? # :nodoc: @remote end - end diff --git a/lib/rubygems/resolver/source_set.rb b/lib/rubygems/resolver/source_set.rb index 8e799514fd..bf8c23184e 100644 --- a/lib/rubygems/resolver/source_set.rb +++ b/lib/rubygems/resolver/source_set.rb @@ -4,7 +4,6 @@ # Kind off like BestSet but filters the sources for gems class Gem::Resolver::SourceSet < Gem::Resolver::Set - ## # Creates a SourceSet for the given +sources+ or Gem::sources if none are # specified. +sources+ must be a Gem::SourceList. @@ -43,5 +42,4 @@ class Gem::Resolver::SourceSet < Gem::Resolver::Set link = @links[name] @sets[link] ||= Gem::Source.new(link).dependency_resolver_set if link end - end diff --git a/lib/rubygems/resolver/spec_specification.rb b/lib/rubygems/resolver/spec_specification.rb index d0e744f3a7..bde5d9cddc 100644 --- a/lib/rubygems/resolver/spec_specification.rb +++ b/lib/rubygems/resolver/spec_specification.rb @@ -4,7 +4,6 @@ # Resolver specifications that are backed by a Gem::Specification. class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification - ## # A SpecSpecification is created for a +set+ for a Gem::Specification in # +spec+. The +source+ is either where the +spec+ came from, or should be @@ -52,5 +51,4 @@ class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification def version spec.version end - end diff --git a/lib/rubygems/resolver/specification.rb b/lib/rubygems/resolver/specification.rb index e859d6659a..7fe2afd3bd 100644 --- a/lib/rubygems/resolver/specification.rb +++ b/lib/rubygems/resolver/specification.rb @@ -5,7 +5,6 @@ # dependency resolution in the resolver is included. class Gem::Resolver::Specification - ## # The dependencies of the gem for this specification @@ -111,5 +110,4 @@ class Gem::Resolver::Specification def local? # :nodoc: false end - end diff --git a/lib/rubygems/resolver/stats.rb b/lib/rubygems/resolver/stats.rb index 5f41940b1e..64b458f504 100644 --- a/lib/rubygems/resolver/stats.rb +++ b/lib/rubygems/resolver/stats.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true class Gem::Resolver::Stats - def initialize @max_depth = 0 @max_requirements = 0 @@ -43,5 +42,4 @@ class Gem::Resolver::Stats $stdout.printf PATTERN, "Backtracking #", @backtracking $stdout.printf PATTERN, "Iteration #", @iterations end - end diff --git a/lib/rubygems/resolver/vendor_set.rb b/lib/rubygems/resolver/vendor_set.rb index 7e2e917d5c..48c640d8c9 100644 --- a/lib/rubygems/resolver/vendor_set.rb +++ b/lib/rubygems/resolver/vendor_set.rb @@ -15,7 +15,6 @@ # rake.gemspec (watching the given name). class Gem::Resolver::VendorSet < Gem::Resolver::Set - ## # The specifications for this set. @@ -83,5 +82,4 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set end end end - end diff --git a/lib/rubygems/resolver/vendor_specification.rb b/lib/rubygems/resolver/vendor_specification.rb index 56f2e6eb2c..8dfe5940f2 100644 --- a/lib/rubygems/resolver/vendor_specification.rb +++ b/lib/rubygems/resolver/vendor_specification.rb @@ -5,7 +5,6 @@ # option. class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification - def ==(other) # :nodoc: self.class === other and @set == other.set and @@ -20,5 +19,4 @@ class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification def install(options = {}) yield nil end - end diff --git a/lib/rubygems/s3_uri_signer.rb b/lib/rubygems/s3_uri_signer.rb index 534b8676a0..1ea9ff06a4 100644 --- a/lib/rubygems/s3_uri_signer.rb +++ b/lib/rubygems/s3_uri_signer.rb @@ -6,9 +6,7 @@ require 'openssl' # S3URISigner implements AWS SigV4 for S3 Source to avoid a dependency on the aws-sdk-* gems # More on AWS SigV4: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html class Gem::S3URISigner - class ConfigurationError < Gem::Exception - def initialize(message) super message end @@ -16,11 +14,9 @@ class Gem::S3URISigner def to_s # :nodoc: "#{super}" end - end class InstanceProfileError < Gem::Exception - def initialize(message) super message end @@ -28,7 +24,6 @@ class Gem::S3URISigner def to_s # :nodoc: "#{super}" end - end attr_accessor :uri @@ -179,5 +174,4 @@ class Gem::S3URISigner BASE64_URI_TRANSLATE = { "+" => "%2B", "/" => "%2F", "=" => "%3D", "\n" => "" }.freeze EC2_IAM_INFO = "http://169.254.169.254/latest/meta-data/iam/info".freeze EC2_IAM_SECURITY_CREDENTIALS = "http://169.254.169.254/latest/meta-data/iam/security-credentials/".freeze - end diff --git a/lib/rubygems/security/policy.rb b/lib/rubygems/security/policy.rb index 90e40b8289..0783fe326f 100644 --- a/lib/rubygems/security/policy.rb +++ b/lib/rubygems/security/policy.rb @@ -8,7 +8,6 @@ require 'rubygems/user_interaction' # Gem::Security::Policies. class Gem::Security::Policy - include Gem::UserInteraction attr_reader :name @@ -291,5 +290,4 @@ class Gem::Security::Policy end alias to_s name # :nodoc: - end diff --git a/lib/rubygems/security/signer.rb b/lib/rubygems/security/signer.rb index cbfdc0e9eb..d1da3f2766 100644 --- a/lib/rubygems/security/signer.rb +++ b/lib/rubygems/security/signer.rb @@ -5,7 +5,6 @@ require "rubygems/user_interaction" class Gem::Security::Signer - include Gem::UserInteraction ## @@ -202,5 +201,4 @@ class Gem::Security::Signer end end end - end diff --git a/lib/rubygems/security/trust_dir.rb b/lib/rubygems/security/trust_dir.rb index 98031ea22b..9016b0c92e 100644 --- a/lib/rubygems/security/trust_dir.rb +++ b/lib/rubygems/security/trust_dir.rb @@ -4,7 +4,6 @@ # verification. class Gem::Security::TrustDir - ## # Default permissions for the trust directory and its contents @@ -115,5 +114,4 @@ class Gem::Security::TrustDir FileUtils.mkdir_p @dir, :mode => @permissions[:trust_dir] end end - end diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb index caa36f5ca5..70ae44609a 100644 --- a/lib/rubygems/server.rb +++ b/lib/rubygems/server.rb @@ -29,7 +29,6 @@ require 'rubygems/rdoc' # TODO Refactor into a real WEBrick servlet to remove code duplication. class Gem::Server - attr_reader :spec_dirs include ERB::Util @@ -875,5 +874,4 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } system("#{@launch} http://#{host}:#{@port}") end - end diff --git a/lib/rubygems/source.rb b/lib/rubygems/source.rb index 8572cb1806..ba5fb032b3 100644 --- a/lib/rubygems/source.rb +++ b/lib/rubygems/source.rb @@ -9,7 +9,6 @@ require "rubygems/text" # bundler dependency API and so-forth. class Gem::Source - include Comparable include Gem::Text @@ -224,7 +223,6 @@ class Gem::Source return if @uri.host.nil? levenshtein_distance(@uri.host, host) <= distance_threshold end - end require 'rubygems/source/git' diff --git a/lib/rubygems/source/git.rb b/lib/rubygems/source/git.rb index b76a068ed1..f06f3b05d6 100644 --- a/lib/rubygems/source/git.rb +++ b/lib/rubygems/source/git.rb @@ -12,7 +12,6 @@ require 'rubygems/util' # source.specs class Gem::Source::Git < Gem::Source - ## # The name of the gem created by this git gem. @@ -239,5 +238,4 @@ class Gem::Source::Git < Gem::Source Digest::SHA1.hexdigest normalized end - end diff --git a/lib/rubygems/source/installed.rb b/lib/rubygems/source/installed.rb index 8e20cbd76d..7e1dd7af5a 100644 --- a/lib/rubygems/source/installed.rb +++ b/lib/rubygems/source/installed.rb @@ -3,7 +3,6 @@ # Represents an installed gem. This is used for dependency resolution. class Gem::Source::Installed < Gem::Source - def initialize # :nodoc: @uri = nil end @@ -36,5 +35,4 @@ class Gem::Source::Installed < Gem::Source def pretty_print(q) # :nodoc: q.text '[Installed]' end - end diff --git a/lib/rubygems/source/local.rb b/lib/rubygems/source/local.rb index 15700a0df2..078b06203f 100644 --- a/lib/rubygems/source/local.rb +++ b/lib/rubygems/source/local.rb @@ -4,7 +4,6 @@ # dependencies. class Gem::Source::Local < Gem::Source - def initialize # :nodoc: @specs = nil @api_uri = nil @@ -129,5 +128,4 @@ class Gem::Source::Local < Gem::Source end end end - end diff --git a/lib/rubygems/source/lock.rb b/lib/rubygems/source/lock.rb index 3b3f491750..49f097467b 100644 --- a/lib/rubygems/source/lock.rb +++ b/lib/rubygems/source/lock.rb @@ -5,7 +5,6 @@ # dependency lock files. class Gem::Source::Lock < Gem::Source - ## # The wrapped Gem::Source @@ -48,5 +47,4 @@ class Gem::Source::Lock < Gem::Source def uri # :nodoc: @wrapped.uri end - end diff --git a/lib/rubygems/source/specific_file.rb b/lib/rubygems/source/specific_file.rb index a22772b9c0..24db1440dd 100644 --- a/lib/rubygems/source/specific_file.rb +++ b/lib/rubygems/source/specific_file.rb @@ -4,7 +4,6 @@ # local gems. class Gem::Source::SpecificFile < Gem::Source - ## # The path to the gem for this specific file. @@ -69,5 +68,4 @@ class Gem::Source::SpecificFile < Gem::Source super end end - end diff --git a/lib/rubygems/source/vendor.rb b/lib/rubygems/source/vendor.rb index a87fa63331..543acf1388 100644 --- a/lib/rubygems/source/vendor.rb +++ b/lib/rubygems/source/vendor.rb @@ -3,7 +3,6 @@ # This represents a vendored source that is similar to an installed gem. class Gem::Source::Vendor < Gem::Source::Installed - ## # Creates a new Vendor source for a gem that was unpacked at +path+. @@ -23,5 +22,4 @@ class Gem::Source::Vendor < Gem::Source::Installed nil end end - end diff --git a/lib/rubygems/source_list.rb b/lib/rubygems/source_list.rb index 2f27303444..39ec1fcec3 100644 --- a/lib/rubygems/source_list.rb +++ b/lib/rubygems/source_list.rb @@ -15,7 +15,6 @@ require 'rubygems/source' # The most common way to get a SourceList is Gem.sources. class Gem::SourceList - include Enumerable ## @@ -149,5 +148,4 @@ class Gem::SourceList @sources.delete_if {|x| x.uri.to_s == source.to_s } end end - end diff --git a/lib/rubygems/spec_fetcher.rb b/lib/rubygems/spec_fetcher.rb index 82b7bb4618..f748b090cc 100644 --- a/lib/rubygems/spec_fetcher.rb +++ b/lib/rubygems/spec_fetcher.rb @@ -9,7 +9,6 @@ require 'rubygems/name_tuple' # SpecFetcher handles metadata updates from remote gem repositories. class Gem::SpecFetcher - include Gem::UserInteraction include Gem::Text @@ -259,5 +258,4 @@ class Gem::SpecFetcher raise unless gracefully_ignore [] end - end diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index 6531cc1b0d..72774810fc 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -37,7 +37,6 @@ require 'rubygems/util/list' # items you may add to a specification. class Gem::Specification < Gem::BasicSpecification - extend Gem::Deprecate # REFACTOR: Consider breaking out this version stuff into a separate @@ -2663,5 +2662,4 @@ class Gem::Specification < Gem::BasicSpecification def raw_require_paths # :nodoc: @require_paths end - end diff --git a/lib/rubygems/specification_policy.rb b/lib/rubygems/specification_policy.rb index b93ff89a3c..2b8b05635e 100644 --- a/lib/rubygems/specification_policy.rb +++ b/lib/rubygems/specification_policy.rb @@ -1,7 +1,6 @@ require 'rubygems/user_interaction' class Gem::SpecificationPolicy - include Gem::UserInteraction VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/.freeze # :nodoc: @@ -483,5 +482,4 @@ You have specified rake based extension, but rake is not added as dependency. It def help_text # :nodoc: "See https://guides.rubygems.org/specification-reference/ for help" end - end diff --git a/lib/rubygems/stub_specification.rb b/lib/rubygems/stub_specification.rb index 959030fd54..5d4d761953 100644 --- a/lib/rubygems/stub_specification.rb +++ b/lib/rubygems/stub_specification.rb @@ -5,7 +5,6 @@ # information. class Gem::StubSpecification < Gem::BasicSpecification - # :nodoc: PREFIX = "# stub: ".freeze @@ -13,7 +12,6 @@ class Gem::StubSpecification < Gem::BasicSpecification OPEN_MODE = 'r:UTF-8:-'.freeze class StubLine # :nodoc: all - attr_reader :name, :version, :platform, :require_paths, :extensions, :full_name @@ -56,7 +54,6 @@ class Gem::StubSpecification < Gem::BasicSpecification REQUIRE_PATHS[x] || x end end - end def self.default_gemspec_stub(filename, base_dir, gems_dir) @@ -212,5 +209,4 @@ class Gem::StubSpecification < Gem::BasicSpecification def stubbed? data.is_a? StubLine end - end diff --git a/lib/rubygems/syck_hack.rb b/lib/rubygems/syck_hack.rb index 0d87c71df4..051483eac8 100644 --- a/lib/rubygems/syck_hack.rb +++ b/lib/rubygems/syck_hack.rb @@ -40,13 +40,11 @@ module YAML # :nodoc: # should. module Syck class DefaultKey - remove_method :to_s rescue nil def to_s '=' end - end end diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 87a0d6ed76..5c576bbfad 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -83,7 +83,6 @@ end require "rubygems/command" class Gem::Command - ## # Allows resetting the hash of specific args per command. This method is # available when requiring 'rubygems/test_case' @@ -91,7 +90,6 @@ class Gem::Command def self.specific_extra_args_hash=(value) @specific_extra_args_hash = value end - end ## @@ -101,7 +99,6 @@ end # your normal set of gems is not affected. class Gem::TestCase < Minitest::Test - extend Gem::Deprecate attr_accessor :fetcher # :nodoc: @@ -1272,11 +1269,11 @@ Also, a list: end class << self - # :nodoc: ## # Return the join path, with escaping backticks, dollars, and # double-quotes. Unlike `shellescape`, equal-sign is not escaped. + private def escape_path(*path) @@ -1287,7 +1284,6 @@ Also, a list: "\"#{path.gsub(/[`$"]/, '\\&')}\"" end end - end @@good_rake = "#{rubybin} #{escape_path(TEST_PATH, 'good_rake.rb')}" @@ -1405,7 +1401,6 @@ Also, a list: # It is available by requiring Gem::TestCase. class StaticSet < Gem::Resolver::Set - ## # A StaticSet ignores remote because it has a fixed set of gems. @@ -1460,7 +1455,6 @@ Also, a list: def prefetch(reqs) # :nodoc: end - end ## @@ -1528,7 +1522,6 @@ Also, a list: PUBLIC_KEY = nil PUBLIC_CERT = nil end if defined?(OpenSSL::SSL) - end require 'rubygems/test_utilities' diff --git a/lib/rubygems/test_utilities.rb b/lib/rubygems/test_utilities.rb index 81b34f3abc..a41b2246ca 100644 --- a/lib/rubygems/test_utilities.rb +++ b/lib/rubygems/test_utilities.rb @@ -29,7 +29,6 @@ require 'rubygems/remote_fetcher' # See RubyGems' tests for more examples of FakeFetcher. class Gem::FakeFetcher - attr_reader :data attr_reader :last_request attr_accessor :paths @@ -162,16 +161,13 @@ class Gem::FakeFetcher download spec, source.uri.to_s end - end # :stopdoc: class Gem::RemoteFetcher - def self.fetcher=(fetcher) @fetcher = fetcher end - end # :startdoc: @@ -191,7 +187,6 @@ end # After the gems are created they are removed from Gem.dir. class Gem::TestCase::SpecFetcherSetup - ## # Executes a SpecFetcher setup block. Yields an instance then creates the # gems and specifications defined in the instance. @@ -346,7 +341,6 @@ class Gem::TestCase::SpecFetcherSetup io.write spec.to_ruby_for_cache end end - end ## @@ -358,7 +352,6 @@ end # This class was added to flush out problems in Rubinius' IO implementation. class TempIO < Tempfile - ## # Creates a new TempIO that will be initialized to contain +string+. @@ -376,5 +369,4 @@ class TempIO < Tempfile flush Gem.read_binary path end - end diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb index 2552fc715d..51ac3494f3 100644 --- a/lib/rubygems/uninstaller.rb +++ b/lib/rubygems/uninstaller.rb @@ -21,7 +21,6 @@ require 'rubygems/user_interaction' # file. See Gem.pre_uninstall and Gem.post_uninstall for details. class Gem::Uninstaller - include Gem::UserInteraction include Gem::InstallerUninstallerUtils @@ -374,5 +373,4 @@ class Gem::Uninstaller raise e end - end diff --git a/lib/rubygems/uri_formatter.rb b/lib/rubygems/uri_formatter.rb index f3d510470b..ab5cc78e67 100644 --- a/lib/rubygems/uri_formatter.rb +++ b/lib/rubygems/uri_formatter.rb @@ -9,7 +9,6 @@ require 'cgi' # p uf.normalize #=> 'http://example.com' class Gem::UriFormatter - ## # The URI to be formatted. @@ -44,5 +43,4 @@ class Gem::UriFormatter return unless @uri CGI.unescape @uri end - end diff --git a/lib/rubygems/uri_parser.rb b/lib/rubygems/uri_parser.rb index 5c7cabc436..f350edec8c 100644 --- a/lib/rubygems/uri_parser.rb +++ b/lib/rubygems/uri_parser.rb @@ -5,7 +5,6 @@ # class Gem::UriParser - ## # Parses the #uri, raising if it's invalid @@ -32,5 +31,4 @@ class Gem::UriParser rescue URI::InvalidURIError uri end - end diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb index 616659ea9e..a5ebaf61e4 100644 --- a/lib/rubygems/user_interaction.rb +++ b/lib/rubygems/user_interaction.rb @@ -173,7 +173,6 @@ end # Gem::StreamUI implements a simple stream based user interface. class Gem::StreamUI - extend Gem::Deprecate ## @@ -388,7 +387,6 @@ class Gem::StreamUI # An absolutely silent progress reporter. class SilentProgressReporter - ## # The count of items is never updated for the silent progress reporter. @@ -413,14 +411,12 @@ class Gem::StreamUI def done end - end ## # A basic dotted progress reporter. class SimpleProgressReporter - include Gem::DefaultUserInteraction ## @@ -458,14 +454,12 @@ class Gem::StreamUI def done @out.puts "\n#{@terminal_message}" end - end ## # A progress reporter that prints out messages about the current progress. class VerboseProgressReporter - include Gem::DefaultUserInteraction ## @@ -502,7 +496,6 @@ class Gem::StreamUI def done @out.puts @terminal_message end - end ## @@ -520,7 +513,6 @@ class Gem::StreamUI # An absolutely silent download reporter. class SilentDownloadReporter - ## # The silent download reporter ignores all arguments @@ -546,14 +538,12 @@ class Gem::StreamUI def done end - end ## # A progress reporter that behaves nicely with threaded downloading. class ThreadedDownloadReporter - MUTEX = Mutex.new ## @@ -602,9 +592,7 @@ class Gem::StreamUI @out.puts message end end - end - end ## @@ -612,7 +600,6 @@ end # STDOUT, and STDERR. class Gem::ConsoleUI < Gem::StreamUI - ## # The Console UI has no arguments as it defaults to reading input from # stdin, output to stdout and warnings or errors to stderr. @@ -620,14 +607,12 @@ class Gem::ConsoleUI < Gem::StreamUI def initialize super STDIN, STDOUT, STDERR, true end - end ## # SilentUI is a UI choice that is absolutely silent. class Gem::SilentUI < Gem::StreamUI - ## # The SilentUI has no arguments as it does not use any stream. @@ -653,5 +638,4 @@ class Gem::SilentUI < Gem::StreamUI def progress_reporter(*args) # :nodoc: SilentProgressReporter.new(@outs, *args) end - end diff --git a/lib/rubygems/util.rb b/lib/rubygems/util.rb index 814a4075fd..2a55305172 100644 --- a/lib/rubygems/util.rb +++ b/lib/rubygems/util.rb @@ -71,11 +71,9 @@ module Gem::Util end class << self - extend Gem::Deprecate rubygems_deprecate :silent_system - end ## diff --git a/lib/rubygems/util/licenses.rb b/lib/rubygems/util/licenses.rb index 5b82667785..29bf310ea0 100644 --- a/lib/rubygems/util/licenses.rb +++ b/lib/rubygems/util/licenses.rb @@ -2,7 +2,6 @@ require 'rubygems/text' class Gem::Licenses - extend Gem::Text NONSTANDARD = 'Nonstandard'.freeze @@ -435,5 +434,4 @@ class Gem::Licenses return unless lowest < license.size by_distance[lowest] end - end diff --git a/lib/rubygems/util/list.rb b/lib/rubygems/util/list.rb index 7e4d6b5de6..33c40af4bb 100644 --- a/lib/rubygems/util/list.rb +++ b/lib/rubygems/util/list.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true module Gem class List - include Enumerable attr_accessor :value, :tail @@ -34,6 +33,5 @@ module Gem return List.new(value) unless list List.new value, list end - end end diff --git a/lib/rubygems/validator.rb b/lib/rubygems/validator.rb index b53dff7b12..30cdd93b5c 100644 --- a/lib/rubygems/validator.rb +++ b/lib/rubygems/validator.rb @@ -12,7 +12,6 @@ require 'rubygems/installer' # Validator performs various gem file and gem database validation class Gem::Validator - include Gem::UserInteraction def initialize # :nodoc: @@ -141,5 +140,4 @@ class Gem::Validator errors end - end diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb index 5c48a02afa..20bbff4fdd 100644 --- a/lib/rubygems/version.rb +++ b/lib/rubygems/version.rb @@ -150,7 +150,6 @@ # a zero to give a sensible result. class Gem::Version - autoload :Requirement, File.expand_path('requirement', __dir__) include Comparable @@ -404,5 +403,4 @@ class Gem::Version numeric_segments = string_segments.slice!(0, string_start || string_segments.size) return numeric_segments, string_segments end - end |