rubygems-update 3.1.6 → 3.2.0.rc.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CODE_OF_CONDUCT.md +55 -19
- data/CONTRIBUTING.md +1 -2
- data/History.txt +122 -14
- data/Manifest.txt +13 -25
- data/POLICIES.md +2 -9
- data/README.md +1 -1
- data/Rakefile +31 -33
- data/bin/update_rubygems +1 -1
- data/bundler/CHANGELOG.md +806 -741
- data/bundler/README.md +6 -8
- data/bundler/UPGRADING.md +16 -30
- data/bundler/bundler.gemspec +3 -3
- data/bundler/exe/bundle +3 -0
- data/bundler/lib/bundler.rb +15 -4
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli.rb +32 -11
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/gem.rb +83 -10
- data/bundler/lib/bundler/cli/info.rb +13 -3
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +5 -14
- data/bundler/lib/bundler/cli/issue.rb +2 -2
- data/bundler/lib/bundler/cli/list.rb +11 -9
- data/bundler/lib/bundler/cli/outdated.rb +88 -65
- data/bundler/lib/bundler/cli/plugin.rb +10 -0
- data/bundler/lib/bundler/cli/pristine.rb +5 -0
- data/bundler/lib/bundler/definition.rb +32 -32
- data/bundler/lib/bundler/dependency.rb +0 -9
- data/bundler/lib/bundler/dsl.rb +1 -5
- data/bundler/lib/bundler/environment_preserver.rb +26 -2
- data/bundler/lib/bundler/errors.rb +1 -0
- data/bundler/lib/bundler/feature_flag.rb +0 -2
- data/bundler/lib/bundler/fetcher.rb +1 -0
- data/bundler/lib/bundler/friendly_errors.rb +4 -10
- data/bundler/lib/bundler/gem_helper.rb +17 -10
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/injector.rb +14 -3
- data/bundler/lib/bundler/inline.rb +1 -1
- data/bundler/lib/bundler/installer.rb +29 -28
- data/bundler/lib/bundler/installer/gem_installer.rb +2 -2
- data/bundler/lib/bundler/installer/parallel_installer.rb +9 -9
- data/bundler/lib/bundler/lazy_specification.rb +16 -3
- data/bundler/lib/bundler/plugin.rb +26 -0
- data/bundler/lib/bundler/plugin/index.rb +9 -0
- data/bundler/lib/bundler/psyched_yaml.rb +0 -15
- data/bundler/lib/bundler/remote_specification.rb +4 -1
- data/bundler/lib/bundler/resolver.rb +31 -8
- data/bundler/lib/bundler/resolver/spec_group.rb +26 -5
- data/bundler/lib/bundler/rubygems_ext.rb +7 -8
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -7
- data/bundler/lib/bundler/rubygems_integration.rb +3 -48
- data/bundler/lib/bundler/runtime.rb +2 -12
- data/bundler/lib/bundler/settings.rb +0 -3
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/source/git.rb +4 -4
- data/bundler/lib/bundler/source/git/git_proxy.rb +53 -58
- data/bundler/lib/bundler/source/path.rb +5 -1
- data/bundler/lib/bundler/source/path/installer.rb +7 -9
- data/bundler/lib/bundler/source/rubygems.rb +11 -14
- data/bundler/lib/bundler/stub_specification.rb +16 -4
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +9 -1
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +19 -5
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +18 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -4
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +75 -189
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +0 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/man/bundle-add.1 +1 -1
- data/bundler/man/bundle-add.1.txt +15 -15
- data/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/man/bundle-binstubs.1.txt +10 -10
- data/bundler/man/bundle-cache.1 +1 -1
- data/bundler/man/bundle-cache.1.txt +15 -15
- data/bundler/man/bundle-check.1 +1 -1
- data/bundler/man/bundle-check.1.txt +8 -8
- data/bundler/man/bundle-clean.1 +1 -1
- data/bundler/man/bundle-clean.1.txt +6 -6
- data/bundler/man/bundle-config.1 +3 -9
- data/bundler/man/bundle-config.1.txt +271 -272
- data/bundler/man/bundle-config.ronn +5 -9
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-doctor.1.txt +9 -9
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-exec.1.txt +84 -81
- data/bundler/man/bundle-gem.1 +25 -3
- data/bundler/man/bundle-gem.1.txt +65 -39
- data/bundler/man/bundle-gem.ronn +30 -7
- data/bundler/man/bundle-info.1 +1 -1
- data/bundler/man/bundle-info.1.txt +2 -2
- data/bundler/man/bundle-init.1 +1 -1
- data/bundler/man/bundle-init.1.txt +9 -9
- data/bundler/man/bundle-inject.1 +1 -1
- data/bundler/man/bundle-inject.1.txt +4 -4
- data/bundler/man/bundle-install.1 +1 -1
- data/bundler/man/bundle-install.1.txt +169 -169
- data/bundler/man/bundle-list.1 +7 -7
- data/bundler/man/bundle-list.1.txt +12 -11
- data/bundler/man/bundle-list.ronn +6 -6
- data/bundler/man/bundle-lock.1 +1 -1
- data/bundler/man/bundle-lock.1.txt +28 -28
- data/bundler/man/bundle-open.1 +1 -1
- data/bundler/man/bundle-open.1.txt +3 -3
- data/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/man/bundle-outdated.1.txt +34 -34
- data/bundler/man/bundle-platform.1 +1 -1
- data/bundler/man/bundle-platform.1.txt +16 -16
- data/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/man/bundle-pristine.1.txt +8 -8
- data/bundler/man/bundle-remove.1 +1 -1
- data/bundler/man/bundle-remove.1.txt +9 -9
- data/bundler/man/bundle-show.1 +1 -1
- data/bundler/man/bundle-show.1.txt +8 -8
- data/bundler/man/bundle-update.1 +1 -1
- data/bundler/man/bundle-update.1.txt +149 -148
- data/bundler/man/bundle-viz.1 +1 -1
- data/bundler/man/bundle-viz.1.txt +11 -11
- data/bundler/man/bundle.1 +1 -1
- data/bundler/man/bundle.1.txt +31 -31
- data/bundler/man/gemfile.5 +1 -1
- data/bundler/man/gemfile.5.txt +218 -216
- data/lib/rubygems.rb +68 -148
- data/lib/rubygems/available_set.rb +4 -4
- data/lib/rubygems/basic_specification.rb +11 -5
- data/lib/rubygems/bundler_version_finder.rb +14 -9
- data/lib/rubygems/command.rb +16 -14
- data/lib/rubygems/command_manager.rb +4 -3
- data/lib/rubygems/commands/cert_command.rb +1 -1
- data/lib/rubygems/commands/cleanup_command.rb +3 -3
- data/lib/rubygems/commands/contents_command.rb +4 -4
- data/lib/rubygems/commands/dependency_command.rb +6 -6
- data/lib/rubygems/commands/fetch_command.rb +2 -2
- data/lib/rubygems/commands/help_command.rb +1 -1
- data/lib/rubygems/commands/info_command.rb +9 -4
- data/lib/rubygems/commands/install_command.rb +3 -3
- data/lib/rubygems/commands/list_command.rb +9 -6
- data/lib/rubygems/commands/lock_command.rb +1 -1
- data/lib/rubygems/commands/open_command.rb +0 -2
- data/lib/rubygems/commands/pristine_command.rb +10 -2
- data/lib/rubygems/commands/push_command.rb +4 -42
- data/lib/rubygems/commands/query_command.rb +7 -352
- data/lib/rubygems/commands/search_command.rb +8 -6
- data/lib/rubygems/commands/setup_command.rb +128 -32
- data/lib/rubygems/commands/specification_command.rb +2 -2
- data/lib/rubygems/commands/stale_command.rb +1 -1
- data/lib/rubygems/commands/uninstall_command.rb +1 -1
- data/lib/rubygems/commands/unpack_command.rb +1 -1
- data/lib/rubygems/commands/update_command.rb +40 -10
- data/lib/rubygems/config_file.rb +11 -2
- data/lib/rubygems/core_ext/kernel_require.rb +2 -2
- data/lib/rubygems/defaults.rb +99 -5
- data/lib/rubygems/dependency.rb +2 -5
- data/lib/rubygems/dependency_installer.rb +1 -73
- data/lib/rubygems/dependency_list.rb +7 -7
- data/lib/rubygems/deprecate.rb +46 -1
- data/lib/rubygems/doctor.rb +4 -2
- data/lib/rubygems/errors.rb +3 -2
- data/lib/rubygems/exceptions.rb +2 -13
- data/lib/rubygems/ext.rb +6 -6
- data/lib/rubygems/ext/build_error.rb +2 -0
- data/lib/rubygems/ext/builder.rb +1 -1
- data/lib/rubygems/ext/cmake_builder.rb +1 -1
- data/lib/rubygems/ext/ext_conf_builder.rb +6 -7
- data/lib/rubygems/gem_runner.rb +3 -8
- data/lib/rubygems/gemcutter_utilities.rb +1 -1
- data/lib/rubygems/indexer.rb +1 -19
- data/lib/rubygems/install_update_options.rb +5 -5
- data/lib/rubygems/installer.rb +45 -42
- data/lib/rubygems/installer_test_case.rb +19 -2
- data/lib/rubygems/installer_uninstaller_utils.rb +24 -0
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/name_tuple.rb +2 -4
- data/lib/rubygems/package.rb +8 -13
- data/lib/rubygems/package/old.rb +1 -1
- data/lib/rubygems/package/tar_header.rb +3 -3
- data/lib/rubygems/package/tar_reader.rb +0 -1
- data/lib/rubygems/package/tar_reader/entry.rb +0 -1
- data/lib/rubygems/package/tar_test_case.rb +1 -1
- data/lib/rubygems/package/tar_writer.rb +2 -6
- data/lib/rubygems/package_task.rb +1 -5
- data/lib/rubygems/path_support.rb +1 -1
- data/lib/rubygems/platform.rb +3 -3
- data/lib/rubygems/query_utils.rb +362 -0
- data/lib/rubygems/rdoc.rb +0 -12
- data/lib/rubygems/remote_fetcher.rb +5 -19
- data/lib/rubygems/request/connection_pools.rb +1 -1
- data/lib/rubygems/request_set.rb +5 -5
- data/lib/rubygems/request_set/gem_dependency_api.rb +1 -1
- data/lib/rubygems/request_set/lockfile.rb +8 -8
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +1 -1
- data/lib/rubygems/requirement.rb +14 -15
- data/lib/rubygems/resolver.rb +7 -8
- data/lib/rubygems/resolver/api_set.rb +3 -3
- data/lib/rubygems/resolver/composed_set.rb +3 -3
- data/lib/rubygems/resolver/conflict.rb +1 -1
- data/lib/rubygems/resolver/index_set.rb +1 -1
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/safe_yaml.rb +4 -4
- data/lib/rubygems/security.rb +25 -25
- data/lib/rubygems/security/policy.rb +3 -3
- data/lib/rubygems/security/signer.rb +4 -4
- data/lib/rubygems/security/trust_dir.rb +1 -1
- data/lib/rubygems/server.rb +8 -8
- data/lib/rubygems/source/git.rb +7 -6
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source_list.rb +4 -5
- data/lib/rubygems/spec_fetcher.rb +18 -15
- data/lib/rubygems/specification.rb +79 -104
- data/lib/rubygems/specification_policy.rb +79 -27
- data/lib/rubygems/ssl_certs/{rubygems.org → index.rubygems.org}/GlobalSignRootCA.pem +0 -0
- data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +23 -0
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +25 -0
- data/lib/rubygems/test_case.rb +63 -83
- data/lib/rubygems/test_utilities.rb +6 -6
- data/lib/rubygems/uninstaller.rb +35 -14
- data/lib/rubygems/user_interaction.rb +1 -10
- data/lib/rubygems/util.rb +10 -2
- data/lib/rubygems/util/licenses.rb +4 -4
- data/lib/rubygems/validator.rb +1 -1
- data/lib/rubygems/version.rb +4 -4
- data/rubygems-update.gemspec +2 -2
- data/setup.rb +2 -7
- data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +0 -2
- data/test/rubygems/test_bundled_ca.rb +4 -12
- data/test/rubygems/test_deprecate.rb +43 -4
- data/test/rubygems/test_gem.rb +79 -74
- data/test/rubygems/test_gem_available_set.rb +3 -3
- data/test/rubygems/test_gem_bundler_version_finder.rb +19 -1
- data/test/rubygems/test_gem_command.rb +24 -3
- data/test/rubygems/test_gem_command_manager.rb +37 -4
- data/test/rubygems/test_gem_commands_build_command.rb +7 -2
- data/test/rubygems/test_gem_commands_cert_command.rb +2 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -1
- data/test/rubygems/test_gem_commands_contents_command.rb +48 -15
- data/test/rubygems/test_gem_commands_environment_command.rb +21 -21
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -5
- data/test/rubygems/test_gem_commands_info_command.rb +6 -6
- data/test/rubygems/test_gem_commands_install_command.rb +31 -31
- data/test/rubygems/test_gem_commands_mirror.rb +1 -1
- data/test/rubygems/test_gem_commands_open_command.rb +4 -4
- data/test/rubygems/test_gem_commands_owner_command.rb +11 -3
- data/test/rubygems/test_gem_commands_pristine_command.rb +41 -8
- data/test/rubygems/test_gem_commands_push_command.rb +7 -2
- data/test/rubygems/test_gem_commands_query_command.rb +9 -5
- data/test/rubygems/test_gem_commands_setup_command.rb +160 -108
- data/test/rubygems/test_gem_commands_signin_command.rb +6 -4
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -5
- data/test/rubygems/test_gem_commands_specification_command.rb +18 -18
- data/test/rubygems/test_gem_commands_uninstall_command.rb +1 -1
- data/test/rubygems/test_gem_commands_update_command.rb +68 -5
- data/test/rubygems/test_gem_commands_which_command.rb +3 -3
- data/test/rubygems/test_gem_commands_yank_command.rb +14 -6
- data/test/rubygems/test_gem_config_file.rb +7 -10
- data/test/rubygems/test_gem_dependency_installer.rb +52 -189
- data/test/rubygems/test_gem_dependency_list.rb +8 -8
- data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -1
- data/test/rubygems/test_gem_doctor.rb +28 -0
- data/test/rubygems/test_gem_ext_builder.rb +14 -25
- data/test/rubygems/test_gem_ext_cmake_builder.rb +13 -12
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -9
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +0 -1
- data/test/rubygems/test_gem_ext_rake_builder.rb +9 -9
- data/test/rubygems/test_gem_gem_runner.rb +42 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +5 -0
- data/test/rubygems/test_gem_indexer.rb +9 -13
- data/test/rubygems/test_gem_installer.rb +149 -45
- data/test/rubygems/test_gem_package.rb +13 -12
- data/test/rubygems/test_gem_package_tar_header.rb +19 -0
- data/test/rubygems/test_gem_package_tar_writer.rb +3 -3
- data/test/rubygems/test_gem_package_task.rb +46 -11
- data/test/rubygems/test_gem_remote_fetcher.rb +152 -190
- data/test/rubygems/test_gem_request.rb +11 -11
- data/test/rubygems/test_gem_request_set.rb +20 -20
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -3
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +9 -9
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +118 -118
- data/test/rubygems/test_gem_requirement.rb +2 -2
- data/test/rubygems/test_gem_resolver.rb +6 -6
- data/test/rubygems/test_gem_resolver_api_set.rb +3 -3
- data/test/rubygems/test_gem_resolver_best_set.rb +2 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +2 -2
- data/test/rubygems/test_gem_resolver_installer_set.rb +7 -7
- data/test/rubygems/test_gem_resolver_lock_set.rb +3 -3
- data/test/rubygems/test_gem_security.rb +20 -20
- data/test/rubygems/test_gem_security_policy.rb +5 -8
- data/test/rubygems/test_gem_security_signer.rb +8 -8
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_server.rb +10 -10
- data/test/rubygems/test_gem_source.rb +12 -14
- data/test/rubygems/test_gem_source_git.rb +12 -11
- data/test/rubygems/test_gem_source_installed.rb +7 -7
- data/test/rubygems/test_gem_source_local.rb +8 -8
- data/test/rubygems/test_gem_source_lock.rb +10 -10
- data/test/rubygems/test_gem_source_specific_file.rb +7 -7
- data/test/rubygems/test_gem_source_vendor.rb +7 -7
- data/test/rubygems/test_gem_spec_fetcher.rb +11 -2
- data/test/rubygems/test_gem_specification.rb +143 -113
- data/test/rubygems/test_gem_stream_ui.rb +3 -1
- data/test/rubygems/test_gem_text.rb +1 -1
- data/test/rubygems/test_gem_uninstaller.rb +134 -10
- data/test/rubygems/test_gem_util.rb +7 -5
- data/test/rubygems/test_gem_version.rb +1 -1
- data/test/rubygems/test_kernel.rb +10 -12
- data/test/rubygems/test_project_sanity.rb +8 -1
- data/test/rubygems/test_require.rb +141 -43
- metadata +32 -45
- data/.bundle/config +0 -2
- data/.rubocop.yml +0 -91
- data/Gemfile +0 -8
- data/Gemfile.lock +0 -43
- data/bundler/CODE_OF_CONDUCT.md +0 -136
- data/lib/rubygems/source_local.rb +0 -7
- data/lib/rubygems/source_specific_file.rb +0 -6
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +0 -21
- data/lib/ubygems.rb +0 -14
- data/tmp/.keep +0 -0
- data/util/CL2notes +0 -55
- data/util/bisect +0 -10
- data/util/ci.sh +0 -62
- data/util/cops/deprecations.rb +0 -52
- data/util/create_certs.rb +0 -171
- data/util/create_certs.sh +0 -27
- data/util/create_encrypted_key.rb +0 -16
- data/util/generate_spdx_license_list.rb +0 -63
- data/util/patch_with_prs.rb +0 -77
- data/util/rubocop +0 -8
- data/util/update_bundled_ca_certificates.rb +0 -137
- data/util/update_changelog.rb +0 -64
@@ -20,7 +20,8 @@ class Gem::Commands::SetupCommand < Gem::Command
|
|
20
20
|
:force => true,
|
21
21
|
:site_or_vendor => 'sitelibdir',
|
22
22
|
:destdir => '', :prefix => '', :previous_version => '',
|
23
|
-
:regenerate_binstubs => true
|
23
|
+
:regenerate_binstubs => true,
|
24
|
+
:regenerate_plugins => true
|
24
25
|
|
25
26
|
add_option '--previous-version=VERSION',
|
26
27
|
'Previous version of RubyGems',
|
@@ -89,6 +90,11 @@ class Gem::Commands::SetupCommand < Gem::Command
|
|
89
90
|
options[:regenerate_binstubs] = value
|
90
91
|
end
|
91
92
|
|
93
|
+
add_option '--[no-]regenerate-plugins',
|
94
|
+
'Regenerate gem plugins' do |value, options|
|
95
|
+
options[:regenerate_plugins] = value
|
96
|
+
end
|
97
|
+
|
92
98
|
add_option '-f', '--[no-]force',
|
93
99
|
'Forcefully overwrite binstubs' do |value, options|
|
94
100
|
options[:force] = value
|
@@ -162,15 +168,20 @@ By default, this RubyGems will install gem as:
|
|
162
168
|
extend MakeDirs
|
163
169
|
|
164
170
|
lib_dir, bin_dir = make_destination_dirs install_destdir
|
171
|
+
man_dir = make_man_dir install_destdir
|
165
172
|
|
166
173
|
install_lib lib_dir
|
167
174
|
|
175
|
+
install_man man_dir
|
176
|
+
|
168
177
|
install_executables bin_dir
|
169
178
|
|
170
179
|
remove_old_bin_files bin_dir
|
171
180
|
|
172
181
|
remove_old_lib_files lib_dir
|
173
182
|
|
183
|
+
remove_old_man_files man_dir
|
184
|
+
|
174
185
|
install_default_bundler_gem bin_dir
|
175
186
|
|
176
187
|
if mode = options[:dir_mode]
|
@@ -181,6 +192,7 @@ By default, this RubyGems will install gem as:
|
|
181
192
|
say "RubyGems #{Gem::VERSION} installed"
|
182
193
|
|
183
194
|
regenerate_binstubs if options[:regenerate_binstubs]
|
195
|
+
regenerate_plugins if options[:regenerate_plugins]
|
184
196
|
|
185
197
|
uninstall_old_gemcutter
|
186
198
|
|
@@ -205,7 +217,7 @@ By default, this RubyGems will install gem as:
|
|
205
217
|
say
|
206
218
|
|
207
219
|
say "RubyGems installed the following executables:"
|
208
|
-
say bin_file_names.map {
|
220
|
+
say bin_file_names.map {|name| "\t#{name}\n" }
|
209
221
|
say
|
210
222
|
|
211
223
|
unless bin_file_names.grep(/#{File::SEPARATOR}gem$/)
|
@@ -305,16 +317,6 @@ By default, this RubyGems will install gem as:
|
|
305
317
|
end
|
306
318
|
end
|
307
319
|
|
308
|
-
def install_file(file, dest_dir)
|
309
|
-
dest_file = File.join dest_dir, file
|
310
|
-
dest_dir = File.dirname dest_file
|
311
|
-
unless File.directory? dest_dir
|
312
|
-
mkdir_p dest_dir, :mode => 0755
|
313
|
-
end
|
314
|
-
|
315
|
-
install file, dest_file, :mode => options[:data_mode] || 0644
|
316
|
-
end
|
317
|
-
|
318
320
|
def install_lib(lib_dir)
|
319
321
|
libs = { 'RubyGems' => 'lib' }
|
320
322
|
libs['Bundler'] = 'bundler/lib'
|
@@ -322,18 +324,27 @@ By default, this RubyGems will install gem as:
|
|
322
324
|
say "Installing #{tool}" if @verbose
|
323
325
|
|
324
326
|
lib_files = rb_files_in path
|
325
|
-
lib_files.concat(
|
327
|
+
lib_files.concat(bundler_template_files) if tool == 'Bundler'
|
326
328
|
|
327
329
|
pem_files = pem_files_in path
|
328
330
|
|
329
331
|
Dir.chdir path do
|
330
|
-
lib_files
|
331
|
-
|
332
|
-
|
332
|
+
install_file_list(lib_files + pem_files, lib_dir)
|
333
|
+
end
|
334
|
+
end
|
335
|
+
end
|
333
336
|
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
+
def install_man(man_dir)
|
338
|
+
mans = { 'Bundler' => 'bundler/man' }
|
339
|
+
mans.each do |tool, path|
|
340
|
+
say "Installing #{tool} manpages" if @verbose
|
341
|
+
|
342
|
+
bundler_man1_files = bundler_man1_files_in(path)
|
343
|
+
bundler_man5_files = bundler_man5_files_in(path)
|
344
|
+
|
345
|
+
Dir.chdir path do
|
346
|
+
install_file_list(bundler_man1_files, "#{man_dir}/man1")
|
347
|
+
install_file_list(bundler_man5_files, "#{man_dir}/man5")
|
337
348
|
end
|
338
349
|
end
|
339
350
|
end
|
@@ -452,6 +463,30 @@ By default, this RubyGems will install gem as:
|
|
452
463
|
return lib_dir, bin_dir
|
453
464
|
end
|
454
465
|
|
466
|
+
def make_man_dir(install_destdir)
|
467
|
+
man_dir = generate_default_man_dir(install_destdir)
|
468
|
+
|
469
|
+
mkdir_p man_dir, :mode => 0755
|
470
|
+
|
471
|
+
return man_dir
|
472
|
+
end
|
473
|
+
|
474
|
+
def generate_default_man_dir(install_destdir)
|
475
|
+
prefix = options[:prefix]
|
476
|
+
|
477
|
+
if prefix.empty?
|
478
|
+
man_dir = RbConfig::CONFIG['mandir']
|
479
|
+
else
|
480
|
+
man_dir = File.join prefix, 'man'
|
481
|
+
end
|
482
|
+
|
483
|
+
unless install_destdir.empty?
|
484
|
+
man_dir = File.join install_destdir, man_dir.gsub(/^[a-zA-Z]:/, '')
|
485
|
+
end
|
486
|
+
|
487
|
+
man_dir
|
488
|
+
end
|
489
|
+
|
455
490
|
def generate_default_dirs(install_destdir)
|
456
491
|
prefix = options[:prefix]
|
457
492
|
site_or_vendor = options[:site_or_vendor]
|
@@ -497,18 +532,31 @@ By default, this RubyGems will install gem as:
|
|
497
532
|
end
|
498
533
|
|
499
534
|
# for installation of bundler as default gems
|
500
|
-
def
|
535
|
+
def bundler_man1_files_in(dir)
|
536
|
+
Dir.chdir dir do
|
537
|
+
Dir['bundle*.1{,.txt}']
|
538
|
+
end
|
539
|
+
end
|
540
|
+
|
541
|
+
# for installation of bundler as default gems
|
542
|
+
def bundler_man5_files_in(dir)
|
543
|
+
Dir.chdir dir do
|
544
|
+
Dir['gemfile.5{,.txt}']
|
545
|
+
end
|
546
|
+
end
|
547
|
+
|
548
|
+
def bundler_template_files
|
501
549
|
Dir.chdir "bundler/lib" do
|
502
|
-
(
|
503
|
-
select{|f| !File.directory?(f)}
|
550
|
+
Dir.glob(File.join('bundler', 'templates', '**', '*'), File::FNM_DOTMATCH).
|
551
|
+
select{|f| !File.directory?(f) }
|
504
552
|
end
|
505
553
|
end
|
506
554
|
|
507
555
|
# for cleanup old bundler files
|
508
556
|
def template_files_in(dir)
|
509
557
|
Dir.chdir dir do
|
510
|
-
(
|
511
|
-
select{|f| !File.directory?(f)}
|
558
|
+
Dir.glob(File.join('templates', '**', '*'), File::FNM_DOTMATCH).
|
559
|
+
select{|f| !File.directory?(f) }
|
512
560
|
end
|
513
561
|
end
|
514
562
|
|
@@ -539,7 +587,7 @@ abort "#{deprecation_message}"
|
|
539
587
|
next unless Gem.win_platform?
|
540
588
|
|
541
589
|
File.open "#{old_bin_path}.bat", 'w' do |fp|
|
542
|
-
fp.puts %
|
590
|
+
fp.puts %(@ECHO.#{deprecation_message})
|
543
591
|
end
|
544
592
|
end
|
545
593
|
end
|
@@ -556,18 +604,29 @@ abort "#{deprecation_message}"
|
|
556
604
|
|
557
605
|
to_remove = old_lib_files - lib_files
|
558
606
|
|
607
|
+
gauntlet_rubygems = File.join(lib_dir, 'gauntlet_rubygems.rb')
|
608
|
+
to_remove << gauntlet_rubygems if File.exist? gauntlet_rubygems
|
609
|
+
|
559
610
|
to_remove.delete_if do |file|
|
560
611
|
file.start_with? 'defaults'
|
561
612
|
end
|
562
613
|
|
563
|
-
|
564
|
-
|
565
|
-
|
614
|
+
remove_file_list(to_remove, old_lib_dir)
|
615
|
+
end
|
616
|
+
end
|
566
617
|
|
567
|
-
|
568
|
-
|
569
|
-
|
570
|
-
|
618
|
+
def remove_old_man_files(man_dir)
|
619
|
+
man_dirs = { man_dir => "bundler/man" }
|
620
|
+
man_dirs.each do |old_man_dir, new_man_dir|
|
621
|
+
man1_files = bundler_man1_files_in(new_man_dir)
|
622
|
+
|
623
|
+
old_man1_dir = "#{old_man_dir}/man1"
|
624
|
+
|
625
|
+
old_man1_files = bundler_man1_files_in(old_man1_dir)
|
626
|
+
|
627
|
+
man1_to_remove = old_man1_files - man1_files
|
628
|
+
|
629
|
+
remove_file_list(man1_to_remove, old_man1_dir)
|
571
630
|
end
|
572
631
|
end
|
573
632
|
|
@@ -626,8 +685,45 @@ abort "#{deprecation_message}"
|
|
626
685
|
command.invoke(*args)
|
627
686
|
end
|
628
687
|
|
688
|
+
def regenerate_plugins
|
689
|
+
require "rubygems/commands/pristine_command"
|
690
|
+
say "Regenerating plugins"
|
691
|
+
|
692
|
+
args = %w[--all --only-plugins --silent]
|
693
|
+
|
694
|
+
command = Gem::Commands::PristineCommand.new
|
695
|
+
command.invoke(*args)
|
696
|
+
end
|
697
|
+
|
629
698
|
private
|
630
699
|
|
700
|
+
def install_file_list(files, dest_dir)
|
701
|
+
files.each do |file|
|
702
|
+
install_file file, dest_dir
|
703
|
+
end
|
704
|
+
end
|
705
|
+
|
706
|
+
def install_file(file, dest_dir)
|
707
|
+
dest_file = File.join dest_dir, file
|
708
|
+
dest_dir = File.dirname dest_file
|
709
|
+
unless File.directory? dest_dir
|
710
|
+
mkdir_p dest_dir, :mode => 0755
|
711
|
+
end
|
712
|
+
|
713
|
+
install file, dest_file, :mode => options[:data_mode] || 0644
|
714
|
+
end
|
715
|
+
|
716
|
+
def remove_file_list(files, dir)
|
717
|
+
Dir.chdir dir do
|
718
|
+
files.each do |file|
|
719
|
+
FileUtils.rm_f file
|
720
|
+
|
721
|
+
warn "unable to remove old file #{file} please remove it by hand" if
|
722
|
+
File.exist? file
|
723
|
+
end
|
724
|
+
end
|
725
|
+
end
|
726
|
+
|
631
727
|
def target_bin_path(bin_dir, bin_file)
|
632
728
|
bin_file_formatted = if options[:format_executable]
|
633
729
|
Gem.default_exec_format % bin_file
|
@@ -119,7 +119,7 @@ Specific fields in the specification can be extracted in YAML format:
|
|
119
119
|
dep.prerelease = options[:prerelease]
|
120
120
|
found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dep
|
121
121
|
|
122
|
-
specs.push(*found.map {
|
122
|
+
specs.push(*found.map {|spec,| spec })
|
123
123
|
end
|
124
124
|
|
125
125
|
if specs.empty?
|
@@ -128,7 +128,7 @@ Specific fields in the specification can be extracted in YAML format:
|
|
128
128
|
end
|
129
129
|
|
130
130
|
unless options[:all]
|
131
|
-
specs = [specs.max_by {
|
131
|
+
specs = [specs.max_by {|s| s.version }]
|
132
132
|
end
|
133
133
|
|
134
134
|
specs.each do |s|
|
@@ -136,7 +136,7 @@ that is a dependency of an existing gem. You can use the
|
|
136
136
|
end
|
137
137
|
|
138
138
|
def uninstall_all
|
139
|
-
specs = Gem::Specification.reject {
|
139
|
+
specs = Gem::Specification.reject {|spec| spec.default_gem? }
|
140
140
|
|
141
141
|
specs.each do |spec|
|
142
142
|
options[:version] = spec.version
|
@@ -157,7 +157,7 @@ command help for an example.
|
|
157
157
|
|
158
158
|
specs = dependency.matching_specs
|
159
159
|
|
160
|
-
selected = specs.max_by {
|
160
|
+
selected = specs.max_by {|s| s.version }
|
161
161
|
|
162
162
|
return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless
|
163
163
|
selected
|
@@ -73,8 +73,6 @@ command to remove old versions.
|
|
73
73
|
say "Latest version already installed. Done."
|
74
74
|
terminate_interaction
|
75
75
|
end
|
76
|
-
|
77
|
-
options[:user_install] = false
|
78
76
|
end
|
79
77
|
|
80
78
|
def check_update_arguments # :nodoc:
|
@@ -90,9 +88,10 @@ command to remove old versions.
|
|
90
88
|
return
|
91
89
|
end
|
92
90
|
|
93
|
-
|
94
|
-
|
95
|
-
|
91
|
+
gems_to_update = which_to_update(
|
92
|
+
highest_installed_gems,
|
93
|
+
options[:args].uniq
|
94
|
+
)
|
96
95
|
|
97
96
|
if options[:explain]
|
98
97
|
say "Gems to update:"
|
@@ -108,7 +107,7 @@ command to remove old versions.
|
|
108
107
|
|
109
108
|
updated = update_gems gems_to_update
|
110
109
|
|
111
|
-
updated_names = updated.map {
|
110
|
+
updated_names = updated.map {|spec| spec.name }
|
112
111
|
not_updated_names = options[:args].uniq - updated_names
|
113
112
|
|
114
113
|
if updated.empty?
|
@@ -127,7 +126,7 @@ command to remove old versions.
|
|
127
126
|
|
128
127
|
spec_tuples, errors = fetcher.search_for_dependency dependency
|
129
128
|
|
130
|
-
error = errors.find {
|
129
|
+
error = errors.find {|e| e.respond_to? :exception }
|
131
130
|
|
132
131
|
raise error if error
|
133
132
|
|
@@ -137,6 +136,9 @@ command to remove old versions.
|
|
137
136
|
def highest_installed_gems # :nodoc:
|
138
137
|
hig = {} # highest installed gems
|
139
138
|
|
139
|
+
# Get only gem specifications installed as --user-install
|
140
|
+
Gem::Specification.dirs = Gem.user_dir if options[:user_install]
|
141
|
+
|
140
142
|
Gem::Specification.each do |spec|
|
141
143
|
if hig[spec.name].nil? or hig[spec.name].version < spec.version
|
142
144
|
hig[spec.name] = spec
|
@@ -168,11 +170,34 @@ command to remove old versions.
|
|
168
170
|
Dir.chdir update_dir do
|
169
171
|
say "Installing RubyGems #{version}"
|
170
172
|
|
171
|
-
installed =
|
173
|
+
installed = preparing_gem_layout_for(version) do
|
174
|
+
system Gem.ruby, '--disable-gems', 'setup.rb', *args
|
175
|
+
end
|
176
|
+
|
172
177
|
say "RubyGems system software updated" if installed
|
173
178
|
end
|
174
179
|
end
|
175
180
|
|
181
|
+
def preparing_gem_layout_for(version)
|
182
|
+
if Gem::Version.new(version) >= Gem::Version.new("3.2.a")
|
183
|
+
yield
|
184
|
+
else
|
185
|
+
require "tmpdir"
|
186
|
+
tmpdir = Dir.mktmpdir
|
187
|
+
FileUtils.mv Gem.plugindir, tmpdir
|
188
|
+
|
189
|
+
status = yield
|
190
|
+
|
191
|
+
if status
|
192
|
+
FileUtils.rm_rf tmpdir
|
193
|
+
else
|
194
|
+
FileUtils.mv File.join(tmpdir, "plugins"), Gem.plugindir
|
195
|
+
end
|
196
|
+
|
197
|
+
status
|
198
|
+
end
|
199
|
+
end
|
200
|
+
|
176
201
|
def rubygems_target_version
|
177
202
|
version = options[:system]
|
178
203
|
update_latest = version == true
|
@@ -206,7 +231,7 @@ command to remove old versions.
|
|
206
231
|
end
|
207
232
|
|
208
233
|
def update_gem(name, version = Gem::Requirement.default)
|
209
|
-
return if @updated.any? {
|
234
|
+
return if @updated.any? {|spec| spec.name == name }
|
210
235
|
|
211
236
|
update_options = options.dup
|
212
237
|
update_options[:prerelease] = version.prerelease?
|
@@ -237,6 +262,11 @@ command to remove old versions.
|
|
237
262
|
# Update RubyGems software to the latest version.
|
238
263
|
|
239
264
|
def update_rubygems
|
265
|
+
if Gem.disable_system_update_message
|
266
|
+
alert_error Gem.disable_system_update_message
|
267
|
+
terminate_interaction 1
|
268
|
+
end
|
269
|
+
|
240
270
|
check_update_arguments
|
241
271
|
|
242
272
|
version, requirement = rubygems_target_version
|
@@ -267,7 +297,7 @@ command to remove old versions.
|
|
267
297
|
|
268
298
|
highest_installed_gems.each do |l_name, l_spec|
|
269
299
|
next if not gem_names.empty? and
|
270
|
-
gem_names.none? {
|
300
|
+
gem_names.none? {|name| name == l_spec.name }
|
271
301
|
|
272
302
|
highest_remote_tup = highest_remote_name_tuple l_spec
|
273
303
|
highest_remote_ver = highest_remote_tup.version
|
data/lib/rubygems/config_file.rb
CHANGED
@@ -261,7 +261,12 @@ if you believe they were disclosed to a third party.
|
|
261
261
|
# Location of RubyGems.org credentials
|
262
262
|
|
263
263
|
def credentials_path
|
264
|
-
File.join Gem.user_home, '.gem', 'credentials'
|
264
|
+
credentials = File.join Gem.user_home, '.gem', 'credentials'
|
265
|
+
if File.exist? credentials
|
266
|
+
credentials
|
267
|
+
else
|
268
|
+
File.join Gem.data_home, "gem", "credentials"
|
269
|
+
end
|
265
270
|
end
|
266
271
|
|
267
272
|
def load_api_keys
|
@@ -429,7 +434,7 @@ if you believe they were disclosed to a third party.
|
|
429
434
|
yaml_hash[:ssl_client_cert] =
|
430
435
|
@hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
|
431
436
|
|
432
|
-
keys = yaml_hash.keys.map {
|
437
|
+
keys = yaml_hash.keys.map {|key| key.to_s }
|
433
438
|
keys << 'debug'
|
434
439
|
re = Regexp.union(*keys)
|
435
440
|
|
@@ -444,6 +449,10 @@ if you believe they were disclosed to a third party.
|
|
444
449
|
|
445
450
|
# Writes out this config file, replacing its source.
|
446
451
|
def write
|
452
|
+
unless File.exist?(File.dirname(config_file_name))
|
453
|
+
FileUtils.mkdir_p File.dirname(config_file_name)
|
454
|
+
end
|
455
|
+
|
447
456
|
File.open config_file_name, 'w' do |io|
|
448
457
|
io.write to_yaml
|
449
458
|
end
|