RubyGems - rubygems-update - Versions diffs - 2.7.11 → 3.0.9 - Mend

rubygems-update 2.7.11 → 3.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (359) hide show

checksums.yaml +4 -4
data/.rubocop.yml +67 -0
data/.travis.yml +24 -18
data/CODE_OF_CONDUCT.md +10 -8
data/CONTRIBUTING.md +148 -0
data/History.txt +458 -8
data/MAINTAINERS.txt +1 -0
data/Manifest.txt +16 -9
data/POLICIES.md +92 -0
data/README.md +53 -26
data/Rakefile +77 -211
data/{UPGRADING.rdoc → UPGRADING.md} +31 -32
data/appveyor.yml +20 -45
data/bin/gem +1 -2
data/bin/update_rubygems +2 -3
data/bundler/CHANGELOG.md +65 -0
data/bundler/bundler.gemspec +7 -1
data/bundler/lib/bundler/build_metadata.rb +1 -1
data/bundler/lib/bundler/cli/add.rb +15 -5
data/bundler/lib/bundler/cli/binstubs.rb +8 -2
data/bundler/lib/bundler/cli/doctor.rb +47 -1
data/bundler/lib/bundler/cli/install.rb +8 -5
data/bundler/lib/bundler/cli/list.rb +41 -5
data/bundler/lib/bundler/cli/outdated.rb +7 -1
data/bundler/lib/bundler/cli/pristine.rb +4 -0
data/bundler/lib/bundler/cli/remove.rb +18 -0
data/bundler/lib/bundler/cli.rb +63 -21
data/bundler/lib/bundler/definition.rb +15 -16
data/bundler/lib/bundler/dependency.rb +2 -2
data/bundler/lib/bundler/dsl.rb +19 -3
data/bundler/lib/bundler/feature_flag.rb +7 -0
data/bundler/lib/bundler/gem_version_promoter.rb +4 -2
data/bundler/lib/bundler/injector.rb +168 -9
data/bundler/lib/bundler/installer/parallel_installer.rb +5 -0
data/bundler/lib/bundler/installer.rb +29 -6
data/bundler/lib/bundler/plugin/events.rb +61 -0
data/bundler/lib/bundler/plugin.rb +10 -3
data/bundler/lib/bundler/resolver.rb +2 -2
data/bundler/lib/bundler/rubygems_gem_installer.rb +7 -0
data/bundler/lib/bundler/runtime.rb +8 -2
data/bundler/lib/bundler/settings/validator.rb +23 -0
data/bundler/lib/bundler/settings.rb +24 -3
data/bundler/lib/bundler/shared_helpers.rb +19 -3
data/bundler/lib/bundler/source/metadata.rb +2 -3
data/bundler/lib/bundler/source.rb +9 -9
data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +1 -0
data/bundler/lib/bundler/version.rb +1 -1
data/bundler/lib/bundler.rb +26 -8
data/bundler/man/bundle-add.ronn +13 -2
data/bundler/man/bundle-config.ronn +21 -0
data/bundler/man/bundle-install.ronn +1 -1
data/bundler/man/bundle-list.ronn +19 -1
data/bundler/man/bundle-outdated.ronn +4 -0
data/bundler/man/bundle-remove.ronn +23 -0
data/bundler/man/bundle-update.ronn +1 -1
data/bundler/man/bundle.ronn +3 -0
data/lib/rubygems/available_set.rb +1 -1
data/lib/rubygems/basic_specification.rb +12 -12
data/lib/rubygems/bundler_version_finder.rb +3 -3
data/lib/rubygems/command.rb +22 -15
data/lib/rubygems/command_manager.rb +22 -5
data/lib/rubygems/commands/build_command.rb +41 -7
data/lib/rubygems/commands/cert_command.rb +45 -24
data/lib/rubygems/commands/check_command.rb +1 -1
data/lib/rubygems/commands/cleanup_command.rb +14 -7
data/lib/rubygems/commands/contents_command.rb +14 -15
data/lib/rubygems/commands/dependency_command.rb +17 -17
data/lib/rubygems/commands/environment_command.rb +20 -1
data/lib/rubygems/commands/fetch_command.rb +2 -3
data/lib/rubygems/commands/generate_index_command.rb +2 -3
data/lib/rubygems/commands/help_command.rb +12 -13
data/lib/rubygems/commands/info_command.rb +33 -0
data/lib/rubygems/commands/install_command.rb +21 -17
data/lib/rubygems/commands/list_command.rb +0 -1
data/lib/rubygems/commands/lock_command.rb +3 -4
data/lib/rubygems/commands/open_command.rb +16 -10
data/lib/rubygems/commands/owner_command.rb +21 -7
data/lib/rubygems/commands/pristine_command.rb +23 -16
data/lib/rubygems/commands/push_command.rb +19 -8
data/lib/rubygems/commands/query_command.rb +24 -24
data/lib/rubygems/commands/rdoc_command.rb +3 -4
data/lib/rubygems/commands/search_command.rb +0 -1
data/lib/rubygems/commands/server_command.rb +1 -2
data/lib/rubygems/commands/setup_command.rb +86 -48
data/lib/rubygems/commands/signin_command.rb +2 -1
data/lib/rubygems/commands/signout_command.rb +2 -2
data/lib/rubygems/commands/sources_command.rb +11 -12
data/lib/rubygems/commands/specification_command.rb +7 -7
data/lib/rubygems/commands/uninstall_command.rb +50 -18
data/lib/rubygems/commands/unpack_command.rb +16 -7
data/lib/rubygems/commands/update_command.rb +28 -23
data/lib/rubygems/commands/which_command.rb +5 -8
data/lib/rubygems/commands/yank_command.rb +1 -2
data/lib/rubygems/compatibility.rb +1 -21
data/lib/rubygems/config_file.rb +36 -36
data/lib/rubygems/core_ext/kernel_require.rb +6 -6
data/lib/rubygems/core_ext/kernel_warn.rb +45 -0
data/lib/rubygems/defaults.rb +31 -19
data/lib/rubygems/dependency.rb +15 -15
data/lib/rubygems/dependency_installer.rb +30 -33
data/lib/rubygems/dependency_list.rb +9 -10
data/lib/rubygems/deprecate.rb +2 -3
data/lib/rubygems/doctor.rb +5 -6
data/lib/rubygems/errors.rb +3 -3
data/lib/rubygems/exceptions.rb +11 -8
data/lib/rubygems/ext/build_error.rb +0 -1
data/lib/rubygems/ext/builder.rb +50 -23
data/lib/rubygems/ext/cmake_builder.rb +2 -2
data/lib/rubygems/ext/configure_builder.rb +2 -3
data/lib/rubygems/ext/ext_conf_builder.rb +8 -7
data/lib/rubygems/ext/rake_builder.rb +16 -18
data/lib/rubygems/ext.rb +0 -1
data/lib/rubygems/gem_runner.rb +2 -2
data/lib/rubygems/gemcutter_utilities.rb +46 -12
data/lib/rubygems/indexer.rb +19 -12
data/lib/rubygems/install_default_message.rb +0 -1
data/lib/rubygems/install_message.rb +0 -1
data/lib/rubygems/install_update_options.rb +3 -29
data/lib/rubygems/installer.rb +97 -55
data/lib/rubygems/installer_test_case.rb +2 -16
data/lib/rubygems/local_remote_options.rb +5 -4
data/lib/rubygems/mock_gem_ui.rb +3 -4
data/lib/rubygems/name_tuple.rb +4 -4
data/lib/rubygems/package/digest_io.rb +3 -4
data/lib/rubygems/package/file_source.rb +3 -4
data/lib/rubygems/package/io_source.rb +1 -2
data/lib/rubygems/package/old.rb +8 -16
data/lib/rubygems/package/source.rb +0 -1
data/lib/rubygems/package/tar_header.rb +13 -4
data/lib/rubygems/package/tar_reader/entry.rb +20 -4
data/lib/rubygems/package/tar_reader.rb +2 -4
data/lib/rubygems/package/tar_test_case.rb +2 -8
data/lib/rubygems/package/tar_writer.rb +13 -15
data/lib/rubygems/package.rb +90 -63
data/lib/rubygems/package_task.rb +0 -1
data/lib/rubygems/path_support.rb +16 -6
data/lib/rubygems/platform.rb +4 -5
data/lib/rubygems/psych_tree.rb +1 -1
data/lib/rubygems/rdoc.rb +2 -313
data/lib/rubygems/remote_fetcher.rb +29 -82
data/lib/rubygems/request/connection_pools.rb +24 -13
data/lib/rubygems/request/http_pool.rb +3 -4
data/lib/rubygems/request/https_pool.rb +1 -3
data/lib/rubygems/request.rb +17 -16
data/lib/rubygems/request_set/gem_dependency_api.rb +46 -49
data/lib/rubygems/request_set/lockfile/parser.rb +18 -29
data/lib/rubygems/request_set/lockfile/tokenizer.rb +9 -9
data/lib/rubygems/request_set/lockfile.rb +12 -12
data/lib/rubygems/request_set.rb +52 -25
data/lib/rubygems/requirement.rb +32 -21
data/lib/rubygems/resolver/activation_request.rb +6 -6
data/lib/rubygems/resolver/api_set.rb +5 -6
data/lib/rubygems/resolver/api_specification.rb +2 -3
data/lib/rubygems/resolver/best_set.rb +5 -6
data/lib/rubygems/resolver/composed_set.rb +5 -6
data/lib/rubygems/resolver/conflict.rb +5 -5
data/lib/rubygems/resolver/current_set.rb +1 -2
data/lib/rubygems/resolver/dependency_request.rb +4 -4
data/lib/rubygems/resolver/git_set.rb +5 -6
data/lib/rubygems/resolver/git_specification.rb +4 -5
data/lib/rubygems/resolver/index_set.rb +5 -6
data/lib/rubygems/resolver/index_specification.rb +3 -4
data/lib/rubygems/resolver/installed_specification.rb +3 -4
data/lib/rubygems/resolver/installer_set.rb +12 -12
data/lib/rubygems/resolver/local_specification.rb +1 -2
data/lib/rubygems/resolver/lock_set.rb +5 -6
data/lib/rubygems/resolver/lock_specification.rb +7 -8
data/lib/rubygems/resolver/requirement_list.rb +1 -1
data/lib/rubygems/resolver/set.rb +2 -2
data/lib/rubygems/resolver/source_set.rb +4 -5
data/lib/rubygems/resolver/spec_specification.rb +1 -2
data/lib/rubygems/resolver/specification.rb +10 -7
data/lib/rubygems/resolver/stats.rb +1 -1
data/lib/rubygems/resolver/vendor_set.rb +4 -5
data/lib/rubygems/resolver/vendor_specification.rb +2 -3
data/lib/rubygems/resolver.rb +14 -16
data/lib/rubygems/s3_uri_signer.rb +183 -0
data/lib/rubygems/safe_yaml.rb +18 -10
data/lib/rubygems/security/policies.rb +1 -2
data/lib/rubygems/security/policy.rb +25 -25
data/lib/rubygems/security/signer.rb +72 -24
data/lib/rubygems/security/trust_dir.rb +10 -10
data/lib/rubygems/security.rb +21 -22
data/lib/rubygems/security_option.rb +0 -1
data/lib/rubygems/server.rb +21 -21
data/lib/rubygems/source/git.rb +9 -10
data/lib/rubygems/source/installed.rb +3 -4
data/lib/rubygems/source/local.rb +7 -7
data/lib/rubygems/source/lock.rb +4 -4
data/lib/rubygems/source/specific_file.rb +5 -5
data/lib/rubygems/source/vendor.rb +2 -3
data/lib/rubygems/source.rb +16 -25
data/lib/rubygems/source_list.rb +2 -2
data/lib/rubygems/source_local.rb +0 -1
data/lib/rubygems/spec_fetcher.rb +5 -6
data/lib/rubygems/specification.rb +219 -558
data/lib/rubygems/specification_policy.rb +407 -0
data/lib/rubygems/stub_specification.rb +12 -17
data/lib/rubygems/test_case.rb +161 -75
data/lib/rubygems/test_utilities.rb +20 -35
data/lib/rubygems/text.rb +6 -6
data/lib/rubygems/uninstaller.rb +38 -27
data/lib/rubygems/uri_formatter.rb +1 -2
data/lib/rubygems/user_interaction.rb +37 -89
data/lib/rubygems/util/licenses.rb +27 -1
data/lib/rubygems/util/list.rb +1 -1
data/lib/rubygems/util.rb +32 -14
data/lib/rubygems/validator.rb +4 -5
data/lib/rubygems/version.rb +15 -15
data/lib/rubygems/version_option.rb +2 -3
data/lib/rubygems.rb +71 -102
data/rubygems-update.gemspec +43 -0
data/setup.rb +2 -8
data/test/rubygems/ca_cert.pem +74 -65
data/test/rubygems/client.pem +103 -45
data/test/rubygems/rubygems_plugin.rb +0 -1
data/test/rubygems/simple_gem.rb +1 -1
data/test/rubygems/ssl_cert.pem +78 -17
data/test/rubygems/ssl_key.pem +25 -13
data/test/rubygems/test_bundled_ca.rb +1 -1
data/test/rubygems/test_config.rb +7 -2
data/test/rubygems/test_gem.rb +205 -132
data/test/rubygems/test_gem_bundler_version_finder.rb +4 -0
data/test/rubygems/test_gem_command.rb +0 -1
data/test/rubygems/test_gem_command_manager.rb +18 -3
data/test/rubygems/test_gem_commands_build_command.rb +220 -15
data/test/rubygems/test_gem_commands_cert_command.rb +69 -8
data/test/rubygems/test_gem_commands_check_command.rb +1 -1
data/test/rubygems/test_gem_commands_cleanup_command.rb +27 -1
data/test/rubygems/test_gem_commands_contents_command.rb +1 -2
data/test/rubygems/test_gem_commands_dependency_command.rb +33 -34
data/test/rubygems/test_gem_commands_environment_command.rb +1 -0
data/test/rubygems/test_gem_commands_fetch_command.rb +0 -1
data/test/rubygems/test_gem_commands_generate_index_command.rb +0 -1
data/test/rubygems/test_gem_commands_help_command.rb +7 -4
data/test/rubygems/test_gem_commands_info_command.rb +44 -0
data/test/rubygems/test_gem_commands_install_command.rb +79 -12
data/test/rubygems/test_gem_commands_lock_command.rb +0 -1
data/test/rubygems/test_gem_commands_open_command.rb +29 -0
data/test/rubygems/test_gem_commands_outdated_command.rb +0 -1
data/test/rubygems/test_gem_commands_owner_command.rb +93 -57
data/test/rubygems/test_gem_commands_pristine_command.rb +65 -30
data/test/rubygems/test_gem_commands_push_command.rb +54 -0
data/test/rubygems/test_gem_commands_query_command.rb +102 -100
data/test/rubygems/test_gem_commands_search_command.rb +0 -1
data/test/rubygems/test_gem_commands_server_command.rb +0 -1
data/test/rubygems/test_gem_commands_setup_command.rb +50 -15
data/test/rubygems/test_gem_commands_signin_command.rb +1 -1
data/test/rubygems/test_gem_commands_sources_command.rb +0 -1
data/test/rubygems/test_gem_commands_specification_command.rb +2 -3
data/test/rubygems/test_gem_commands_stale_command.rb +3 -2
data/test/rubygems/test_gem_commands_uninstall_command.rb +161 -8
data/test/rubygems/test_gem_commands_unpack_command.rb +17 -1
data/test/rubygems/test_gem_commands_update_command.rb +19 -2
data/test/rubygems/test_gem_commands_which_command.rb +0 -1
data/test/rubygems/test_gem_commands_yank_command.rb +0 -1
data/test/rubygems/test_gem_config_file.rb +4 -2
data/test/rubygems/test_gem_dependency.rb +0 -1
data/test/rubygems/test_gem_dependency_installer.rb +8 -5
data/test/rubygems/test_gem_dependency_list.rb +6 -7
data/test/rubygems/test_gem_dependency_resolution_error.rb +0 -1
data/test/rubygems/test_gem_doctor.rb +1 -2
data/test/rubygems/test_gem_ext_builder.rb +10 -23
data/test/rubygems/test_gem_ext_cmake_builder.rb +5 -4
data/test/rubygems/test_gem_ext_configure_builder.rb +3 -3
data/test/rubygems/test_gem_ext_ext_conf_builder.rb +8 -9
data/test/rubygems/test_gem_ext_rake_builder.rb +20 -5
data/test/rubygems/test_gem_gem_runner.rb +0 -1
data/test/rubygems/test_gem_gemcutter_utilities.rb +32 -6
data/test/rubygems/test_gem_impossible_dependencies_error.rb +0 -1
data/test/rubygems/test_gem_indexer.rb +16 -10
data/test/rubygems/test_gem_install_update_options.rb +1 -20
data/test/rubygems/test_gem_installer.rb +154 -119
data/test/rubygems/test_gem_local_remote_options.rb +3 -3
data/test/rubygems/test_gem_name_tuple.rb +0 -1
data/test/rubygems/test_gem_package.rb +77 -31
data/test/rubygems/test_gem_package_old.rb +0 -1
data/test/rubygems/test_gem_package_tar_header.rb +42 -2
data/test/rubygems/test_gem_package_tar_reader.rb +0 -1
data/test/rubygems/test_gem_package_tar_reader_entry.rb +11 -0
data/test/rubygems/test_gem_package_tar_writer.rb +43 -7
data/test/rubygems/test_gem_package_task.rb +2 -2
data/test/rubygems/test_gem_path_support.rb +28 -11
data/test/rubygems/test_gem_platform.rb +4 -5
data/test/rubygems/test_gem_rdoc.rb +1 -136
data/test/rubygems/test_gem_remote_fetcher.rb +241 -141
data/test/rubygems/test_gem_request.rb +9 -9
data/test/rubygems/test_gem_request_connection_pools.rb +24 -3
data/test/rubygems/test_gem_request_set.rb +5 -5
data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +82 -64
data/test/rubygems/test_gem_request_set_lockfile.rb +1 -2
data/test/rubygems/test_gem_request_set_lockfile_parser.rb +4 -9
data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +1 -1
data/test/rubygems/test_gem_requirement.rb +24 -4
data/test/rubygems/test_gem_resolver.rb +13 -17
data/test/rubygems/test_gem_resolver_activation_request.rb +0 -1
data/test/rubygems/test_gem_resolver_api_set.rb +0 -1
data/test/rubygems/test_gem_resolver_api_specification.rb +0 -1
data/test/rubygems/test_gem_resolver_best_set.rb +0 -1
data/test/rubygems/test_gem_resolver_composed_set.rb +0 -1
data/test/rubygems/test_gem_resolver_conflict.rb +0 -1
data/test/rubygems/test_gem_resolver_dependency_request.rb +0 -1
data/test/rubygems/test_gem_resolver_git_set.rb +0 -1
data/test/rubygems/test_gem_resolver_git_specification.rb +0 -1
data/test/rubygems/test_gem_resolver_index_set.rb +0 -1
data/test/rubygems/test_gem_resolver_index_specification.rb +0 -1
data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -1
data/test/rubygems/test_gem_resolver_installer_set.rb +2 -3
data/test/rubygems/test_gem_resolver_local_specification.rb +0 -1
data/test/rubygems/test_gem_resolver_lock_set.rb +0 -1
data/test/rubygems/test_gem_resolver_lock_specification.rb +0 -1
data/test/rubygems/test_gem_resolver_requirement_list.rb +0 -1
data/test/rubygems/test_gem_resolver_specification.rb +1 -2
data/test/rubygems/test_gem_resolver_vendor_set.rb +0 -1
data/test/rubygems/test_gem_resolver_vendor_specification.rb +0 -1
data/test/rubygems/test_gem_security.rb +1 -3
data/test/rubygems/test_gem_security_policy.rb +5 -6
data/test/rubygems/test_gem_security_signer.rb +4 -3
data/test/rubygems/test_gem_security_trust_dir.rb +1 -2
data/test/rubygems/test_gem_server.rb +4 -4
data/test/rubygems/test_gem_source.rb +0 -13
data/test/rubygems/test_gem_source_fetch_problem.rb +0 -1
data/test/rubygems/test_gem_source_git.rb +0 -1
data/test/rubygems/test_gem_source_installed.rb +0 -1
data/test/rubygems/test_gem_source_lock.rb +0 -1
data/test/rubygems/test_gem_source_vendor.rb +0 -1
data/test/rubygems/test_gem_spec_fetcher.rb +0 -1
data/test/rubygems/test_gem_specification.rb +366 -198
data/test/rubygems/test_gem_stream_ui.rb +15 -32
data/test/rubygems/test_gem_stub_specification.rb +0 -2
data/test/rubygems/test_gem_text.rb +4 -0
data/test/rubygems/test_gem_uninstaller.rb +42 -3
data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +0 -1
data/test/rubygems/test_gem_uri_formatter.rb +0 -1
data/test/rubygems/test_gem_util.rb +31 -11
data/test/rubygems/test_gem_validator.rb +0 -1
data/test/rubygems/test_gem_version.rb +11 -11
data/test/rubygems/test_gem_version_option.rb +0 -1
data/test/rubygems/test_remote_fetch_error.rb +0 -1
data/test/rubygems/test_require.rb +67 -52
data/util/CL2notes +1 -2
data/util/ci +20 -12
data/util/cops/deprecations.rb +52 -0
data/util/create_certs.rb +6 -7
data/util/create_certs.sh +27 -0
data/util/create_encrypted_key.rb +4 -5
data/util/patch_with_prs.rb +1 -1
data/util/rubocop +8 -0
data/util/update_bundled_ca_certificates.rb +12 -13
data/util/update_changelog.rb +1 -1
metadata +61 -51
data/.autotest +0 -71
data/.document +0 -5
data/CONTRIBUTING.rdoc +0 -130
data/CVE-2013-4287.txt +0 -35
data/CVE-2013-4363.txt +0 -45
data/CVE-2015-3900.txt +0 -40
data/POLICIES.rdoc +0 -74
data/test/rubygems/fix_openssl_warnings.rb +0 -13

