rubygems-update 3.3.26 → 3.4.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1334 -1088
- data/CONTRIBUTING.md +31 -8
- data/Manifest.txt +49 -35
- data/POLICIES.md +15 -13
- data/README.md +19 -6
- data/bundler/CHANGELOG.md +290 -1
- data/bundler/README.md +3 -6
- data/bundler/UPGRADING.md +1 -1
- data/bundler/bundler.gemspec +2 -2
- data/bundler/exe/bundle +5 -16
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/binstubs.rb +5 -1
- data/bundler/lib/bundler/cli/check.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +1 -0
- data/bundler/lib/bundler/cli/console.rb +2 -2
- data/bundler/lib/bundler/cli/doctor.rb +4 -6
- data/bundler/lib/bundler/cli/gem.rb +62 -40
- data/bundler/lib/bundler/cli/init.rb +2 -2
- data/bundler/lib/bundler/cli/install.rb +2 -3
- data/bundler/lib/bundler/cli/lock.rb +8 -5
- data/bundler/lib/bundler/cli/open.rb +6 -4
- data/bundler/lib/bundler/cli/outdated.rb +1 -3
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +45 -2
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/updater.rb +40 -39
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +2 -0
- data/bundler/lib/bundler/definition.rb +163 -82
- data/bundler/lib/bundler/dependency.rb +13 -12
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +3 -3
- data/bundler/lib/bundler/endpoint_specification.rb +0 -4
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/environment_preserver.rb +3 -2
- data/bundler/lib/bundler/errors.rb +1 -11
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher/compact_index.rb +9 -11
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher.rb +4 -8
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +0 -3
- data/bundler/lib/bundler/gem_version_promoter.rb +52 -86
- data/bundler/lib/bundler/graph.rb +3 -3
- data/bundler/lib/bundler/index.rb +7 -15
- data/bundler/lib/bundler/injector.rb +2 -2
- data/bundler/lib/bundler/inline.rb +8 -10
- data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
- data/bundler/lib/bundler/installer/standalone.rb +12 -8
- data/bundler/lib/bundler/installer.rb +10 -24
- data/bundler/lib/bundler/lazy_specification.rb +42 -42
- data/bundler/lib/bundler/lockfile_generator.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +17 -16
- data/bundler/lib/bundler/man/bundle-add.1 +1 -1
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +3 -3
- data/bundler/lib/bundler/man/bundle-cache.1.ronn +2 -2
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +2 -5
- data/bundler/lib/bundler/man/bundle-config.1.ronn +1 -4
- data/bundler/lib/bundler/man/bundle-console.1 +1 -1
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +5 -5
- data/bundler/lib/bundler/man/bundle-exec.1.ronn +5 -5
- data/bundler/lib/bundler/man/bundle-gem.1 +27 -37
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -5
- data/bundler/lib/bundler/man/bundle-help.1 +1 -1
- data/bundler/lib/bundler/man/bundle-info.1 +1 -1
- data/bundler/lib/bundler/man/bundle-init.1 +5 -1
- data/bundler/lib/bundler/man/bundle-init.1.ronn +2 -0
- data/bundler/lib/bundler/man/bundle-inject.1 +1 -1
- data/bundler/lib/bundler/man/bundle-install.1 +1 -30
- data/bundler/lib/bundler/man/bundle-install.1.ronn +0 -29
- data/bundler/lib/bundler/man/bundle-list.1 +1 -1
- data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
- data/bundler/lib/bundler/man/bundle-open.1 +22 -2
- data/bundler/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +13 -9
- data/bundler/lib/bundler/man/bundle-outdated.1.ronn +12 -9
- data/bundler/lib/bundler/man/bundle-platform.1 +2 -2
- data/bundler/lib/bundler/man/bundle-platform.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-plugin.1 +1 -1
- data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
- data/bundler/lib/bundler/man/bundle-show.1 +1 -1
- data/bundler/lib/bundler/man/bundle-update.1 +1 -1
- data/bundler/lib/bundler/man/bundle-version.1 +1 -1
- data/bundler/lib/bundler/man/bundle-viz.1 +1 -1
- data/bundler/lib/bundler/man/bundle.1 +1 -1
- data/bundler/lib/bundler/man/gemfile.5 +2 -2
- data/bundler/lib/bundler/man/gemfile.5.ronn +1 -1
- data/bundler/lib/bundler/mirror.rb +5 -7
- data/bundler/lib/bundler/plugin/index.rb +4 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -4
- data/bundler/lib/bundler/plugin/installer.rb +5 -2
- data/bundler/lib/bundler/plugin.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +2 -6
- data/bundler/lib/bundler/resolver/base.rb +72 -15
- data/bundler/lib/bundler/resolver/candidate.rb +94 -0
- data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
- data/bundler/lib/bundler/resolver/package.rb +72 -0
- data/bundler/lib/bundler/resolver/root.rb +25 -0
- data/bundler/lib/bundler/resolver/spec_group.rb +26 -36
- data/bundler/lib/bundler/resolver.rb +324 -277
- data/bundler/lib/bundler/ruby_version.rb +1 -1
- data/bundler/lib/bundler/rubygems_ext.rb +16 -9
- data/bundler/lib/bundler/rubygems_gem_installer.rb +4 -2
- data/bundler/lib/bundler/rubygems_integration.rb +10 -14
- data/bundler/lib/bundler/runtime.rb +2 -6
- data/bundler/lib/bundler/safe_marshal.rb +31 -0
- data/bundler/lib/bundler/settings.rb +4 -10
- data/bundler/lib/bundler/setup.rb +4 -1
- data/bundler/lib/bundler/shared_helpers.rb +2 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +237 -74
- data/bundler/lib/bundler/source/git.rb +48 -30
- data/bundler/lib/bundler/source/metadata.rb +0 -1
- data/bundler/lib/bundler/source/path/installer.rb +1 -22
- data/bundler/lib/bundler/source/path.rb +6 -6
- data/bundler/lib/bundler/source/rubygems.rb +26 -81
- data/bundler/lib/bundler/source.rb +1 -1
- data/bundler/lib/bundler/source_list.rb +8 -2
- data/bundler/lib/bundler/spec_set.rb +22 -14
- data/bundler/lib/bundler/templates/Executable +1 -1
- data/bundler/lib/bundler/templates/Executable.bundler +5 -10
- data/bundler/lib/bundler/templates/Executable.standalone +2 -0
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/README.md.tt +6 -4
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +12 -1
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +0 -4
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +9 -2
- data/bundler/lib/bundler/ui/shell.rb +35 -12
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/uri_normalizer.rb +23 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1351 -409
- data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
- data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +15 -9
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -6
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -2
- data/bundler/lib/bundler/vendored_persistent.rb +1 -33
- data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +5 -7
- data/bundler/lib/bundler.rb +21 -72
- data/{bin → exe}/gem +3 -4
- data/{bin → exe}/update_rubygems +8 -6
- data/lib/rubygems/available_set.rb +1 -0
- data/lib/rubygems/basic_specification.rb +1 -0
- data/lib/rubygems/bundler_version_finder.rb +1 -1
- data/lib/rubygems/command.rb +16 -7
- data/lib/rubygems/command_manager.rb +23 -8
- data/lib/rubygems/commands/build_command.rb +4 -0
- data/lib/rubygems/commands/cert_command.rb +1 -0
- data/lib/rubygems/commands/check_command.rb +1 -0
- data/lib/rubygems/commands/cleanup_command.rb +1 -0
- data/lib/rubygems/commands/contents_command.rb +1 -0
- data/lib/rubygems/commands/dependency_command.rb +1 -0
- data/lib/rubygems/commands/environment_command.rb +1 -0
- data/lib/rubygems/commands/exec_command.rb +249 -0
- data/lib/rubygems/commands/fetch_command.rb +2 -1
- data/lib/rubygems/commands/generate_index_command.rb +1 -0
- data/lib/rubygems/commands/help_command.rb +4 -3
- data/lib/rubygems/commands/install_command.rb +8 -3
- data/lib/rubygems/commands/list_command.rb +1 -0
- data/lib/rubygems/commands/lock_command.rb +1 -0
- data/lib/rubygems/commands/mirror_command.rb +1 -0
- data/lib/rubygems/commands/open_command.rb +1 -0
- data/lib/rubygems/commands/outdated_command.rb +1 -0
- data/lib/rubygems/commands/owner_command.rb +6 -3
- data/lib/rubygems/commands/pristine_command.rb +10 -0
- data/lib/rubygems/commands/push_command.rb +1 -0
- data/lib/rubygems/commands/query_command.rb +1 -0
- data/lib/rubygems/commands/rdoc_command.rb +4 -2
- data/lib/rubygems/commands/search_command.rb +1 -0
- data/lib/rubygems/commands/server_command.rb +1 -0
- data/lib/rubygems/commands/setup_command.rb +4 -3
- data/lib/rubygems/commands/signin_command.rb +1 -0
- data/lib/rubygems/commands/signout_command.rb +1 -0
- data/lib/rubygems/commands/sources_command.rb +1 -0
- data/lib/rubygems/commands/specification_command.rb +1 -0
- data/lib/rubygems/commands/stale_command.rb +1 -0
- data/lib/rubygems/commands/uninstall_command.rb +4 -0
- data/lib/rubygems/commands/unpack_command.rb +2 -1
- data/lib/rubygems/commands/update_command.rb +2 -7
- data/lib/rubygems/commands/which_command.rb +1 -0
- data/lib/rubygems/commands/yank_command.rb +1 -0
- data/lib/rubygems/config_file.rb +34 -0
- data/lib/rubygems/core_ext/kernel_gem.rb +0 -5
- data/lib/rubygems/core_ext/kernel_require.rb +108 -114
- data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
- data/lib/rubygems/core_ext/tcpsocket_init.rb +2 -0
- data/lib/rubygems/defaults.rb +17 -2
- data/lib/rubygems/dependency.rb +6 -2
- data/lib/rubygems/dependency_installer.rb +25 -24
- data/lib/rubygems/dependency_list.rb +1 -0
- data/lib/rubygems/deprecate.rb +3 -2
- data/lib/rubygems/doctor.rb +1 -0
- data/lib/rubygems/errors.rb +1 -0
- data/lib/rubygems/exceptions.rb +11 -3
- data/lib/rubygems/ext/build_error.rb +1 -0
- data/lib/rubygems/ext/builder.rb +23 -7
- data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +9 -5
- data/lib/rubygems/ext/cargo_builder.rb +145 -110
- data/lib/rubygems/ext/configure_builder.rb +1 -0
- data/lib/rubygems/ext/ext_conf_builder.rb +4 -2
- data/lib/rubygems/ext/rake_builder.rb +5 -3
- data/lib/rubygems/ext.rb +1 -0
- data/lib/rubygems/gem_runner.rb +1 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb +163 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_listener.rb +105 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_poller.rb +78 -0
- data/lib/rubygems/gemcutter_utilities.rb +53 -6
- data/lib/rubygems/indexer.rb +2 -1
- data/lib/rubygems/install_default_message.rb +1 -0
- data/lib/rubygems/install_message.rb +1 -0
- data/lib/rubygems/install_update_options.rb +1 -0
- data/lib/rubygems/installer.rb +22 -6
- data/lib/rubygems/local_remote_options.rb +1 -0
- data/lib/rubygems/mock_gem_ui.rb +1 -0
- data/lib/rubygems/name_tuple.rb +1 -0
- data/lib/rubygems/optparse/lib/optparse.rb +20 -15
- data/lib/rubygems/package/digest_io.rb +1 -0
- data/lib/rubygems/package/file_source.rb +1 -0
- data/lib/rubygems/package/io_source.rb +1 -0
- data/lib/rubygems/package/old.rb +1 -0
- data/lib/rubygems/package/source.rb +1 -0
- data/lib/rubygems/package/tar_header.rb +13 -12
- data/lib/rubygems/package/tar_reader/entry.rb +89 -7
- data/lib/rubygems/package/tar_reader.rb +1 -28
- data/lib/rubygems/package/tar_writer.rb +1 -0
- data/lib/rubygems/package.rb +1 -0
- data/lib/rubygems/package_task.rb +1 -0
- data/lib/rubygems/path_support.rb +1 -0
- data/lib/rubygems/platform.rb +4 -5
- data/lib/rubygems/psych_tree.rb +1 -0
- data/lib/rubygems/rdoc.rb +1 -0
- data/lib/rubygems/remote_fetcher.rb +1 -0
- data/lib/rubygems/request/http_pool.rb +1 -0
- data/lib/rubygems/request/https_pool.rb +1 -0
- data/lib/rubygems/request.rb +1 -0
- data/lib/rubygems/request_set/gem_dependency_api.rb +105 -105
- data/lib/rubygems/request_set/lockfile/parser.rb +1 -0
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
- data/lib/rubygems/request_set/lockfile.rb +1 -0
- data/lib/rubygems/request_set.rb +3 -2
- data/lib/rubygems/requirement.rb +9 -8
- data/lib/rubygems/resolver/activation_request.rb +1 -0
- data/lib/rubygems/resolver/api_set.rb +1 -0
- data/lib/rubygems/resolver/api_specification.rb +1 -0
- data/lib/rubygems/resolver/best_set.rb +1 -0
- data/lib/rubygems/resolver/composed_set.rb +1 -0
- data/lib/rubygems/resolver/conflict.rb +1 -0
- data/lib/rubygems/resolver/current_set.rb +1 -0
- data/lib/rubygems/resolver/dependency_request.rb +1 -0
- data/lib/rubygems/resolver/git_set.rb +1 -0
- data/lib/rubygems/resolver/git_specification.rb +1 -0
- data/lib/rubygems/resolver/index_set.rb +1 -0
- data/lib/rubygems/resolver/index_specification.rb +1 -0
- data/lib/rubygems/resolver/installed_specification.rb +1 -0
- data/lib/rubygems/resolver/installer_set.rb +5 -2
- data/lib/rubygems/resolver/local_specification.rb +1 -0
- data/lib/rubygems/resolver/lock_set.rb +1 -0
- data/lib/rubygems/resolver/lock_specification.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/rubygems/resolver/molinillo.rb +1 -0
- data/lib/rubygems/resolver/requirement_list.rb +1 -0
- data/lib/rubygems/resolver/set.rb +1 -0
- data/lib/rubygems/resolver/source_set.rb +2 -0
- data/lib/rubygems/resolver/spec_specification.rb +1 -0
- data/lib/rubygems/resolver/specification.rb +1 -0
- data/lib/rubygems/resolver/stats.rb +2 -1
- data/lib/rubygems/resolver/vendor_set.rb +1 -0
- data/lib/rubygems/resolver/vendor_specification.rb +1 -0
- data/lib/rubygems/resolver.rb +1 -0
- data/lib/rubygems/s3_uri_signer.rb +4 -2
- data/lib/rubygems/safe_yaml.rb +2 -0
- data/lib/rubygems/security/policies.rb +41 -40
- data/lib/rubygems/security/policy.rb +1 -0
- data/lib/rubygems/security/signer.rb +1 -0
- data/lib/rubygems/security/trust_dir.rb +2 -1
- data/lib/rubygems/security.rb +4 -16
- data/lib/rubygems/security_option.rb +1 -0
- data/lib/rubygems/shellwords.rb +3 -0
- data/lib/rubygems/source/git.rb +1 -1
- data/lib/rubygems/source/installed.rb +1 -0
- data/lib/rubygems/source/local.rb +1 -0
- data/lib/rubygems/source/lock.rb +1 -0
- data/lib/rubygems/source/specific_file.rb +1 -0
- data/lib/rubygems/source/vendor.rb +1 -0
- data/lib/rubygems/source.rb +2 -2
- data/lib/rubygems/spec_fetcher.rb +1 -0
- data/lib/rubygems/specification.rb +58 -52
- data/lib/rubygems/specification_policy.rb +21 -0
- data/lib/rubygems/stub_specification.rb +10 -8
- data/lib/rubygems/text.rb +2 -2
- data/lib/rubygems/tsort/lib/tsort.rb +308 -310
- data/lib/rubygems/uninstaller.rb +1 -0
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/user_interaction.rb +2 -0
- data/lib/rubygems/util/licenses.rb +3 -2
- data/lib/rubygems/util/list.rb +1 -0
- data/lib/rubygems/util.rb +2 -5
- data/lib/rubygems/validator.rb +2 -1
- data/lib/rubygems/version.rb +2 -2
- data/lib/rubygems/version_option.rb +1 -0
- data/lib/rubygems.rb +32 -11
- data/rubygems-update.gemspec +6 -4
- data/setup.rb +1 -0
- data/test/rubygems/bad_rake.rb +1 -0
- data/test/rubygems/bundler_test_gem.rb +421 -0
- data/test/rubygems/fake_certlib/openssl.rb +1 -0
- data/test/rubygems/good_rake.rb +1 -0
- data/test/rubygems/helper.rb +23 -6
- data/test/rubygems/installer_test_case.rb +1 -0
- data/test/rubygems/multifactor_auth_utilities.rb +111 -0
- data/test/rubygems/package/tar_test_case.rb +51 -15
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -0
- data/test/rubygems/plugin/load/rubygems_plugin.rb +1 -0
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -0
- data/test/rubygems/rubygems/commands/crash_command.rb +1 -0
- data/test/rubygems/rubygems_plugin.rb +1 -0
- data/test/rubygems/simple_gem.rb +2 -1
- data/test/rubygems/specifications/bar-0.0.2.gemspec +2 -0
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +2 -0
- data/test/rubygems/test_bundled_ca.rb +3 -2
- data/test/rubygems/test_config.rb +2 -1
- data/test/rubygems/test_deprecate.rb +2 -1
- data/test/rubygems/test_exit.rb +7 -1
- data/test/rubygems/test_gem.rb +41 -421
- data/test/rubygems/test_gem_available_set.rb +1 -0
- data/test/rubygems/test_gem_bundler_version_finder.rb +5 -3
- data/test/rubygems/test_gem_command.rb +1 -0
- data/test/rubygems/test_gem_command_manager.rb +67 -1
- data/test/rubygems/test_gem_commands_build_command.rb +11 -0
- data/test/rubygems/test_gem_commands_cert_command.rb +1 -0
- data/test/rubygems/test_gem_commands_check_command.rb +1 -0
- data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -0
- data/test/rubygems/test_gem_commands_contents_command.rb +1 -0
- data/test/rubygems/test_gem_commands_dependency_command.rb +1 -0
- data/test/rubygems/test_gem_commands_environment_command.rb +1 -0
- data/test/rubygems/test_gem_commands_exec_command.rb +853 -0
- data/test/rubygems/test_gem_commands_fetch_command.rb +1 -0
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -0
- data/test/rubygems/test_gem_commands_help_command.rb +1 -0
- data/test/rubygems/test_gem_commands_info_command.rb +1 -0
- data/test/rubygems/test_gem_commands_install_command.rb +21 -1
- data/test/rubygems/test_gem_commands_list_command.rb +1 -0
- data/test/rubygems/test_gem_commands_lock_command.rb +1 -0
- data/test/rubygems/test_gem_commands_mirror.rb +1 -0
- data/test/rubygems/test_gem_commands_open_command.rb +1 -0
- data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
- data/test/rubygems/test_gem_commands_owner_command.rb +103 -7
- data/test/rubygems/test_gem_commands_pristine_command.rb +50 -1
- data/test/rubygems/test_gem_commands_push_command.rb +110 -6
- data/test/rubygems/test_gem_commands_query_command.rb +1 -0
- data/test/rubygems/test_gem_commands_search_command.rb +1 -0
- data/test/rubygems/test_gem_commands_server_command.rb +1 -0
- data/test/rubygems/test_gem_commands_setup_command.rb +4 -11
- data/test/rubygems/test_gem_commands_signin_command.rb +1 -0
- data/test/rubygems/test_gem_commands_sources_command.rb +1 -0
- data/test/rubygems/test_gem_commands_specification_command.rb +1 -0
- data/test/rubygems/test_gem_commands_stale_command.rb +1 -0
- data/test/rubygems/test_gem_commands_uninstall_command.rb +32 -14
- data/test/rubygems/test_gem_commands_unpack_command.rb +1 -0
- data/test/rubygems/test_gem_commands_update_command.rb +7 -6
- data/test/rubygems/test_gem_commands_which_command.rb +1 -0
- data/test/rubygems/test_gem_commands_yank_command.rb +120 -1
- data/test/rubygems/test_gem_config_file.rb +2 -1
- data/test/rubygems/test_gem_dependency.rb +3 -0
- data/test/rubygems/test_gem_dependency_installer.rb +35 -0
- data/test/rubygems/test_gem_dependency_list.rb +1 -0
- data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -0
- data/test/rubygems/test_gem_doctor.rb +1 -0
- data/test/rubygems/test_gem_ext_builder.rb +7 -8
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +4 -4
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{Cargo.lock → ext/custom_name_lib/Cargo.lock} +22 -32
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{Cargo.toml → ext/custom_name_lib/Cargo.toml} +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{src → ext/custom_name_lib/src}/lib.rs +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +3 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +36 -32
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +2 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +12 -0
- data/test/rubygems/test_gem_ext_cargo_builder.rb +33 -44
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +17 -16
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +5 -20
- data/test/rubygems/test_gem_ext_cmake_builder.rb +1 -0
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +1 -0
- data/test/rubygems/test_gem_gem_runner.rb +8 -2
- data/test/rubygems/test_gem_gemcutter_utilities.rb +130 -48
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +1 -0
- data/test/rubygems/test_gem_indexer.rb +40 -20
- data/test/rubygems/test_gem_install_update_options.rb +1 -0
- data/test/rubygems/test_gem_installer.rb +120 -5
- data/test/rubygems/test_gem_local_remote_options.rb +1 -0
- data/test/rubygems/test_gem_name_tuple.rb +1 -0
- data/test/rubygems/test_gem_package.rb +0 -25
- data/test/rubygems/test_gem_package_old.rb +1 -0
- data/test/rubygems/test_gem_package_tar_header.rb +14 -13
- data/test/rubygems/test_gem_package_tar_reader.rb +49 -1
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +152 -6
- data/test/rubygems/test_gem_package_tar_writer.rb +1 -0
- data/test/rubygems/test_gem_package_task.rb +1 -0
- data/test/rubygems/test_gem_path_support.rb +1 -0
- data/test/rubygems/test_gem_platform.rb +60 -60
- data/test/rubygems/test_gem_rdoc.rb +1 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +6 -5
- data/test/rubygems/test_gem_request.rb +10 -4
- data/test/rubygems/test_gem_request_connection_pools.rb +1 -0
- data/test/rubygems/test_gem_request_set.rb +3 -2
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +11 -10
- data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +7 -6
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +1 -0
- data/test/rubygems/test_gem_requirement.rb +2 -1
- data/test/rubygems/test_gem_resolver.rb +1 -0
- data/test/rubygems/test_gem_resolver_activation_request.rb +1 -0
- data/test/rubygems/test_gem_resolver_api_set.rb +13 -12
- data/test/rubygems/test_gem_resolver_api_specification.rb +20 -19
- data/test/rubygems/test_gem_resolver_best_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_composed_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -0
- data/test/rubygems/test_gem_resolver_dependency_request.rb +1 -0
- data/test/rubygems/test_gem_resolver_git_set.rb +10 -9
- data/test/rubygems/test_gem_resolver_git_specification.rb +3 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_index_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_installed_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_installer_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_local_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_lock_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_lock_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -0
- data/test/rubygems/test_gem_resolver_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +1 -0
- data/test/rubygems/test_gem_security.rb +1 -0
- data/test/rubygems/test_gem_security_policy.rb +10 -10
- data/test/rubygems/test_gem_security_signer.rb +1 -0
- data/test/rubygems/test_gem_security_trust_dir.rb +3 -2
- data/test/rubygems/test_gem_silent_ui.rb +1 -0
- data/test/rubygems/test_gem_source.rb +2 -1
- data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
- data/test/rubygems/test_gem_source_git.rb +14 -12
- data/test/rubygems/test_gem_source_installed.rb +2 -1
- data/test/rubygems/test_gem_source_list.rb +1 -0
- data/test/rubygems/test_gem_source_local.rb +1 -0
- data/test/rubygems/test_gem_source_lock.rb +4 -3
- data/test/rubygems/test_gem_source_specific_file.rb +1 -0
- data/test/rubygems/test_gem_source_subpath_problem.rb +1 -0
- data/test/rubygems/test_gem_source_vendor.rb +2 -1
- data/test/rubygems/test_gem_spec_fetcher.rb +1 -0
- data/test/rubygems/test_gem_specification.rb +95 -39
- data/test/rubygems/test_gem_stream_ui.rb +34 -3
- data/test/rubygems/test_gem_stub_specification.rb +1 -0
- data/test/rubygems/test_gem_text.rb +1 -0
- data/test/rubygems/test_gem_uninstaller.rb +6 -5
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +1 -0
- data/test/rubygems/test_gem_update_suggestion.rb +209 -0
- data/test/rubygems/test_gem_uri.rb +2 -0
- data/test/rubygems/test_gem_uri_formatter.rb +1 -0
- data/test/rubygems/test_gem_util.rb +1 -0
- data/test/rubygems/test_gem_version.rb +3 -2
- data/test/rubygems/test_gem_version_option.rb +1 -0
- data/test/rubygems/test_kernel.rb +12 -17
- data/test/rubygems/test_project_sanity.rb +32 -3
- data/test/rubygems/test_remote_fetch_error.rb +2 -1
- data/test/rubygems/test_require.rb +70 -55
- data/test/rubygems/test_rubygems.rb +2 -0
- data/test/rubygems/test_webauthn_listener.rb +143 -0
- data/test/rubygems/test_webauthn_listener_response.rb +93 -0
- data/test/rubygems/test_webauthn_poller.rb +124 -0
- data/test/rubygems/utilities.rb +45 -3
- data/test/test_changelog_generator.rb +1 -1
- metadata +59 -43
- data/bundler/lib/bundler/templates/gems.rb +0 -5
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -149
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/bundler/lib/bundler/vendored_molinillo.rb +0 -4
- data/bundler/lib/bundler/version_ranges.rb +0 -122
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb +0 -21
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb +0 -21
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
#--
|
3
4
|
# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
|
4
5
|
# All rights reserved.
|
@@ -13,12 +14,12 @@ module Kernel
|
|
13
14
|
|
14
15
|
# Make sure we have a reference to Ruby's original Kernel#require
|
15
16
|
unless defined?(gem_original_require)
|
17
|
+
# :stopdoc:
|
16
18
|
alias gem_original_require require
|
17
19
|
private :gem_original_require
|
20
|
+
# :startdoc:
|
18
21
|
end
|
19
22
|
|
20
|
-
file = Gem::KERNEL_WARN_IGNORES_INTERNAL_ENTRIES ? "<internal:#{__FILE__}>" : __FILE__
|
21
|
-
module_eval <<'RUBY', file, __LINE__ + 1 # rubocop:disable Style/EvalWithLocation
|
22
23
|
##
|
23
24
|
# When RubyGems is required, Kernel#require is replaced with our own which
|
24
25
|
# is capable of loading gems on demand.
|
@@ -33,142 +34,135 @@ module Kernel
|
|
33
34
|
# The normal <tt>require</tt> functionality of returning false if
|
34
35
|
# that file has already been loaded is preserved.
|
35
36
|
|
36
|
-
def require(path)
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
37
|
+
def require(path) # :doc:
|
38
|
+
return gem_original_require(path) unless Gem.discover_gems_on_require
|
39
|
+
|
40
|
+
begin
|
41
|
+
RUBYGEMS_ACTIVATION_MONITOR.enter
|
42
|
+
|
43
|
+
path = path.to_path if path.respond_to? :to_path
|
44
|
+
|
45
|
+
if spec = Gem.find_unresolved_default_spec(path)
|
46
|
+
# Ensure -I beats a default gem
|
47
|
+
resolved_path = begin
|
48
|
+
rp = nil
|
49
|
+
load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
|
50
|
+
Gem.suffixes.each do |s|
|
51
|
+
$LOAD_PATH[0...load_path_check_index].each do |lp|
|
52
|
+
safe_lp = lp.dup.tap(&Gem::UNTAINT)
|
53
|
+
begin
|
54
|
+
if File.symlink? safe_lp # for backward compatibility
|
55
|
+
next
|
56
|
+
end
|
57
|
+
rescue SecurityError
|
58
|
+
RUBYGEMS_ACTIVATION_MONITOR.exit
|
59
|
+
raise
|
55
60
|
end
|
56
|
-
rescue SecurityError
|
57
|
-
RUBYGEMS_ACTIVATION_MONITOR.exit
|
58
|
-
raise
|
59
|
-
end
|
60
61
|
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
62
|
+
full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
|
63
|
+
if File.file?(full_path)
|
64
|
+
rp = full_path
|
65
|
+
break
|
66
|
+
end
|
65
67
|
end
|
68
|
+
break if rp
|
66
69
|
end
|
67
|
-
|
70
|
+
rp
|
68
71
|
end
|
69
|
-
rp
|
70
|
-
end
|
71
|
-
|
72
|
-
begin
|
73
|
-
Kernel.send(:gem, spec.name, Gem::Requirement.default_prerelease)
|
74
|
-
rescue Exception
|
75
|
-
RUBYGEMS_ACTIVATION_MONITOR.exit
|
76
|
-
raise
|
77
|
-
end unless resolved_path
|
78
|
-
end
|
79
|
-
|
80
|
-
# If there are no unresolved deps, then we can use just try
|
81
|
-
# normal require handle loading a gem from the rescue below.
|
82
|
-
|
83
|
-
if Gem::Specification.unresolved_deps.empty?
|
84
|
-
RUBYGEMS_ACTIVATION_MONITOR.exit
|
85
|
-
return gem_original_require(path)
|
86
|
-
end
|
87
|
-
|
88
|
-
# If +path+ is for a gem that has already been loaded, don't
|
89
|
-
# bother trying to find it in an unresolved gem, just go straight
|
90
|
-
# to normal require.
|
91
|
-
#--
|
92
|
-
# TODO request access to the C implementation of this to speed up RubyGems
|
93
|
-
|
94
|
-
if Gem::Specification.find_active_stub_by_path(path)
|
95
|
-
RUBYGEMS_ACTIVATION_MONITOR.exit
|
96
|
-
return gem_original_require(path)
|
97
|
-
end
|
98
72
|
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
# For example, given:
|
106
|
-
#
|
107
|
-
# a => b => c => d
|
108
|
-
#
|
109
|
-
# If a and b are currently active with c being unresolved and d.rb is
|
110
|
-
# requested, then find_in_unresolved_tree will find d.rb in d because
|
111
|
-
# it's a dependency of c.
|
112
|
-
#
|
113
|
-
if found_specs.empty?
|
114
|
-
found_specs = Gem::Specification.find_in_unresolved_tree path
|
115
|
-
|
116
|
-
found_specs.each do |found_spec|
|
117
|
-
found_spec.activate
|
73
|
+
begin
|
74
|
+
Kernel.send(:gem, spec.name, Gem::Requirement.default_prerelease)
|
75
|
+
rescue Exception
|
76
|
+
RUBYGEMS_ACTIVATION_MONITOR.exit
|
77
|
+
raise
|
78
|
+
end unless resolved_path
|
118
79
|
end
|
119
80
|
|
120
|
-
|
121
|
-
|
122
|
-
else
|
123
|
-
|
124
|
-
# Check that all the found specs are just different
|
125
|
-
# versions of the same gem
|
126
|
-
names = found_specs.map(&:name).uniq
|
81
|
+
# If there are no unresolved deps, then we can use just try
|
82
|
+
# normal require handle loading a gem from the rescue below.
|
127
83
|
|
128
|
-
if
|
84
|
+
if Gem::Specification.unresolved_deps.empty?
|
129
85
|
RUBYGEMS_ACTIVATION_MONITOR.exit
|
130
|
-
|
86
|
+
return gem_original_require(path)
|
131
87
|
end
|
132
88
|
|
133
|
-
#
|
134
|
-
#
|
135
|
-
|
89
|
+
# If +path+ is for a gem that has already been loaded, don't
|
90
|
+
# bother trying to find it in an unresolved gem, just go straight
|
91
|
+
# to normal require.
|
92
|
+
#--
|
93
|
+
# TODO request access to the C implementation of this to speed up RubyGems
|
136
94
|
|
137
|
-
|
138
|
-
le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"
|
139
|
-
le.name = names.first
|
95
|
+
if Gem::Specification.find_active_stub_by_path(path)
|
140
96
|
RUBYGEMS_ACTIVATION_MONITOR.exit
|
141
|
-
|
97
|
+
return gem_original_require(path)
|
142
98
|
end
|
143
99
|
|
144
|
-
|
145
|
-
|
100
|
+
# Attempt to find +path+ in any unresolved gems...
|
101
|
+
|
102
|
+
found_specs = Gem::Specification.find_in_unresolved path
|
103
|
+
|
104
|
+
# If there are no directly unresolved gems, then try and find +path+
|
105
|
+
# in any gems that are available via the currently unresolved gems.
|
106
|
+
# For example, given:
|
107
|
+
#
|
108
|
+
# a => b => c => d
|
109
|
+
#
|
110
|
+
# If a and b are currently active with c being unresolved and d.rb is
|
111
|
+
# requested, then find_in_unresolved_tree will find d.rb in d because
|
112
|
+
# it's a dependency of c.
|
113
|
+
#
|
114
|
+
if found_specs.empty?
|
115
|
+
found_specs = Gem::Specification.find_in_unresolved_tree path
|
116
|
+
|
117
|
+
found_specs.each do |found_spec|
|
118
|
+
found_spec.activate
|
119
|
+
end
|
146
120
|
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
RUBYGEMS_ACTIVATION_MONITOR.enter
|
121
|
+
# We found +path+ directly in an unresolved gem. Now we figure out, of
|
122
|
+
# the possible found specs, which one we should activate.
|
123
|
+
else
|
151
124
|
|
152
|
-
|
153
|
-
|
154
|
-
|
125
|
+
# Check that all the found specs are just different
|
126
|
+
# versions of the same gem
|
127
|
+
names = found_specs.map(&:name).uniq
|
128
|
+
|
129
|
+
if names.size > 1
|
130
|
+
RUBYGEMS_ACTIVATION_MONITOR.exit
|
131
|
+
raise Gem::LoadError, "#{path} found in multiple gems: #{names.join ', '}"
|
132
|
+
end
|
133
|
+
|
134
|
+
# Ok, now find a gem that has no conflicts, starting
|
135
|
+
# at the highest version.
|
136
|
+
valid = found_specs.find {|s| !s.has_conflicts? }
|
137
|
+
|
138
|
+
unless valid
|
139
|
+
le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"
|
140
|
+
le.name = names.first
|
141
|
+
RUBYGEMS_ACTIVATION_MONITOR.exit
|
142
|
+
raise le
|
143
|
+
end
|
144
|
+
|
145
|
+
valid.activate
|
155
146
|
end
|
156
|
-
ensure
|
157
|
-
RUBYGEMS_ACTIVATION_MONITOR.exit
|
158
|
-
end
|
159
147
|
|
160
|
-
|
148
|
+
RUBYGEMS_ACTIVATION_MONITOR.exit
|
149
|
+
return gem_original_require(path)
|
150
|
+
rescue LoadError => load_error
|
151
|
+
if load_error.path == path
|
152
|
+
RUBYGEMS_ACTIVATION_MONITOR.enter
|
153
|
+
|
154
|
+
begin
|
155
|
+
require_again = Gem.try_activate(path)
|
156
|
+
ensure
|
157
|
+
RUBYGEMS_ACTIVATION_MONITOR.exit
|
158
|
+
end
|
161
159
|
|
162
|
-
|
163
|
-
ensure
|
164
|
-
if RUBYGEMS_ACTIVATION_MONITOR.respond_to?(:mon_owned?)
|
165
|
-
if monitor_owned != (ow = RUBYGEMS_ACTIVATION_MONITOR.mon_owned?)
|
166
|
-
STDERR.puts [$$, Thread.current, $!, $!.backtrace].inspect if $!
|
167
|
-
raise "CRITICAL: RUBYGEMS_ACTIVATION_MONITOR.owned?: before #{monitor_owned} -> after #{ow}"
|
160
|
+
return gem_original_require(path) if require_again
|
168
161
|
end
|
162
|
+
|
163
|
+
raise load_error
|
169
164
|
end
|
170
165
|
end
|
171
|
-
RUBY
|
172
166
|
|
173
167
|
private :require
|
174
168
|
|
@@ -1,54 +1,50 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
|
3
|
+
module Kernel
|
4
|
+
rubygems_path = "#{__dir__}/" # Frames to be skipped start with this path.
|
5
5
|
|
6
|
-
|
7
|
-
rubygems_path = "#{__dir__}/" # Frames to be skipped start with this path.
|
6
|
+
original_warn = instance_method(:warn)
|
8
7
|
|
9
|
-
|
8
|
+
remove_method :warn
|
10
9
|
|
10
|
+
class << self
|
11
11
|
remove_method :warn
|
12
|
+
end
|
12
13
|
|
13
|
-
|
14
|
-
|
14
|
+
module_function define_method(:warn) {|*messages, **kw|
|
15
|
+
unless uplevel = kw[:uplevel]
|
16
|
+
if Gem.java_platform? && RUBY_VERSION < "3.1"
|
17
|
+
return original_warn.bind(self).call(*messages)
|
18
|
+
else
|
19
|
+
return original_warn.bind(self).call(*messages, **kw)
|
20
|
+
end
|
15
21
|
end
|
16
22
|
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
+
# Ensure `uplevel` fits a `long`
|
24
|
+
uplevel, = [uplevel].pack("l!").unpack("l!")
|
25
|
+
|
26
|
+
if uplevel >= 0
|
27
|
+
start = 0
|
28
|
+
while uplevel >= 0
|
29
|
+
loc, = caller_locations(start, 1)
|
30
|
+
unless loc
|
31
|
+
# No more backtrace
|
32
|
+
start += uplevel
|
33
|
+
break
|
23
34
|
end
|
24
|
-
end
|
25
35
|
|
26
|
-
|
27
|
-
uplevel, = [uplevel].pack("l!").unpack("l!")
|
28
|
-
|
29
|
-
if uplevel >= 0
|
30
|
-
start = 0
|
31
|
-
while uplevel >= 0
|
32
|
-
loc, = caller_locations(start, 1)
|
33
|
-
unless loc
|
34
|
-
# No more backtrace
|
35
|
-
start += uplevel
|
36
|
-
break
|
37
|
-
end
|
36
|
+
start += 1
|
38
37
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
# Non-rubygems frames
|
44
|
-
uplevel -= 1
|
45
|
-
end
|
38
|
+
if path = loc.path
|
39
|
+
unless path.start_with?(rubygems_path) || path.start_with?("<internal:")
|
40
|
+
# Non-rubygems frames
|
41
|
+
uplevel -= 1
|
46
42
|
end
|
47
43
|
end
|
48
|
-
kw[:uplevel] = start
|
49
44
|
end
|
45
|
+
kw[:uplevel] = start
|
46
|
+
end
|
50
47
|
|
51
|
-
|
52
|
-
|
53
|
-
end
|
48
|
+
original_warn.bind(self).call(*messages, **kw)
|
49
|
+
}
|
54
50
|
end
|
data/lib/rubygems/defaults.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Gem
|
3
|
-
DEFAULT_HOST = "https://rubygems.org"
|
4
|
+
DEFAULT_HOST = "https://rubygems.org"
|
4
5
|
|
5
6
|
@post_install_hooks ||= []
|
6
7
|
@done_installing_hooks ||= []
|
@@ -133,6 +134,13 @@ module Gem
|
|
133
134
|
@config_file ||= find_config_file.tap(&Gem::UNTAINT)
|
134
135
|
end
|
135
136
|
|
137
|
+
##
|
138
|
+
# The path to standard location of the user's state file.
|
139
|
+
|
140
|
+
def self.state_file
|
141
|
+
@state_file ||= File.join(Gem.state_home, "gem", "last_update_check").tap(&Gem::UNTAINT)
|
142
|
+
end
|
143
|
+
|
136
144
|
##
|
137
145
|
# The path to standard location of the user's cache directory.
|
138
146
|
|
@@ -147,6 +155,13 @@ module Gem
|
|
147
155
|
@data_home ||= (ENV["XDG_DATA_HOME"] || File.join(Gem.user_home, ".local", "share"))
|
148
156
|
end
|
149
157
|
|
158
|
+
##
|
159
|
+
# The path to standard location of the user's state directory.
|
160
|
+
|
161
|
+
def self.state_home
|
162
|
+
@state_home ||= (ENV["XDG_STATE_HOME"] || File.join(Gem.user_home, ".local", "state"))
|
163
|
+
end
|
164
|
+
|
150
165
|
##
|
151
166
|
# How String Gem paths should be split. Overridable for esoteric platforms.
|
152
167
|
|
@@ -171,7 +186,7 @@ module Gem
|
|
171
186
|
def self.default_exec_format
|
172
187
|
exec_format = RbConfig::CONFIG["ruby_install_name"].sub("ruby", "%s") rescue "%s"
|
173
188
|
|
174
|
-
unless exec_format
|
189
|
+
unless exec_format.include?("%s")
|
175
190
|
raise Gem::Exception,
|
176
191
|
"[BUG] invalid exec_format #{exec_format.inspect}, no %s"
|
177
192
|
end
|
data/lib/rubygems/dependency.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
##
|
3
4
|
# The Dependency class holds a Gem name and a Gem::Requirement.
|
4
5
|
|
@@ -277,7 +278,10 @@ class Gem::Dependency
|
|
277
278
|
requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version)
|
278
279
|
end.map(&:to_spec)
|
279
280
|
|
280
|
-
|
281
|
+
if prioritizes_bundler?
|
282
|
+
require_relative "bundler_version_finder"
|
283
|
+
Gem::BundlerVersionFinder.prioritize!(matches)
|
284
|
+
end
|
281
285
|
|
282
286
|
if platform_only
|
283
287
|
matches.reject! do |spec|
|
@@ -296,7 +300,7 @@ class Gem::Dependency
|
|
296
300
|
end
|
297
301
|
|
298
302
|
def prioritizes_bundler?
|
299
|
-
name == "bundler"
|
303
|
+
name == "bundler" && !specific?
|
300
304
|
end
|
301
305
|
|
302
306
|
def to_specs
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require_relative "../rubygems"
|
3
4
|
require_relative "dependency_list"
|
4
5
|
require_relative "package"
|
@@ -16,16 +17,16 @@ class Gem::DependencyInstaller
|
|
16
17
|
extend Gem::Deprecate
|
17
18
|
|
18
19
|
DEFAULT_OPTIONS = { # :nodoc:
|
19
|
-
:env_shebang
|
20
|
-
:document
|
21
|
-
:domain
|
22
|
-
:force
|
23
|
-
:format_executable
|
20
|
+
:env_shebang => false,
|
21
|
+
:document => %w[ri],
|
22
|
+
:domain => :both, # HACK dup
|
23
|
+
:force => false,
|
24
|
+
:format_executable => false, # HACK dup
|
24
25
|
:ignore_dependencies => false,
|
25
|
-
:prerelease
|
26
|
-
:security_policy
|
27
|
-
:wrappers
|
28
|
-
:build_args
|
26
|
+
:prerelease => false,
|
27
|
+
:security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
|
28
|
+
:wrappers => true,
|
29
|
+
:build_args => nil,
|
29
30
|
:build_docs_in_background => false,
|
30
31
|
:install_as_default => false,
|
31
32
|
}.freeze
|
@@ -230,22 +231,22 @@ class Gem::DependencyInstaller
|
|
230
231
|
@installed_gems = []
|
231
232
|
|
232
233
|
options = {
|
233
|
-
:bin_dir
|
234
|
-
:build_args
|
235
|
-
:document
|
236
|
-
:env_shebang
|
237
|
-
:force
|
238
|
-
:format_executable
|
234
|
+
:bin_dir => @bin_dir,
|
235
|
+
:build_args => @build_args,
|
236
|
+
:document => @document,
|
237
|
+
:env_shebang => @env_shebang,
|
238
|
+
:force => @force,
|
239
|
+
:format_executable => @format_executable,
|
239
240
|
:ignore_dependencies => @ignore_dependencies,
|
240
|
-
:prerelease
|
241
|
-
:security_policy
|
242
|
-
:user_install
|
243
|
-
:wrappers
|
244
|
-
:build_root
|
245
|
-
:install_as_default
|
246
|
-
:dir_mode
|
247
|
-
:data_mode
|
248
|
-
:prog_mode
|
241
|
+
:prerelease => @prerelease,
|
242
|
+
:security_policy => @security_policy,
|
243
|
+
:user_install => @user_install,
|
244
|
+
:wrappers => @wrappers,
|
245
|
+
:build_root => @build_root,
|
246
|
+
:install_as_default => @install_as_default,
|
247
|
+
:dir_mode => @dir_mode,
|
248
|
+
:data_mode => @data_mode,
|
249
|
+
:prog_mode => @prog_mode,
|
249
250
|
}
|
250
251
|
options[:install_dir] = @install_dir if @only_install_dir
|
251
252
|
|
data/lib/rubygems/deprecate.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
##
|
3
4
|
# Provides 3 methods for declaring when something is going away.
|
4
5
|
#
|
@@ -143,7 +144,7 @@ module Gem::Deprecate
|
|
143
144
|
end
|
144
145
|
|
145
146
|
# Deprecation method to deprecate Rubygems commands
|
146
|
-
def rubygems_deprecate_command
|
147
|
+
def rubygems_deprecate_command(version = Gem::Deprecate.next_rubygems_major_version)
|
147
148
|
class_eval do
|
148
149
|
define_method "deprecated?" do
|
149
150
|
true
|
@@ -151,7 +152,7 @@ module Gem::Deprecate
|
|
151
152
|
|
152
153
|
define_method "deprecation_warning" do
|
153
154
|
msg = [ "#{self.command} command is deprecated",
|
154
|
-
". It will be removed in Rubygems #{
|
155
|
+
". It will be removed in Rubygems #{version}.\n",
|
155
156
|
]
|
156
157
|
|
157
158
|
alert_warning "#{msg.join}" unless Gem::Deprecate.skip
|
data/lib/rubygems/doctor.rb
CHANGED
data/lib/rubygems/errors.rb
CHANGED
data/lib/rubygems/exceptions.rb
CHANGED
@@ -213,6 +213,16 @@ class Gem::RubyVersionMismatch < Gem::Exception; end
|
|
213
213
|
|
214
214
|
class Gem::VerificationError < Gem::Exception; end
|
215
215
|
|
216
|
+
##
|
217
|
+
# Raised by Gem::WebauthnListener when an error occurs during security
|
218
|
+
# device verification.
|
219
|
+
|
220
|
+
class Gem::WebauthnVerificationError < Gem::Exception
|
221
|
+
def initialize(message)
|
222
|
+
super "Security device verification failed: #{message}"
|
223
|
+
end
|
224
|
+
end
|
225
|
+
|
216
226
|
##
|
217
227
|
# Raised to indicate that a system exit should occur with the specified
|
218
228
|
# exit_code
|
@@ -221,14 +231,12 @@ class Gem::SystemExitException < SystemExit
|
|
221
231
|
##
|
222
232
|
# The exit code for the process
|
223
233
|
|
224
|
-
|
234
|
+
alias exit_code status
|
225
235
|
|
226
236
|
##
|
227
237
|
# Creates a new SystemExitException with the given +exit_code+
|
228
238
|
|
229
239
|
def initialize(exit_code)
|
230
|
-
@exit_code = exit_code
|
231
|
-
|
232
240
|
super exit_code, "Exiting RubyGems with exit_code #{exit_code}"
|
233
241
|
end
|
234
242
|
end
|
data/lib/rubygems/ext/builder.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
#--
|
3
4
|
# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
|
4
5
|
# All rights reserved.
|
@@ -6,6 +7,7 @@
|
|
6
7
|
#++
|
7
8
|
|
8
9
|
require_relative "../user_interaction"
|
10
|
+
require_relative "../shellwords"
|
9
11
|
|
10
12
|
class Gem::Ext::Builder
|
11
13
|
include Gem::UserInteraction
|
@@ -17,7 +19,7 @@ class Gem::Ext::Builder
|
|
17
19
|
$1.downcase
|
18
20
|
end
|
19
21
|
|
20
|
-
def self.make(dest_path, results, make_dir = Dir.pwd, sitedir = nil)
|
22
|
+
def self.make(dest_path, results, make_dir = Dir.pwd, sitedir = nil, targets = ["clean", "", "install"])
|
21
23
|
unless File.exist? File.join(make_dir, "Makefile")
|
22
24
|
raise Gem::InstallError, "Makefile not found"
|
23
25
|
end
|
@@ -26,7 +28,7 @@ class Gem::Ext::Builder
|
|
26
28
|
RbConfig::CONFIG["configure_args"] =~ /with-make-prog\=(\w+)/
|
27
29
|
make_program_name = ENV["MAKE"] || ENV["make"] || $1
|
28
30
|
unless make_program_name
|
29
|
-
make_program_name = (
|
31
|
+
make_program_name = (RUBY_PLATFORM.include?("mswin")) ? "nmake" : "make"
|
30
32
|
end
|
31
33
|
make_program = Shellwords.split(make_program_name)
|
32
34
|
|
@@ -40,7 +42,7 @@ class Gem::Ext::Builder
|
|
40
42
|
env << "sitelibdir=%s" % sitedir
|
41
43
|
end
|
42
44
|
|
43
|
-
|
45
|
+
targets.each do |target|
|
44
46
|
# Pass DESTDIR via command line to override what's in MAKEFLAGS
|
45
47
|
cmd = [
|
46
48
|
*make_program,
|
@@ -55,6 +57,22 @@ class Gem::Ext::Builder
|
|
55
57
|
end
|
56
58
|
end
|
57
59
|
|
60
|
+
def self.ruby
|
61
|
+
# Gem.ruby is quoted if it contains whitespace
|
62
|
+
cmd = Shellwords.split(Gem.ruby)
|
63
|
+
|
64
|
+
# This load_path is only needed when running rubygems test without a proper installation.
|
65
|
+
# Prepending it in a normal installation will cause problem with order of $LOAD_PATH.
|
66
|
+
# Therefore only add load_path if it is not present in the default $LOAD_PATH.
|
67
|
+
load_path = File.expand_path("../..", __dir__)
|
68
|
+
case load_path
|
69
|
+
when RbConfig::CONFIG["sitelibdir"], RbConfig::CONFIG["vendorlibdir"], RbConfig::CONFIG["rubylibdir"]
|
70
|
+
cmd
|
71
|
+
else
|
72
|
+
cmd << "-I#{load_path}"
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
58
76
|
def self.run(command, results, command_name = nil, dir = Dir.pwd, env = {})
|
59
77
|
verbose = Gem.configuration.really_verbose
|
60
78
|
|
@@ -65,8 +83,7 @@ class Gem::Ext::Builder
|
|
65
83
|
p(command)
|
66
84
|
end
|
67
85
|
results << "current directory: #{dir}"
|
68
|
-
|
69
|
-
results << command.shelljoin
|
86
|
+
results << Shellwords.join(command)
|
70
87
|
|
71
88
|
require "open3"
|
72
89
|
# Set $SOURCE_DATE_EPOCH for the subprocess.
|
@@ -131,8 +148,7 @@ class Gem::Ext::Builder
|
|
131
148
|
when /CMakeLists.txt/ then
|
132
149
|
Gem::Ext::CmakeBuilder
|
133
150
|
when /Cargo.toml/ then
|
134
|
-
|
135
|
-
Gem::Ext::CargoBuilder.new(@spec)
|
151
|
+
Gem::Ext::CargoBuilder.new
|
136
152
|
else
|
137
153
|
build_error("No builder for extension '#{extension}'")
|
138
154
|
end
|