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 (C) 2004 Mauricio Julio Fernández Pradier
|
4
5
|
# See LICENSE.txt for additional licensing information.
|
@@ -8,6 +9,20 @@
|
|
8
9
|
# Class for reading entries out of a tar file
|
9
10
|
|
10
11
|
class Gem::Package::TarReader::Entry
|
12
|
+
##
|
13
|
+
# Creates a new tar entry for +header+ that will be read from +io+
|
14
|
+
# If a block is given, the entry is yielded and then closed.
|
15
|
+
|
16
|
+
def self.open(header, io, &block)
|
17
|
+
entry = new header, io
|
18
|
+
return entry unless block_given?
|
19
|
+
begin
|
20
|
+
yield entry
|
21
|
+
ensure
|
22
|
+
entry.close
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
11
26
|
##
|
12
27
|
# Header for this tar entry
|
13
28
|
|
@@ -21,6 +36,7 @@ class Gem::Package::TarReader::Entry
|
|
21
36
|
@header = header
|
22
37
|
@io = io
|
23
38
|
@orig_pos = @io.pos
|
39
|
+
@end_pos = @orig_pos + @header.size
|
24
40
|
@read = 0
|
25
41
|
end
|
26
42
|
|
@@ -39,7 +55,14 @@ class Gem::Package::TarReader::Entry
|
|
39
55
|
# Closes the tar entry
|
40
56
|
|
41
57
|
def close
|
58
|
+
return if closed?
|
59
|
+
# Seek to the end of the entry if it wasn't fully read
|
60
|
+
seek(0, IO::SEEK_END)
|
61
|
+
# discard trailing zeros
|
62
|
+
skip = (512 - (@header.size % 512)) % 512
|
63
|
+
@io.read(skip)
|
42
64
|
@closed = true
|
65
|
+
nil
|
43
66
|
end
|
44
67
|
|
45
68
|
##
|
@@ -117,6 +140,14 @@ class Gem::Package::TarReader::Entry
|
|
117
140
|
bytes_read
|
118
141
|
end
|
119
142
|
|
143
|
+
##
|
144
|
+
# Seek to the position in the tar entry
|
145
|
+
|
146
|
+
def pos=(new_pos)
|
147
|
+
seek(new_pos, IO::SEEK_SET)
|
148
|
+
new_pos
|
149
|
+
end
|
150
|
+
|
120
151
|
def size
|
121
152
|
@header.size
|
122
153
|
end
|
@@ -130,9 +161,10 @@ class Gem::Package::TarReader::Entry
|
|
130
161
|
def read(len = nil)
|
131
162
|
check_closed
|
132
163
|
|
133
|
-
return nil if @read >= @header.size
|
134
|
-
|
135
164
|
len ||= @header.size - @read
|
165
|
+
|
166
|
+
return nil if len > 0 && @read >= @header.size
|
167
|
+
|
136
168
|
max_read = [len, @header.size - @read].min
|
137
169
|
|
138
170
|
ret = @io.read max_read
|
@@ -144,9 +176,10 @@ class Gem::Package::TarReader::Entry
|
|
144
176
|
def readpartial(maxlen = nil, outbuf = "".b)
|
145
177
|
check_closed
|
146
178
|
|
147
|
-
raise EOFError if @read >= @header.size
|
148
|
-
|
149
179
|
maxlen ||= @header.size - @read
|
180
|
+
|
181
|
+
raise EOFError if maxlen > 0 && @read >= @header.size
|
182
|
+
|
150
183
|
max_read = [maxlen, @header.size - @read].min
|
151
184
|
|
152
185
|
@io.readpartial(max_read, outbuf)
|
@@ -155,13 +188,62 @@ class Gem::Package::TarReader::Entry
|
|
155
188
|
outbuf
|
156
189
|
end
|
157
190
|
|
191
|
+
##
|
192
|
+
# Seeks to +offset+ bytes into the tar file entry
|
193
|
+
# +whence+ can be IO::SEEK_SET, IO::SEEK_CUR, or IO::SEEK_END
|
194
|
+
|
195
|
+
def seek(offset, whence = IO::SEEK_SET)
|
196
|
+
check_closed
|
197
|
+
|
198
|
+
new_pos =
|
199
|
+
case whence
|
200
|
+
when IO::SEEK_SET then @orig_pos + offset
|
201
|
+
when IO::SEEK_CUR then @io.pos + offset
|
202
|
+
when IO::SEEK_END then @end_pos + offset
|
203
|
+
else
|
204
|
+
raise ArgumentError, "invalid whence"
|
205
|
+
end
|
206
|
+
|
207
|
+
if new_pos < @orig_pos
|
208
|
+
new_pos = @orig_pos
|
209
|
+
elsif new_pos > @end_pos
|
210
|
+
new_pos = @end_pos
|
211
|
+
end
|
212
|
+
|
213
|
+
pending = new_pos - @io.pos
|
214
|
+
|
215
|
+
if @io.respond_to?(:seek)
|
216
|
+
begin
|
217
|
+
# avoid reading if the @io supports seeking
|
218
|
+
@io.seek new_pos, IO::SEEK_SET
|
219
|
+
pending = 0
|
220
|
+
rescue Errno::EINVAL
|
221
|
+
end
|
222
|
+
end
|
223
|
+
|
224
|
+
# if seeking isn't supported or failed
|
225
|
+
# negative seek requires that we rewind and read
|
226
|
+
if pending < 0
|
227
|
+
@io.rewind
|
228
|
+
pending = new_pos
|
229
|
+
end
|
230
|
+
|
231
|
+
while pending > 0 do
|
232
|
+
size_read = @io.read([pending, 4096].min).size
|
233
|
+
raise UnexpectedEOF if @io.eof?
|
234
|
+
pending -= size_read
|
235
|
+
end
|
236
|
+
|
237
|
+
@read = @io.pos - @orig_pos
|
238
|
+
|
239
|
+
0
|
240
|
+
end
|
241
|
+
|
158
242
|
##
|
159
243
|
# Rewinds to the beginning of the tar file entry
|
160
244
|
|
161
245
|
def rewind
|
162
246
|
check_closed
|
163
|
-
|
164
|
-
@io.pos = @orig_pos
|
165
|
-
@read = 0
|
247
|
+
seek(0, IO::SEEK_SET)
|
166
248
|
end
|
167
249
|
end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
#--
|
3
4
|
# Copyright (C) 2004 Mauricio Julio Fernández Pradier
|
4
5
|
# See LICENSE.txt for additional licensing information.
|
@@ -53,39 +54,11 @@ class Gem::Package::TarReader
|
|
53
54
|
def each
|
54
55
|
return enum_for __method__ unless block_given?
|
55
56
|
|
56
|
-
use_seek = @io.respond_to?(:seek)
|
57
|
-
|
58
57
|
until @io.eof? do
|
59
58
|
header = Gem::Package::TarHeader.from @io
|
60
59
|
return if header.empty?
|
61
|
-
|
62
60
|
entry = Gem::Package::TarReader::Entry.new header, @io
|
63
|
-
size = entry.header.size
|
64
|
-
|
65
61
|
yield entry
|
66
|
-
|
67
|
-
skip = (512 - (size % 512)) % 512
|
68
|
-
pending = size - entry.bytes_read
|
69
|
-
|
70
|
-
if use_seek
|
71
|
-
begin
|
72
|
-
# avoid reading if the @io supports seeking
|
73
|
-
@io.seek pending, IO::SEEK_CUR
|
74
|
-
pending = 0
|
75
|
-
rescue Errno::EINVAL
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
# if seeking isn't supported or failed
|
80
|
-
while pending > 0 do
|
81
|
-
bytes_read = @io.read([pending, 4096].min).size
|
82
|
-
raise UnexpectedEOF if @io.eof?
|
83
|
-
pending -= bytes_read
|
84
|
-
end
|
85
|
-
|
86
|
-
@io.read skip # discard trailing zeros
|
87
|
-
|
88
|
-
# make sure nobody can use #read, #getc or #rewind anymore
|
89
62
|
entry.close
|
90
63
|
end
|
91
64
|
end
|
data/lib/rubygems/package.rb
CHANGED
data/lib/rubygems/platform.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require_relative "deprecate"
|
3
4
|
|
4
5
|
##
|
@@ -97,7 +98,6 @@ class Gem::Platform
|
|
97
98
|
when /darwin(\d+)?/ then [ "darwin", $1 ]
|
98
99
|
when /^macruby$/ then [ "macruby", nil ]
|
99
100
|
when /freebsd(\d+)?/ then [ "freebsd", $1 ]
|
100
|
-
when /hpux(\d+)?/ then [ "hpux", $1 ]
|
101
101
|
when /^java$/, /^jruby$/ then [ "java", nil ]
|
102
102
|
when /^java([\d.]*)/ then [ "java", $1 ]
|
103
103
|
when /^dalvik(\d+)?$/ then [ "dalvik", $1 ]
|
@@ -112,7 +112,6 @@ class Gem::Platform
|
|
112
112
|
[os, version]
|
113
113
|
when /netbsdelf/ then [ "netbsdelf", nil ]
|
114
114
|
when /openbsd(\d+\.\d+)?/ then [ "openbsd", $1 ]
|
115
|
-
when /bitrig(\d+\.\d+)?/ then [ "bitrig", $1 ]
|
116
115
|
when /solaris(\d+\.\d+)?/ then [ "solaris", $1 ]
|
117
116
|
# test
|
118
117
|
when /^(\w+_platform)(\d+)?/ then [ $1, $2 ]
|
@@ -160,7 +159,7 @@ class Gem::Platform
|
|
160
159
|
# Of note, this method is not commutative. Indeed the OS 'linux' has a
|
161
160
|
# special case: the version is the libc name, yet while "no version" stands
|
162
161
|
# as a wildcard for a binary gem platform (as for other OSes), for the
|
163
|
-
# runtime platform "no version" stands for 'gnu'. To be able to
|
162
|
+
# runtime platform "no version" stands for 'gnu'. To be able to distinguish
|
164
163
|
# these, the method receiver is the gem platform, while the argument is
|
165
164
|
# the runtime platform.
|
166
165
|
#
|
@@ -237,11 +236,11 @@ class Gem::Platform
|
|
237
236
|
# A pure-Ruby gem that may use Gem::Specification#extensions to build
|
238
237
|
# binary files.
|
239
238
|
|
240
|
-
RUBY = "ruby"
|
239
|
+
RUBY = "ruby"
|
241
240
|
|
242
241
|
##
|
243
242
|
# A platform-specific gem that is built for the packaging Ruby's platform.
|
244
243
|
# This will be replaced with Gem::Platform::local.
|
245
244
|
|
246
|
-
CURRENT = "current"
|
245
|
+
CURRENT = "current"
|
247
246
|
end
|
data/lib/rubygems/psych_tree.rb
CHANGED
data/lib/rubygems/rdoc.rb
CHANGED
data/lib/rubygems/request.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
##
|
3
4
|
# A semi-compatible DSL for the Bundler Gemfile and Isolate gem dependencies
|
4
5
|
# files.
|
@@ -32,22 +33,22 @@
|
|
32
33
|
|
33
34
|
class Gem::RequestSet::GemDependencyAPI
|
34
35
|
ENGINE_MAP = { # :nodoc:
|
35
|
-
:jruby
|
36
|
-
:jruby_18
|
37
|
-
:jruby_19
|
38
|
-
:maglev
|
39
|
-
:mri
|
40
|
-
:mri_18
|
41
|
-
:mri_19
|
42
|
-
:mri_20
|
43
|
-
:mri_21
|
44
|
-
:rbx
|
45
|
-
:truffleruby
|
46
|
-
:ruby
|
47
|
-
:ruby_18
|
48
|
-
:ruby_19
|
49
|
-
:ruby_20
|
50
|
-
:ruby_21
|
36
|
+
:jruby => %w[jruby],
|
37
|
+
:jruby_18 => %w[jruby],
|
38
|
+
:jruby_19 => %w[jruby],
|
39
|
+
:maglev => %w[maglev],
|
40
|
+
:mri => %w[ruby],
|
41
|
+
:mri_18 => %w[ruby],
|
42
|
+
:mri_19 => %w[ruby],
|
43
|
+
:mri_20 => %w[ruby],
|
44
|
+
:mri_21 => %w[ruby],
|
45
|
+
:rbx => %w[rbx],
|
46
|
+
:truffleruby => %w[truffleruby],
|
47
|
+
:ruby => %w[ruby rbx maglev truffleruby],
|
48
|
+
:ruby_18 => %w[ruby rbx maglev truffleruby],
|
49
|
+
:ruby_19 => %w[ruby rbx maglev truffleruby],
|
50
|
+
:ruby_20 => %w[ruby rbx maglev truffleruby],
|
51
|
+
:ruby_21 => %w[ruby rbx maglev truffleruby],
|
51
52
|
}.freeze
|
52
53
|
|
53
54
|
mswin = Gem::Platform.new "x86-mswin32"
|
@@ -56,37 +57,37 @@ class Gem::RequestSet::GemDependencyAPI
|
|
56
57
|
x64_mingw = Gem::Platform.new "x64-mingw32"
|
57
58
|
|
58
59
|
PLATFORM_MAP = { # :nodoc:
|
59
|
-
:jruby
|
60
|
-
:jruby_18
|
61
|
-
:jruby_19
|
62
|
-
:maglev
|
63
|
-
:mingw
|
64
|
-
:mingw_18
|
65
|
-
:mingw_19
|
66
|
-
:mingw_20
|
67
|
-
:mingw_21
|
68
|
-
:mri
|
69
|
-
:mri_18
|
70
|
-
:mri_19
|
71
|
-
:mri_20
|
72
|
-
:mri_21
|
73
|
-
:mswin
|
74
|
-
:mswin_18
|
75
|
-
:mswin_19
|
76
|
-
:mswin_20
|
77
|
-
:mswin_21
|
78
|
-
:mswin64
|
79
|
-
:mswin64_19
|
80
|
-
:mswin64_20
|
81
|
-
:mswin64_21
|
82
|
-
:rbx
|
83
|
-
:ruby
|
84
|
-
:ruby_18
|
85
|
-
:ruby_19
|
86
|
-
:ruby_20
|
87
|
-
:ruby_21
|
88
|
-
:truffleruby
|
89
|
-
:x64_mingw
|
60
|
+
:jruby => Gem::Platform::RUBY,
|
61
|
+
:jruby_18 => Gem::Platform::RUBY,
|
62
|
+
:jruby_19 => Gem::Platform::RUBY,
|
63
|
+
:maglev => Gem::Platform::RUBY,
|
64
|
+
:mingw => x86_mingw,
|
65
|
+
:mingw_18 => x86_mingw,
|
66
|
+
:mingw_19 => x86_mingw,
|
67
|
+
:mingw_20 => x86_mingw,
|
68
|
+
:mingw_21 => x86_mingw,
|
69
|
+
:mri => Gem::Platform::RUBY,
|
70
|
+
:mri_18 => Gem::Platform::RUBY,
|
71
|
+
:mri_19 => Gem::Platform::RUBY,
|
72
|
+
:mri_20 => Gem::Platform::RUBY,
|
73
|
+
:mri_21 => Gem::Platform::RUBY,
|
74
|
+
:mswin => mswin,
|
75
|
+
:mswin_18 => mswin,
|
76
|
+
:mswin_19 => mswin,
|
77
|
+
:mswin_20 => mswin,
|
78
|
+
:mswin_21 => mswin,
|
79
|
+
:mswin64 => mswin64,
|
80
|
+
:mswin64_19 => mswin64,
|
81
|
+
:mswin64_20 => mswin64,
|
82
|
+
:mswin64_21 => mswin64,
|
83
|
+
:rbx => Gem::Platform::RUBY,
|
84
|
+
:ruby => Gem::Platform::RUBY,
|
85
|
+
:ruby_18 => Gem::Platform::RUBY,
|
86
|
+
:ruby_19 => Gem::Platform::RUBY,
|
87
|
+
:ruby_20 => Gem::Platform::RUBY,
|
88
|
+
:ruby_21 => Gem::Platform::RUBY,
|
89
|
+
:truffleruby => Gem::Platform::RUBY,
|
90
|
+
:x64_mingw => x64_mingw,
|
90
91
|
:x64_mingw_20 => x64_mingw,
|
91
92
|
:x64_mingw_21 => x64_mingw,
|
92
93
|
}.freeze
|
@@ -98,68 +99,68 @@ class Gem::RequestSet::GemDependencyAPI
|
|
98
99
|
tilde_gt_2_1_0 = Gem::Requirement.new "~> 2.1.0"
|
99
100
|
|
100
101
|
VERSION_MAP = { # :nodoc:
|
101
|
-
:jruby
|
102
|
-
:jruby_18
|
103
|
-
:jruby_19
|
104
|
-
:maglev
|
105
|
-
:mingw
|
106
|
-
:mingw_18
|
107
|
-
:mingw_19
|
108
|
-
:mingw_20
|
109
|
-
:mingw_21
|
110
|
-
:mri
|
111
|
-
:mri_18
|
112
|
-
:mri_19
|
113
|
-
:mri_20
|
114
|
-
:mri_21
|
115
|
-
:mswin
|
116
|
-
:mswin_18
|
117
|
-
:mswin_19
|
118
|
-
:mswin_20
|
119
|
-
:mswin_21
|
120
|
-
:mswin64
|
121
|
-
:mswin64_19
|
122
|
-
:mswin64_20
|
123
|
-
:mswin64_21
|
124
|
-
:rbx
|
125
|
-
:ruby
|
126
|
-
:ruby_18
|
127
|
-
:ruby_19
|
128
|
-
:ruby_20
|
129
|
-
:ruby_21
|
130
|
-
:truffleruby
|
131
|
-
:x64_mingw
|
102
|
+
:jruby => gt_eq_0,
|
103
|
+
:jruby_18 => tilde_gt_1_8_0,
|
104
|
+
:jruby_19 => tilde_gt_1_9_0,
|
105
|
+
:maglev => gt_eq_0,
|
106
|
+
:mingw => gt_eq_0,
|
107
|
+
:mingw_18 => tilde_gt_1_8_0,
|
108
|
+
:mingw_19 => tilde_gt_1_9_0,
|
109
|
+
:mingw_20 => tilde_gt_2_0_0,
|
110
|
+
:mingw_21 => tilde_gt_2_1_0,
|
111
|
+
:mri => gt_eq_0,
|
112
|
+
:mri_18 => tilde_gt_1_8_0,
|
113
|
+
:mri_19 => tilde_gt_1_9_0,
|
114
|
+
:mri_20 => tilde_gt_2_0_0,
|
115
|
+
:mri_21 => tilde_gt_2_1_0,
|
116
|
+
:mswin => gt_eq_0,
|
117
|
+
:mswin_18 => tilde_gt_1_8_0,
|
118
|
+
:mswin_19 => tilde_gt_1_9_0,
|
119
|
+
:mswin_20 => tilde_gt_2_0_0,
|
120
|
+
:mswin_21 => tilde_gt_2_1_0,
|
121
|
+
:mswin64 => gt_eq_0,
|
122
|
+
:mswin64_19 => tilde_gt_1_9_0,
|
123
|
+
:mswin64_20 => tilde_gt_2_0_0,
|
124
|
+
:mswin64_21 => tilde_gt_2_1_0,
|
125
|
+
:rbx => gt_eq_0,
|
126
|
+
:ruby => gt_eq_0,
|
127
|
+
:ruby_18 => tilde_gt_1_8_0,
|
128
|
+
:ruby_19 => tilde_gt_1_9_0,
|
129
|
+
:ruby_20 => tilde_gt_2_0_0,
|
130
|
+
:ruby_21 => tilde_gt_2_1_0,
|
131
|
+
:truffleruby => gt_eq_0,
|
132
|
+
:x64_mingw => gt_eq_0,
|
132
133
|
:x64_mingw_20 => tilde_gt_2_0_0,
|
133
134
|
:x64_mingw_21 => tilde_gt_2_1_0,
|
134
135
|
}.freeze
|
135
136
|
|
136
137
|
WINDOWS = { # :nodoc:
|
137
|
-
:mingw
|
138
|
-
:mingw_18
|
139
|
-
:mingw_19
|
140
|
-
:mingw_20
|
141
|
-
:mingw_21
|
142
|
-
:mri
|
143
|
-
:mri_18
|
144
|
-
:mri_19
|
145
|
-
:mri_20
|
146
|
-
:mri_21
|
147
|
-
:mswin
|
148
|
-
:mswin_18
|
149
|
-
:mswin_19
|
150
|
-
:mswin_20
|
151
|
-
:mswin_21
|
152
|
-
:mswin64
|
153
|
-
:mswin64_19
|
154
|
-
:mswin64_20
|
155
|
-
:mswin64_21
|
156
|
-
:rbx
|
157
|
-
:ruby
|
158
|
-
:ruby_18
|
159
|
-
:ruby_19
|
160
|
-
:ruby_20
|
161
|
-
:ruby_21
|
162
|
-
:x64_mingw
|
138
|
+
:mingw => :only,
|
139
|
+
:mingw_18 => :only,
|
140
|
+
:mingw_19 => :only,
|
141
|
+
:mingw_20 => :only,
|
142
|
+
:mingw_21 => :only,
|
143
|
+
:mri => :never,
|
144
|
+
:mri_18 => :never,
|
145
|
+
:mri_19 => :never,
|
146
|
+
:mri_20 => :never,
|
147
|
+
:mri_21 => :never,
|
148
|
+
:mswin => :only,
|
149
|
+
:mswin_18 => :only,
|
150
|
+
:mswin_19 => :only,
|
151
|
+
:mswin_20 => :only,
|
152
|
+
:mswin_21 => :only,
|
153
|
+
:mswin64 => :only,
|
154
|
+
:mswin64_19 => :only,
|
155
|
+
:mswin64_20 => :only,
|
156
|
+
:mswin64_21 => :only,
|
157
|
+
:rbx => :never,
|
158
|
+
:ruby => :never,
|
159
|
+
:ruby_18 => :never,
|
160
|
+
:ruby_19 => :never,
|
161
|
+
:ruby_20 => :never,
|
162
|
+
:ruby_21 => :never,
|
163
|
+
:x64_mingw => :only,
|
163
164
|
:x64_mingw_20 => :only,
|
164
165
|
:x64_mingw_21 => :only,
|
165
166
|
}.freeze
|
@@ -435,7 +436,6 @@ Gem dependencies file #{@path} requires #{name} more than once.
|
|
435
436
|
reference ||= ref
|
436
437
|
reference ||= branch
|
437
438
|
reference ||= tag
|
438
|
-
reference ||= "master"
|
439
439
|
|
440
440
|
if ref && branch
|
441
441
|
warn <<-WARNING
|
data/lib/rubygems/request_set.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require_relative "tsort"
|
3
4
|
|
4
5
|
##
|
@@ -107,7 +108,7 @@ class Gem::RequestSet
|
|
107
108
|
@requests = []
|
108
109
|
@sets = []
|
109
110
|
@soft_missing = false
|
110
|
-
@
|
111
|
+
@sorted_requests = nil
|
111
112
|
@specs = nil
|
112
113
|
@vendor_set = nil
|
113
114
|
@source_set = nil
|
@@ -424,7 +425,7 @@ class Gem::RequestSet
|
|
424
425
|
end
|
425
426
|
|
426
427
|
def sorted_requests
|
427
|
-
@
|
428
|
+
@sorted_requests ||= strongly_connected_components.flatten
|
428
429
|
end
|
429
430
|
|
430
431
|
def specs
|
data/lib/rubygems/requirement.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require_relative "version"
|
3
4
|
|
4
5
|
##
|
@@ -10,19 +11,19 @@ require_relative "version"
|
|
10
11
|
|
11
12
|
class Gem::Requirement
|
12
13
|
OPS = { #:nodoc:
|
13
|
-
"="
|
14
|
-
"!=" =>
|
15
|
-
">"
|
16
|
-
"<"
|
17
|
-
">=" =>
|
18
|
-
"<=" =>
|
19
|
-
"~>" =>
|
14
|
+
"=" => lambda {|v, r| v == r },
|
15
|
+
"!=" => lambda {|v, r| v != r },
|
16
|
+
">" => lambda {|v, r| v > r },
|
17
|
+
"<" => lambda {|v, r| v < r },
|
18
|
+
">=" => lambda {|v, r| v >= r },
|
19
|
+
"<=" => lambda {|v, r| v <= r },
|
20
|
+
"~>" => lambda {|v, r| v >= r && v.release < r.bump },
|
20
21
|
}.freeze
|
21
22
|
|
22
23
|
SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
|
23
24
|
|
24
25
|
quoted = OPS.keys.map {|k| Regexp.quote k }.join "|"
|
25
|
-
PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*"
|
26
|
+
PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*" # :nodoc:
|
26
27
|
|
27
28
|
##
|
28
29
|
# A regular expression that matches a requirement
|