data/lib/rubygems/server.rb CHANGED Viewed

@@ -35,7 +35,7 @@ class Gem::Server
   include ERB::Util
   include Gem::UserInteraction
-  SEARCH = <<-ERB
+  SEARCH = <<-ERB.freeze
       <form class="headerSearch" name="headerSearchForm" method="get" action="/rdoc">
         <div id="search" style="float:right">
           <label for="q">Filter/Search</label>
@@ -45,7 +45,7 @@ class Gem::Server
       </form>
   ERB
-  DOC_TEMPLATE = <<-'ERB'
+  DOC_TEMPLATE = <<-'ERB'.freeze
   <?xml version="1.0" encoding="iso-8859-1"?>
   <!DOCTYPE html
        PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -129,7 +129,7 @@ class Gem::Server
   ERB
   # CSS is copy & paste from rdoc-style.css, RDoc V1.0.1 - 20041108
-  RDOC_CSS = <<-CSS
+  RDOC_CSS = <<-CSS.freeze
 body {
     font-family: Verdana,Arial,Helvetica,sans-serif;
     font-size:   90%;
@@ -339,7 +339,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 .ruby-value   { color: #7fffd4; background: transparent; }
   CSS
-  RDOC_NO_DOCUMENTATION = <<-'ERB'
+  RDOC_NO_DOCUMENTATION = <<-'ERB'.freeze
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -373,7 +373,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 </html>
   ERB
-  RDOC_SEARCH_TEMPLATE = <<-'ERB'
+  RDOC_SEARCH_TEMPLATE = <<-'ERB'.freeze
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -450,7 +450,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     @have_rdoc_4_plus = nil
   end
-  def add_date res
+  def add_date(res)
     res['date'] = @spec_dirs.map do |spec_dir|
       File.stat(spec_dir).mtime
     end.max
@@ -462,8 +462,8 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     end
   end
-  def doc_root gem_name
-    if have_rdoc_4_plus? then
+  def doc_root(gem_name)
+    if have_rdoc_4_plus?
       "/doc_root/#{u gem_name}/"
     else
       "/doc_root/#{u gem_name}/rdoc/index.html"
@@ -491,14 +491,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     specs = Marshal.dump specs
-    if req.path =~ /\.gz$/ then
+    if req.path =~ /\.gz$/
       specs = Gem::Util.gzip specs
       res['content-type'] = 'application/x-gzip'
     else
       res['content-type'] = 'application/octet-stream'
     end
-    if req.request_method == 'HEAD' then
+    if req.request_method == 'HEAD'
       res['content-length'] = specs.length
     else
       res.body << specs
@@ -509,7 +509,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   # Creates server sockets based on the addresses option.  If no addresses
   # were given a server socket for all interfaces is created.
-  def listen addresses = @addresses
+  def listen(addresses = @addresses)
     addresses = [nil] unless addresses
     listeners = 0
@@ -529,14 +529,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       end
     end
-    if @server.listeners.empty? then
+    if @server.listeners.empty?
       say "Unable to start a server."
       say "Check for running servers or your --bind and --port arguments"
       terminate_interaction 1
     end
   end
-  def prerelease_specs req, res
+  def prerelease_specs(req, res)
     reset_gems
     res['content-type'] = 'application/x-gzip'
@@ -552,14 +552,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     specs = Marshal.dump specs
-    if req.path =~ /\.gz$/ then
+    if req.path =~ /\.gz$/
       specs = Gem::Util.gzip specs
       res['content-type'] = 'application/x-gzip'
     else
       res['content-type'] = 'application/octet-stream'
     end
-    if req.request_method == 'HEAD' then
+    if req.request_method == 'HEAD'
       res['content-length'] = specs.length
     else
       res.body << specs
@@ -579,13 +579,13 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       selector = full_name.inspect
-      if specs.empty? then
+      if specs.empty?
         res.status = 404
         res.body = "No gems found matching #{selector}"
-      elsif specs.length > 1 then
+      elsif specs.length > 1
         res.status = 500
         res.body = "Multiple gems found matching #{selector}"
-      elsif marshal_format then
+      elsif marshal_format
         res['content-type'] = 'application/x-deflate'
         res.body << Gem.deflate(Marshal.dump(specs.first))
       end
@@ -818,7 +818,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       '/gems' => '/cache/',
     }
-    if have_rdoc_4_plus? then
+    if have_rdoc_4_plus?
       @server.mount '/doc_root', RDoc::Servlet, '/doc_root'
     else
       file_handlers['/doc_root'] = '/doc/'
@@ -851,14 +851,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     specs = Marshal.dump specs
-    if req.path =~ /\.gz$/ then
+    if req.path =~ /\.gz$/
       specs = Gem::Util.gzip specs
       res['content-type'] = 'application/x-gzip'
     else
       res['content-type'] = 'application/octet-stream'
     end
-    if req.request_method == 'HEAD' then
+    if req.request_method == 'HEAD'
       res['content-length'] = specs.length
     else
       res.body << specs

data/lib/rubygems/source/git.rb CHANGED Viewed

@@ -50,7 +50,7 @@ class Gem::Source::Git < Gem::Source
   # repository may contain multiple gems.  If +submodules+ is true, submodules
   # will be checked out when the gem is installed.
-  def initialize name, repository, reference, submodules = false
+  def initialize(name, repository, reference, submodules = false)
     super repository
     @name            = name
@@ -63,7 +63,7 @@ class Gem::Source::Git < Gem::Source
     @git      = ENV['git'] || 'git'
   end
-  def <=> other
+  def <=>(other)
     case other
     when Gem::Source::Git then
       0
@@ -77,7 +77,7 @@ class Gem::Source::Git < Gem::Source
     end
   end
-  def == other # :nodoc:
+  def ==(other) # :nodoc:
     super and
       @name            == other.name and
       @repository      == other.repository and
@@ -93,7 +93,7 @@ class Gem::Source::Git < Gem::Source
     return false unless File.exist? repo_cache_dir
-    unless File.exist? install_dir then
+    unless File.exist? install_dir
       system @git, 'clone', '--quiet', '--no-checkout',
              repo_cache_dir, install_dir
     end
@@ -117,7 +117,7 @@ class Gem::Source::Git < Gem::Source
   def cache # :nodoc:
     return unless @remote
-    if File.exist? repo_cache_dir then
+    if File.exist? repo_cache_dir
       Dir.chdir repo_cache_dir do
         system @git, 'fetch', '--quiet', '--force', '--tags',
                @repository, 'refs/heads/*:refs/heads/*'
@@ -145,7 +145,7 @@ class Gem::Source::Git < Gem::Source
   ##
   # Nothing to download for git gems
-  def download full_spec, path # :nodoc:
+  def download(full_spec, path) # :nodoc:
   end
   ##
@@ -157,7 +157,7 @@ class Gem::Source::Git < Gem::Source
     File.join base_dir, 'gems', "#{@name}-#{dir_shortref}"
   end
-  def pretty_print q # :nodoc:
+  def pretty_print(q) # :nodoc:
     q.group 2, '[Git: ', ']' do
       q.breakable
       q.text @repository
@@ -206,7 +206,7 @@ class Gem::Source::Git < Gem::Source
         Dir.chdir directory do
           spec = Gem::Specification.load file
-          if spec then
+          if spec
             spec.base_dir = base_dir
             spec.extension_dir =
@@ -228,7 +228,7 @@ class Gem::Source::Git < Gem::Source
     require 'digest' # required here to avoid deadlocking in Gem.activate_bin_path (because digest is a gem on 2.5+)
     normalized =
-      if @repository =~ %r%^\w+://(\w+@)?% then
+      if @repository =~ %r%^\w+://(\w+@)?%
         uri = URI(@repository).normalize.to_s.sub %r%/$%,''
         uri.sub(/\A(\w+)/) { $1.downcase }
       else
@@ -239,4 +239,3 @@ class Gem::Source::Git < Gem::Source
   end
 end

data/lib/rubygems/source/installed.rb CHANGED Viewed

@@ -11,7 +11,7 @@ class Gem::Source::Installed < Gem::Source
   ##
   # Installed sources sort before all other sources
-  def <=> other
+  def <=>(other)
     case other
     when Gem::Source::Git,
          Gem::Source::Lock,
@@ -29,13 +29,12 @@ class Gem::Source::Installed < Gem::Source
   ##
   # We don't need to download an installed gem
-  def download spec, path
+  def download(spec, path)
     nil
   end
-  def pretty_print q # :nodoc:
+  def pretty_print(q) # :nodoc:
     q.text '[Installed]'
   end
 end

data/lib/rubygems/source/local.rb CHANGED Viewed

@@ -15,7 +15,7 @@ class Gem::Source::Local < Gem::Source
   ##
   # Local sorts before Gem::Source and after Gem::Source::Installed
-  def <=> other
+  def <=>(other)
     case other
     when Gem::Source::Installed,
          Gem::Source::Lock then
@@ -34,7 +34,7 @@ class Gem::Source::Local < Gem::Source
     "#<%s specs: %p>" % [self.class, keys]
   end
-  def load_specs type # :nodoc:
+  def load_specs(type) # :nodoc:
     @load_specs_names[type] ||= begin
       names = []
@@ -78,8 +78,8 @@ class Gem::Source::Local < Gem::Source
     end
   end
-  def find_gem gem_name, version = Gem::Requirement.default, # :nodoc:
-               prerelease = false
+  def find_gem(gem_name, version = Gem::Requirement.default, # :nodoc:
+               prerelease = false)
     load_specs :complete
     found = []
@@ -101,7 +101,7 @@ class Gem::Source::Local < Gem::Source
     found.max_by { |s| s.version }
   end
-  def fetch_spec name # :nodoc:
+  def fetch_spec(name) # :nodoc:
     load_specs :complete
     if data = @specs[name]
@@ -111,7 +111,7 @@ class Gem::Source::Local < Gem::Source
     end
   end
-  def download spec, cache_dir = nil # :nodoc:
+  def download(spec, cache_dir = nil) # :nodoc:
     load_specs :complete
     @specs.each do |name, data|
@@ -121,7 +121,7 @@ class Gem::Source::Local < Gem::Source
     raise Gem::Exception, "Unable to find file for '#{spec.full_name}'"
   end
-  def pretty_print q # :nodoc:
+  def pretty_print(q) # :nodoc:
     q.group 2, '[Local gems:', ']' do
       q.breakable
       q.seplist @specs.keys do |v|

data/lib/rubygems/source/lock.rb CHANGED Viewed

@@ -15,11 +15,11 @@ class Gem::Source::Lock < Gem::Source
   # Creates a new Lock source that wraps +source+ and moves it earlier in the
   # sort list.
-  def initialize source
+  def initialize(source)
     @wrapped = source
   end
-  def <=> other # :nodoc:
+  def <=>(other) # :nodoc:
     case other
     when Gem::Source::Lock then
       @wrapped <=> other.wrapped
@@ -30,7 +30,7 @@ class Gem::Source::Lock < Gem::Source
     end
   end
-  def == other # :nodoc:
+  def ==(other) # :nodoc:
     0 == (self <=> other)
   end
@@ -41,7 +41,7 @@ class Gem::Source::Lock < Gem::Source
   ##
   # Delegates to the wrapped source's fetch_spec method.
-  def fetch_spec name_tuple
+  def fetch_spec(name_tuple)
     @wrapped.fetch_spec name_tuple
   end

data/lib/rubygems/source/specific_file.rb CHANGED Viewed

@@ -27,22 +27,22 @@ class Gem::Source::SpecificFile < Gem::Source
   attr_reader :spec
-  def load_specs *a # :nodoc:
+  def load_specs(*a) # :nodoc:
     [@name]
   end
-  def fetch_spec name # :nodoc:
+  def fetch_spec(name) # :nodoc:
     return @spec if name == @name
     raise Gem::Exception, "Unable to find '#{name}'"
     @spec
   end
-  def download spec, dir = nil # :nodoc:
+  def download(spec, dir = nil) # :nodoc:
     return @path if spec == @spec
     raise Gem::Exception, "Unable to download '#{spec.full_name}'"
   end
-  def pretty_print q # :nodoc:
+  def pretty_print(q) # :nodoc:
     q.group 2, '[SpecificFile:', ']' do
       q.breakable
       q.text @path
@@ -59,7 +59,7 @@ class Gem::Source::SpecificFile < Gem::Source
   #
   # Otherwise Gem::Source#<=> is used.
-  def <=> other
+  def <=>(other)
     case other
     when Gem::Source::SpecificFile then
       return nil if @spec.name != other.spec.name

data/lib/rubygems/source/vendor.rb CHANGED Viewed

@@ -7,11 +7,11 @@ class Gem::Source::Vendor < Gem::Source::Installed
   ##
   # Creates a new Vendor source for a gem that was unpacked at +path+.
-  def initialize path
+  def initialize(path)
     @uri = path
   end
-  def <=> other
+  def <=>(other)
     case other
     when Gem::Source::Lock then
       -1
@@ -25,4 +25,3 @@ class Gem::Source::Vendor < Gem::Source::Installed
   end
 end

data/lib/rubygems/source.rb CHANGED Viewed

@@ -16,7 +16,7 @@ class Gem::Source
     :released   => 'specs',
     :latest     => 'latest_specs',
     :prerelease => 'prerelease_specs',
-  }
+  }.freeze
   ##
   # The URI this source will fetch gems from.
