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
@@ -1,7 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require "rubygems/util"
|
4
|
-
|
5
3
|
module Gem::BundlerVersionFinder
|
6
4
|
def self.bundler_version
|
7
5
|
version, _ = bundler_version_with_reason
|
@@ -44,9 +42,9 @@ To install the missing version, run `gem install bundler:#{vr.first}`
|
|
44
42
|
def self.filter!(specs)
|
45
43
|
return unless bundler_version = self.bundler_version
|
46
44
|
|
47
|
-
specs.reject! {
|
45
|
+
specs.reject! {|spec| spec.version.segments.first != bundler_version.segments.first }
|
48
46
|
|
49
|
-
exact_match_index = specs.find_index {
|
47
|
+
exact_match_index = specs.find_index {|spec| spec.version == bundler_version }
|
50
48
|
return unless exact_match_index
|
51
49
|
|
52
50
|
specs.unshift(specs.delete_at(exact_match_index))
|
@@ -82,12 +80,19 @@ To install the missing version, run `gem install bundler:#{vr.first}`
|
|
82
80
|
def self.lockfile_contents
|
83
81
|
gemfile = ENV["BUNDLE_GEMFILE"]
|
84
82
|
gemfile = nil if gemfile && gemfile.empty?
|
85
|
-
Gem::Util.traverse_parents Dir.pwd do |directory|
|
86
|
-
next unless gemfile = Gem::GEM_DEP_FILES.find { |f| File.file?(f.tap(&Gem::UNTAINT)) }
|
87
83
|
|
88
|
-
|
89
|
-
|
90
|
-
|
84
|
+
unless gemfile
|
85
|
+
begin
|
86
|
+
Gem::Util.traverse_parents(Dir.pwd) do |directory|
|
87
|
+
next unless gemfile = Gem::GEM_DEP_FILES.find {|f| File.file?(f.tap(&Gem::UNTAINT)) }
|
88
|
+
|
89
|
+
gemfile = File.join directory, gemfile
|
90
|
+
break
|
91
|
+
end
|
92
|
+
rescue Errno::ENOENT
|
93
|
+
return
|
94
|
+
end
|
95
|
+
end
|
91
96
|
|
92
97
|
return unless gemfile
|
93
98
|
|
data/lib/rubygems/command.rb
CHANGED
@@ -6,8 +6,8 @@
|
|
6
6
|
#++
|
7
7
|
|
8
8
|
require 'optparse'
|
9
|
-
|
10
|
-
|
9
|
+
require_relative 'requirement'
|
10
|
+
require_relative 'user_interaction'
|
11
11
|
|
12
12
|
##
|
13
13
|
# Base class for all Gem commands. When creating a new gem command, define
|
@@ -77,7 +77,7 @@ class Gem::Command
|
|
77
77
|
when Array
|
78
78
|
@extra_args = value
|
79
79
|
when String
|
80
|
-
@extra_args = value.split
|
80
|
+
@extra_args = value.split(' ')
|
81
81
|
end
|
82
82
|
end
|
83
83
|
|
@@ -125,7 +125,7 @@ class Gem::Command
|
|
125
125
|
@program_name = "gem #{command}"
|
126
126
|
@defaults = defaults
|
127
127
|
@options = defaults.dup
|
128
|
-
@option_groups = Hash.new {
|
128
|
+
@option_groups = Hash.new {|h,k| h[k] = [] }
|
129
129
|
@deprecated_options = { command => {} }
|
130
130
|
@parser = nil
|
131
131
|
@when_invoked = nil
|
@@ -162,7 +162,7 @@ class Gem::Command
|
|
162
162
|
|
163
163
|
if errors and !errors.empty?
|
164
164
|
msg << ", here is why:\n"
|
165
|
-
errors.each {
|
165
|
+
errors.each {|x| msg << " #{x.wordy}\n" }
|
166
166
|
else
|
167
167
|
if required_by and gem != required_by
|
168
168
|
msg << " (required by #{required_by}) in any repository"
|
@@ -174,8 +174,7 @@ class Gem::Command
|
|
174
174
|
alert_error msg
|
175
175
|
|
176
176
|
unless suppress_suggestions
|
177
|
-
suggestions = Gem::SpecFetcher.fetcher.suggest_gems_from_name
|
178
|
-
|
177
|
+
suggestions = Gem::SpecFetcher.fetcher.suggest_gems_from_name(gem_name, :latest, 10)
|
179
178
|
unless suggestions.empty?
|
180
179
|
alert_error "Possible alternatives: #{suggestions.join(", ")}"
|
181
180
|
end
|
@@ -193,7 +192,7 @@ class Gem::Command
|
|
193
192
|
"Please specify at least one gem name (e.g. gem build GEMNAME)"
|
194
193
|
end
|
195
194
|
|
196
|
-
args.select {
|
195
|
+
args.select {|arg| arg !~ /^-/ }
|
197
196
|
end
|
198
197
|
|
199
198
|
##
|
@@ -365,7 +364,7 @@ class Gem::Command
|
|
365
364
|
|
366
365
|
def remove_option(name)
|
367
366
|
@option_groups.each do |_, option_list|
|
368
|
-
option_list.reject! {
|
367
|
+
option_list.reject! {|args, _| args.any? {|x| x.is_a?(String) && x =~ /^#{name}/ } }
|
369
368
|
end
|
370
369
|
end
|
371
370
|
|
@@ -418,7 +417,7 @@ class Gem::Command
|
|
418
417
|
|
419
418
|
def merge_options(new_options)
|
420
419
|
@options = @defaults.clone
|
421
|
-
new_options.each {
|
420
|
+
new_options.each {|k,v| @options[k] = v }
|
422
421
|
end
|
423
422
|
|
424
423
|
##
|
@@ -457,7 +456,7 @@ class Gem::Command
|
|
457
456
|
until extra.empty? do
|
458
457
|
ex = []
|
459
458
|
ex << extra.shift
|
460
|
-
ex << extra.shift if extra.first.to_s =~ /^[^-]/
|
459
|
+
ex << extra.shift if extra.first.to_s =~ /^[^-]/ # rubocop:disable Performance/StartWith
|
461
460
|
result << ex if handles?(ex)
|
462
461
|
end
|
463
462
|
|
@@ -466,6 +465,10 @@ class Gem::Command
|
|
466
465
|
result
|
467
466
|
end
|
468
467
|
|
468
|
+
def deprecated?
|
469
|
+
false
|
470
|
+
end
|
471
|
+
|
469
472
|
private
|
470
473
|
|
471
474
|
def option_is_deprecated?(option)
|
@@ -493,7 +496,7 @@ class Gem::Command
|
|
493
496
|
|
494
497
|
configure_options "", regular_options
|
495
498
|
|
496
|
-
@option_groups.sort_by {
|
499
|
+
@option_groups.sort_by {|n,_| n.to_s }.each do |group_name, option_list|
|
497
500
|
@parser.separator nil
|
498
501
|
configure_options group_name, option_list
|
499
502
|
end
|
@@ -621,8 +624,7 @@ class Gem::Command
|
|
621
624
|
# :stopdoc:
|
622
625
|
|
623
626
|
HELP = <<-HELP.freeze
|
624
|
-
RubyGems is a
|
625
|
-
basic help message containing pointers to more information.
|
627
|
+
RubyGems is a package manager for Ruby.
|
626
628
|
|
627
629
|
Usage:
|
628
630
|
gem -h/--help
|
@@ -138,7 +138,7 @@ class Gem::CommandManager
|
|
138
138
|
# Return a sorted list of all command names as strings.
|
139
139
|
|
140
140
|
def command_names
|
141
|
-
@commands.keys.collect {|key| key.to_s}.sort
|
141
|
+
@commands.keys.collect {|key| key.to_s }.sort
|
142
142
|
end
|
143
143
|
|
144
144
|
##
|
@@ -176,6 +176,7 @@ class Gem::CommandManager
|
|
176
176
|
cmd_name = args.shift.downcase
|
177
177
|
cmd = find_command cmd_name
|
178
178
|
cmd.invoke_with_build_args args, build_args
|
179
|
+
cmd.deprecation_warning if cmd.deprecated?
|
179
180
|
end
|
180
181
|
end
|
181
182
|
|
@@ -202,9 +203,9 @@ class Gem::CommandManager
|
|
202
203
|
def find_command_possibilities(cmd_name)
|
203
204
|
len = cmd_name.length
|
204
205
|
|
205
|
-
found = command_names.select {
|
206
|
+
found = command_names.select {|name| cmd_name == name[0, len] }
|
206
207
|
|
207
|
-
exact = found.find {
|
208
|
+
exact = found.find {|name| name == cmd_name }
|
208
209
|
|
209
210
|
exact ? [exact] : found
|
210
211
|
end
|
@@ -186,7 +186,7 @@ class Gem::Commands::CertCommand < Gem::Command
|
|
186
186
|
subject = certificate.subject.to_s
|
187
187
|
subject.downcase.index filter
|
188
188
|
end.sort_by do |certificate, _|
|
189
|
-
certificate.subject.to_a.map {
|
189
|
+
certificate.subject.to_a.map {|name, data,| [name, data] }
|
190
190
|
end.each do |certificate, path|
|
191
191
|
yield certificate, path
|
192
192
|
end
|
@@ -69,7 +69,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
|
|
69
69
|
until done do
|
70
70
|
clean_gems
|
71
71
|
|
72
|
-
this_set = @gems_to_cleanup.map {
|
72
|
+
this_set = @gems_to_cleanup.map {|spec| spec.full_name }.sort
|
73
73
|
|
74
74
|
done = this_set.empty? || last_set == this_set
|
75
75
|
|
@@ -82,7 +82,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
|
|
82
82
|
say "Clean up complete"
|
83
83
|
|
84
84
|
verbose do
|
85
|
-
skipped = @default_gems.map {
|
85
|
+
skipped = @default_gems.map {|spec| spec.full_name }
|
86
86
|
|
87
87
|
"Skipped default gems: #{skipped.join ', '}"
|
88
88
|
end
|
@@ -99,7 +99,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
|
|
99
99
|
@full = Gem::DependencyList.from_specs
|
100
100
|
|
101
101
|
deplist = Gem::DependencyList.new
|
102
|
-
@gems_to_cleanup.each {
|
102
|
+
@gems_to_cleanup.each {|spec| deplist.add spec }
|
103
103
|
|
104
104
|
deps = deplist.strongly_connected_components.flatten
|
105
105
|
|
@@ -1,5 +1,4 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require 'English'
|
3
2
|
require 'rubygems/command'
|
4
3
|
require 'rubygems/version_option'
|
5
4
|
|
@@ -106,7 +105,8 @@ prefix or only the files that are requireable.
|
|
106
105
|
spec.files.map do |file|
|
107
106
|
case file
|
108
107
|
when /\A#{spec.bindir}\//
|
109
|
-
|
108
|
+
# $' is POSTMATCH
|
109
|
+
[RbConfig::CONFIG['bindir'], $']
|
110
110
|
when /\.so\z/
|
111
111
|
[RbConfig::CONFIG['archdir'], file]
|
112
112
|
else
|
@@ -167,7 +167,7 @@ prefix or only the files that are requireable.
|
|
167
167
|
end
|
168
168
|
|
169
169
|
def spec_for(name)
|
170
|
-
spec = Gem::Specification.find_all_by_name(name, @version).
|
170
|
+
spec = Gem::Specification.find_all_by_name(name, @version).first
|
171
171
|
|
172
172
|
return spec if spec
|
173
173
|
|
@@ -175,7 +175,7 @@ prefix or only the files that are requireable.
|
|
175
175
|
|
176
176
|
if Gem.configuration.verbose
|
177
177
|
say "\nDirectories searched:"
|
178
|
-
@spec_dirs.sort.each {
|
178
|
+
@spec_dirs.sort.each {|dir| say dir }
|
179
179
|
end
|
180
180
|
|
181
181
|
return nil
|
@@ -59,14 +59,14 @@ use with other commands.
|
|
59
59
|
|
60
60
|
ss, = fetcher.spec_for_dependency dependency
|
61
61
|
|
62
|
-
ss.map {
|
62
|
+
ss.map {|spec, _| spec }
|
63
63
|
end
|
64
64
|
|
65
65
|
def fetch_specs(name_pattern, dependency) # :nodoc:
|
66
66
|
specs = []
|
67
67
|
|
68
68
|
if local?
|
69
|
-
specs.concat Gem::Specification.stubs.find_all {
|
69
|
+
specs.concat Gem::Specification.stubs.find_all {|spec|
|
70
70
|
name_pattern =~ spec.name and
|
71
71
|
dependency.requirement.satisfied_by? spec.version
|
72
72
|
}.map(&:to_spec)
|
@@ -92,7 +92,7 @@ use with other commands.
|
|
92
92
|
def display_pipe(specs) # :nodoc:
|
93
93
|
specs.each do |spec|
|
94
94
|
unless spec.dependencies.empty?
|
95
|
-
spec.dependencies.sort_by {
|
95
|
+
spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
|
96
96
|
say "#{dep.name} --version '#{dep.requirement}'"
|
97
97
|
end
|
98
98
|
end
|
@@ -156,7 +156,7 @@ use with other commands.
|
|
156
156
|
response = String.new
|
157
157
|
response << ' ' * level + "Gem #{spec.full_name}\n"
|
158
158
|
unless spec.dependencies.empty?
|
159
|
-
spec.dependencies.sort_by {
|
159
|
+
spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
|
160
160
|
response << ' ' * level + " #{dep}\n"
|
161
161
|
end
|
162
162
|
end
|
@@ -168,11 +168,11 @@ use with other commands.
|
|
168
168
|
|
169
169
|
ss, _ = fetcher.spec_for_dependency dependency
|
170
170
|
|
171
|
-
ss.map {
|
171
|
+
ss.map {|s,o| s }
|
172
172
|
end
|
173
173
|
|
174
174
|
def reverse_dependencies(specs) # :nodoc:
|
175
|
-
reverse = Hash.new {
|
175
|
+
reverse = Hash.new {|h, k| h[k] = [] }
|
176
176
|
|
177
177
|
return reverse unless options[:reverse_dependencies]
|
178
178
|
|
@@ -57,11 +57,11 @@ then repackaging it.
|
|
57
57
|
Gem::SpecFetcher.fetcher.spec_for_dependency dep
|
58
58
|
|
59
59
|
if platform
|
60
|
-
filtered = specs_and_sources.select {
|
60
|
+
filtered = specs_and_sources.select {|s,| s.platform == platform }
|
61
61
|
specs_and_sources = filtered unless filtered.empty?
|
62
62
|
end
|
63
63
|
|
64
|
-
spec, source = specs_and_sources.max_by {
|
64
|
+
spec, source = specs_and_sources.max_by {|s,| s.version }
|
65
65
|
|
66
66
|
if spec.nil?
|
67
67
|
show_lookup_failure gem_name, version, errors, options[:domain]
|
@@ -324,7 +324,7 @@ platform.
|
|
324
324
|
|
325
325
|
margin_width = 4
|
326
326
|
|
327
|
-
desc_width = @command_manager.command_names.map {
|
327
|
+
desc_width = @command_manager.command_names.map {|n| n.size }.max + 4
|
328
328
|
|
329
329
|
summary_width = 80 - margin_width - desc_width
|
330
330
|
wrap_indent = ' ' * (margin_width + desc_width)
|
@@ -1,14 +1,19 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'rubygems/command'
|
4
|
-
require 'rubygems/
|
4
|
+
require 'rubygems/query_utils'
|
5
5
|
|
6
|
-
class Gem::Commands::InfoCommand < Gem::
|
6
|
+
class Gem::Commands::InfoCommand < Gem::Command
|
7
|
+
|
8
|
+
include Gem::QueryUtils
|
7
9
|
|
8
10
|
def initialize
|
9
|
-
super "info", "Show information for the given gem"
|
11
|
+
super "info", "Show information for the given gem",
|
12
|
+
:name => //, :domain => :local, :details => false, :versions => true,
|
13
|
+
:installed => nil, :version => Gem::Requirement.default
|
14
|
+
|
15
|
+
add_query_options
|
10
16
|
|
11
|
-
remove_option('--name-matches')
|
12
17
|
remove_option('-d')
|
13
18
|
|
14
19
|
defaults[:details] = true
|
@@ -218,7 +218,7 @@ You can use `i` command instead of `install`.
|
|
218
218
|
gem_version ||= options[:version]
|
219
219
|
domain = options[:domain]
|
220
220
|
domain = :local unless options[:suggest_alternate]
|
221
|
-
|
221
|
+
suppress_suggestions = (domain == :local)
|
222
222
|
|
223
223
|
begin
|
224
224
|
install_gem gem_name, gem_version
|
@@ -226,11 +226,11 @@ You can use `i` command instead of `install`.
|
|
226
226
|
alert_error "Error installing #{gem_name}:\n\t#{e.message}"
|
227
227
|
exit_code |= 1
|
228
228
|
rescue Gem::GemNotFoundException => e
|
229
|
-
show_lookup_failure e.name, e.version, e.errors,
|
229
|
+
show_lookup_failure e.name, e.version, e.errors, suppress_suggestions
|
230
230
|
|
231
231
|
exit_code |= 2
|
232
232
|
rescue Gem::UnsatisfiableDependencyError => e
|
233
|
-
show_lookup_failure e.name, e.version, e.errors,
|
233
|
+
show_lookup_failure e.name, e.version, e.errors, suppress_suggestions,
|
234
234
|
"'#{gem_name}' (#{gem_version})"
|
235
235
|
|
236
236
|
exit_code |= 2
|
@@ -1,17 +1,20 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
require 'rubygems/command'
|
3
|
-
require 'rubygems/
|
3
|
+
require 'rubygems/query_utils'
|
4
4
|
|
5
5
|
##
|
6
|
-
#
|
7
|
-
# with the supplied argument.
|
6
|
+
# Searches for gems starting with the supplied argument.
|
8
7
|
|
9
|
-
class Gem::Commands::ListCommand < Gem::
|
8
|
+
class Gem::Commands::ListCommand < Gem::Command
|
9
|
+
|
10
|
+
include Gem::QueryUtils
|
10
11
|
|
11
12
|
def initialize
|
12
|
-
super 'list', 'Display local gems whose name matches REGEXP'
|
13
|
+
super 'list', 'Display local gems whose name matches REGEXP',
|
14
|
+
:name => //, :domain => :local, :details => false, :versions => true,
|
15
|
+
:installed => nil, :version => Gem::Requirement.default
|
13
16
|
|
14
|
-
|
17
|
+
add_query_options
|
15
18
|
end
|
16
19
|
|
17
20
|
def arguments # :nodoc:
|
@@ -40,6 +40,11 @@ class Gem::Commands::PristineCommand < Gem::Command
|
|
40
40
|
options[:only_executables] = value
|
41
41
|
end
|
42
42
|
|
43
|
+
add_option('--only-plugins',
|
44
|
+
'Only restore plugins') do |value, options|
|
45
|
+
options[:only_plugins] = value
|
46
|
+
end
|
47
|
+
|
43
48
|
add_option('-E', '--[no-]env-shebang',
|
44
49
|
'Rewrite executables with a shebang',
|
45
50
|
'of /usr/bin/env') do |value, options|
|
@@ -126,14 +131,14 @@ extensions will be restored.
|
|
126
131
|
end
|
127
132
|
end
|
128
133
|
|
129
|
-
unless spec.extensions.empty? or options[:extensions] or options[:only_executables]
|
134
|
+
unless spec.extensions.empty? or options[:extensions] or options[:only_executables] or options[:only_plugins]
|
130
135
|
say "Skipped #{spec.full_name}, it needs to compile an extension"
|
131
136
|
next
|
132
137
|
end
|
133
138
|
|
134
139
|
gem = spec.cache_file
|
135
140
|
|
136
|
-
unless File.exist? gem or options[:only_executables]
|
141
|
+
unless File.exist? gem or options[:only_executables] or options[:only_plugins]
|
137
142
|
require 'rubygems/remote_fetcher'
|
138
143
|
|
139
144
|
say "Cached gem for #{spec.full_name} not found, attempting to fetch..."
|
@@ -172,6 +177,9 @@ extensions will be restored.
|
|
172
177
|
if options[:only_executables]
|
173
178
|
installer = Gem::Installer.for_spec(spec, installer_options)
|
174
179
|
installer.generate_bin
|
180
|
+
elsif options[:only_plugins]
|
181
|
+
installer = Gem::Installer.for_spec(spec)
|
182
|
+
installer.generate_plugins
|
175
183
|
else
|
176
184
|
installer = Gem::Installer.at(gem, installer_options)
|
177
185
|
installer.install
|