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
@@ -47,6 +47,32 @@ module Bundler
|
|
47
47
|
Bundler.ui.error "Failed to install plugin #{name}: #{e.message}\n #{e.backtrace.join("\n ")}"
|
48
48
|
end
|
49
49
|
|
50
|
+
# Uninstalls plugins by the given names
|
51
|
+
#
|
52
|
+
# @param [Array<String>] names the names of plugins to be uninstalled
|
53
|
+
def uninstall(names, options)
|
54
|
+
if names.empty? && !options[:all]
|
55
|
+
Bundler.ui.error "No plugins to uninstall. Specify at least 1 plugin to uninstall.\n"\
|
56
|
+
"Use --all option to uninstall all the installed plugins."
|
57
|
+
return
|
58
|
+
end
|
59
|
+
|
60
|
+
names = index.installed_plugins if options[:all]
|
61
|
+
if names.any?
|
62
|
+
names.each do |name|
|
63
|
+
if index.installed?(name)
|
64
|
+
Bundler.rm_rf(index.plugin_path(name))
|
65
|
+
index.unregister_plugin(name)
|
66
|
+
Bundler.ui.info "Uninstalled plugin #{name}"
|
67
|
+
else
|
68
|
+
Bundler.ui.error "Plugin #{name} is not installed \n"
|
69
|
+
end
|
70
|
+
end
|
71
|
+
else
|
72
|
+
Bundler.ui.info "No plugins installed"
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
50
76
|
# List installed plugins and commands
|
51
77
|
#
|
52
78
|
def list
|
@@ -71,6 +71,15 @@ module Bundler
|
|
71
71
|
raise
|
72
72
|
end
|
73
73
|
|
74
|
+
def unregister_plugin(name)
|
75
|
+
@commands.delete_if {|_, v| v == name }
|
76
|
+
@sources.delete_if {|_, v| v == name }
|
77
|
+
@hooks.each {|_, plugin_names| plugin_names.delete(name) }
|
78
|
+
@plugin_paths.delete(name)
|
79
|
+
@load_paths.delete(name)
|
80
|
+
save_index
|
81
|
+
end
|
82
|
+
|
74
83
|
# Path of default index file
|
75
84
|
def index_file
|
76
85
|
Plugin.root.join("index")
|
@@ -1,11 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
# Psych could be a gem, so try to ask for it
|
4
|
-
begin
|
5
|
-
gem "psych"
|
6
|
-
rescue LoadError
|
7
|
-
end if defined?(gem)
|
8
|
-
|
9
3
|
# Psych could be in the stdlib
|
10
4
|
# but it's too late if Syck is already loaded
|
11
5
|
begin
|
@@ -26,12 +20,3 @@ module Bundler
|
|
26
20
|
YamlLibrarySyntaxError = ::ArgumentError
|
27
21
|
end
|
28
22
|
end
|
29
|
-
|
30
|
-
require_relative "deprecate"
|
31
|
-
begin
|
32
|
-
Bundler::Deprecate.skip_during do
|
33
|
-
require "rubygems/safe_yaml"
|
34
|
-
end
|
35
|
-
rescue LoadError
|
36
|
-
# it's OK if the file isn't there
|
37
|
-
end
|
@@ -50,6 +50,8 @@ module Bundler
|
|
50
50
|
# once the remote gem is downloaded, the backend specification will
|
51
51
|
# be swapped out.
|
52
52
|
def __swap__(spec)
|
53
|
+
raise APIResponseInvalidDependenciesError unless spec.dependencies.all? {|d| d.is_a?(Gem::Dependency) }
|
54
|
+
|
53
55
|
SharedHelpers.ensure_same_dependencies(self, dependencies, spec.dependencies)
|
54
56
|
@_remote_specification = spec
|
55
57
|
end
|
@@ -76,7 +78,8 @@ module Bundler
|
|
76
78
|
deps = method_missing(:dependencies)
|
77
79
|
|
78
80
|
# allow us to handle when the specs dependencies are an array of array of string
|
79
|
-
#
|
81
|
+
# in order to delay the crash to `#__swap__` where it results in a friendlier error
|
82
|
+
# see https://github.com/rubygems/bundler/issues/5797
|
80
83
|
deps = deps.map {|d| d.is_a?(Gem::Dependency) ? d : Gem::Dependency.new(*d) }
|
81
84
|
|
82
85
|
deps
|
@@ -75,12 +75,17 @@ module Bundler
|
|
75
75
|
return unless debug?
|
76
76
|
debug_info = yield
|
77
77
|
debug_info = debug_info.inspect unless debug_info.is_a?(String)
|
78
|
-
warn debug_info.split("\n").map {|s| " " * depth + s }
|
78
|
+
warn debug_info.split("\n").map {|s| "BUNDLER: " + " " * depth + s }
|
79
79
|
end
|
80
80
|
|
81
81
|
def debug?
|
82
82
|
return @debug_mode if defined?(@debug_mode)
|
83
|
-
@debug_mode =
|
83
|
+
@debug_mode =
|
84
|
+
ENV["BUNDLER_DEBUG_RESOLVER"] ||
|
85
|
+
ENV["BUNDLER_DEBUG_RESOLVER_TREE"] ||
|
86
|
+
ENV["DEBUG_RESOLVER"] ||
|
87
|
+
ENV["DEBUG_RESOLVER_TREE"] ||
|
88
|
+
false
|
84
89
|
end
|
85
90
|
|
86
91
|
def before_resolution
|
@@ -146,7 +151,26 @@ module Bundler
|
|
146
151
|
@gem_version_promoter.sort_versions(dependency, spec_groups)
|
147
152
|
end
|
148
153
|
end
|
149
|
-
|
154
|
+
selected_sgs = []
|
155
|
+
search.each do |sg|
|
156
|
+
next unless sg.for?(platform)
|
157
|
+
# Add a spec group for "non platform specific spec" as the fallback
|
158
|
+
# spec group.
|
159
|
+
sg_ruby = sg.copy_for(Gem::Platform::RUBY)
|
160
|
+
selected_sgs << sg_ruby if sg_ruby
|
161
|
+
sg_all_platforms = nil
|
162
|
+
all_platforms = @platforms + [platform]
|
163
|
+
sorted_all_platforms = self.class.sort_platforms(all_platforms)
|
164
|
+
sorted_all_platforms.reverse_each do |other_platform|
|
165
|
+
if sg_all_platforms.nil?
|
166
|
+
sg_all_platforms = sg.copy_for(other_platform)
|
167
|
+
else
|
168
|
+
sg_all_platforms.activate_platform!(other_platform)
|
169
|
+
end
|
170
|
+
end
|
171
|
+
selected_sgs << sg_all_platforms
|
172
|
+
end
|
173
|
+
selected_sgs
|
150
174
|
end
|
151
175
|
|
152
176
|
def index_for(dependency)
|
@@ -183,9 +207,7 @@ module Bundler
|
|
183
207
|
end
|
184
208
|
|
185
209
|
def requirement_satisfied_by?(requirement, activated, spec)
|
186
|
-
|
187
|
-
spec.activate_platform!(requirement.__platform) if !@platforms || @platforms.include?(requirement.__platform)
|
188
|
-
true
|
210
|
+
requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
|
189
211
|
end
|
190
212
|
|
191
213
|
def relevant_sources_for_vertex(vertex)
|
@@ -223,8 +245,9 @@ module Bundler
|
|
223
245
|
end
|
224
246
|
|
225
247
|
def self.platform_sort_key(platform)
|
226
|
-
|
227
|
-
|
248
|
+
# Prefer specific platform to not specific platform
|
249
|
+
return ["99-LAST", "", "", ""] if Gem::Platform::RUBY == platform
|
250
|
+
["00", *platform.to_a.map {|part| part || "" }]
|
228
251
|
end
|
229
252
|
|
230
253
|
private
|
@@ -9,6 +9,7 @@ module Bundler
|
|
9
9
|
attr_accessor :ignores_bundler_dependencies
|
10
10
|
|
11
11
|
def initialize(all_specs)
|
12
|
+
@all_specs = all_specs
|
12
13
|
raise ArgumentError, "cannot initialize with an empty value" unless exemplary_spec = all_specs.first
|
13
14
|
@name = exemplary_spec.name
|
14
15
|
@version = exemplary_spec.version
|
@@ -28,7 +29,7 @@ module Bundler
|
|
28
29
|
lazy_spec = LazySpecification.new(name, version, s.platform, source)
|
29
30
|
lazy_spec.dependencies.replace s.dependencies
|
30
31
|
lazy_spec
|
31
|
-
end.compact
|
32
|
+
end.compact.uniq
|
32
33
|
end
|
33
34
|
|
34
35
|
def activate_platform!(platform)
|
@@ -37,13 +38,25 @@ module Bundler
|
|
37
38
|
@activated_platforms << platform
|
38
39
|
end
|
39
40
|
|
41
|
+
def copy_for(platform)
|
42
|
+
copied_sg = self.class.new(@all_specs)
|
43
|
+
copied_sg.ignores_bundler_dependencies = @ignores_bundler_dependencies
|
44
|
+
return nil unless copied_sg.for?(platform)
|
45
|
+
copied_sg.activate_platform!(platform)
|
46
|
+
copied_sg
|
47
|
+
end
|
48
|
+
|
49
|
+
def spec_for(platform)
|
50
|
+
@specs[platform]
|
51
|
+
end
|
52
|
+
|
40
53
|
def for?(platform)
|
41
|
-
|
42
|
-
!spec.nil?
|
54
|
+
!spec_for(platform).nil?
|
43
55
|
end
|
44
56
|
|
45
57
|
def to_s
|
46
|
-
|
58
|
+
activated_platforms_string = sorted_activated_platforms.join(", ")
|
59
|
+
"#{name} (#{version}) (#{activated_platforms_string})"
|
47
60
|
end
|
48
61
|
|
49
62
|
def dependencies_for_activated_platforms
|
@@ -58,6 +71,7 @@ module Bundler
|
|
58
71
|
return unless other.is_a?(SpecGroup)
|
59
72
|
name == other.name &&
|
60
73
|
version == other.version &&
|
74
|
+
sorted_activated_platforms == other.sorted_activated_platforms &&
|
61
75
|
source == other.source
|
62
76
|
end
|
63
77
|
|
@@ -65,11 +79,18 @@ module Bundler
|
|
65
79
|
return unless other.is_a?(SpecGroup)
|
66
80
|
name.eql?(other.name) &&
|
67
81
|
version.eql?(other.version) &&
|
82
|
+
sorted_activated_platforms.eql?(other.sorted_activated_platforms) &&
|
68
83
|
source.eql?(other.source)
|
69
84
|
end
|
70
85
|
|
71
86
|
def hash
|
72
|
-
|
87
|
+
name.hash ^ version.hash ^ sorted_activated_platforms.hash ^ source.hash
|
88
|
+
end
|
89
|
+
|
90
|
+
protected
|
91
|
+
|
92
|
+
def sorted_activated_platforms
|
93
|
+
@activated_platforms.sort_by(&:to_s)
|
73
94
|
end
|
74
95
|
|
75
96
|
private
|
@@ -47,14 +47,13 @@ module Gem
|
|
47
47
|
full_require_paths
|
48
48
|
end
|
49
49
|
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
end
|
50
|
+
alias_method :rg_extension_dir, :extension_dir
|
51
|
+
def extension_dir
|
52
|
+
@bundler_extension_dir ||= if source.respond_to?(:extension_dir_name)
|
53
|
+
unique_extension_dir = [source.extension_dir_name, File.basename(full_gem_path)].uniq.join("-")
|
54
|
+
File.expand_path(File.join(extensions_dir, unique_extension_dir))
|
55
|
+
else
|
56
|
+
rg_extension_dir
|
58
57
|
end
|
59
58
|
end
|
60
59
|
|
@@ -4,12 +4,6 @@ require "rubygems/installer"
|
|
4
4
|
|
5
5
|
module Bundler
|
6
6
|
class RubyGemsGemInstaller < Gem::Installer
|
7
|
-
unless respond_to?(:at)
|
8
|
-
def self.at(*args)
|
9
|
-
new(*args)
|
10
|
-
end
|
11
|
-
end
|
12
|
-
|
13
7
|
def check_executable_overwrite(filename)
|
14
8
|
# Bundler needs to install gems regardless of binstub overwriting
|
15
9
|
end
|
@@ -20,7 +14,7 @@ module Bundler
|
|
20
14
|
|
21
15
|
def build_extensions
|
22
16
|
extension_cache_path = options[:bundler_extension_cache_path]
|
23
|
-
return super unless extension_cache_path && extension_dir =
|
17
|
+
return super unless extension_cache_path && extension_dir = spec.extension_dir
|
24
18
|
|
25
19
|
extension_dir = Pathname.new(extension_dir)
|
26
20
|
build_complete = SharedHelpers.filesystem_access(extension_cache_path.join("gem.build_complete"), :read, &:file?)
|
@@ -102,11 +102,6 @@ module Bundler
|
|
102
102
|
end.flatten(1)
|
103
103
|
end
|
104
104
|
|
105
|
-
def spec_extension_dir(spec)
|
106
|
-
return unless spec.respond_to?(:extension_dir)
|
107
|
-
spec.extension_dir
|
108
|
-
end
|
109
|
-
|
110
105
|
def stub_set_spec(stub, spec)
|
111
106
|
stub.instance_variable_set(:@spec, spec)
|
112
107
|
end
|
@@ -141,14 +136,10 @@ module Bundler
|
|
141
136
|
end
|
142
137
|
|
143
138
|
def inflate(obj)
|
144
|
-
require "rubygems/util"
|
145
|
-
|
146
139
|
Gem::Util.inflate(obj)
|
147
140
|
end
|
148
141
|
|
149
142
|
def correct_for_windows_path(path)
|
150
|
-
require "rubygems/util"
|
151
|
-
|
152
143
|
if Gem::Util.respond_to?(:correct_for_windows_path)
|
153
144
|
Gem::Util.correct_for_windows_path(path)
|
154
145
|
elsif path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":"
|
@@ -223,11 +214,6 @@ module Bundler
|
|
223
214
|
Gem.bin_path(gem, bin, ver)
|
224
215
|
end
|
225
216
|
|
226
|
-
def preserve_paths
|
227
|
-
# this is a no-op outside of RubyGems 1.8
|
228
|
-
yield
|
229
|
-
end
|
230
|
-
|
231
217
|
def loaded_gem_paths
|
232
218
|
loaded_gem_paths = Gem.loaded_specs.map {|_, s| s.full_require_paths }
|
233
219
|
loaded_gem_paths.flatten
|
@@ -265,8 +251,6 @@ module Bundler
|
|
265
251
|
require "rubygems/security"
|
266
252
|
require_relative "psyched_yaml"
|
267
253
|
gem_from_path(path, security_policies[policy]).spec
|
268
|
-
rescue Gem::Package::FormatError
|
269
|
-
raise GemspecError, "Could not read gem at #{path}. It may be corrupted."
|
270
254
|
rescue Exception, Gem::Exception, Gem::Security::Exception => e # rubocop:disable Lint/RescueException
|
271
255
|
if e.is_a?(Gem::Security::Exception) ||
|
272
256
|
e.message =~ /unknown trust policy|unsigned gem/i ||
|
@@ -346,7 +330,7 @@ module Bundler
|
|
346
330
|
raise e
|
347
331
|
end
|
348
332
|
|
349
|
-
# backwards compatibility shim, see https://github.com/
|
333
|
+
# backwards compatibility shim, see https://github.com/rubygems/bundler/issues/5102
|
350
334
|
kernel_class.send(:public, :gem) if Bundler.feature_flag.setup_makes_kernel_gem_public?
|
351
335
|
end
|
352
336
|
end
|
@@ -443,35 +427,6 @@ module Bundler
|
|
443
427
|
Gem.clear_paths
|
444
428
|
end
|
445
429
|
|
446
|
-
# This backports base_dir which replaces installation path
|
447
|
-
# RubyGems 1.8+
|
448
|
-
def backport_base_dir
|
449
|
-
redefine_method(Gem::Specification, :base_dir) do
|
450
|
-
return Gem.dir unless loaded_from
|
451
|
-
File.dirname File.dirname loaded_from
|
452
|
-
end
|
453
|
-
end
|
454
|
-
|
455
|
-
def backport_cache_file
|
456
|
-
redefine_method(Gem::Specification, :cache_dir) do
|
457
|
-
@cache_dir ||= File.join base_dir, "cache"
|
458
|
-
end
|
459
|
-
|
460
|
-
redefine_method(Gem::Specification, :cache_file) do
|
461
|
-
@cache_file ||= File.join cache_dir, "#{full_name}.gem"
|
462
|
-
end
|
463
|
-
end
|
464
|
-
|
465
|
-
def backport_spec_file
|
466
|
-
redefine_method(Gem::Specification, :spec_dir) do
|
467
|
-
@spec_dir ||= File.join base_dir, "specifications"
|
468
|
-
end
|
469
|
-
|
470
|
-
redefine_method(Gem::Specification, :spec_file) do
|
471
|
-
@spec_file ||= File.join spec_dir, "#{full_name}.gemspec"
|
472
|
-
end
|
473
|
-
end
|
474
|
-
|
475
430
|
def undo_replacements
|
476
431
|
@replaced_methods.each do |(sym, klass), method|
|
477
432
|
redefine_method(klass, sym, method)
|
@@ -602,10 +557,10 @@ module Bundler
|
|
602
557
|
|
603
558
|
def backport_ext_builder_monitor
|
604
559
|
# So we can avoid requiring "rubygems/ext" in its entirety
|
605
|
-
Gem.module_eval <<-
|
560
|
+
Gem.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
606
561
|
module Ext
|
607
562
|
end
|
608
|
-
|
563
|
+
RUBY
|
609
564
|
|
610
565
|
require "rubygems/ext/builder"
|
611
566
|
|
@@ -43,14 +43,6 @@ module Bundler
|
|
43
43
|
self
|
44
44
|
end
|
45
45
|
|
46
|
-
REQUIRE_ERRORS = [
|
47
|
-
/^no such file to load -- (.+)$/i,
|
48
|
-
/^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
|
49
|
-
/^Missing API definition file in (.+)$/i,
|
50
|
-
/^cannot load such file -- (.+)$/i,
|
51
|
-
/^dlopen\([^)]*\): Library not loaded: (.+)$/i,
|
52
|
-
].freeze
|
53
|
-
|
54
46
|
def require(*groups)
|
55
47
|
groups.map!(&:to_sym)
|
56
48
|
groups = [:default] if groups.empty?
|
@@ -79,16 +71,14 @@ module Bundler
|
|
79
71
|
end
|
80
72
|
end
|
81
73
|
rescue LoadError => e
|
82
|
-
|
83
|
-
raise if dep.autorequire || $1 != required_file
|
74
|
+
raise if dep.autorequire || e.path != required_file
|
84
75
|
|
85
76
|
if dep.autorequire.nil? && dep.name.include?("-")
|
86
77
|
begin
|
87
78
|
namespaced_file = dep.name.tr("-", "/")
|
88
79
|
Kernel.require namespaced_file
|
89
80
|
rescue LoadError => e
|
90
|
-
|
91
|
-
raise if $1 != namespaced_file
|
81
|
+
raise if e.path != namespaced_file
|
92
82
|
end
|
93
83
|
end
|
94
84
|
end
|
@@ -12,7 +12,6 @@ module Bundler
|
|
12
12
|
allow_offline_install
|
13
13
|
auto_clean_without_path
|
14
14
|
auto_install
|
15
|
-
auto_config_jobs
|
16
15
|
cache_all
|
17
16
|
cache_all_platforms
|
18
17
|
default_install_uses_path
|
@@ -22,7 +21,6 @@ module Bundler
|
|
22
21
|
disable_exec_load
|
23
22
|
disable_local_branch_check
|
24
23
|
disable_multisource
|
25
|
-
disable_platform_warnings
|
26
24
|
disable_shared_gems
|
27
25
|
disable_version_check
|
28
26
|
force_ruby_platform
|
@@ -44,7 +42,6 @@ module Bundler
|
|
44
42
|
setup_makes_kernel_gem_public
|
45
43
|
silence_deprecations
|
46
44
|
silence_root_warning
|
47
|
-
skip_default_git_sources
|
48
45
|
specific_platform
|
49
46
|
suppress_install_using_messages
|
50
47
|
unlock_source_unlocks_spec
|