@@ -36,15 +36,6 @@ class Gem::Source
     end
     @uri = uri
-    @api_uri = nil
-  end
-  ##
-  # Use an SRV record on the host to look up the true endpoint for the index.
-  def api_uri # :nodoc:
-    require 'rubygems/remote_fetcher'
-    @api_uri ||= Gem::RemoteFetcher.fetcher.api_endpoint uri
   end
   ##
@@ -77,7 +68,7 @@ class Gem::Source
     end
   end
-  def == other # :nodoc:
+  def ==(other) # :nodoc:
     self.class === other and @uri == other.uri
   end
@@ -87,9 +78,9 @@ class Gem::Source
   # Returns a Set that can fetch specifications from this source.
   def dependency_resolver_set # :nodoc:
-    return Gem::Resolver::IndexSet.new self if 'file' == api_uri.scheme
+    return Gem::Resolver::IndexSet.new self if 'file' == uri.scheme
-    bundler_api_uri = api_uri + './api/v1/dependencies'
+    bundler_api_uri = uri + './api/v1/dependencies'
     begin
       fetcher = Gem::RemoteFetcher.fetcher
@@ -97,7 +88,7 @@ class Gem::Source
     rescue Gem::RemoteFetcher::FetchError
       Gem::Resolver::IndexSet.new self
     else
