rubygems-update 3.0.8 → 3.1.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +31 -8
- data/.travis.yml +9 -27
- data/CONTRIBUTING.md +13 -0
- data/History.txt +24 -21
- data/MAINTAINERS.txt +1 -6
- data/Manifest.txt +62 -13
- data/Rakefile +39 -23
- data/bin/gem +0 -6
- data/bundler/CHANGELOG.md +746 -570
- data/bundler/CODE_OF_CONDUCT.md +117 -23
- data/bundler/LICENSE.md +18 -19
- data/bundler/README.md +9 -8
- data/bundler/bundler.gemspec +8 -25
- data/bundler/exe/bundle +19 -3
- data/bundler/lib/bundler.rb +120 -67
- data/bundler/lib/bundler/build_metadata.rb +1 -3
- data/bundler/lib/bundler/capistrano.rb +4 -4
- data/bundler/lib/bundler/cli.rb +129 -121
- data/bundler/lib/bundler/cli/add.rb +27 -16
- data/bundler/lib/bundler/cli/common.rb +11 -12
- data/bundler/lib/bundler/cli/config.rb +161 -86
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/doctor.rb +4 -4
- data/bundler/lib/bundler/cli/exec.rb +4 -9
- data/bundler/lib/bundler/cli/gem.rb +5 -5
- data/bundler/lib/bundler/cli/info.rb +17 -5
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +11 -10
- data/bundler/lib/bundler/cli/issue.rb +3 -3
- data/bundler/lib/bundler/cli/open.rb +10 -6
- data/bundler/lib/bundler/cli/outdated.rb +85 -81
- data/bundler/lib/bundler/cli/package.rb +8 -9
- data/bundler/lib/bundler/cli/plugin.rb +9 -2
- data/bundler/lib/bundler/cli/pristine.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +31 -11
- data/bundler/lib/bundler/compact_index_client.rb +25 -9
- data/bundler/lib/bundler/compact_index_client/updater.rb +2 -6
- data/bundler/lib/bundler/current_ruby.rb +9 -7
- data/bundler/lib/bundler/definition.rb +35 -26
- data/bundler/lib/bundler/dependency.rb +16 -4
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +15 -39
- data/bundler/lib/bundler/env.rb +8 -13
- data/bundler/lib/bundler/environment_preserver.rb +0 -1
- data/bundler/lib/bundler/feature_flag.rb +23 -34
- data/bundler/lib/bundler/fetcher.rb +14 -11
- data/bundler/lib/bundler/fetcher/compact_index.rb +26 -12
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +4 -1
- data/bundler/lib/bundler/fetcher/index.rb +4 -2
- data/bundler/lib/bundler/friendly_errors.rb +4 -5
- data/bundler/lib/bundler/gem_helper.rb +39 -24
- data/bundler/lib/bundler/gem_helpers.rb +2 -4
- data/bundler/lib/bundler/gem_tasks.rb +1 -1
- data/bundler/lib/bundler/gem_version_promoter.rb +3 -3
- data/bundler/lib/bundler/graph.rb +2 -2
- data/bundler/lib/bundler/injector.rb +10 -8
- data/bundler/lib/bundler/inline.rb +19 -18
- data/bundler/lib/bundler/installer.rb +7 -14
- data/bundler/lib/bundler/installer/gem_installer.rb +5 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +4 -8
- data/bundler/lib/bundler/installer/standalone.rb +1 -2
- data/bundler/lib/bundler/lazy_specification.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +13 -21
- data/bundler/lib/bundler/match_platform.rb +1 -1
- data/bundler/lib/bundler/plugin.rb +42 -29
- data/bundler/lib/bundler/plugin/api.rb +1 -1
- data/bundler/lib/bundler/plugin/api/source.rb +2 -2
- data/bundler/lib/bundler/plugin/index.rb +14 -3
- data/bundler/lib/bundler/plugin/installer.rb +28 -15
- data/bundler/lib/bundler/psyched_yaml.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +72 -24
- data/bundler/lib/bundler/resolver/spec_group.rb +3 -2
- data/bundler/lib/bundler/retry.rb +2 -2
- data/bundler/lib/bundler/ruby_version.rb +4 -19
- data/bundler/lib/bundler/rubygems_ext.rb +10 -66
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -8
- data/bundler/lib/bundler/rubygems_integration.rb +144 -395
- data/bundler/lib/bundler/runtime.rb +2 -9
- data/bundler/lib/bundler/settings.rb +15 -47
- data/bundler/lib/bundler/setup.rb +6 -5
- data/bundler/lib/bundler/shared_helpers.rb +58 -71
- data/bundler/lib/bundler/similarity_detector.rb +2 -2
- data/bundler/lib/bundler/source.rb +5 -5
- data/bundler/lib/bundler/source/git.rb +19 -12
- data/bundler/lib/bundler/source/git/git_proxy.rb +35 -39
- data/bundler/lib/bundler/source/metadata.rb +7 -2
- data/bundler/lib/bundler/source/path.rb +13 -8
- data/bundler/lib/bundler/source/rubygems.rb +11 -5
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -2
- data/bundler/lib/bundler/source_list.rb +9 -12
- data/bundler/lib/bundler/spec_set.rb +23 -12
- data/bundler/lib/bundler/stub_specification.rb +18 -30
- data/bundler/lib/bundler/templates/Executable.bundler +23 -14
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +4 -3
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -27
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -1
- data/bundler/lib/bundler/ui.rb +3 -3
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -1
- data/bundler/lib/bundler/ui/shell.rb +4 -8
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +161 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +66 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +176 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +151 -48
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils/version.rb +5 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +30 -8
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +4 -4
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +248 -279
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -11
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +11 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +16 -17
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +82 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +6 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +52 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendored_fileutils.rb +1 -6
- data/bundler/lib/bundler/vendored_molinillo.rb +1 -1
- data/bundler/lib/bundler/vendored_persistent.rb +7 -5
- data/bundler/lib/bundler/vendored_thor.rb +2 -2
- data/bundler/lib/bundler/version.rb +1 -20
- data/bundler/lib/bundler/version_ranges.rb +51 -5
- data/bundler/lib/bundler/vlad.rb +2 -2
- data/bundler/lib/bundler/worker.rb +1 -3
- data/bundler/lib/bundler/yaml_serializer.rb +2 -3
- data/bundler/man/bundle-add.1 +66 -0
- data/bundler/man/bundle-add.1.txt +58 -0
- data/bundler/man/bundle-add.ronn +7 -1
- data/bundler/man/bundle-binstubs.1 +40 -0
- data/bundler/man/bundle-binstubs.1.txt +48 -0
- data/bundler/man/bundle-binstubs.ronn +1 -1
- data/bundler/man/bundle-check.1 +31 -0
- data/bundler/man/bundle-check.1.txt +33 -0
- data/bundler/man/bundle-clean.1 +24 -0
- data/bundler/man/bundle-clean.1.txt +26 -0
- data/bundler/man/bundle-config.1 +497 -0
- data/bundler/man/bundle-config.1.txt +528 -0
- data/bundler/man/bundle-config.ronn +42 -40
- data/bundler/man/bundle-doctor.1 +44 -0
- data/bundler/man/bundle-doctor.1.txt +44 -0
- data/bundler/man/bundle-exec.1 +165 -0
- data/bundler/man/bundle-exec.1.txt +178 -0
- data/bundler/man/bundle-exec.ronn +1 -1
- data/bundler/man/bundle-gem.1 +80 -0
- data/bundler/man/bundle-gem.1.txt +91 -0
- data/bundler/man/bundle-info.1 +20 -0
- data/bundler/man/bundle-info.1.txt +21 -0
- data/bundler/man/bundle-init.1 +25 -0
- data/bundler/man/bundle-init.1.txt +34 -0
- data/bundler/man/bundle-init.ronn +1 -1
- data/bundler/man/bundle-inject.1 +33 -0
- data/bundler/man/bundle-inject.1.txt +32 -0
- data/bundler/man/bundle-install.1 +311 -0
- data/bundler/man/bundle-install.1.txt +401 -0
- data/bundler/man/bundle-install.ronn +9 -4
- data/bundler/man/bundle-list.1 +50 -0
- data/bundler/man/bundle-list.1.txt +43 -0
- data/bundler/man/bundle-lock.1 +84 -0
- data/bundler/man/bundle-lock.1.txt +93 -0
- data/bundler/man/bundle-open.1 +32 -0
- data/bundler/man/bundle-open.1.txt +29 -0
- data/bundler/man/bundle-outdated.1 +155 -0
- data/bundler/man/bundle-outdated.1.txt +131 -0
- data/bundler/man/bundle-package.1 +55 -0
- data/bundler/man/bundle-package.1.txt +79 -0
- data/bundler/man/bundle-platform.1 +61 -0
- data/bundler/man/bundle-platform.1.txt +57 -0
- data/bundler/man/bundle-pristine.1 +34 -0
- data/bundler/man/bundle-pristine.1.txt +44 -0
- data/bundler/man/bundle-remove.1 +31 -0
- data/bundler/man/bundle-remove.1.txt +34 -0
- data/bundler/man/bundle-show.1 +23 -0
- data/bundler/man/bundle-show.1.txt +27 -0
- data/bundler/man/bundle-update.1 +394 -0
- data/bundler/man/bundle-update.1.txt +390 -0
- data/bundler/man/bundle-update.ronn +3 -3
- data/bundler/man/bundle-viz.1 +39 -0
- data/bundler/man/bundle-viz.1.txt +39 -0
- data/bundler/man/bundle.1 +136 -0
- data/bundler/man/bundle.1.txt +116 -0
- data/bundler/man/bundle.ronn +2 -2
- data/bundler/man/gemfile.5 +686 -0
- data/bundler/man/gemfile.5.ronn +14 -18
- data/bundler/man/gemfile.5.txt +649 -0
- data/bundler/man/index.txt +25 -0
- data/lib/rubygems.rb +80 -48
- data/lib/rubygems/available_set.rb +1 -0
- data/lib/rubygems/basic_specification.rb +17 -6
- data/lib/rubygems/bundler_version_finder.rb +5 -0
- data/lib/rubygems/command.rb +34 -5
- data/lib/rubygems/command_manager.rb +0 -6
- data/lib/rubygems/commands/build_command.rb +21 -8
- data/lib/rubygems/commands/cert_command.rb +0 -1
- data/lib/rubygems/commands/cleanup_command.rb +7 -7
- data/lib/rubygems/commands/contents_command.rb +3 -3
- data/lib/rubygems/commands/dependency_command.rb +4 -3
- data/lib/rubygems/commands/environment_command.rb +0 -3
- data/lib/rubygems/commands/info_command.rb +2 -0
- data/lib/rubygems/commands/install_command.rb +12 -52
- data/lib/rubygems/commands/lock_command.rb +2 -2
- data/lib/rubygems/commands/mirror_command.rb +1 -0
- data/lib/rubygems/commands/open_command.rb +2 -1
- data/lib/rubygems/commands/outdated_command.rb +1 -0
- data/lib/rubygems/commands/owner_command.rb +2 -7
- data/lib/rubygems/commands/pristine_command.rb +3 -0
- data/lib/rubygems/commands/push_command.rb +4 -6
- data/lib/rubygems/commands/query_command.rb +94 -80
- data/lib/rubygems/commands/rdoc_command.rb +1 -0
- data/lib/rubygems/commands/setup_command.rb +10 -8
- data/lib/rubygems/commands/signin_command.rb +1 -0
- data/lib/rubygems/commands/specification_command.rb +1 -0
- data/lib/rubygems/commands/stale_command.rb +2 -0
- data/lib/rubygems/commands/uninstall_command.rb +1 -0
- data/lib/rubygems/commands/unpack_command.rb +2 -29
- data/lib/rubygems/commands/update_command.rb +14 -14
- data/lib/rubygems/commands/which_command.rb +1 -0
- data/lib/rubygems/commands/yank_command.rb +8 -2
- data/lib/rubygems/compatibility.rb +4 -4
- data/lib/rubygems/config_file.rb +28 -23
- data/lib/rubygems/core_ext/kernel_gem.rb +2 -5
- data/lib/rubygems/core_ext/kernel_require.rb +29 -2
- data/lib/rubygems/core_ext/kernel_warn.rb +10 -4
- data/lib/rubygems/defaults.rb +10 -17
- data/lib/rubygems/dependency.rb +21 -6
- data/lib/rubygems/dependency_installer.rb +19 -102
- data/lib/rubygems/dependency_list.rb +11 -10
- data/lib/rubygems/deprecate.rb +5 -5
- data/lib/rubygems/errors.rb +11 -2
- data/lib/rubygems/exceptions.rb +9 -0
- data/lib/rubygems/ext/builder.rb +24 -43
- data/lib/rubygems/ext/cmake_builder.rb +2 -0
- data/lib/rubygems/ext/ext_conf_builder.rb +11 -9
- data/lib/rubygems/ext/rake_builder.rb +1 -1
- data/lib/rubygems/gemcutter_utilities.rb +19 -26
- data/lib/rubygems/indexer.rb +9 -5
- data/lib/rubygems/installer.rb +26 -13
- data/lib/rubygems/installer_test_case.rb +86 -38
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/mock_gem_ui.rb +4 -1
- data/lib/rubygems/name_tuple.rb +1 -0
- data/lib/rubygems/package.rb +37 -9
- data/lib/rubygems/package/tar_writer.rb +4 -4
- data/lib/rubygems/path_support.rb +2 -0
- data/lib/rubygems/platform.rb +2 -1
- data/lib/rubygems/psych_tree.rb +2 -0
- data/lib/rubygems/remote_fetcher.rb +5 -1
- data/lib/rubygems/request.rb +5 -3
- data/lib/rubygems/request/connection_pools.rb +4 -4
- data/lib/rubygems/request/http_pool.rb +1 -0
- data/lib/rubygems/request/https_pool.rb +2 -0
- data/lib/rubygems/request_set.rb +2 -2
- data/lib/rubygems/request_set/gem_dependency_api.rb +2 -2
- data/lib/rubygems/request_set/lockfile.rb +5 -2
- data/lib/rubygems/request_set/lockfile/parser.rb +4 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
- data/lib/rubygems/requirement.rb +20 -18
- data/lib/rubygems/resolver.rb +4 -5
- data/lib/rubygems/resolver/activation_request.rb +19 -49
- data/lib/rubygems/resolver/best_set.rb +2 -2
- data/lib/rubygems/resolver/conflict.rb +0 -5
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/resolver/lock_specification.rb +2 -2
- data/lib/rubygems/resolver/requirement_list.rb +1 -0
- data/lib/rubygems/resolver/specification.rb +1 -0
- data/lib/rubygems/resolver/stats.rb +2 -0
- data/lib/rubygems/security/signer.rb +3 -2
- data/lib/rubygems/server.rb +5 -4
- data/lib/rubygems/source_list.rb +1 -0
- data/lib/rubygems/spec_fetcher.rb +3 -16
- data/lib/rubygems/specification.rb +69 -133
- data/lib/rubygems/specification_policy.rb +7 -2
- data/lib/rubygems/stub_specification.rb +5 -2
- data/lib/rubygems/syck_hack.rb +2 -0
- data/lib/rubygems/test_case.rb +78 -227
- data/lib/rubygems/test_utilities.rb +17 -6
- data/lib/rubygems/text.rb +2 -3
- data/lib/rubygems/uninstaller.rb +15 -15
- data/lib/rubygems/user_interaction.rb +9 -1
- data/lib/rubygems/util.rb +5 -41
- data/lib/rubygems/util/licenses.rb +398 -396
- data/lib/rubygems/util/list.rb +2 -0
- data/lib/rubygems/validator.rb +9 -29
- data/lib/rubygems/version.rb +5 -3
- data/rubygems-update.gemspec +3 -3
- data/test/rubygems/plugin/load/rubygems_plugin.rb +2 -0
- data/test/rubygems/test_deprecate.rb +3 -0
- data/test/rubygems/test_gem.rb +183 -176
- data/test/rubygems/test_gem_available_set.rb +3 -2
- data/test/rubygems/test_gem_bundler_version_finder.rb +3 -1
- data/test/rubygems/test_gem_command.rb +94 -5
- data/test/rubygems/test_gem_command_manager.rb +5 -13
- data/test/rubygems/test_gem_commands_build_command.rb +142 -4
- data/test/rubygems/test_gem_commands_cert_command.rb +15 -1
- data/test/rubygems/test_gem_commands_cleanup_command.rb +22 -6
- data/test/rubygems/test_gem_commands_dependency_command.rb +1 -1
- data/test/rubygems/test_gem_commands_environment_command.rb +1 -11
- data/test/rubygems/test_gem_commands_help_command.rb +2 -0
- data/test/rubygems/test_gem_commands_info_command.rb +1 -0
- data/test/rubygems/test_gem_commands_install_command.rb +207 -2
- data/test/rubygems/test_gem_commands_mirror.rb +1 -0
- data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
- data/test/rubygems/test_gem_commands_owner_command.rb +4 -5
- data/test/rubygems/test_gem_commands_pristine_command.rb +56 -4
- data/test/rubygems/test_gem_commands_push_command.rb +19 -14
- data/test/rubygems/test_gem_commands_query_command.rb +27 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +62 -37
- data/test/rubygems/test_gem_commands_signin_command.rb +5 -4
- data/test/rubygems/test_gem_commands_sources_command.rb +20 -6
- data/test/rubygems/test_gem_commands_uninstall_command.rb +107 -50
- data/test/rubygems/test_gem_commands_update_command.rb +86 -23
- data/test/rubygems/test_gem_commands_yank_command.rb +46 -1
- data/test/rubygems/test_gem_config_file.rb +9 -2
- data/test/rubygems/test_gem_dependency.rb +6 -0
- data/test/rubygems/test_gem_dependency_installer.rb +67 -36
- data/test/rubygems/test_gem_dependency_list.rb +21 -14
- data/test/rubygems/test_gem_ext_builder.rb +5 -1
- data/test/rubygems/test_gem_ext_cmake_builder.rb +2 -0
- data/test/rubygems/test_gem_ext_configure_builder.rb +8 -0
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +12 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +8 -8
- data/test/rubygems/test_gem_indexer.rb +31 -40
- data/test/rubygems/test_gem_install_update_options.rb +31 -17
- data/test/rubygems/test_gem_installer.rb +383 -223
- data/test/rubygems/test_gem_package.rb +99 -14
- data/test/rubygems/test_gem_package_old.rb +57 -54
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +6 -5
- data/test/rubygems/test_gem_package_tar_writer.rb +11 -6
- data/test/rubygems/test_gem_path_support.rb +19 -13
- data/test/rubygems/test_gem_platform.rb +4 -2
- data/test/rubygems/test_gem_rdoc.rb +1 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +29 -16
- data/test/rubygems/test_gem_request.rb +19 -4
- data/test/rubygems/test_gem_request_connection_pools.rb +6 -2
- data/test/rubygems/test_gem_request_set.rb +33 -8
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +1 -1
- data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +2 -1
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +2 -0
- data/test/rubygems/test_gem_requirement.rb +7 -1
- data/test/rubygems/test_gem_resolver.rb +67 -23
- data/test/rubygems/test_gem_resolver_activation_request.rb +3 -32
- data/test/rubygems/test_gem_resolver_conflict.rb +0 -4
- data/test/rubygems/test_gem_resolver_git_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_index_specification.rb +7 -2
- data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -1
- data/test/rubygems/test_gem_resolver_installer_set.rb +3 -1
- data/test/rubygems/test_gem_resolver_specification.rb +2 -0
- data/test/rubygems/test_gem_security.rb +6 -2
- data/test/rubygems/test_gem_security_signer.rb +1 -0
- data/test/rubygems/test_gem_server.rb +7 -2
- data/test/rubygems/test_gem_silent_ui.rb +1 -0
- data/test/rubygems/test_gem_source.rb +7 -7
- data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
- data/test/rubygems/test_gem_source_git.rb +4 -9
- data/test/rubygems/test_gem_source_installed.rb +6 -6
- data/test/rubygems/test_gem_source_list.rb +1 -0
- data/test/rubygems/test_gem_source_local.rb +5 -4
- data/test/rubygems/test_gem_source_lock.rb +12 -12
- data/test/rubygems/test_gem_source_specific_file.rb +7 -6
- data/test/rubygems/test_gem_source_vendor.rb +4 -4
- data/test/rubygems/test_gem_specification.rb +75 -43
- data/test/rubygems/test_gem_stream_ui.rb +2 -0
- data/test/rubygems/test_gem_stub_specification.rb +3 -1
- data/test/rubygems/test_gem_text.rb +1 -0
- data/test/rubygems/test_gem_uninstaller.rb +31 -10
- data/test/rubygems/test_gem_util.rb +6 -4
- data/test/rubygems/test_gem_validator.rb +3 -4
- data/test/rubygems/test_gem_version.rb +16 -8
- data/test/rubygems/test_kernel.rb +1 -0
- data/test/rubygems/test_rake_package.rb +26 -0
- data/test/rubygems/test_remote_fetch_error.rb +1 -0
- data/test/rubygems/test_require.rb +107 -3
- data/util/bisect +31 -0
- data/util/ci.sh +50 -0
- data/util/generate_spdx_license_list.rb +4 -2
- data/util/rubocop +2 -2
- metadata +90 -18
- data/appveyor.yml +0 -43
- data/bundler/CONTRIBUTING.md +0 -17
- data/bundler/exe/bundle_ruby +0 -60
- data/bundler/lib/bundler/cli/cache.rb +0 -36
- data/bundler/lib/bundler/compatibility_guard.rb +0 -14
- data/bundler/lib/bundler/ssl_certs/.document +0 -1
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/bundler/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -21
- data/bundler/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/bundler/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/util/ci +0 -82
@@ -0,0 +1,25 @@
|
|
1
|
+
Gemfile(5) gemfile.5
|
2
|
+
bundle(1) bundle.1
|
3
|
+
bundle-add(1) bundle-add.1
|
4
|
+
bundle-binstubs(1) bundle-binstubs.1
|
5
|
+
bundle-check(1) bundle-check.1
|
6
|
+
bundle-clean(1) bundle-clean.1
|
7
|
+
bundle-config(1) bundle-config.1
|
8
|
+
bundle-doctor(1) bundle-doctor.1
|
9
|
+
bundle-exec(1) bundle-exec.1
|
10
|
+
bundle-gem(1) bundle-gem.1
|
11
|
+
bundle-info(1) bundle-info.1
|
12
|
+
bundle-init(1) bundle-init.1
|
13
|
+
bundle-inject(1) bundle-inject.1
|
14
|
+
bundle-install(1) bundle-install.1
|
15
|
+
bundle-list(1) bundle-list.1
|
16
|
+
bundle-lock(1) bundle-lock.1
|
17
|
+
bundle-open(1) bundle-open.1
|
18
|
+
bundle-outdated(1) bundle-outdated.1
|
19
|
+
bundle-package(1) bundle-package.1
|
20
|
+
bundle-platform(1) bundle-platform.1
|
21
|
+
bundle-pristine(1) bundle-pristine.1
|
22
|
+
bundle-remove(1) bundle-remove.1
|
23
|
+
bundle-show(1) bundle-show.1
|
24
|
+
bundle-update(1) bundle-update.1
|
25
|
+
bundle-viz(1) bundle-viz.1
|
data/lib/rubygems.rb
CHANGED
@@ -9,7 +9,7 @@
|
|
9
9
|
require 'rbconfig'
|
10
10
|
|
11
11
|
module Gem
|
12
|
-
VERSION = "3.0.
|
12
|
+
VERSION = "3.1.0.pre1".freeze
|
13
13
|
end
|
14
14
|
|
15
15
|
# Must be first since it unloads the prelude from 1.9.2
|
@@ -113,7 +113,6 @@ require 'rubygems/path_support'
|
|
113
113
|
#
|
114
114
|
# -The RubyGems Team
|
115
115
|
|
116
|
-
|
117
116
|
module Gem
|
118
117
|
RUBYGEMS_DIR = File.dirname File.expand_path(__FILE__)
|
119
118
|
|
@@ -176,8 +175,6 @@ module Gem
|
|
176
175
|
write_binary_errors
|
177
176
|
end.freeze
|
178
177
|
|
179
|
-
USE_BUNDLER_FOR_GEMDEPS = !ENV['DONT_USE_BUNDLER_FOR_GEMDEPS'] # :nodoc:
|
180
|
-
|
181
178
|
@@win_platform = nil
|
182
179
|
|
183
180
|
@configuration = nil
|
@@ -255,8 +252,6 @@ module Gem
|
|
255
252
|
# TODO: fails test_self_bin_path_bin_file_gone_in_latest
|
256
253
|
# Gem::Specification.find_by_name(name, *requirements).bin_file exec_name
|
257
254
|
|
258
|
-
raise ArgumentError, "you must supply exec_name" unless exec_name
|
259
|
-
|
260
255
|
requirements = Gem::Requirement.default if
|
261
256
|
requirements.empty?
|
262
257
|
|
@@ -264,6 +259,8 @@ module Gem
|
|
264
259
|
end
|
265
260
|
|
266
261
|
def self.find_spec_for_exe(name, exec_name, requirements)
|
262
|
+
raise ArgumentError, "you must supply exec_name" unless exec_name
|
263
|
+
|
267
264
|
dep = Gem::Dependency.new name, requirements
|
268
265
|
|
269
266
|
loaded = Gem.loaded_specs[name]
|
@@ -272,9 +269,9 @@ module Gem
|
|
272
269
|
|
273
270
|
specs = dep.matching_specs(true)
|
274
271
|
|
275
|
-
specs = specs.find_all
|
272
|
+
specs = specs.find_all do |spec|
|
276
273
|
spec.executables.include? exec_name
|
277
|
-
|
274
|
+
end if exec_name
|
278
275
|
|
279
276
|
unless spec = specs.first
|
280
277
|
msg = "can't find gem #{dep} with executable #{exec_name}"
|
@@ -299,8 +296,8 @@ module Gem
|
|
299
296
|
#
|
300
297
|
# This method should *only* be used in bin stub files.
|
301
298
|
|
302
|
-
def self.activate_bin_path(name, exec_name,
|
303
|
-
spec = find_spec_for_exe name, exec_name,
|
299
|
+
def self.activate_bin_path(name, exec_name = nil, *requirements) # :nodoc:
|
300
|
+
spec = find_spec_for_exe name, exec_name, requirements
|
304
301
|
Gem::LOADED_SPECS_MUTEX.synchronize do
|
305
302
|
spec.activate
|
306
303
|
finish_resolve
|
@@ -472,7 +469,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
472
469
|
subdirs.each do |name|
|
473
470
|
subdir = File.join dir, name
|
474
471
|
next if File.exist? subdir
|
475
|
-
FileUtils.mkdir_p subdir, options rescue nil
|
472
|
+
FileUtils.mkdir_p subdir, **options rescue nil
|
476
473
|
end
|
477
474
|
ensure
|
478
475
|
File.umask old_umask
|
@@ -522,9 +519,9 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
522
519
|
|
523
520
|
def self.find_files_from_load_path(glob) # :nodoc:
|
524
521
|
glob_with_suffixes = "#{glob}#{Gem.suffix_pattern}"
|
525
|
-
$LOAD_PATH.map
|
522
|
+
$LOAD_PATH.map do |load_path|
|
526
523
|
Gem::Util.glob_files_in_dir(glob_with_suffixes, load_path)
|
527
|
-
|
524
|
+
end.flatten.select { |file| File.file? file.untaint }
|
528
525
|
end
|
529
526
|
|
530
527
|
##
|
@@ -592,8 +589,10 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
592
589
|
end
|
593
590
|
|
594
591
|
class << self
|
592
|
+
|
595
593
|
extend Gem::Deprecate
|
596
594
|
deprecate :gunzip, "Gem::Util.gunzip", 2018, 12
|
595
|
+
|
597
596
|
end
|
598
597
|
|
599
598
|
##
|
@@ -604,8 +603,10 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
604
603
|
end
|
605
604
|
|
606
605
|
class << self
|
606
|
+
|
607
607
|
extend Gem::Deprecate
|
608
608
|
deprecate :gzip, "Gem::Util.gzip", 2018, 12
|
609
|
+
|
609
610
|
end
|
610
611
|
|
611
612
|
##
|
@@ -616,8 +617,10 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
616
617
|
end
|
617
618
|
|
618
619
|
class << self
|
620
|
+
|
619
621
|
extend Gem::Deprecate
|
620
622
|
deprecate :inflate, "Gem::Util.inflate", 2018, 12
|
623
|
+
|
621
624
|
end
|
622
625
|
|
623
626
|
##
|
@@ -663,6 +666,21 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
663
666
|
index
|
664
667
|
end
|
665
668
|
|
669
|
+
##
|
670
|
+
# Add a list of paths to the $LOAD_PATH at the proper place.
|
671
|
+
|
672
|
+
def self.add_to_load_path(*paths)
|
673
|
+
insert_index = load_path_insert_index
|
674
|
+
|
675
|
+
if insert_index
|
676
|
+
# gem directories must come after -I and ENV['RUBYLIB']
|
677
|
+
$LOAD_PATH.insert(insert_index, *paths)
|
678
|
+
else
|
679
|
+
# we are probably testing in core, -I and RUBYLIB don't apply
|
680
|
+
$LOAD_PATH.unshift(*paths)
|
681
|
+
end
|
682
|
+
end
|
683
|
+
|
666
684
|
@yaml_loaded = false
|
667
685
|
|
668
686
|
##
|
@@ -1006,17 +1024,21 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1006
1024
|
@suffix_pattern ||= "{#{suffixes.join(',')}}"
|
1007
1025
|
end
|
1008
1026
|
|
1027
|
+
def self.suffix_regexp
|
1028
|
+
@suffix_regexp ||= /#{Regexp.union(suffixes)}\z/
|
1029
|
+
end
|
1030
|
+
|
1009
1031
|
##
|
1010
1032
|
# Suffixes for require-able paths.
|
1011
1033
|
|
1012
1034
|
def self.suffixes
|
1013
1035
|
@suffixes ||= ['',
|
1014
1036
|
'.rb',
|
1015
|
-
*%w(DLEXT DLEXT2).map
|
1037
|
+
*%w(DLEXT DLEXT2).map do |key|
|
1016
1038
|
val = RbConfig::CONFIG[key]
|
1017
1039
|
next unless val and not val.empty?
|
1018
1040
|
".#{val}"
|
1019
|
-
|
1041
|
+
end
|
1020
1042
|
].compact.uniq
|
1021
1043
|
end
|
1022
1044
|
|
@@ -1076,6 +1098,13 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1076
1098
|
@@win_platform
|
1077
1099
|
end
|
1078
1100
|
|
1101
|
+
##
|
1102
|
+
# Is this a java platform?
|
1103
|
+
|
1104
|
+
def self.java_platform?
|
1105
|
+
RUBY_PLATFORM == "java"
|
1106
|
+
end
|
1107
|
+
|
1079
1108
|
##
|
1080
1109
|
# Load +plugins+ as Ruby files
|
1081
1110
|
|
@@ -1175,27 +1204,21 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1175
1204
|
raise ArgumentError, "Unable to find gem dependencies file at #{path}"
|
1176
1205
|
end
|
1177
1206
|
|
1178
|
-
|
1179
|
-
|
1180
|
-
|
1181
|
-
require
|
1182
|
-
|
1183
|
-
require "bundler"
|
1207
|
+
ENV["BUNDLE_GEMFILE"] ||= File.expand_path(path)
|
1208
|
+
require 'rubygems/user_interaction'
|
1209
|
+
Gem::DefaultUserInteraction.use_ui(ui) do
|
1210
|
+
require "bundler"
|
1211
|
+
begin
|
1184
1212
|
@gemdeps = Bundler.setup
|
1185
|
-
|
1186
|
-
|
1187
|
-
|
1188
|
-
|
1189
|
-
else
|
1190
|
-
|
1191
|
-
rs = Gem::RequestSet.new
|
1192
|
-
@gemdeps = rs.load_gemdeps path
|
1193
|
-
|
1194
|
-
rs.resolve_current.map do |s|
|
1195
|
-
s.full_spec.tap(&:activate)
|
1213
|
+
ensure
|
1214
|
+
if Gem::DefaultUserInteraction.ui.is_a?(Gem::SilentUI)
|
1215
|
+
Gem::DefaultUserInteraction.ui.close
|
1216
|
+
end
|
1196
1217
|
end
|
1197
|
-
|
1218
|
+
Bundler.ui = nil
|
1219
|
+
@gemdeps.requested_specs.map(&:to_spec).sort_by(&:name)
|
1198
1220
|
end
|
1221
|
+
|
1199
1222
|
rescue => e
|
1200
1223
|
case e
|
1201
1224
|
when Gem::LoadError, Gem::UnsatisfiableDependencyError, (defined?(Bundler::GemNotFound) ? Bundler::GemNotFound : Gem::LoadError)
|
@@ -1208,6 +1231,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1208
1231
|
end
|
1209
1232
|
|
1210
1233
|
class << self
|
1234
|
+
|
1211
1235
|
##
|
1212
1236
|
# TODO remove with RubyGems 4.0
|
1213
1237
|
|
@@ -1215,6 +1239,24 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1215
1239
|
|
1216
1240
|
extend Gem::Deprecate
|
1217
1241
|
deprecate :detect_gemdeps, "Gem.use_gemdeps", 2018, 12
|
1242
|
+
|
1243
|
+
end
|
1244
|
+
|
1245
|
+
##
|
1246
|
+
# The SOURCE_DATE_EPOCH environment variable (or, if that's not set, the current time), converted to Time object.
|
1247
|
+
# This is used throughout RubyGems for enabling reproducible builds.
|
1248
|
+
#
|
1249
|
+
# If it is not set as an environment variable already, this also sets it.
|
1250
|
+
#
|
1251
|
+
# Details on SOURCE_DATE_EPOCH:
|
1252
|
+
# https://reproducible-builds.org/specs/source-date-epoch/
|
1253
|
+
|
1254
|
+
def self.source_date_epoch
|
1255
|
+
if ENV["SOURCE_DATE_EPOCH"].nil? || ENV["SOURCE_DATE_EPOCH"].empty?
|
1256
|
+
ENV["SOURCE_DATE_EPOCH"] = Time.now.to_i.to_s
|
1257
|
+
end
|
1258
|
+
|
1259
|
+
Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc.freeze
|
1218
1260
|
end
|
1219
1261
|
|
1220
1262
|
# FIX: Almost everywhere else we use the `def self.` way of defining class
|
@@ -1246,15 +1288,13 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1246
1288
|
#
|
1247
1289
|
|
1248
1290
|
def register_default_spec(spec)
|
1249
|
-
new_format =
|
1291
|
+
new_format = spec.require_paths.any? {|path| spec.files.any? {|f| f.start_with? path } }
|
1250
1292
|
|
1251
1293
|
if new_format
|
1252
1294
|
prefix_group = spec.require_paths.map {|f| f + "/"}.join("|")
|
1253
1295
|
prefix_pattern = /^(#{prefix_group})/
|
1254
1296
|
end
|
1255
1297
|
|
1256
|
-
suffix_pattern = /#{Regexp.union(Gem.suffixes)}\z/
|
1257
|
-
|
1258
1298
|
spec.files.each do |file|
|
1259
1299
|
if new_format
|
1260
1300
|
file = file.sub(prefix_pattern, "")
|
@@ -1262,7 +1302,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1262
1302
|
end
|
1263
1303
|
|
1264
1304
|
@path_to_default_spec_map[file] = spec
|
1265
|
-
@path_to_default_spec_map[file.sub(
|
1305
|
+
@path_to_default_spec_map[file.sub(suffix_regexp, "")] = spec
|
1266
1306
|
end
|
1267
1307
|
end
|
1268
1308
|
|
@@ -1270,17 +1310,8 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1270
1310
|
# Find a Gem::Specification of default gem from +path+
|
1271
1311
|
|
1272
1312
|
def find_unresolved_default_spec(path)
|
1273
|
-
@path_to_default_spec_map[path]
|
1274
|
-
|
1275
|
-
|
1276
|
-
##
|
1277
|
-
# Remove needless Gem::Specification of default gem from
|
1278
|
-
# unresolved default gem list
|
1279
|
-
|
1280
|
-
def remove_unresolved_default_spec(spec)
|
1281
|
-
spec.files.each do |file|
|
1282
|
-
@path_to_default_spec_map.delete(file)
|
1283
|
-
end
|
1313
|
+
default_spec = @path_to_default_spec_map[path]
|
1314
|
+
return default_spec if default_spec && loaded_specs[default_spec.name] != default_spec
|
1284
1315
|
end
|
1285
1316
|
|
1286
1317
|
##
|
@@ -1334,6 +1365,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
|
1334
1365
|
# work
|
1335
1366
|
|
1336
1367
|
attr_reader :pre_uninstall_hooks
|
1368
|
+
|
1337
1369
|
end
|
1338
1370
|
|
1339
1371
|
##
|
@@ -35,7 +35,14 @@ class Gem::BasicSpecification
|
|
35
35
|
end
|
36
36
|
|
37
37
|
def self.default_specifications_dir
|
38
|
-
|
38
|
+
Gem.default_specifications_dir
|
39
|
+
end
|
40
|
+
|
41
|
+
class << self
|
42
|
+
|
43
|
+
extend Gem::Deprecate
|
44
|
+
deprecate :default_specifications_dir, "Gem.default_specifications_dir", 2020, 02
|
45
|
+
|
39
46
|
end
|
40
47
|
|
41
48
|
##
|
@@ -71,8 +78,11 @@ class Gem::BasicSpecification
|
|
71
78
|
elsif missing_extensions?
|
72
79
|
@ignored = true
|
73
80
|
|
74
|
-
|
75
|
-
"
|
81
|
+
if RUBY_ENGINE == platform || Gem::Platform.local === platform
|
82
|
+
warn "Ignoring #{full_name} because its extensions are not built. " +
|
83
|
+
"Try: gem pristine #{name} --version #{version}"
|
84
|
+
end
|
85
|
+
|
76
86
|
return false
|
77
87
|
end
|
78
88
|
|
@@ -81,7 +91,7 @@ class Gem::BasicSpecification
|
|
81
91
|
|
82
92
|
def default_gem?
|
83
93
|
loaded_from &&
|
84
|
-
File.dirname(loaded_from) ==
|
94
|
+
File.dirname(loaded_from) == Gem.default_specifications_dir
|
85
95
|
end
|
86
96
|
|
87
97
|
##
|
@@ -196,8 +206,8 @@ class Gem::BasicSpecification
|
|
196
206
|
|
197
207
|
def internal_init # :nodoc:
|
198
208
|
@extension_dir = nil
|
199
|
-
@full_gem_path
|
200
|
-
@gem_dir
|
209
|
+
@full_gem_path = nil
|
210
|
+
@gem_dir = nil
|
201
211
|
@ignored = nil
|
202
212
|
end
|
203
213
|
|
@@ -329,4 +339,5 @@ class Gem::BasicSpecification
|
|
329
339
|
false
|
330
340
|
end
|
331
341
|
end
|
342
|
+
|
332
343
|
end
|
@@ -45,6 +45,11 @@ To install the missing version, run `gem install bundler:#{vr.first}`
|
|
45
45
|
return unless bundler_version = self.bundler_version
|
46
46
|
|
47
47
|
specs.reject! { |spec| spec.version.segments.first != bundler_version.segments.first }
|
48
|
+
|
49
|
+
exact_match_index = specs.find_index { |spec| spec.version == bundler_version }
|
50
|
+
return unless exact_match_index
|
51
|
+
|
52
|
+
specs.unshift(specs.delete_at(exact_match_index))
|
48
53
|
end
|
49
54
|
|
50
55
|
def self.bundle_update_bundler_version
|
data/lib/rubygems/command.rb
CHANGED
@@ -20,6 +20,10 @@ class Gem::Command
|
|
20
20
|
|
21
21
|
include Gem::UserInteraction
|
22
22
|
|
23
|
+
OptionParser.accept Symbol do |value|
|
24
|
+
value.to_sym
|
25
|
+
end
|
26
|
+
|
23
27
|
##
|
24
28
|
# The name of the command.
|
25
29
|
|
@@ -122,6 +126,7 @@ class Gem::Command
|
|
122
126
|
@defaults = defaults
|
123
127
|
@options = defaults.dup
|
124
128
|
@option_groups = Hash.new { |h,k| h[k] = [] }
|
129
|
+
@deprecated_options = { command => {} }
|
125
130
|
@parser = nil
|
126
131
|
@when_invoked = nil
|
127
132
|
end
|
@@ -150,9 +155,8 @@ class Gem::Command
|
|
150
155
|
##
|
151
156
|
# Display to the user that a gem couldn't be found and reasons why
|
152
157
|
#--
|
153
|
-
# TODO: replace +domain+ with a parameter to suppress suggestions
|
154
158
|
|
155
|
-
def show_lookup_failure(gem_name, version, errors,
|
159
|
+
def show_lookup_failure(gem_name, version, errors, suppress_suggestions = false, required_by = nil)
|
156
160
|
gem = "'#{gem_name}' (#{version})"
|
157
161
|
msg = String.new "Could not find a valid gem #{gem}"
|
158
162
|
|
@@ -169,7 +173,7 @@ class Gem::Command
|
|
169
173
|
|
170
174
|
alert_error msg
|
171
175
|
|
172
|
-
unless
|
176
|
+
unless suppress_suggestions
|
173
177
|
suggestions = Gem::SpecFetcher.fetcher.suggest_gems_from_name gem_name
|
174
178
|
|
175
179
|
unless suggestions.empty?
|
@@ -365,13 +369,34 @@ class Gem::Command
|
|
365
369
|
end
|
366
370
|
end
|
367
371
|
|
372
|
+
def deprecate_option(short_name: nil, long_name: nil, version: nil)
|
373
|
+
@deprecated_options[command].merge!({ short_name => { "rg_version_to_expire" => version } }) if short_name
|
374
|
+
@deprecated_options[command].merge!({ long_name => { "rg_version_to_expire" => version } }) if long_name
|
375
|
+
end
|
376
|
+
|
377
|
+
def check_deprecated_options(options)
|
378
|
+
options.each do |option|
|
379
|
+
if option_is_deprecated?(option)
|
380
|
+
version_to_expire = @deprecated_options[command][option]["rg_version_to_expire"]
|
381
|
+
|
382
|
+
deprecate_option_msg = if version_to_expire
|
383
|
+
"The \"#{option}\" option has been deprecated and will be removed in Rubygems #{version_to_expire}, its use is discouraged."
|
384
|
+
else
|
385
|
+
"The \"#{option}\" option has been deprecated and will be removed in future versions of Rubygems, its use is discouraged."
|
386
|
+
end
|
387
|
+
|
388
|
+
alert_warning(deprecate_option_msg)
|
389
|
+
end
|
390
|
+
end
|
391
|
+
end
|
392
|
+
|
368
393
|
##
|
369
394
|
# Merge a set of command options with the set of default options (without
|
370
395
|
# modifying the default option hash).
|
371
396
|
|
372
397
|
def merge_options(new_options)
|
373
398
|
@options = @defaults.clone
|
374
|
-
new_options.each
|
399
|
+
new_options.each { |k,v| @options[k] = v }
|
375
400
|
end
|
376
401
|
|
377
402
|
##
|
@@ -392,6 +417,7 @@ class Gem::Command
|
|
392
417
|
|
393
418
|
def handle_options(args)
|
394
419
|
args = add_extra_args(args)
|
420
|
+
check_deprecated_options(args)
|
395
421
|
@options = Marshal.load Marshal.dump @defaults # deep copy
|
396
422
|
parser.parse!(args)
|
397
423
|
@options[:args] = args
|
@@ -420,6 +446,10 @@ class Gem::Command
|
|
420
446
|
|
421
447
|
private
|
422
448
|
|
449
|
+
def option_is_deprecated?(option)
|
450
|
+
@deprecated_options[command].has_key?(option)
|
451
|
+
end
|
452
|
+
|
423
453
|
def add_parser_description # :nodoc:
|
424
454
|
return unless description
|
425
455
|
|
@@ -566,7 +596,6 @@ class Gem::Command
|
|
566
596
|
'Avoid loading any .gemrc file') do
|
567
597
|
end
|
568
598
|
|
569
|
-
|
570
599
|
# :stopdoc:
|
571
600
|
|
572
601
|
HELP = <<-HELP.freeze
|