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,380 +1,427 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
module Bundler
|
4
|
+
#
|
5
|
+
# This class implements the interface needed by PubGrub for resolution. It is
|
6
|
+
# equivalent to the `PubGrub::BasicPackageSource` class provided by PubGrub by
|
7
|
+
# default and used by the most simple PubGrub consumers.
|
8
|
+
#
|
4
9
|
class Resolver
|
5
|
-
require_relative "
|
10
|
+
require_relative "vendored_pub_grub"
|
6
11
|
require_relative "resolver/base"
|
7
|
-
require_relative "resolver/
|
12
|
+
require_relative "resolver/candidate"
|
13
|
+
require_relative "resolver/incompatibility"
|
14
|
+
require_relative "resolver/root"
|
8
15
|
|
9
16
|
include GemHelpers
|
10
17
|
|
11
|
-
def initialize(
|
12
|
-
@source_requirements = source_requirements
|
13
|
-
@base =
|
14
|
-
@resolver = Molinillo::Resolver.new(self, self)
|
15
|
-
@results_for = {}
|
16
|
-
@search_for = {}
|
17
|
-
@platforms = platforms
|
18
|
-
@resolving_only_for_ruby = platforms == [Gem::Platform::RUBY]
|
18
|
+
def initialize(base, gem_version_promoter)
|
19
|
+
@source_requirements = base.source_requirements
|
20
|
+
@base = base
|
19
21
|
@gem_version_promoter = gem_version_promoter
|
20
22
|
end
|
21
23
|
|
22
|
-
def start
|
23
|
-
@
|
24
|
+
def start
|
25
|
+
@requirements = @base.requirements
|
26
|
+
@packages = @base.packages
|
24
27
|
|
25
|
-
|
26
|
-
remove_from_candidates(spec)
|
27
|
-
end
|
28
|
+
root, logger = setup_solver
|
28
29
|
|
29
|
-
|
30
|
+
Bundler.ui.info "Resolving dependencies...", true
|
30
31
|
|
31
|
-
|
32
|
-
|
33
|
-
map(&:payload).
|
34
|
-
reject {|sg| sg.name.end_with?("\0") }.
|
35
|
-
map(&:to_specs).
|
36
|
-
flatten
|
32
|
+
solve_versions(:root => root, :logger => logger)
|
33
|
+
end
|
37
34
|
|
38
|
-
|
39
|
-
|
40
|
-
|
35
|
+
def setup_solver
|
36
|
+
root = Resolver::Root.new(name_for_explicit_dependency_source)
|
37
|
+
root_version = Resolver::Candidate.new(0)
|
41
38
|
|
42
|
-
|
43
|
-
|
39
|
+
@all_specs = Hash.new do |specs, name|
|
40
|
+
specs[name] = source_for(name).specs.search(name).reject do |s|
|
41
|
+
s.dependencies.any? {|d| d.name == name && !d.requirement.satisfied_by?(s.version) } # ignore versions that depend on themselves incorrectly
|
42
|
+
end.sort_by {|s| [s.version, s.platform.to_s] }
|
44
43
|
end
|
45
44
|
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
45
|
+
@sorted_versions = Hash.new do |candidates, package|
|
46
|
+
candidates[package] = if package.root?
|
47
|
+
[root_version]
|
48
|
+
else
|
49
|
+
all_versions_for(package).sort
|
50
|
+
end
|
50
51
|
end
|
51
52
|
|
52
|
-
|
53
|
-
raise VersionConflict.new(conflicts.keys.uniq, message)
|
54
|
-
rescue Molinillo::CircularDependencyError => e
|
55
|
-
names = e.dependencies.sort_by(&:name).map {|d| "gem '#{d.name}'" }
|
56
|
-
raise CyclicDependencyError, "Your bundle requires gems that depend" \
|
57
|
-
" on each other, creating an infinite loop. Please remove" \
|
58
|
-
" #{names.count > 1 ? "either " : ""}#{names.join(" or ")}" \
|
59
|
-
" and try again."
|
60
|
-
end
|
53
|
+
root_dependencies = prepare_dependencies(@requirements, @packages)
|
61
54
|
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
debug_info = debug_info.inspect unless debug_info.is_a?(String)
|
72
|
-
puts debug_info.split("\n").map {|s| depth == 0 ? "BUNDLER: #{s}" : "BUNDLER(#{depth}): #{s}" }
|
73
|
-
end
|
55
|
+
@cached_dependencies = Hash.new do |dependencies, package|
|
56
|
+
dependencies[package] = if package.root?
|
57
|
+
{ root_version => root_dependencies }
|
58
|
+
else
|
59
|
+
Hash.new do |versions, version|
|
60
|
+
versions[version] = to_dependency_hash(version.dependencies.reject {|d| d.name == package.name }, @packages)
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
74
64
|
|
75
|
-
|
76
|
-
|
77
|
-
@debug_mode =
|
78
|
-
ENV["BUNDLER_DEBUG_RESOLVER"] ||
|
79
|
-
ENV["BUNDLER_DEBUG_RESOLVER_TREE"] ||
|
80
|
-
ENV["DEBUG_RESOLVER"] ||
|
81
|
-
ENV["DEBUG_RESOLVER_TREE"] ||
|
82
|
-
false
|
83
|
-
end
|
65
|
+
logger = Bundler::UI::Shell.new
|
66
|
+
logger.level = debug? ? "debug" : "warn"
|
84
67
|
|
85
|
-
|
86
|
-
Bundler.ui.info "Resolving dependencies...", debug?
|
68
|
+
[root, logger]
|
87
69
|
end
|
88
70
|
|
89
|
-
def
|
90
|
-
|
91
|
-
|
71
|
+
def solve_versions(root:, logger:)
|
72
|
+
solver = PubGrub::VersionSolver.new(:source => self, :root => root, :logger => logger)
|
73
|
+
result = solver.solve
|
74
|
+
result.map {|package, version| version.to_specs(package) }.flatten.uniq
|
75
|
+
rescue PubGrub::SolveFailure => e
|
76
|
+
incompatibility = e.incompatibility
|
92
77
|
|
93
|
-
|
94
|
-
|
95
|
-
|
78
|
+
names_to_unlock, names_to_allow_prereleases_for, extended_explanation = find_names_to_relax(incompatibility)
|
79
|
+
|
80
|
+
names_to_relax = names_to_unlock + names_to_allow_prereleases_for
|
81
|
+
|
82
|
+
if names_to_relax.any?
|
83
|
+
if names_to_unlock.any?
|
84
|
+
Bundler.ui.debug "Found conflicts with locked dependencies. Will retry with #{names_to_unlock.join(", ")} unlocked...", true
|
85
|
+
|
86
|
+
@base.unlock_names(names_to_unlock)
|
87
|
+
end
|
88
|
+
|
89
|
+
if names_to_allow_prereleases_for.any?
|
90
|
+
Bundler.ui.debug "Found conflicts with dependencies with prereleases. Will retrying considering prereleases for #{names_to_allow_prereleases_for.join(", ")}...", true
|
91
|
+
|
92
|
+
@base.include_prereleases(names_to_allow_prereleases_for)
|
93
|
+
end
|
94
|
+
|
95
|
+
root, logger = setup_solver
|
96
|
+
|
97
|
+
Bundler.ui.debug "Retrying resolution...", true
|
98
|
+
retry
|
99
|
+
end
|
100
|
+
|
101
|
+
explanation = e.message
|
96
102
|
|
97
|
-
|
103
|
+
if extended_explanation
|
104
|
+
explanation << "\n\n"
|
105
|
+
explanation << extended_explanation
|
106
|
+
end
|
98
107
|
|
99
|
-
|
100
|
-
specification.dependencies_for_activated_platforms
|
108
|
+
raise SolveFailure.new(explanation)
|
101
109
|
end
|
102
110
|
|
103
|
-
def
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
locked_requirement = base_requirements[name]
|
108
|
-
results = results_for(dependency) + locked_results
|
109
|
-
results = results.select {|spec| requirement_satisfied_by?(locked_requirement, nil, spec) } if locked_requirement
|
110
|
-
dep_platforms = dependency.gem_platforms(@platforms)
|
111
|
-
|
112
|
-
@gem_version_promoter.sort_versions(dependency, results).group_by(&:version).reduce([]) do |groups, (_, specs)|
|
113
|
-
relevant_platforms = dep_platforms.select {|platform| specs.any? {|spec| spec.match_platform(platform) } }
|
114
|
-
next groups unless relevant_platforms.any?
|
115
|
-
|
116
|
-
ruby_specs = select_best_platform_match(specs, Gem::Platform::RUBY)
|
117
|
-
if ruby_specs.any?
|
118
|
-
spec_group_ruby = SpecGroup.new(ruby_specs, [Gem::Platform::RUBY])
|
119
|
-
spec_group_ruby.force_ruby_platform = dependency.force_ruby_platform
|
120
|
-
groups << spec_group_ruby
|
121
|
-
end
|
111
|
+
def find_names_to_relax(incompatibility)
|
112
|
+
names_to_unlock = []
|
113
|
+
names_to_allow_prereleases_for = []
|
114
|
+
extended_explanation = nil
|
122
115
|
|
123
|
-
|
116
|
+
while incompatibility.conflict?
|
117
|
+
cause = incompatibility.cause
|
118
|
+
incompatibility = cause.incompatibility
|
124
119
|
|
125
|
-
|
126
|
-
|
120
|
+
incompatibility.terms.each do |term|
|
121
|
+
package = term.package
|
122
|
+
name = package.name
|
127
123
|
|
128
|
-
|
129
|
-
|
124
|
+
if base_requirements[name]
|
125
|
+
names_to_unlock << name
|
126
|
+
elsif package.ignores_prereleases?
|
127
|
+
names_to_allow_prereleases_for << name
|
128
|
+
end
|
129
|
+
|
130
|
+
no_versions_incompat = [cause.incompatibility, cause.satisfier].find {|incompat| incompat.cause.is_a?(PubGrub::Incompatibility::NoVersions) }
|
131
|
+
next unless no_versions_incompat
|
130
132
|
|
131
|
-
|
133
|
+
extended_explanation = no_versions_incompat.extended_explanation
|
132
134
|
end
|
133
135
|
end
|
134
|
-
end
|
135
136
|
|
136
|
-
|
137
|
-
source_for(dependency.name).specs
|
137
|
+
[names_to_unlock.uniq, names_to_allow_prereleases_for.uniq, extended_explanation]
|
138
138
|
end
|
139
139
|
|
140
|
-
def
|
141
|
-
|
142
|
-
|
140
|
+
def parse_dependency(package, dependency)
|
141
|
+
range = if repository_for(package).is_a?(Source::Gemspec)
|
142
|
+
PubGrub::VersionRange.any
|
143
|
+
else
|
144
|
+
requirement_to_range(dependency)
|
145
|
+
end
|
143
146
|
|
144
|
-
|
145
|
-
@results_for[dependency] ||= index_for(dependency).search(dependency)
|
147
|
+
PubGrub::VersionConstraint.new(package, :range => range)
|
146
148
|
end
|
147
149
|
|
148
|
-
def
|
149
|
-
|
150
|
+
def versions_for(package, range=VersionRange.any)
|
151
|
+
versions = range.select_versions(@sorted_versions[package])
|
152
|
+
|
153
|
+
sort_versions(package, versions)
|
150
154
|
end
|
151
155
|
|
152
|
-
def
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
+
def no_versions_incompatibility_for(package, unsatisfied_term)
|
157
|
+
cause = PubGrub::Incompatibility::NoVersions.new(unsatisfied_term)
|
158
|
+
name = package.name
|
159
|
+
constraint = unsatisfied_term.constraint
|
160
|
+
constraint_string = constraint.constraint_string
|
161
|
+
requirements = constraint_string.split(" OR ").map {|req| Gem::Requirement.new(req.split(",")) }
|
162
|
+
|
163
|
+
if name == "bundler" && bundler_pinned_to_current_version?
|
164
|
+
custom_explanation = "the current Bundler version (#{Bundler::VERSION}) does not satisfy #{constraint}"
|
165
|
+
extended_explanation = bundler_not_found_message(requirements)
|
166
|
+
else
|
167
|
+
specs_matching_other_platforms = filter_matching_specs(@all_specs[name], requirements)
|
168
|
+
|
169
|
+
platforms_explanation = specs_matching_other_platforms.any? ? " for any resolution platforms (#{package.platforms.join(", ")})" : ""
|
170
|
+
custom_explanation = "#{constraint} could not be found in #{repository_for(package)}#{platforms_explanation}"
|
171
|
+
|
172
|
+
label = "#{name} (#{constraint_string})"
|
173
|
+
extended_explanation = other_specs_matching_message(specs_matching_other_platforms, label) if specs_matching_other_platforms.any?
|
174
|
+
end
|
175
|
+
|
176
|
+
Incompatibility.new([unsatisfied_term], :cause => cause, :custom_explanation => custom_explanation, :extended_explanation => extended_explanation)
|
156
177
|
end
|
157
178
|
|
158
|
-
def
|
159
|
-
|
179
|
+
def debug?
|
180
|
+
ENV["BUNDLER_DEBUG_RESOLVER"] ||
|
181
|
+
ENV["BUNDLER_DEBUG_RESOLVER_TREE"] ||
|
182
|
+
ENV["DEBUG_RESOLVER"] ||
|
183
|
+
ENV["DEBUG_RESOLVER_TREE"] ||
|
184
|
+
false
|
160
185
|
end
|
161
186
|
|
162
|
-
def
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
187
|
+
def incompatibilities_for(package, version)
|
188
|
+
package_deps = @cached_dependencies[package]
|
189
|
+
sorted_versions = @sorted_versions[package]
|
190
|
+
package_deps[version].map do |dep_package, dep_constraint|
|
191
|
+
low = high = sorted_versions.index(version)
|
192
|
+
|
193
|
+
# find version low such that all >= low share the same dep
|
194
|
+
while low > 0 && package_deps[sorted_versions[low - 1]][dep_package] == dep_constraint
|
195
|
+
low -= 1
|
196
|
+
end
|
197
|
+
low =
|
198
|
+
if low == 0
|
199
|
+
nil
|
200
|
+
else
|
201
|
+
sorted_versions[low]
|
202
|
+
end
|
203
|
+
|
204
|
+
# find version high such that all < high share the same dep
|
205
|
+
while high < sorted_versions.length && package_deps[sorted_versions[high]][dep_package] == dep_constraint
|
206
|
+
high += 1
|
207
|
+
end
|
208
|
+
high =
|
209
|
+
if high == sorted_versions.length
|
210
|
+
nil
|
211
|
+
else
|
212
|
+
sorted_versions[high]
|
213
|
+
end
|
214
|
+
|
215
|
+
range = PubGrub::VersionRange.new(:min => low, :max => high, :include_min => true)
|
216
|
+
|
217
|
+
self_constraint = PubGrub::VersionConstraint.new(package, :range => range)
|
218
|
+
|
219
|
+
dep_term = PubGrub::Term.new(dep_constraint, false)
|
220
|
+
self_term = PubGrub::Term.new(self_constraint, true)
|
221
|
+
|
222
|
+
custom_explanation = if dep_package.meta? && package.root?
|
223
|
+
"current #{dep_package} version is #{dep_constraint.constraint_string}"
|
224
|
+
end
|
225
|
+
|
226
|
+
PubGrub::Incompatibility.new([self_term, dep_term], :cause => :dependency, :custom_explanation => custom_explanation)
|
174
227
|
end
|
175
228
|
end
|
176
229
|
|
177
|
-
|
230
|
+
def all_versions_for(package)
|
231
|
+
name = package.name
|
232
|
+
results = (@base[name] + filter_prereleases(@all_specs[name], package)).uniq {|spec| [spec.version.hash, spec.platform] }
|
178
233
|
|
179
|
-
|
180
|
-
|
181
|
-
|
234
|
+
if name == "bundler" && !bundler_pinned_to_current_version?
|
235
|
+
bundler_spec = Gem.loaded_specs["bundler"]
|
236
|
+
results << bundler_spec if bundler_spec
|
237
|
+
end
|
182
238
|
|
183
|
-
|
184
|
-
|
185
|
-
|
239
|
+
locked_requirement = base_requirements[name]
|
240
|
+
results = filter_matching_specs(results, locked_requirement) if locked_requirement
|
241
|
+
|
242
|
+
versions = results.group_by(&:version).reduce([]) do |groups, (version, specs)|
|
243
|
+
platform_specs = package.platforms.flat_map {|platform| select_best_platform_match(specs, platform) }
|
244
|
+
next groups if platform_specs.empty?
|
245
|
+
|
246
|
+
ruby_specs = select_best_platform_match(specs, Gem::Platform::RUBY)
|
247
|
+
groups << Resolver::Candidate.new(version, :specs => ruby_specs) if ruby_specs.any?
|
186
248
|
|
187
|
-
|
188
|
-
@base.delete(spec)
|
249
|
+
next groups if platform_specs == ruby_specs || package.force_ruby_platform?
|
189
250
|
|
190
|
-
|
191
|
-
next unless dep.name == spec.name
|
251
|
+
groups << Resolver::Candidate.new(version, :specs => platform_specs)
|
192
252
|
|
193
|
-
|
253
|
+
groups
|
194
254
|
end
|
195
255
|
|
196
|
-
|
256
|
+
sort_versions(package, versions)
|
197
257
|
end
|
198
258
|
|
199
|
-
def
|
200
|
-
@
|
201
|
-
@gem_version_promoter.reset
|
259
|
+
def source_for(name)
|
260
|
+
@source_requirements[name] || @source_requirements[:default]
|
202
261
|
end
|
203
262
|
|
204
|
-
|
205
|
-
|
206
|
-
#
|
207
|
-
# dependencies w/ 0 or 1 possibilities (ignoring version requirements)
|
208
|
-
# are given very negative values, so they _always_ sort first,
|
209
|
-
# before dependencies that are unconstrained
|
210
|
-
def amount_constrained(dependency)
|
211
|
-
@amount_constrained ||= {}
|
212
|
-
@amount_constrained[dependency.name] ||= if (base = @base[dependency.name]) && !base.empty?
|
213
|
-
dependency.requirement.satisfied_by?(base.first.version) ? 0 : 1
|
214
|
-
else
|
215
|
-
all = index_for(dependency).search(dependency.name).size
|
216
|
-
|
217
|
-
if all <= 1
|
218
|
-
all - 1_000_000
|
219
|
-
else
|
220
|
-
search = search_for(dependency)
|
221
|
-
search = prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
|
222
|
-
search - all
|
223
|
-
end
|
224
|
-
end
|
263
|
+
def default_bundler_source
|
264
|
+
@source_requirements[:default_bundler]
|
225
265
|
end
|
226
266
|
|
227
|
-
def
|
228
|
-
|
229
|
-
|
230
|
-
next requirement if name == "bundler"
|
231
|
-
next if requirement.gem_platforms(@platforms).empty?
|
232
|
-
next requirement unless search_for(requirement).empty?
|
233
|
-
next unless requirement.current_platform?
|
267
|
+
def bundler_pinned_to_current_version?
|
268
|
+
!default_bundler_source.nil?
|
269
|
+
end
|
234
270
|
|
235
|
-
|
236
|
-
|
271
|
+
def name_for_explicit_dependency_source
|
272
|
+
Bundler.default_gemfile.basename.to_s
|
273
|
+
rescue StandardError
|
274
|
+
"Gemfile"
|
237
275
|
end
|
238
276
|
|
239
|
-
def
|
240
|
-
|
277
|
+
def raise_not_found!(package)
|
278
|
+
name = package.name
|
279
|
+
source = source_for(name)
|
280
|
+
specs = @all_specs[name]
|
241
281
|
matching_part = name
|
242
|
-
requirement_label = SharedHelpers.pretty_dependency(
|
282
|
+
requirement_label = SharedHelpers.pretty_dependency(package.dependency)
|
243
283
|
cache_message = begin
|
244
284
|
" or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
|
245
285
|
rescue GemfileNotFound
|
246
286
|
nil
|
247
287
|
end
|
248
|
-
specs_matching_requirement = specs.
|
288
|
+
specs_matching_requirement = filter_matching_specs(specs, package.dependency.requirement)
|
249
289
|
|
250
290
|
if specs_matching_requirement.any?
|
251
291
|
specs = specs_matching_requirement
|
252
292
|
matching_part = requirement_label
|
253
|
-
platforms =
|
293
|
+
platforms = package.platforms
|
254
294
|
platform_label = platforms.size == 1 ? "platform '#{platforms.first}" : "platforms '#{platforms.join("', '")}"
|
255
295
|
requirement_label = "#{requirement_label}' with #{platform_label}"
|
256
296
|
end
|
257
297
|
|
258
|
-
message = String.new("Could not find gem '#{requirement_label}'
|
298
|
+
message = String.new("Could not find gem '#{requirement_label}' in #{source}#{cache_message}.\n")
|
259
299
|
|
260
300
|
if specs.any?
|
261
|
-
message << "\
|
262
|
-
message << specs.map {|s| " * #{s.full_name}" }.join("\n")
|
301
|
+
message << "\n#{other_specs_matching_message(specs, matching_part)}"
|
263
302
|
end
|
264
303
|
|
265
|
-
message
|
304
|
+
raise GemNotFound, message
|
305
|
+
end
|
306
|
+
|
307
|
+
private
|
308
|
+
|
309
|
+
def filter_matching_specs(specs, requirements)
|
310
|
+
Array(requirements).flat_map do |requirement|
|
311
|
+
specs.select {| spec| requirement_satisfied_by?(requirement, spec) }
|
312
|
+
end
|
266
313
|
end
|
267
314
|
|
268
|
-
def
|
269
|
-
|
270
|
-
|
315
|
+
def filter_prereleases(specs, package)
|
316
|
+
return specs unless package.ignores_prereleases? && specs.size > 1
|
317
|
+
|
318
|
+
specs.reject {|s| s.version.prerelease? }
|
319
|
+
end
|
271
320
|
|
272
|
-
|
273
|
-
|
321
|
+
def requirement_satisfied_by?(requirement, spec)
|
322
|
+
requirement.satisfied_by?(spec.version) || spec.source.is_a?(Source::Gemspec)
|
323
|
+
end
|
324
|
+
|
325
|
+
def sort_versions(package, versions)
|
326
|
+
if versions.size > 1
|
327
|
+
@gem_version_promoter.sort_versions(package, versions).reverse
|
274
328
|
else
|
275
|
-
|
276
|
-
deps = conflict.requirement_trees.map(&:last).flatten(1)
|
277
|
-
!Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
|
278
|
-
end
|
329
|
+
versions
|
279
330
|
end
|
331
|
+
end
|
280
332
|
|
281
|
-
|
333
|
+
def repository_for(package)
|
334
|
+
source_for(package.name)
|
335
|
+
end
|
282
336
|
|
283
|
-
|
284
|
-
|
285
|
-
|
337
|
+
def base_requirements
|
338
|
+
@base.base_requirements
|
339
|
+
end
|
286
340
|
|
287
|
-
|
288
|
-
|
341
|
+
def prepare_dependencies(requirements, packages)
|
342
|
+
to_dependency_hash(requirements, packages).map do |dep_package, dep_constraint|
|
343
|
+
name = dep_package.name
|
289
344
|
|
290
|
-
|
291
|
-
if trees.size <= 15
|
292
|
-
maximal = 1.upto(trees.size).map do |size|
|
293
|
-
trees.map(&:last).flatten(1).combination(size).to_a
|
294
|
-
end.flatten(1).select do |deps|
|
295
|
-
Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
|
296
|
-
end.min_by(&:size)
|
345
|
+
next [dep_package, dep_constraint] if name == "bundler"
|
297
346
|
|
298
|
-
|
347
|
+
versions = versions_for(dep_package, dep_constraint.range)
|
348
|
+
if versions.empty? && dep_package.ignores_prereleases?
|
349
|
+
@sorted_versions.delete(dep_package)
|
350
|
+
dep_package.consider_prereleases!
|
351
|
+
versions = versions_for(dep_package, dep_constraint.range)
|
352
|
+
end
|
353
|
+
next [dep_package, dep_constraint] unless versions.empty?
|
299
354
|
|
300
|
-
|
301
|
-
end
|
355
|
+
next unless dep_package.current_platform?
|
302
356
|
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
else
|
307
|
-
String.new("Bundler could not find compatible versions for gem \"#{name}\":")
|
308
|
-
end
|
309
|
-
o << %(\n)
|
310
|
-
o << %( In #{name_for_explicit_dependency_source}:\n)
|
311
|
-
o << trees.map do |tree|
|
312
|
-
t = "".dup
|
313
|
-
depth = 2
|
314
|
-
|
315
|
-
base_tree = tree.first
|
316
|
-
base_tree_name = base_tree.name
|
317
|
-
|
318
|
-
if base_tree_name.end_with?("\0")
|
319
|
-
t = nil
|
320
|
-
else
|
321
|
-
tree.each do |req|
|
322
|
-
t << " " * depth << SharedHelpers.pretty_dependency(req)
|
323
|
-
unless tree.last == req
|
324
|
-
if spec = conflict.activated_by_name[req.name]
|
325
|
-
t << %( was resolved to #{spec.version}, which)
|
326
|
-
end
|
327
|
-
t << %( depends on)
|
328
|
-
end
|
329
|
-
t << %(\n)
|
330
|
-
depth += 1
|
331
|
-
end
|
332
|
-
end
|
333
|
-
t
|
334
|
-
end.compact.join("\n")
|
335
|
-
else
|
336
|
-
o = String.new
|
337
|
-
end
|
357
|
+
raise_not_found!(dep_package)
|
358
|
+
end.compact.to_h
|
359
|
+
end
|
338
360
|
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
other_bundler_required = !conflict_requirement.satisfied_by?(Gem::Version.new(Bundler::VERSION))
|
345
|
-
|
346
|
-
if other_bundler_required
|
347
|
-
o << "\n\n"
|
348
|
-
|
349
|
-
candidate_specs = source_for(:default_bundler).specs.search(conflict_dependency)
|
350
|
-
if candidate_specs.any?
|
351
|
-
target_version = candidate_specs.last.version
|
352
|
-
new_command = [File.basename($PROGRAM_NAME), "_#{target_version}_", *ARGV].join(" ")
|
353
|
-
o << "Your bundle requires a different version of Bundler than the one you're running.\n"
|
354
|
-
o << "Install the necessary version with `gem install bundler:#{target_version}` and rerun bundler using `#{new_command}`\n"
|
355
|
-
else
|
356
|
-
o << "Your bundle requires a different version of Bundler than the one you're running, and that version could not be found.\n"
|
357
|
-
end
|
358
|
-
end
|
359
|
-
elsif name.end_with?("\0")
|
360
|
-
o << %(\n Current #{name} version:\n #{SharedHelpers.pretty_dependency(@metadata_requirements.find {|req| req.name == name })}\n\n)
|
361
|
-
elsif !conflict.existing
|
362
|
-
o << "\n"
|
363
|
-
|
364
|
-
relevant_source = conflict.requirement.source || source_for(name)
|
365
|
-
|
366
|
-
extra_message = if trees.first.size > 1
|
367
|
-
", which is required by gem '#{SharedHelpers.pretty_dependency(trees.first[-2])}',"
|
368
|
-
else
|
369
|
-
""
|
370
|
-
end
|
371
|
-
|
372
|
-
o << gem_not_found_message(name, conflict.requirement, relevant_source, extra_message)
|
373
|
-
end
|
361
|
+
def other_specs_matching_message(specs, requirement)
|
362
|
+
message = String.new("The source contains the following gems matching '#{requirement}':\n")
|
363
|
+
message << specs.map {|s| " * #{s.full_name}" }.join("\n")
|
364
|
+
message
|
365
|
+
end
|
374
366
|
|
375
|
-
|
367
|
+
def requirement_to_range(requirement)
|
368
|
+
ranges = requirement.requirements.map do |(op, version)|
|
369
|
+
ver = Resolver::Candidate.new(version).generic!
|
370
|
+
platform_ver = Resolver::Candidate.new(version).platform_specific!
|
371
|
+
|
372
|
+
case op
|
373
|
+
when "~>"
|
374
|
+
name = "~> #{ver}"
|
375
|
+
bump = Resolver::Candidate.new(version.bump.to_s + ".A")
|
376
|
+
PubGrub::VersionRange.new(:name => name, :min => ver, :max => bump, :include_min => true)
|
377
|
+
when ">"
|
378
|
+
PubGrub::VersionRange.new(:min => platform_ver)
|
379
|
+
when ">="
|
380
|
+
PubGrub::VersionRange.new(:min => ver, :include_min => true)
|
381
|
+
when "<"
|
382
|
+
PubGrub::VersionRange.new(:max => ver)
|
383
|
+
when "<="
|
384
|
+
PubGrub::VersionRange.new(:max => platform_ver, :include_max => true)
|
385
|
+
when "="
|
386
|
+
PubGrub::VersionRange.new(:min => ver, :max => platform_ver, :include_min => true, :include_max => true)
|
387
|
+
when "!="
|
388
|
+
PubGrub::VersionRange.new(:min => ver, :max => platform_ver, :include_min => true, :include_max => true).invert
|
389
|
+
else
|
390
|
+
raise "bad version specifier: #{op}"
|
391
|
+
end
|
392
|
+
end
|
393
|
+
|
394
|
+
ranges.inject(&:intersect)
|
395
|
+
end
|
396
|
+
|
397
|
+
def to_dependency_hash(dependencies, packages)
|
398
|
+
dependencies.inject({}) do |deps, dep|
|
399
|
+
package = packages[dep.name]
|
400
|
+
|
401
|
+
current_req = deps[package]
|
402
|
+
new_req = parse_dependency(package, dep.requirement)
|
403
|
+
|
404
|
+
deps[package] = if current_req
|
405
|
+
current_req.intersect(new_req)
|
406
|
+
else
|
407
|
+
new_req
|
376
408
|
end
|
377
|
-
|
409
|
+
|
410
|
+
deps
|
411
|
+
end
|
412
|
+
end
|
413
|
+
|
414
|
+
def bundler_not_found_message(conflict_dependencies)
|
415
|
+
candidate_specs = filter_matching_specs(default_bundler_source.specs.search("bundler"), conflict_dependencies)
|
416
|
+
|
417
|
+
if candidate_specs.any?
|
418
|
+
target_version = candidate_specs.last.version
|
419
|
+
new_command = [File.basename($PROGRAM_NAME), "_#{target_version}_", *ARGV].join(" ")
|
420
|
+
"Your bundle requires a different version of Bundler than the one you're running.\n" \
|
421
|
+
"Install the necessary version with `gem install bundler:#{target_version}` and rerun bundler using `#{new_command}`\n"
|
422
|
+
else
|
423
|
+
"Your bundle requires a different version of Bundler than the one you're running, and that version could not be found.\n"
|
424
|
+
end
|
378
425
|
end
|
379
426
|
end
|
380
427
|
end
|