-      if response.respond_to? :uri then
+      if response.respond_to? :uri
         Gem::Resolver::APISet.new response.uri
       else
         Gem::Resolver::APISet.new bundler_api_uri
@@ -135,29 +126,29 @@ class Gem::Source
   ##
   # Fetches a specification for the given +name_tuple+.
-  def fetch_spec name_tuple
+  def fetch_spec(name_tuple)
     fetcher = Gem::RemoteFetcher.fetcher
     spec_file_name = name_tuple.spec_name
-    uri = api_uri + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
+    source_uri = uri + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
-    cache_dir = cache_dir uri
+    cache_dir = cache_dir source_uri
     local_spec = File.join cache_dir, spec_file_name
-    if File.exist? local_spec then
+    if File.exist? local_spec
       spec = Gem.read_binary local_spec
       spec = Marshal.load(spec) rescue nil
       return spec if spec
     end
-    uri.path << '.rz'
+    source_uri.path << '.rz'
-    spec = fetcher.fetch_path uri
+    spec = fetcher.fetch_path source_uri
     spec = Gem::Util.inflate spec
-    if update_cache? then
+    if update_cache?
       FileUtils.mkdir_p cache_dir
       File.open local_spec, 'wb' do |io|
@@ -184,7 +175,7 @@ class Gem::Source
     file       = FILES[type]
     fetcher    = Gem::RemoteFetcher.fetcher
     file_name  = "#{file}.#{Gem.marshal_version}"
