rubygems-update 3.1.0 → 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 +2 -3
- data/History.txt +195 -7
- data/Manifest.txt +11 -23
- data/POLICIES.md +2 -9
- data/README.md +5 -5
- data/Rakefile +38 -35
- data/bin/update_rubygems +2 -2
- data/bundler/CHANGELOG.md +846 -728
- 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 +29 -9
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/exec.rb +3 -12
- data/bundler/lib/bundler/cli/gem.rb +74 -10
- data/bundler/lib/bundler/cli/info.rb +6 -3
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +8 -16
- data/bundler/lib/bundler/cli/issue.rb +2 -2
- data/bundler/lib/bundler/cli/outdated.rb +5 -5
- data/bundler/lib/bundler/cli/plugin.rb +10 -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 +18 -12
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/injector.rb +14 -3
- data/bundler/lib/bundler/inline.rb +2 -2
- 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 +13 -19
- data/bundler/lib/bundler/runtime.rb +2 -12
- data/bundler/lib/bundler/settings.rb +0 -3
- data/bundler/lib/bundler/setup.rb +5 -0
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- 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 +7 -2
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +12 -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 +5 -3
- 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 +72 -208
- 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 +1 -1
- data/bundler/man/bundle-list.1.txt +7 -7
- 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 +135 -185
- data/lib/rubygems/available_set.rb +4 -4
- data/lib/rubygems/basic_specification.rb +12 -6
- data/lib/rubygems/bundler_version_finder.rb +14 -9
- data/lib/rubygems/command.rb +17 -15
- 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 +2 -2
- 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 +156 -45
- data/lib/rubygems/commands/sources_command.rb +3 -3
- 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 +2 -2
- 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 +26 -36
- 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 +4 -2
- 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 +2 -2
- 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 +4 -4
- data/lib/rubygems/resolver/api_specification.rb +1 -1
- 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 +9 -9
- data/lib/rubygems/source/git.rb +7 -6
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source_list.rb +6 -5
- data/lib/rubygems/spec_fetcher.rb +18 -15
- data/lib/rubygems/specification.rb +91 -112
- data/lib/rubygems/specification_policy.rb +88 -28
- data/lib/rubygems/test_case.rb +122 -81
- 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 +17 -3
- data/lib/rubygems/util/licenses.rb +4 -4
- data/lib/rubygems/validator.rb +1 -1
- data/lib/rubygems/version.rb +5 -5
- 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 +12 -0
- data/test/rubygems/test_bundled_ca.rb +1 -5
- data/test/rubygems/test_deprecate.rb +43 -4
- data/test/rubygems/test_gem.rb +150 -101
- 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 +25 -3
- 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 +212 -114
- 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_sources_command.rb +39 -1
- data/test/rubygems/test_gem_commands_specification_command.rb +18 -18
- data/test/rubygems/test_gem_commands_uninstall_command.rb +2 -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 +158 -67
- data/test/rubygems/test_gem_package.rb +16 -20
- data/test/rubygems/test_gem_package_tar_header.rb +19 -0
- data/test/rubygems/test_gem_package_tar_writer.rb +8 -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 +72 -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 +169 -119
- data/test/rubygems/test_gem_stream_ui.rb +3 -1
- data/test/rubygems/test_gem_stub_specification.rb +0 -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 +25 -8
- data/test/rubygems/test_project_sanity.rb +8 -1
- data/test/rubygems/test_require.rb +242 -40
- metadata +33 -46
- 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/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 -139
- data/util/update_changelog.rb +0 -67
data/lib/rubygems/rdoc.rb
CHANGED
@@ -1,18 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
require 'rubygems'
|
3
3
|
|
4
|
-
begin
|
5
|
-
gem 'rdoc'
|
6
|
-
rescue Gem::LoadError
|
7
|
-
# swallow
|
8
|
-
else
|
9
|
-
# This will force any deps that 'rdoc' might have
|
10
|
-
# (such as json) that are ambiguous to be activated, which
|
11
|
-
# is important because we end up using Specification.reset
|
12
|
-
# and we don't want the warning it pops out.
|
13
|
-
Gem.finish_resolve
|
14
|
-
end
|
15
|
-
|
16
4
|
begin
|
17
5
|
require 'rdoc/rubygems_hook'
|
18
6
|
module Gem
|
@@ -7,7 +7,6 @@ require 'rubygems/uri_formatter'
|
|
7
7
|
require 'rubygems/uri_parsing'
|
8
8
|
require 'rubygems/user_interaction'
|
9
9
|
require 'resolv'
|
10
|
-
require 'rubygems/deprecate'
|
11
10
|
|
12
11
|
##
|
13
12
|
# RemoteFetcher handles the details of fetching gems and gem information from
|
@@ -16,8 +15,6 @@ require 'rubygems/deprecate'
|
|
16
15
|
class Gem::RemoteFetcher
|
17
16
|
|
18
17
|
include Gem::UserInteraction
|
19
|
-
extend Gem::Deprecate
|
20
|
-
|
21
18
|
include Gem::UriParsing
|
22
19
|
|
23
20
|
##
|
@@ -109,7 +106,7 @@ class Gem::RemoteFetcher
|
|
109
106
|
|
110
107
|
return if found.empty?
|
111
108
|
|
112
|
-
spec, source = found.max_by {
|
109
|
+
spec, source = found.max_by {|(s,_)| s.version }
|
113
110
|
|
114
111
|
download spec, source.uri
|
115
112
|
end
|
@@ -121,7 +118,7 @@ class Gem::RemoteFetcher
|
|
121
118
|
|
122
119
|
def download(spec, source_uri, install_dir = Gem.dir)
|
123
120
|
cache_dir =
|
124
|
-
if Dir.pwd == install_dir
|
121
|
+
if Dir.pwd == install_dir # see fetch_command
|
125
122
|
install_dir
|
126
123
|
elsif File.writable? install_dir
|
127
124
|
File.join install_dir, "cache"
|
@@ -215,7 +212,7 @@ class Gem::RemoteFetcher
|
|
215
212
|
def fetch_http(uri, last_modified = nil, head = false, depth = 0)
|
216
213
|
fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
|
217
214
|
response = request uri, fetch_type, last_modified do |req|
|
218
|
-
headers.each {
|
215
|
+
headers.each {|k,v| req.add_field(k,v) }
|
219
216
|
end
|
220
217
|
|
221
218
|
case response
|
@@ -255,7 +252,7 @@ class Gem::RemoteFetcher
|
|
255
252
|
|
256
253
|
data = send "fetch_#{uri.scheme}", uri, mtime, head
|
257
254
|
|
258
|
-
if data and !head and uri.to_s
|
255
|
+
if data and !head and uri.to_s.end_with?(".gz")
|
259
256
|
begin
|
260
257
|
data = Gem::Util.gunzip data
|
261
258
|
rescue Zlib::GzipFile::Error
|
@@ -309,17 +306,6 @@ class Gem::RemoteFetcher
|
|
309
306
|
data
|
310
307
|
end
|
311
308
|
|
312
|
-
##
|
313
|
-
# Returns the size of +uri+ in bytes.
|
314
|
-
|
315
|
-
def fetch_size(uri)
|
316
|
-
response = fetch_path(uri, nil, true)
|
317
|
-
|
318
|
-
response['content-length'].to_i
|
319
|
-
end
|
320
|
-
|
321
|
-
deprecate :fetch_size, :none, 2019, 12
|
322
|
-
|
323
309
|
##
|
324
310
|
# Performs a Net::HTTP request of type +request_class+ on +uri+ returning
|
325
311
|
# a Net::HTTP response object. request maintains a table of persistent
|
@@ -341,7 +327,7 @@ class Gem::RemoteFetcher
|
|
341
327
|
end
|
342
328
|
|
343
329
|
def close_all
|
344
|
-
@pools.each_value {|pool| pool.close_all}
|
330
|
+
@pools.each_value {|pool| pool.close_all }
|
345
331
|
end
|
346
332
|
|
347
333
|
private
|
data/lib/rubygems/request_set.rb
CHANGED
@@ -184,7 +184,7 @@ class Gem::RequestSet
|
|
184
184
|
if req.installed?
|
185
185
|
req.spec.spec.build_extensions
|
186
186
|
|
187
|
-
if @always_install.none? {
|
187
|
+
if @always_install.none? {|spec| spec == req.spec.spec }
|
188
188
|
yield req, nil if block_given?
|
189
189
|
next
|
190
190
|
end
|
@@ -269,7 +269,7 @@ class Gem::RequestSet
|
|
269
269
|
gem_home, ENV['GEM_HOME'] = ENV['GEM_HOME'], dir
|
270
270
|
|
271
271
|
existing = force ? [] : specs_in(dir)
|
272
|
-
existing.delete_if {
|
272
|
+
existing.delete_if {|s| @always_install.include? s }
|
273
273
|
|
274
274
|
dir = File.expand_path dir
|
275
275
|
|
@@ -283,7 +283,7 @@ class Gem::RequestSet
|
|
283
283
|
sorted_requests.each do |request|
|
284
284
|
spec = request.spec
|
285
285
|
|
286
|
-
if existing.find {
|
286
|
+
if existing.find {|s| s.full_name == spec.full_name }
|
287
287
|
yield request, nil if block_given?
|
288
288
|
next
|
289
289
|
end
|
@@ -386,7 +386,7 @@ class Gem::RequestSet
|
|
386
386
|
q.text 'sets:'
|
387
387
|
|
388
388
|
q.breakable
|
389
|
-
q.pp @sets.map {
|
389
|
+
q.pp @sets.map {|set| set.class }
|
390
390
|
end
|
391
391
|
end
|
392
392
|
|
@@ -440,7 +440,7 @@ class Gem::RequestSet
|
|
440
440
|
end
|
441
441
|
|
442
442
|
def specs
|
443
|
-
@specs ||= @requests.map {
|
443
|
+
@specs ||= @requests.map {|r| r.full_spec }
|
444
444
|
end
|
445
445
|
|
446
446
|
def specs_in(dir)
|
@@ -206,7 +206,7 @@ class Gem::RequestSet::GemDependencyAPI
|
|
206
206
|
@git_set = @set.git_set
|
207
207
|
@git_sources = {}
|
208
208
|
@installing = false
|
209
|
-
@requires = Hash.new {
|
209
|
+
@requires = Hash.new {|h, name| h[name] = [] }
|
210
210
|
@vendor_set = @set.vendor_set
|
211
211
|
@source_set = @set.source_set
|
212
212
|
@gem_sources = {}
|
@@ -235,7 +235,7 @@ class Gem::RequestSet::GemDependencyAPI
|
|
235
235
|
return unless (groups & @without_groups).empty?
|
236
236
|
|
237
237
|
dependencies.each do |dep|
|
238
|
-
@set.gem dep.name, *dep.requirement
|
238
|
+
@set.gem dep.name, *dep.requirement.as_list
|
239
239
|
end
|
240
240
|
end
|
241
241
|
|
@@ -89,7 +89,7 @@ class Gem::RequestSet::Lockfile
|
|
89
89
|
def add_DEPENDENCIES(out) # :nodoc:
|
90
90
|
out << "DEPENDENCIES"
|
91
91
|
|
92
|
-
out.concat @dependencies.sort_by {
|
92
|
+
out.concat @dependencies.sort_by {|name,| name }.map {|name, requirement|
|
93
93
|
" #{name}#{requirement.for_lockfile}"
|
94
94
|
}
|
95
95
|
|
@@ -103,12 +103,12 @@ class Gem::RequestSet::Lockfile
|
|
103
103
|
request.spec.source.uri
|
104
104
|
end
|
105
105
|
|
106
|
-
source_groups.sort_by {
|
106
|
+
source_groups.sort_by {|group,| group.to_s }.map do |group, requests|
|
107
107
|
out << "GEM"
|
108
108
|
out << " remote: #{group}"
|
109
109
|
out << " specs:"
|
110
110
|
|
111
|
-
requests.sort_by {
|
111
|
+
requests.sort_by {|request| request.name }.each do |request|
|
112
112
|
next if request.spec.name == 'bundler'
|
113
113
|
platform = "-#{request.spec.platform}" unless
|
114
114
|
Gem::Platform::RUBY == request.spec.platform
|
@@ -140,10 +140,10 @@ class Gem::RequestSet::Lockfile
|
|
140
140
|
out << " revision: #{revision}"
|
141
141
|
out << " specs:"
|
142
142
|
|
143
|
-
requests.sort_by {
|
143
|
+
requests.sort_by {|request| request.name }.each do |request|
|
144
144
|
out << " #{request.name} (#{request.version})"
|
145
145
|
|
146
|
-
dependencies = request.spec.dependencies.sort_by {
|
146
|
+
dependencies = request.spec.dependencies.sort_by {|dep| dep.name }
|
147
147
|
dependencies.each do |dep|
|
148
148
|
out << " #{dep.name}#{dep.requirement.for_lockfile}"
|
149
149
|
end
|
@@ -185,9 +185,9 @@ class Gem::RequestSet::Lockfile
|
|
185
185
|
def add_PLATFORMS(out) # :nodoc:
|
186
186
|
out << "PLATFORMS"
|
187
187
|
|
188
|
-
platforms = requests.map {
|
188
|
+
platforms = requests.map {|request| request.spec.platform }.uniq
|
189
189
|
|
190
|
-
platforms = platforms.sort_by {
|
190
|
+
platforms = platforms.sort_by {|platform| platform.to_s }
|
191
191
|
|
192
192
|
platforms.each do |platform|
|
193
193
|
out << " #{platform}"
|
@@ -197,7 +197,7 @@ class Gem::RequestSet::Lockfile
|
|
197
197
|
end
|
198
198
|
|
199
199
|
def spec_groups
|
200
|
-
requests.group_by {
|
200
|
+
requests.group_by {|request| request.spec.class }
|
201
201
|
end
|
202
202
|
|
203
203
|
##
|
data/lib/rubygems/requirement.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require "rubygems/version"
|
3
2
|
require "rubygems/deprecate"
|
4
3
|
|
5
4
|
##
|
@@ -12,18 +11,18 @@ require "rubygems/deprecate"
|
|
12
11
|
class Gem::Requirement
|
13
12
|
|
14
13
|
OPS = { #:nodoc:
|
15
|
-
"=" => lambda {
|
16
|
-
"!=" => lambda {
|
17
|
-
">" => lambda {
|
18
|
-
"<" => lambda {
|
19
|
-
">=" => lambda {
|
20
|
-
"<=" => lambda {
|
21
|
-
"~>" => lambda {
|
14
|
+
"=" => lambda {|v, r| v == r },
|
15
|
+
"!=" => lambda {|v, r| v != r },
|
16
|
+
">" => lambda {|v, r| v > r },
|
17
|
+
"<" => lambda {|v, r| v < r },
|
18
|
+
">=" => lambda {|v, r| v >= r },
|
19
|
+
"<=" => lambda {|v, r| v <= r },
|
20
|
+
"~>" => lambda {|v, r| v >= r && v.release < r.bump }
|
22
21
|
}.freeze
|
23
22
|
|
24
23
|
SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
|
25
24
|
|
26
|
-
quoted = OPS.keys.map {
|
25
|
+
quoted = OPS.keys.map {|k| Regexp.quote k }.join "|"
|
27
26
|
PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*".freeze # :nodoc:
|
28
27
|
|
29
28
|
##
|
@@ -137,7 +136,7 @@ class Gem::Requirement
|
|
137
136
|
if requirements.empty?
|
138
137
|
@requirements = [DefaultRequirement]
|
139
138
|
else
|
140
|
-
@requirements = requirements.map! {
|
139
|
+
@requirements = requirements.map! {|r| self.class.parse r }
|
141
140
|
end
|
142
141
|
end
|
143
142
|
|
@@ -148,7 +147,7 @@ class Gem::Requirement
|
|
148
147
|
new = new.flatten
|
149
148
|
new.compact!
|
150
149
|
new.uniq!
|
151
|
-
new = new.map {
|
150
|
+
new = new.map {|r| self.class.parse r }
|
152
151
|
|
153
152
|
@requirements.concat new
|
154
153
|
end
|
@@ -188,7 +187,7 @@ class Gem::Requirement
|
|
188
187
|
end
|
189
188
|
|
190
189
|
def as_list # :nodoc:
|
191
|
-
requirements.map {
|
190
|
+
requirements.map {|op, version| "#{op} #{version}" }
|
192
191
|
end
|
193
192
|
|
194
193
|
def hash # :nodoc:
|
@@ -233,7 +232,7 @@ class Gem::Requirement
|
|
233
232
|
# are prereleases
|
234
233
|
|
235
234
|
def prerelease?
|
236
|
-
requirements.any? {
|
235
|
+
requirements.any? {|r| r.last.prerelease? }
|
237
236
|
end
|
238
237
|
|
239
238
|
def pretty_print(q) # :nodoc:
|
@@ -249,7 +248,7 @@ class Gem::Requirement
|
|
249
248
|
raise ArgumentError, "Need a Gem::Version: #{version.inspect}" unless
|
250
249
|
Gem::Version === version
|
251
250
|
# #28965: syck has a bug with unquoted '=' YAML.loading as YAML::DefaultKey
|
252
|
-
requirements.all? {
|
251
|
+
requirements.all? {|op, rv| (OPS[op] || OPS["="]).call version, rv }
|
253
252
|
end
|
254
253
|
|
255
254
|
alias :=== :satisfied_by?
|
@@ -285,7 +284,7 @@ class Gem::Requirement
|
|
285
284
|
protected
|
286
285
|
|
287
286
|
def _tilde_requirements
|
288
|
-
requirements.select {
|
287
|
+
requirements.select {|r| r.first == "~>" }
|
289
288
|
end
|
290
289
|
|
291
290
|
private
|
data/lib/rubygems/resolver.rb
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
require 'rubygems/dependency'
|
3
3
|
require 'rubygems/exceptions'
|
4
|
-
require 'rubygems/util'
|
5
4
|
require 'rubygems/util/list'
|
6
5
|
|
7
6
|
##
|
@@ -116,7 +115,7 @@ class Gem::Resolver
|
|
116
115
|
def explain(stage, *data) # :nodoc:
|
117
116
|
return unless DEBUG_RESOLVER
|
118
117
|
|
119
|
-
d = data.map {
|
118
|
+
d = data.map {|x| x.pretty_inspect }.join(", ")
|
120
119
|
$stderr.printf "%10s %s\n", stage.to_s.upcase, d
|
121
120
|
end
|
122
121
|
|
@@ -189,7 +188,7 @@ class Gem::Resolver
|
|
189
188
|
|
190
189
|
def resolve
|
191
190
|
locking_dg = Molinillo::DependencyGraph.new
|
192
|
-
Molinillo::Resolver.new(self, self).resolve(@needed.map {
|
191
|
+
Molinillo::Resolver.new(self, self).resolve(@needed.map {|d| DependencyRequest.new d, nil }, locking_dg).tsort.map(&:payload).compact
|
193
192
|
rescue Molinillo::VersionConflict => e
|
194
193
|
conflict = e.conflicts.values.first
|
195
194
|
raise Gem::DependencyResolutionError, Conflict.new(conflict.requirement_trees.first.first, conflict.existing, conflict.requirement)
|
@@ -206,7 +205,7 @@ class Gem::Resolver
|
|
206
205
|
|
207
206
|
if (skip_dep_gems = skip_gems[dependency.name]) && !skip_dep_gems.empty?
|
208
207
|
matching = all.select do |api_spec|
|
209
|
-
skip_dep_gems.any? {
|
208
|
+
skip_dep_gems.any? {|s| api_spec.version == s.version }
|
210
209
|
end
|
211
210
|
|
212
211
|
all = matching unless matching.empty?
|
@@ -235,7 +234,7 @@ class Gem::Resolver
|
|
235
234
|
raise exc
|
236
235
|
end
|
237
236
|
|
238
|
-
groups = Hash.new {
|
237
|
+
groups = Hash.new {|hash, key| hash[key] = [] }
|
239
238
|
|
240
239
|
# create groups & sources in the same loop
|
241
240
|
sources = possibles.map do |spec|
|
@@ -248,9 +247,9 @@ class Gem::Resolver
|
|
248
247
|
|
249
248
|
sources.each do |source|
|
250
249
|
groups[source].
|
251
|
-
sort_by {
|
252
|
-
map {
|
253
|
-
each {
|
250
|
+
sort_by {|spec| [spec.version, Gem::Platform.local =~ spec.platform ? 1 : 0] }.
|
251
|
+
map {|spec| ActivationRequest.new spec, dependency }.
|
252
|
+
each {|activation_request| activation_requests << activation_request }
|
254
253
|
end
|
255
254
|
|
256
255
|
activation_requests
|
@@ -23,17 +23,17 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
|
|
23
23
|
##
|
24
24
|
# Creates a new APISet that will retrieve gems from +uri+ using the RubyGems
|
25
25
|
# API URL +dep_uri+ which is described at
|
26
|
-
#
|
26
|
+
# https://guides.rubygems.org/rubygems-org-api
|
27
27
|
|
28
28
|
def initialize(dep_uri = 'https://rubygems.org/api/v1/dependencies')
|
29
29
|
super()
|
30
30
|
|
31
|
-
dep_uri = URI dep_uri unless URI === dep_uri
|
31
|
+
dep_uri = URI dep_uri unless URI === dep_uri
|
32
32
|
|
33
33
|
@dep_uri = dep_uri
|
34
34
|
@uri = dep_uri + '../..'
|
35
35
|
|
36
|
-
@data = Hash.new {
|
36
|
+
@data = Hash.new {|h,k| h[k] = [] }
|
37
37
|
@source = Gem::Source.new @uri
|
38
38
|
|
39
39
|
@to_fetch = []
|
@@ -67,7 +67,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
|
|
67
67
|
|
68
68
|
def prefetch(reqs)
|
69
69
|
return unless @remote
|
70
|
-
names = reqs.map {
|
70
|
+
names = reqs.map {|r| r.dependency.name }
|
71
71
|
needed = names - @data.keys - @to_fetch
|
72
72
|
|
73
73
|
@to_fetch += needed
|
@@ -11,7 +11,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
11
11
|
# Creates an APISpecification for the given +set+ from the rubygems.org
|
12
12
|
# +api_data+.
|
13
13
|
#
|
14
|
-
# See
|
14
|
+
# See https://guides.rubygems.org/rubygems-org-api/#misc_methods for the
|
15
15
|
# format of the +api_data+.
|
16
16
|
|
17
17
|
def initialize(set, api_data)
|
@@ -40,11 +40,11 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
|
|
40
40
|
def remote=(remote)
|
41
41
|
super
|
42
42
|
|
43
|
-
@sets.each {
|
43
|
+
@sets.each {|set| set.remote = remote }
|
44
44
|
end
|
45
45
|
|
46
46
|
def errors
|
47
|
-
@errors + @sets.map {
|
47
|
+
@errors + @sets.map {|set| set.errors }.flatten
|
48
48
|
end
|
49
49
|
|
50
50
|
##
|
@@ -60,7 +60,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
|
|
60
60
|
# Prefetches +reqs+ in all sets.
|
61
61
|
|
62
62
|
def prefetch(reqs)
|
63
|
-
@sets.each {
|
63
|
+
@sets.each {|s| s.prefetch(reqs) }
|
64
64
|
end
|
65
65
|
|
66
66
|
end
|
@@ -55,7 +55,7 @@ class Gem::Resolver::Conflict
|
|
55
55
|
activated = @activated.spec.full_name
|
56
56
|
dependency = @failed_dep.dependency
|
57
57
|
requirement = dependency.requirement
|
58
|
-
alternates = dependency.matching_specs.map {
|
58
|
+
alternates = dependency.matching_specs.map {|spec| spec.full_name }
|
59
59
|
|
60
60
|
unless alternates.empty?
|
61
61
|
matching = <<-MATCHING.chomp
|