-    spec_path  = api_uri + "#{file_name}.gz"
+    spec_path  = uri + "#{file_name}.gz"
     cache_dir  = cache_dir spec_path
     local_file = File.join(cache_dir, file_name)
     retried    = false
@@ -212,15 +203,15 @@ class Gem::Source
   def download(spec, dir=Dir.pwd)
     fetcher = Gem::RemoteFetcher.fetcher
-    fetcher.download spec, api_uri.to_s, dir
+    fetcher.download spec, uri.to_s, dir
   end
-  def pretty_print q # :nodoc:
+  def pretty_print(q) # :nodoc:
     q.group 2, '[Remote:', ']' do
       q.breakable
       q.text @uri.to_s
-      if api = api_uri
+      if api = uri
         q.breakable
         q.text 'API URI: '
         q.text api.to_s

data/lib/rubygems/source_list.rb CHANGED Viewed

@@ -105,7 +105,7 @@ class Gem::SourceList
     @sources.empty?
   end
-  def == other # :nodoc:
+  def ==(other) # :nodoc:
     to_a == other
   end
@@ -140,7 +140,7 @@ class Gem::SourceList
   ##
   # Deletes +source+ from the source list which may be a Gem::Source or a URI.
-  def delete source
+  def delete(source)
     if source.kind_of? Gem::Source
       @sources.delete source
     else

data/lib/rubygems/source_local.rb CHANGED Viewed

@@ -5,4 +5,3 @@ require 'rubygems/source_local'
 unless Gem::Deprecate.skip
   Kernel.warn "#{Gem.location_of_caller(3).join(':')}: Warning: Requiring rubygems/source_local is deprecated; please use rubygems/source/local instead."
 end

data/lib/rubygems/spec_fetcher.rb CHANGED Viewed

@@ -54,7 +54,7 @@ class Gem::SpecFetcher
   # If you need to retrieve specifications from a different +source+, you can
   # send it as an argument.
-  def initialize sources = nil
+  def initialize(sources = nil)
     @sources = sources || Gem.sources
     @update_cache =
@@ -202,10 +202,10 @@ class Gem::SpecFetcher
     }.compact
     matches = if matches.empty? && type != :prerelease
-      suggest_gems_from_name gem_name, :prerelease
-    else
-      matches.uniq.sort_by { |name, dist| dist }
-    end
+                suggest_gems_from_name gem_name, :prerelease
+              else
+                matches.uniq.sort_by { |name, dist| dist }
+              end
     matches.first(5).map { |name, dist| name }
   end
@@ -271,4 +271,3 @@ class Gem::SpecFetcher
   end
 end