rubygems-update 3.0.3 → 3.4.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5556 -0
- data/CODE_OF_CONDUCT.md +62 -24
- data/CONTRIBUTING.md +111 -21
- data/MAINTAINERS.txt +1 -6
- data/Manifest.txt +209 -101
- data/POLICIES.md +65 -22
- data/README.md +23 -15
- data/UPGRADING.md +5 -81
- data/bin/gem +2 -16
- data/bin/update_rubygems +5 -5
- data/bundler/CHANGELOG.md +2619 -1256
- data/bundler/LICENSE.md +18 -19
- data/bundler/README.md +11 -12
- data/bundler/UPGRADING.md +222 -0
- data/bundler/bundler.gemspec +13 -33
- data/bundler/exe/bundle +26 -11
- data/bundler/exe/bundler +1 -1
- data/bundler/lib/bundler/.document +1 -0
- data/bundler/lib/bundler/build_metadata.rb +5 -13
- data/bundler/lib/bundler/capistrano.rb +4 -4
- data/bundler/lib/bundler/cli/add.rb +28 -16
- data/bundler/lib/bundler/cli/binstubs.rb +11 -3
- data/bundler/lib/bundler/cli/cache.rb +24 -17
- data/bundler/lib/bundler/cli/check.rb +5 -3
- data/bundler/lib/bundler/cli/clean.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +41 -13
- data/bundler/lib/bundler/cli/config.rb +170 -86
- data/bundler/lib/bundler/cli/console.rb +3 -3
- data/bundler/lib/bundler/cli/doctor.rb +27 -10
- data/bundler/lib/bundler/cli/exec.rb +8 -25
- data/bundler/lib/bundler/cli/fund.rb +36 -0
- data/bundler/lib/bundler/cli/gem.rb +261 -48
- data/bundler/lib/bundler/cli/info.rb +52 -8
- data/bundler/lib/bundler/cli/init.rb +7 -3
- data/bundler/lib/bundler/cli/inject.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +38 -66
- data/bundler/lib/bundler/cli/issue.rb +8 -7
- data/bundler/lib/bundler/cli/list.rb +19 -11
- data/bundler/lib/bundler/cli/lock.rb +11 -4
- data/bundler/lib/bundler/cli/open.rb +14 -9
- data/bundler/lib/bundler/cli/outdated.rb +152 -121
- data/bundler/lib/bundler/cli/platform.rb +2 -2
- data/bundler/lib/bundler/cli/plugin.rb +19 -2
- data/bundler/lib/bundler/cli/pristine.rb +6 -1
- data/bundler/lib/bundler/cli/remove.rb +1 -2
- data/bundler/lib/bundler/cli/show.rb +3 -3
- data/bundler/lib/bundler/cli/update.rb +49 -18
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +269 -165
- data/bundler/lib/bundler/compact_index_client/cache.rb +7 -24
- data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/bundler/lib/bundler/compact_index_client/updater.rb +58 -57
- data/bundler/lib/bundler/compact_index_client.rb +28 -18
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +26 -11
- data/bundler/lib/bundler/definition.rb +359 -441
- data/bundler/lib/bundler/dependency.rb +29 -71
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/digest.rb +71 -0
- data/bundler/lib/bundler/dsl.rb +84 -116
- data/bundler/lib/bundler/endpoint_specification.rb +20 -14
- data/bundler/lib/bundler/env.rb +10 -15
- data/bundler/lib/bundler/environment_preserver.rb +30 -3
- data/bundler/lib/bundler/errors.rb +31 -14
- data/bundler/lib/bundler/feature_flag.rb +13 -33
- data/bundler/lib/bundler/fetcher/base.rb +7 -9
- data/bundler/lib/bundler/fetcher/compact_index.rb +46 -39
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -2
- data/bundler/lib/bundler/fetcher/downloader.rb +15 -12
- data/bundler/lib/bundler/fetcher/index.rb +4 -30
- data/bundler/lib/bundler/fetcher.rb +39 -41
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +49 -54
- data/bundler/lib/bundler/gem_helper.rb +79 -43
- data/bundler/lib/bundler/gem_helpers.rb +44 -28
- data/bundler/lib/bundler/gem_tasks.rb +1 -1
- data/bundler/lib/bundler/gem_version_promoter.rb +54 -99
- data/bundler/lib/bundler/graph.rb +5 -5
- data/bundler/lib/bundler/index.rb +14 -52
- data/bundler/lib/bundler/injector.rb +50 -16
- data/bundler/lib/bundler/inline.rb +28 -29
- data/bundler/lib/bundler/installer/gem_installer.rb +22 -23
- data/bundler/lib/bundler/installer/parallel_installer.rb +51 -51
- data/bundler/lib/bundler/installer/standalone.rb +62 -12
- data/bundler/lib/bundler/installer.rb +46 -97
- data/bundler/lib/bundler/lazy_specification.rb +88 -48
- data/bundler/lib/bundler/lockfile_generator.rb +3 -3
- data/bundler/lib/bundler/lockfile_parser.rb +30 -62
- data/bundler/{man → lib/bundler/man}/bundle-add.1 +29 -5
- data/bundler/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +22 -4
- data/bundler/{man → lib/bundler/man}/bundle-binstubs.1 +6 -4
- data/bundler/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +3 -5
- data/bundler/lib/bundler/man/bundle-cache.1 +61 -0
- data/bundler/{man/bundle-package.ronn → lib/bundler/man/bundle-cache.1.ronn} +22 -15
- data/bundler/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-clean.1 +2 -2
- data/bundler/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-config.1 +78 -60
- data/bundler/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +96 -85
- data/bundler/lib/bundler/man/bundle-console.1 +53 -0
- data/bundler/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/bundler/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-exec.1 +6 -6
- data/bundler/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +6 -6
- data/bundler/lib/bundler/man/bundle-gem.1 +105 -0
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +117 -0
- data/bundler/lib/bundler/man/bundle-help.1 +13 -0
- data/bundler/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/bundler/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-init.1 +6 -2
- data/bundler/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +3 -1
- data/bundler/{man → lib/bundler/man}/bundle-inject.1 +5 -2
- data/bundler/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +3 -1
- data/bundler/{man → lib/bundler/man}/bundle-install.1 +42 -37
- data/bundler/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +42 -38
- data/bundler/{man → lib/bundler/man}/bundle-list.1 +7 -7
- data/bundler/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
- data/bundler/{man → lib/bundler/man}/bundle-lock.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-open.1 +22 -2
- data/bundler/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +9 -1
- data/bundler/{man → lib/bundler/man}/bundle-outdated.1 +3 -10
- data/bundler/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +1 -10
- data/bundler/{man → lib/bundler/man}/bundle-platform.1 +16 -6
- data/bundler/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +14 -7
- data/bundler/lib/bundler/man/bundle-plugin.1 +81 -0
- data/bundler/lib/bundler/man/bundle-plugin.1.ronn +59 -0
- data/bundler/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-update.1 +8 -8
- data/bundler/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +8 -7
- data/bundler/lib/bundler/man/bundle-version.1 +35 -0
- data/bundler/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/bundler/{man → lib/bundler/man}/bundle-viz.1 +4 -1
- data/bundler/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +2 -0
- data/bundler/{man → lib/bundler/man}/bundle.1 +17 -12
- data/bundler/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +14 -9
- data/bundler/lib/bundler/man/gemfile.5 +723 -0
- data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +112 -95
- data/bundler/lib/bundler/man/index.txt +29 -0
- data/bundler/lib/bundler/match_metadata.rb +13 -0
- data/bundler/lib/bundler/match_platform.rb +1 -2
- data/bundler/lib/bundler/match_remote_metadata.rb +29 -0
- data/bundler/lib/bundler/mirror.rb +10 -12
- data/bundler/lib/bundler/plugin/api/source.rb +29 -15
- data/bundler/lib/bundler/plugin/api.rb +1 -1
- data/bundler/lib/bundler/plugin/dsl.rb +1 -1
- data/bundler/lib/bundler/plugin/index.rb +31 -8
- data/bundler/lib/bundler/plugin/installer/git.rb +0 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +1 -9
- data/bundler/lib/bundler/plugin/installer.rb +35 -22
- data/bundler/lib/bundler/plugin/source_list.rb +5 -1
- data/bundler/lib/bundler/plugin.rb +102 -42
- data/bundler/lib/bundler/process_lock.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +15 -8
- data/bundler/lib/bundler/resolver/base.rb +77 -0
- 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 +49 -73
- data/bundler/lib/bundler/resolver.rb +343 -300
- data/bundler/lib/bundler/retry.rb +4 -4
- data/bundler/lib/bundler/ruby_dsl.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +9 -37
- data/bundler/lib/bundler/rubygems_ext.rb +235 -92
- data/bundler/lib/bundler/rubygems_gem_installer.rb +87 -21
- data/bundler/lib/bundler/rubygems_integration.rb +179 -515
- data/bundler/lib/bundler/runtime.rb +25 -40
- data/bundler/lib/bundler/self_manager.rb +168 -0
- data/bundler/lib/bundler/settings.rb +162 -118
- data/bundler/lib/bundler/setup.rb +11 -12
- data/bundler/lib/bundler/shared_helpers.rb +61 -102
- data/bundler/lib/bundler/similarity_detector.rb +3 -3
- data/bundler/lib/bundler/source/git/git_proxy.rb +257 -128
- data/bundler/lib/bundler/source/git.rb +84 -61
- data/bundler/lib/bundler/source/metadata.rb +9 -9
- data/bundler/lib/bundler/source/path/installer.rb +11 -32
- data/bundler/lib/bundler/source/path.rb +28 -17
- data/bundler/lib/bundler/source/rubygems/remote.rb +3 -4
- data/bundler/lib/bundler/source/rubygems.rb +171 -197
- data/bundler/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/bundler/lib/bundler/source.rb +30 -10
- data/bundler/lib/bundler/source_list.rb +112 -67
- data/bundler/lib/bundler/source_map.rb +71 -0
- data/bundler/lib/bundler/spec_set.rb +86 -72
- data/bundler/lib/bundler/stub_specification.rb +45 -37
- data/bundler/lib/bundler/templates/Executable +3 -5
- data/bundler/lib/bundler/templates/Executable.bundler +21 -17
- data/bundler/lib/bundler/templates/Executable.standalone +4 -4
- data/bundler/lib/bundler/templates/Gemfile +0 -2
- data/bundler/lib/bundler/templates/newgem/CHANGELOG.md.tt +5 -0
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +22 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +13 -15
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +33 -5
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -0
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +25 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- 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 +37 -0
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +18 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +36 -41
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +13 -0
- data/bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
- data/bundler/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/test_newgem.rb.tt} +3 -1
- data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -1
- data/bundler/lib/bundler/ui/shell.rb +39 -20
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/ui.rb +3 -3
- data/bundler/lib/bundler/uri_credentials_filter.rb +10 -4
- data/bundler/lib/bundler/vendor/.document +1 -0
- data/bundler/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +174 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +128 -0
- data/bundler/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1493 -425
- data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +302 -462
- 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 +155 -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 +243 -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/LICENSE.md +20 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +3 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +7 -17
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +25 -14
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +20 -10
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +34 -15
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +63 -43
- data/bundler/lib/bundler/vendor/thor/lib/thor/command.rb +21 -14
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +6 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +83 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/invocation.rb +1 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb +6 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/nested_context.rb +29 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +7 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/option.rb +20 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +40 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +1 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +15 -14
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +88 -13
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +10 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +5 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +18 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +16 -9
- data/bundler/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +452 -0
- data/bundler/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +729 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +100 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +267 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +1587 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +125 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +23 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +261 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +22 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +293 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +539 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +119 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +6 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +104 -0
- data/bundler/lib/bundler/vendored_fileutils.rb +1 -6
- data/bundler/lib/bundler/vendored_persistent.rb +2 -39
- data/bundler/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/vendored_thor.rb +2 -2
- data/bundler/lib/bundler/vendored_tsort.rb +4 -0
- data/bundler/lib/bundler/vendored_uri.rb +4 -0
- data/bundler/lib/bundler/version.rb +5 -20
- data/bundler/lib/bundler/vlad.rb +2 -2
- data/bundler/lib/bundler/worker.rb +26 -15
- data/bundler/lib/bundler/yaml_serializer.rb +3 -4
- data/bundler/lib/bundler.rb +285 -183
- data/hide_lib_for_update/note.txt +0 -4
- data/lib/rubygems/available_set.rb +7 -8
- data/lib/rubygems/basic_specification.rb +44 -31
- data/lib/rubygems/bundler_version_finder.rb +28 -50
- data/lib/rubygems/command.rb +104 -46
- data/lib/rubygems/command_manager.rb +35 -16
- data/lib/rubygems/commands/build_command.rb +77 -26
- data/lib/rubygems/commands/cert_command.rb +78 -76
- data/lib/rubygems/commands/check_command.rb +20 -22
- data/lib/rubygems/commands/cleanup_command.rb +36 -32
- data/lib/rubygems/commands/contents_command.rb +16 -18
- data/lib/rubygems/commands/dependency_command.rb +39 -50
- data/lib/rubygems/commands/environment_command.rb +11 -13
- data/lib/rubygems/commands/fetch_command.rb +33 -16
- data/lib/rubygems/commands/generate_index_command.rb +18 -17
- data/lib/rubygems/commands/help_command.rb +7 -7
- data/lib/rubygems/commands/info_command.rb +11 -6
- data/lib/rubygems/commands/install_command.rb +45 -79
- data/lib/rubygems/commands/list_command.rb +9 -8
- data/lib/rubygems/commands/lock_command.rb +7 -9
- data/lib/rubygems/commands/mirror_command.rb +3 -4
- data/lib/rubygems/commands/open_command.rb +11 -14
- data/lib/rubygems/commands/outdated_command.rb +5 -6
- data/lib/rubygems/commands/owner_command.rb +29 -22
- data/lib/rubygems/commands/pristine_command.rb +61 -51
- data/lib/rubygems/commands/push_command.rb +26 -63
- data/lib/rubygems/commands/query_command.rb +21 -337
- data/lib/rubygems/commands/rdoc_command.rb +26 -26
- data/lib/rubygems/commands/search_command.rb +8 -8
- data/lib/rubygems/commands/server_command.rb +16 -77
- data/lib/rubygems/commands/setup_command.rb +282 -241
- data/lib/rubygems/commands/signin_command.rb +9 -10
- data/lib/rubygems/commands/signout_command.rb +7 -9
- data/lib/rubygems/commands/sources_command.rb +42 -26
- data/lib/rubygems/commands/specification_command.rb +25 -20
- data/lib/rubygems/commands/stale_command.rb +3 -3
- data/lib/rubygems/commands/uninstall_command.rb +58 -49
- data/lib/rubygems/commands/unpack_command.rb +15 -44
- data/lib/rubygems/commands/update_command.rb +133 -81
- data/lib/rubygems/commands/which_command.rb +8 -11
- data/lib/rubygems/commands/yank_command.rb +22 -19
- data/lib/rubygems/compatibility.rb +7 -5
- data/lib/rubygems/config_file.rb +101 -47
- data/lib/rubygems/core_ext/kernel_gem.rb +8 -12
- data/lib/rubygems/core_ext/kernel_require.rb +124 -83
- data/lib/rubygems/core_ext/kernel_warn.rb +35 -30
- data/lib/rubygems/core_ext/tcpsocket_init.rb +52 -0
- data/lib/rubygems/defaults.rb +131 -55
- data/lib/rubygems/dependency.rb +44 -27
- data/lib/rubygems/dependency_installer.rb +49 -205
- data/lib/rubygems/dependency_list.rb +24 -25
- data/lib/rubygems/deprecate.rb +106 -12
- data/lib/rubygems/doctor.rb +22 -22
- data/lib/rubygems/errors.rb +8 -14
- data/lib/rubygems/exceptions.rb +35 -33
- data/lib/rubygems/ext/build_error.rb +2 -0
- data/lib/rubygems/ext/builder.rb +71 -95
- data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +27 -0
- data/lib/rubygems/ext/cargo_builder.rb +360 -0
- data/lib/rubygems/ext/cmake_builder.rb +6 -7
- data/lib/rubygems/ext/configure_builder.rb +5 -8
- data/lib/rubygems/ext/ext_conf_builder.rb +45 -65
- data/lib/rubygems/ext/rake_builder.rb +7 -10
- data/lib/rubygems/ext.rb +7 -6
- data/lib/rubygems/gem_runner.rb +15 -26
- data/lib/rubygems/gemcutter_utilities.rb +179 -54
- data/lib/rubygems/indexer.rb +38 -53
- data/lib/rubygems/install_default_message.rb +2 -2
- data/lib/rubygems/install_message.rb +2 -2
- data/lib/rubygems/install_update_options.rb +73 -64
- data/lib/rubygems/installer.rb +230 -173
- data/lib/rubygems/installer_uninstaller_utils.rb +29 -0
- data/lib/rubygems/local_remote_options.rb +22 -24
- data/lib/rubygems/mock_gem_ui.rb +2 -5
- data/lib/rubygems/name_tuple.rb +10 -14
- data/lib/rubygems/openssl.rb +7 -0
- data/lib/rubygems/optparse/.document +1 -0
- data/lib/rubygems/optparse/COPYING +56 -0
- data/lib/rubygems/optparse/lib/optionparser.rb +2 -0
- data/lib/rubygems/optparse/lib/optparse/ac.rb +54 -0
- data/lib/rubygems/optparse/lib/optparse/date.rb +18 -0
- data/lib/rubygems/optparse/lib/optparse/kwargs.rb +22 -0
- data/lib/rubygems/optparse/lib/optparse/shellwords.rb +7 -0
- data/lib/rubygems/optparse/lib/optparse/time.rb +11 -0
- data/lib/rubygems/optparse/lib/optparse/uri.rb +7 -0
- data/lib/rubygems/optparse/lib/optparse/version.rb +71 -0
- data/lib/rubygems/optparse/lib/optparse.rb +2308 -0
- data/lib/rubygems/optparse.rb +3 -0
- data/lib/rubygems/package/digest_io.rb +0 -2
- data/lib/rubygems/package/file_source.rb +2 -4
- data/lib/rubygems/package/io_source.rb +4 -2
- data/lib/rubygems/package/old.rb +9 -11
- data/lib/rubygems/package/tar_header.rb +73 -66
- data/lib/rubygems/package/tar_reader/entry.rb +8 -9
- data/lib/rubygems/package/tar_reader.rb +16 -13
- data/lib/rubygems/package/tar_writer.rb +12 -22
- data/lib/rubygems/package.rb +142 -125
- data/lib/rubygems/package_task.rb +5 -11
- data/lib/rubygems/path_support.rb +3 -8
- data/lib/rubygems/platform.rb +113 -73
- data/lib/rubygems/psych_tree.rb +1 -1
- data/lib/rubygems/query_utils.rb +351 -0
- data/lib/rubygems/rdoc.rb +4 -16
- data/lib/rubygems/remote_fetcher.rb +64 -136
- data/lib/rubygems/request/connection_pools.rb +7 -11
- data/lib/rubygems/request/http_pool.rb +2 -3
- data/lib/rubygems/request.rb +31 -32
- data/lib/rubygems/request_set/gem_dependency_api.rb +135 -136
- data/lib/rubygems/request_set/lockfile/parser.rb +28 -28
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +5 -5
- data/lib/rubygems/request_set/lockfile.rb +21 -20
- data/lib/rubygems/request_set.rb +30 -43
- data/lib/rubygems/requirement.rb +42 -64
- data/lib/rubygems/resolver/activation_request.rb +29 -53
- data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
- data/lib/rubygems/resolver/api_set.rb +33 -26
- data/lib/rubygems/resolver/api_specification.rb +30 -16
- data/lib/rubygems/resolver/best_set.rb +9 -11
- data/lib/rubygems/resolver/composed_set.rb +3 -5
- data/lib/rubygems/resolver/conflict.rb +12 -19
- data/lib/rubygems/resolver/current_set.rb +0 -2
- data/lib/rubygems/resolver/dependency_request.rb +3 -5
- data/lib/rubygems/resolver/git_set.rb +2 -4
- data/lib/rubygems/resolver/git_specification.rb +6 -8
- data/lib/rubygems/resolver/index_set.rb +4 -6
- data/lib/rubygems/resolver/index_specification.rb +38 -7
- data/lib/rubygems/resolver/installed_specification.rb +4 -6
- data/lib/rubygems/resolver/installer_set.rb +69 -27
- data/lib/rubygems/resolver/local_specification.rb +2 -4
- data/lib/rubygems/resolver/lock_set.rb +7 -9
- data/lib/rubygems/resolver/lock_specification.rb +6 -8
- data/lib/rubygems/resolver/molinillo/LICENSE +9 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +8 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb +7 -6
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb +4 -3
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +51 -12
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +42 -9
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +82 -8
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb +13 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +510 -165
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb +3 -2
- data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb +8 -4
- data/lib/rubygems/resolver/molinillo/lib/molinillo.rb +6 -5
- data/lib/rubygems/resolver/molinillo.rb +1 -1
- data/lib/rubygems/resolver/requirement_list.rb +0 -1
- data/lib/rubygems/resolver/set.rb +0 -3
- data/lib/rubygems/resolver/source_set.rb +0 -2
- data/lib/rubygems/resolver/spec_specification.rb +14 -2
- data/lib/rubygems/resolver/specification.rb +14 -3
- data/lib/rubygems/resolver/vendor_set.rb +1 -3
- data/lib/rubygems/resolver/vendor_specification.rb +3 -5
- data/lib/rubygems/resolver.rb +58 -54
- data/lib/rubygems/s3_uri_signer.rb +175 -0
- data/lib/rubygems/safe_yaml.rb +14 -16
- data/lib/rubygems/security/policies.rb +47 -47
- data/lib/rubygems/security/policy.rb +25 -29
- data/lib/rubygems/security/signer.rb +16 -18
- data/lib/rubygems/security/trust_dir.rb +5 -6
- data/lib/rubygems/security.rb +90 -69
- data/lib/rubygems/security_option.rb +7 -8
- data/lib/rubygems/source/git.rb +30 -30
- data/lib/rubygems/source/installed.rb +1 -3
- data/lib/rubygems/source/local.rb +4 -6
- data/lib/rubygems/source/lock.rb +0 -2
- data/lib/rubygems/source/specific_file.rb +1 -3
- data/lib/rubygems/source/vendor.rb +0 -2
- data/lib/rubygems/source.rb +50 -38
- data/lib/rubygems/source_list.rb +9 -13
- data/lib/rubygems/spec_fetcher.rb +52 -64
- data/lib/rubygems/specification.rb +432 -463
- data/lib/rubygems/specification_policy.rb +185 -87
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +21 -0
- data/lib/rubygems/stub_specification.rb +24 -29
- data/lib/rubygems/text.rb +21 -21
- data/lib/rubygems/tsort/.document +1 -0
- data/lib/rubygems/tsort/LICENSE.txt +22 -0
- data/lib/rubygems/tsort/lib/tsort.rb +452 -0
- data/lib/rubygems/tsort.rb +3 -0
- data/lib/rubygems/uninstaller.rb +110 -57
- data/lib/rubygems/unknown_command_spell_checker.rb +21 -0
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/uri.rb +126 -0
- data/lib/rubygems/uri_formatter.rb +2 -4
- data/lib/rubygems/user_interaction.rb +46 -49
- data/lib/rubygems/util/licenses.rb +511 -404
- data/lib/rubygems/util.rb +40 -56
- data/lib/rubygems/validator.rb +15 -37
- data/lib/rubygems/version.rb +48 -29
- data/lib/rubygems/version_option.rb +11 -5
- data/lib/rubygems.rb +305 -332
- data/rubygems-update.gemspec +6 -13
- data/setup.rb +11 -22
- data/test/rubygems/alternate_cert.pem +14 -14
- data/test/rubygems/alternate_cert_32.pem +15 -15
- data/test/rubygems/alternate_key.pem +25 -25
- data/test/rubygems/bundler_test_gem.rb +419 -0
- data/test/rubygems/ca_cert.pem +74 -65
- data/test/rubygems/child_cert.pem +15 -16
- data/test/rubygems/child_cert_32.pem +15 -16
- data/test/rubygems/child_key.pem +25 -25
- data/test/rubygems/client.pem +103 -45
- data/test/rubygems/data/excon-0.7.7.gemspec.rz +0 -0
- data/test/rubygems/data/null-required-ruby-version.gemspec.rz +0 -0
- data/test/rubygems/data/null-required-rubygems-version.gemspec.rz +0 -0
- data/test/rubygems/data/pry-0.4.7.gemspec.rz +0 -0
- data/test/rubygems/encrypted_private_key.pem +26 -26
- data/test/rubygems/expired_cert.pem +15 -15
- data/test/rubygems/future_cert.pem +15 -15
- data/test/rubygems/future_cert_32.pem +15 -15
- data/test/rubygems/grandchild_cert.pem +15 -16
- data/test/rubygems/grandchild_cert_32.pem +15 -16
- data/test/rubygems/grandchild_key.pem +25 -25
- data/{lib/rubygems/test_case.rb → test/rubygems/helper.rb} +505 -507
- data/{lib → test}/rubygems/installer_test_case.rb +115 -53
- data/test/rubygems/invalid_issuer_cert.pem +16 -16
- data/test/rubygems/invalid_issuer_cert_32.pem +16 -16
- data/test/rubygems/invalid_key.pem +25 -25
- data/test/rubygems/invalid_signer_cert.pem +15 -15
- data/test/rubygems/invalid_signer_cert_32.pem +15 -15
- data/test/rubygems/invalidchild_cert.pem +15 -16
- data/test/rubygems/invalidchild_cert_32.pem +15 -16
- data/test/rubygems/invalidchild_key.pem +25 -25
- data/{lib → test}/rubygems/package/tar_test_case.rb +4 -6
- data/test/rubygems/packages/Bluebie-legs-0.6.2.gem +0 -0
- data/test/rubygems/packages/ascii_binder-0.1.10.1.gem +0 -0
- data/test/rubygems/packages/ill-formatted-platform-1.0.0.10.gem +0 -0
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
- data/test/rubygems/private_ec_key.pem +9 -0
- data/test/rubygems/private_key.pem +25 -25
- data/test/rubygems/public_cert.pem +16 -16
- data/test/rubygems/public_cert_32.pem +15 -15
- data/test/rubygems/public_key.pem +7 -7
- data/test/rubygems/rubygems/commands/crash_command.rb +0 -2
- data/test/rubygems/rubygems_plugin.rb +2 -4
- data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +12 -0
- data/test/rubygems/ssl_cert.pem +78 -17
- data/test/rubygems/ssl_key.pem +25 -13
- data/test/rubygems/test_bundled_ca.rb +44 -47
- data/test/rubygems/test_config.rb +5 -7
- data/test/rubygems/test_deprecate.rb +90 -10
- data/test/rubygems/test_exit.rb +17 -0
- data/test/rubygems/test_gem.rb +679 -885
- data/test/rubygems/test_gem_available_set.rb +24 -25
- data/test/rubygems/test_gem_bundler_version_finder.rb +42 -42
- data/test/rubygems/test_gem_command.rb +186 -39
- data/test/rubygems/test_gem_command_manager.rb +166 -36
- data/test/rubygems/test_gem_commands_build_command.rb +436 -52
- data/test/rubygems/test_gem_commands_cert_command.rb +193 -124
- data/test/rubygems/test_gem_commands_check_command.rb +9 -11
- data/test/rubygems/test_gem_commands_cleanup_command.rb +87 -62
- data/test/rubygems/test_gem_commands_contents_command.rb +73 -42
- data/test/rubygems/test_gem_commands_dependency_command.rb +39 -41
- data/test/rubygems/test_gem_commands_environment_command.rb +60 -48
- data/test/rubygems/test_gem_commands_fetch_command.rb +163 -32
- data/test/rubygems/test_gem_commands_generate_index_command.rb +39 -9
- data/test/rubygems/test_gem_commands_help_command.rb +34 -19
- data/test/rubygems/test_gem_commands_info_command.rb +34 -9
- data/test/rubygems/test_gem_commands_install_command.rb +600 -173
- data/test/rubygems/test_gem_commands_list_command.rb +5 -7
- data/test/rubygems/test_gem_commands_lock_command.rb +11 -13
- data/test/rubygems/test_gem_commands_mirror.rb +3 -4
- data/test/rubygems/test_gem_commands_open_command.rb +16 -19
- data/test/rubygems/test_gem_commands_outdated_command.rb +24 -7
- data/test/rubygems/test_gem_commands_owner_command.rb +183 -49
- data/test/rubygems/test_gem_commands_pristine_command.rb +222 -89
- data/test/rubygems/test_gem_commands_push_command.rb +178 -69
- data/test/rubygems/test_gem_commands_query_command.rb +114 -89
- data/test/rubygems/test_gem_commands_search_command.rb +2 -4
- data/test/rubygems/test_gem_commands_server_command.rb +6 -46
- data/test/rubygems/test_gem_commands_setup_command.rb +334 -157
- data/test/rubygems/test_gem_commands_signin_command.rb +187 -27
- data/test/rubygems/test_gem_commands_signout_command.rb +3 -10
- data/test/rubygems/test_gem_commands_sources_command.rb +266 -33
- data/test/rubygems/test_gem_commands_specification_command.rb +81 -55
- data/test/rubygems/test_gem_commands_stale_command.rb +4 -6
- data/test/rubygems/test_gem_commands_uninstall_command.rb +230 -95
- data/test/rubygems/test_gem_commands_unpack_command.rb +32 -34
- data/test/rubygems/test_gem_commands_update_command.rb +412 -102
- data/test/rubygems/test_gem_commands_which_command.rb +12 -14
- data/test/rubygems/test_gem_commands_yank_command.rb +107 -26
- data/test/rubygems/test_gem_config_file.rb +120 -96
- data/test/rubygems/test_gem_dependency.rb +94 -86
- data/test/rubygems/test_gem_dependency_installer.rb +305 -388
- data/test/rubygems/test_gem_dependency_list.rb +66 -61
- data/test/rubygems/test_gem_dependency_resolution_error.rb +5 -7
- data/test/rubygems/test_gem_doctor.rb +73 -47
- data/test/rubygems/test_gem_ext_builder.rb +116 -106
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/.gitignore +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +8 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock +233 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml +10 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs +27 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/.gitignore +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +233 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +10 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +8 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +51 -0
- data/test/rubygems/test_gem_ext_cargo_builder.rb +166 -0
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +33 -0
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +60 -0
- data/test/rubygems/test_gem_ext_cmake_builder.rb +32 -37
- data/test/rubygems/test_gem_ext_configure_builder.rb +23 -31
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +75 -79
- data/test/rubygems/test_gem_ext_rake_builder.rb +49 -30
- data/test/rubygems/test_gem_gem_runner.rb +52 -7
- data/test/rubygems/test_gem_gemcutter_utilities.rb +91 -76
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -6
- data/test/rubygems/test_gem_indexer.rb +120 -105
- data/test/rubygems/test_gem_install_update_options.rb +57 -33
- data/test/rubygems/test_gem_installer.rb +1230 -644
- data/test/rubygems/test_gem_local_remote_options.rb +11 -13
- data/test/rubygems/test_gem_name_tuple.rb +4 -6
- data/test/rubygems/test_gem_package.rb +396 -266
- data/test/rubygems/test_gem_package_old.rb +57 -56
- data/test/rubygems/test_gem_package_tar_header.rb +108 -50
- data/test/rubygems/test_gem_package_tar_reader.rb +8 -10
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +77 -20
- data/test/rubygems/test_gem_package_tar_writer.rb +107 -101
- data/test/rubygems/test_gem_package_task.rb +58 -25
- data/test/rubygems/test_gem_path_support.rb +29 -29
- data/test/rubygems/test_gem_platform.rb +388 -199
- data/test/rubygems/test_gem_rdoc.rb +20 -155
- data/test/rubygems/test_gem_remote_fetcher.rb +474 -303
- data/test/rubygems/test_gem_request.rb +128 -85
- data/test/rubygems/test_gem_request_connection_pools.rb +32 -32
- data/test/rubygems/test_gem_request_set.rb +186 -110
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +280 -261
- data/test/rubygems/test_gem_request_set_lockfile.rb +93 -94
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +68 -69
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +136 -136
- data/test/rubygems/test_gem_requirement.rb +140 -55
- data/test/rubygems/test_gem_resolver.rb +224 -115
- data/test/rubygems/test_gem_resolver_activation_request.rb +9 -40
- data/test/rubygems/test_gem_resolver_api_set.rb +79 -78
- data/test/rubygems/test_gem_resolver_api_specification.rb +47 -49
- data/test/rubygems/test_gem_resolver_best_set.rb +43 -22
- data/test/rubygems/test_gem_resolver_composed_set.rb +1 -3
- data/test/rubygems/test_gem_resolver_conflict.rb +12 -18
- data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -17
- data/test/rubygems/test_gem_resolver_git_set.rb +22 -24
- data/test/rubygems/test_gem_resolver_git_specification.rb +22 -22
- data/test/rubygems/test_gem_resolver_index_set.rb +14 -16
- data/test/rubygems/test_gem_resolver_index_specification.rb +21 -18
- data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -8
- data/test/rubygems/test_gem_resolver_installer_set.rb +106 -44
- data/test/rubygems/test_gem_resolver_local_specification.rb +7 -9
- data/test/rubygems/test_gem_resolver_lock_set.rb +15 -17
- data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -19
- data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -3
- data/test/rubygems/test_gem_resolver_specification.rb +8 -10
- data/test/rubygems/test_gem_resolver_vendor_set.rb +9 -11
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -12
- data/test/rubygems/test_gem_security.rb +109 -79
- data/test/rubygems/test_gem_security_policy.rb +102 -107
- data/test/rubygems/test_gem_security_signer.rb +51 -52
- data/test/rubygems/test_gem_security_trust_dir.rb +14 -16
- data/test/rubygems/test_gem_silent_ui.rb +47 -42
- data/test/rubygems/test_gem_source.rb +66 -51
- data/test/rubygems/test_gem_source_fetch_problem.rb +17 -8
- data/test/rubygems/test_gem_source_git.rb +74 -74
- data/test/rubygems/test_gem_source_installed.rb +16 -18
- data/test/rubygems/test_gem_source_list.rb +5 -5
- data/test/rubygems/test_gem_source_local.rb +15 -16
- data/test/rubygems/test_gem_source_lock.rb +31 -33
- data/test/rubygems/test_gem_source_specific_file.rb +18 -19
- data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
- data/test/rubygems/test_gem_source_vendor.rb +13 -15
- data/test/rubygems/test_gem_spec_fetcher.rb +74 -67
- data/test/rubygems/test_gem_specification.rb +1051 -1071
- data/test/rubygems/test_gem_stream_ui.rb +25 -23
- data/test/rubygems/test_gem_stub_specification.rb +39 -56
- data/test/rubygems/test_gem_text.rb +8 -3
- data/test/rubygems/test_gem_uninstaller.rb +269 -100
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -5
- data/test/rubygems/test_gem_update_suggestion.rb +208 -0
- data/test/rubygems/test_gem_uri.rb +39 -0
- data/test/rubygems/test_gem_uri_formatter.rb +14 -16
- data/test/rubygems/test_gem_util.rb +46 -34
- data/test/rubygems/test_gem_validator.rb +12 -15
- data/test/rubygems/test_gem_version.rb +49 -34
- data/test/rubygems/test_gem_version_option.rb +16 -18
- data/test/rubygems/test_kernel.rb +61 -53
- data/test/rubygems/test_project_sanity.rb +20 -0
- data/test/rubygems/test_remote_fetch_error.rb +7 -8
- data/test/rubygems/test_require.rb +415 -121
- data/test/rubygems/test_rubygems.rb +74 -0
- data/{lib/rubygems/test_utilities.rb → test/rubygems/utilities.rb} +74 -50
- data/test/rubygems/wrong_key_cert.pem +15 -15
- data/test/rubygems/wrong_key_cert_32.pem +15 -15
- data/test/test_changelog_generator.rb +17 -0
- metadata +218 -244
- data/.rubocop.yml +0 -66
- data/.travis.yml +0 -38
- data/History.txt +0 -3965
- data/Rakefile +0 -372
- data/appveyor.yml +0 -43
- data/bundler/CODE_OF_CONDUCT.md +0 -42
- data/bundler/CONTRIBUTING.md +0 -17
- data/bundler/exe/bundle_ruby +0 -60
- data/bundler/lib/bundler/cli/package.rb +0 -49
- data/bundler/lib/bundler/compatibility_guard.rb +0 -14
- data/bundler/lib/bundler/dep_proxy.rb +0 -48
- data/bundler/lib/bundler/gem_remote_fetcher.rb +0 -43
- data/bundler/lib/bundler/gemdeps.rb +0 -29
- data/bundler/lib/bundler/psyched_yaml.rb +0 -37
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/bundler/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/bundler/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/bundler/lib/bundler/templates/gems.rb +0 -8
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +0 -4
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -7
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- 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 -81
- 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 -136
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -223
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
- 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 -101
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -837
- 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 -12
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +0 -12
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +0 -129
- data/bundler/lib/bundler/version_ranges.rb +0 -76
- data/bundler/man/bundle-gem.1 +0 -80
- data/bundler/man/bundle-gem.ronn +0 -78
- data/bundler/man/bundle-package.1 +0 -55
- data/lib/rubygems/psych_additions.rb +0 -10
- data/lib/rubygems/server.rb +0 -878
- data/lib/rubygems/source_local.rb +0 -7
- data/lib/rubygems/source_specific_file.rb +0 -6
- data/lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -21
- data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/lib/rubygems/syck_hack.rb +0 -77
- data/lib/ubygems.rb +0 -14
- data/test/rubygems/bogussources.rb +0 -9
- data/test/rubygems/data/null-type.gemspec.rz +0 -0
- data/test/rubygems/test_gem_server.rb +0 -607
- data/util/CL2notes +0 -55
- data/util/ci +0 -77
- data/util/create_certs.rb +0 -171
- data/util/create_encrypted_key.rb +0 -16
- data/util/generate_spdx_license_list.rb +0 -61
- data/util/patch_with_prs.rb +0 -77
- data/util/rubocop +0 -8
- data/util/update_bundled_ca_certificates.rb +0 -139
- data/util/update_changelog.rb +0 -67
- /data/bundler/lib/bundler/{ssl_certs → man}/.document +0 -0
- /data/bundler/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- /data/bundler/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- /data/bundler/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- /data/bundler/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- /data/bundler/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- /data/bundler/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- /data/bundler/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
- /data/{bundler/lib/bundler/ssl_certs/index.rubygems.org → lib/rubygems/ssl_certs/rubygems.org}/GlobalSignRootCA.pem +0 -0
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Gem::Resolver::Molinillo
|
3
4
|
class Resolver
|
4
5
|
# A specific resolution from a given {Resolver}
|
@@ -8,22 +9,125 @@ module Gem::Resolver::Molinillo
|
|
8
9
|
# @attr [{String,Nil=>[Object]}] requirements the requirements that caused the conflict
|
9
10
|
# @attr [Object, nil] existing the existing spec that was in conflict with
|
10
11
|
# the {#possibility}
|
11
|
-
# @attr [Object]
|
12
|
-
# to a conflict
|
12
|
+
# @attr [Object] possibility_set the set of specs that was unable to be
|
13
|
+
# activated due to a conflict.
|
13
14
|
# @attr [Object] locked_requirement the relevant locking requirement.
|
14
15
|
# @attr [Array<Array<Object>>] requirement_trees the different requirement
|
15
16
|
# trees that led to every requirement for the conflicting name.
|
16
17
|
# @attr [{String=>Object}] activated_by_name the already-activated specs.
|
18
|
+
# @attr [Object] underlying_error an error that has occurred during resolution, and
|
19
|
+
# will be raised at the end of it if no resolution is found.
|
17
20
|
Conflict = Struct.new(
|
18
21
|
:requirement,
|
19
22
|
:requirements,
|
20
23
|
:existing,
|
21
|
-
:
|
24
|
+
:possibility_set,
|
22
25
|
:locked_requirement,
|
23
26
|
:requirement_trees,
|
24
|
-
:activated_by_name
|
27
|
+
:activated_by_name,
|
28
|
+
:underlying_error
|
25
29
|
)
|
26
30
|
|
31
|
+
class Conflict
|
32
|
+
# @return [Object] a spec that was unable to be activated due to a conflict
|
33
|
+
def possibility
|
34
|
+
possibility_set && possibility_set.latest_version
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
# A collection of possibility states that share the same dependencies
|
39
|
+
# @attr [Array] dependencies the dependencies for this set of possibilities
|
40
|
+
# @attr [Array] possibilities the possibilities
|
41
|
+
PossibilitySet = Struct.new(:dependencies, :possibilities)
|
42
|
+
|
43
|
+
class PossibilitySet
|
44
|
+
# String representation of the possibility set, for debugging
|
45
|
+
def to_s
|
46
|
+
"[#{possibilities.join(', ')}]"
|
47
|
+
end
|
48
|
+
|
49
|
+
# @return [Object] most up-to-date dependency in the possibility set
|
50
|
+
def latest_version
|
51
|
+
possibilities.last
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
# Details of the state to unwind to when a conflict occurs, and the cause of the unwind
|
56
|
+
# @attr [Integer] state_index the index of the state to unwind to
|
57
|
+
# @attr [Object] state_requirement the requirement of the state we're unwinding to
|
58
|
+
# @attr [Array] requirement_tree for the requirement we're relaxing
|
59
|
+
# @attr [Array] conflicting_requirements the requirements that combined to cause the conflict
|
60
|
+
# @attr [Array] requirement_trees for the conflict
|
61
|
+
# @attr [Array] requirements_unwound_to_instead array of unwind requirements that were chosen over this unwind
|
62
|
+
UnwindDetails = Struct.new(
|
63
|
+
:state_index,
|
64
|
+
:state_requirement,
|
65
|
+
:requirement_tree,
|
66
|
+
:conflicting_requirements,
|
67
|
+
:requirement_trees,
|
68
|
+
:requirements_unwound_to_instead
|
69
|
+
)
|
70
|
+
|
71
|
+
class UnwindDetails
|
72
|
+
include Comparable
|
73
|
+
|
74
|
+
# We compare UnwindDetails when choosing which state to unwind to. If
|
75
|
+
# two options have the same state_index we prefer the one most
|
76
|
+
# removed from a requirement that caused the conflict. Both options
|
77
|
+
# would unwind to the same state, but a `grandparent` option will
|
78
|
+
# filter out fewer of its possibilities after doing so - where a state
|
79
|
+
# is both a `parent` and a `grandparent` to requirements that have
|
80
|
+
# caused a conflict this is the correct behaviour.
|
81
|
+
# @param [UnwindDetail] other UnwindDetail to be compared
|
82
|
+
# @return [Integer] integer specifying ordering
|
83
|
+
def <=>(other)
|
84
|
+
if state_index > other.state_index
|
85
|
+
1
|
86
|
+
elsif state_index == other.state_index
|
87
|
+
reversed_requirement_tree_index <=> other.reversed_requirement_tree_index
|
88
|
+
else
|
89
|
+
-1
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
# @return [Integer] index of state requirement in reversed requirement tree
|
94
|
+
# (the conflicting requirement itself will be at position 0)
|
95
|
+
def reversed_requirement_tree_index
|
96
|
+
@reversed_requirement_tree_index ||=
|
97
|
+
if state_requirement
|
98
|
+
requirement_tree.reverse.index(state_requirement)
|
99
|
+
else
|
100
|
+
999_999
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
104
|
+
# @return [Boolean] where the requirement of the state we're unwinding
|
105
|
+
# to directly caused the conflict. Note: in this case, it is
|
106
|
+
# impossible for the state we're unwinding to to be a parent of
|
107
|
+
# any of the other conflicting requirements (or we would have
|
108
|
+
# circularity)
|
109
|
+
def unwinding_to_primary_requirement?
|
110
|
+
requirement_tree.last == state_requirement
|
111
|
+
end
|
112
|
+
|
113
|
+
# @return [Array] array of sub-dependencies to avoid when choosing a
|
114
|
+
# new possibility for the state we've unwound to. Only relevant for
|
115
|
+
# non-primary unwinds
|
116
|
+
def sub_dependencies_to_avoid
|
117
|
+
@requirements_to_avoid ||=
|
118
|
+
requirement_trees.map do |tree|
|
119
|
+
index = tree.index(state_requirement)
|
120
|
+
tree[index + 1] if index
|
121
|
+
end.compact
|
122
|
+
end
|
123
|
+
|
124
|
+
# @return [Array] array of all the requirements that led to the need for
|
125
|
+
# this unwind
|
126
|
+
def all_requirements
|
127
|
+
@all_requirements ||= requirement_trees.flatten(1)
|
128
|
+
end
|
129
|
+
end
|
130
|
+
|
27
131
|
# @return [SpecificationProvider] the provider that knows about
|
28
132
|
# dependencies, requirements, specifications, versions, etc.
|
29
133
|
attr_reader :specification_provider
|
@@ -64,7 +168,7 @@ module Gem::Resolver::Molinillo
|
|
64
168
|
start_resolution
|
65
169
|
|
66
170
|
while state
|
67
|
-
break
|
171
|
+
break if !state.requirement && state.requirements.empty?
|
68
172
|
indicate_progress
|
69
173
|
if state.respond_to?(:pop_possibility_state) # DependencyState
|
70
174
|
debug(depth) { "Creating possibility state for #{requirement} (#{possibilities.count} remaining)" }
|
@@ -78,7 +182,7 @@ module Gem::Resolver::Molinillo
|
|
78
182
|
process_topmost_state
|
79
183
|
end
|
80
184
|
|
81
|
-
|
185
|
+
resolve_activated_specs
|
82
186
|
ensure
|
83
187
|
end_resolution
|
84
188
|
end
|
@@ -103,12 +207,25 @@ module Gem::Resolver::Molinillo
|
|
103
207
|
def start_resolution
|
104
208
|
@started_at = Time.now
|
105
209
|
|
106
|
-
|
210
|
+
push_initial_state
|
107
211
|
|
108
212
|
debug { "Starting resolution (#{@started_at})\nUser-requested dependencies: #{original_requested}" }
|
109
213
|
resolver_ui.before_resolution
|
110
214
|
end
|
111
215
|
|
216
|
+
def resolve_activated_specs
|
217
|
+
activated.vertices.each do |_, vertex|
|
218
|
+
next unless vertex.payload
|
219
|
+
|
220
|
+
latest_version = vertex.payload.possibilities.reverse_each.find do |possibility|
|
221
|
+
vertex.requirements.all? { |req| requirement_satisfied_by?(req, activated, possibility) }
|
222
|
+
end
|
223
|
+
|
224
|
+
activated.set_payload(vertex.name, latest_version)
|
225
|
+
end
|
226
|
+
activated.freeze
|
227
|
+
end
|
228
|
+
|
112
229
|
# Ends the resolution process
|
113
230
|
# @return [void]
|
114
231
|
def end_resolution
|
@@ -121,11 +238,11 @@ module Gem::Resolver::Molinillo
|
|
121
238
|
debug { 'Activated: ' + Hash[activated.vertices.select { |_n, v| v.payload }].keys.join(', ') } if state
|
122
239
|
end
|
123
240
|
|
124
|
-
|
125
|
-
|
241
|
+
require_relative 'state'
|
242
|
+
require_relative 'modules/specification_provider'
|
126
243
|
|
127
|
-
|
128
|
-
|
244
|
+
require_relative 'delegates/resolution_state'
|
245
|
+
require_relative 'delegates/specification_provider'
|
129
246
|
|
130
247
|
include Gem::Resolver::Molinillo::Delegates::ResolutionState
|
131
248
|
include Gem::Resolver::Molinillo::Delegates::SpecificationProvider
|
@@ -136,9 +253,12 @@ module Gem::Resolver::Molinillo
|
|
136
253
|
if possibility
|
137
254
|
attempt_to_activate
|
138
255
|
else
|
139
|
-
create_conflict
|
140
|
-
unwind_for_conflict
|
256
|
+
create_conflict
|
257
|
+
unwind_for_conflict
|
141
258
|
end
|
259
|
+
rescue CircularDependencyError => underlying_error
|
260
|
+
create_conflict(underlying_error)
|
261
|
+
unwind_for_conflict
|
142
262
|
end
|
143
263
|
|
144
264
|
# @return [Object] the current possibility that the resolution is trying
|
@@ -153,63 +273,296 @@ module Gem::Resolver::Molinillo
|
|
153
273
|
states.last
|
154
274
|
end
|
155
275
|
|
156
|
-
# Creates the initial state for the resolution, based upon the
|
276
|
+
# Creates and pushes the initial state for the resolution, based upon the
|
157
277
|
# {#requested} dependencies
|
158
|
-
# @return [
|
159
|
-
def
|
278
|
+
# @return [void]
|
279
|
+
def push_initial_state
|
160
280
|
graph = DependencyGraph.new.tap do |dg|
|
161
|
-
original_requested.each
|
281
|
+
original_requested.each do |requested|
|
282
|
+
vertex = dg.add_vertex(name_for(requested), nil, true)
|
283
|
+
vertex.explicit_requirements << requested
|
284
|
+
end
|
162
285
|
dg.tag(:initial_state)
|
163
286
|
end
|
164
287
|
|
165
|
-
|
166
|
-
initial_requirement = requirements.shift
|
167
|
-
DependencyState.new(
|
168
|
-
initial_requirement && name_for(initial_requirement),
|
169
|
-
requirements,
|
170
|
-
graph,
|
171
|
-
initial_requirement,
|
172
|
-
initial_requirement && search_for(initial_requirement),
|
173
|
-
0,
|
174
|
-
{}
|
175
|
-
)
|
288
|
+
push_state_for_requirements(original_requested, true, graph)
|
176
289
|
end
|
177
290
|
|
178
291
|
# Unwinds the states stack because a conflict has been encountered
|
179
292
|
# @return [void]
|
180
293
|
def unwind_for_conflict
|
181
|
-
|
294
|
+
details_for_unwind = build_details_for_unwind
|
295
|
+
unwind_options = unused_unwind_options
|
296
|
+
debug(depth) { "Unwinding for conflict: #{requirement} to #{details_for_unwind.state_index / 2}" }
|
182
297
|
conflicts.tap do |c|
|
183
|
-
sliced_states = states.slice!((
|
184
|
-
|
298
|
+
sliced_states = states.slice!((details_for_unwind.state_index + 1)..-1)
|
299
|
+
raise_error_unless_state(c)
|
185
300
|
activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
|
186
301
|
state.conflicts = c
|
302
|
+
state.unused_unwind_options = unwind_options
|
303
|
+
filter_possibilities_after_unwind(details_for_unwind)
|
187
304
|
index = states.size - 1
|
188
305
|
@parents_of.each { |_, a| a.reject! { |i| i >= index } }
|
306
|
+
state.unused_unwind_options.reject! { |uw| uw.state_index >= index }
|
307
|
+
end
|
308
|
+
end
|
309
|
+
|
310
|
+
# Raises a VersionConflict error, or any underlying error, if there is no
|
311
|
+
# current state
|
312
|
+
# @return [void]
|
313
|
+
def raise_error_unless_state(conflicts)
|
314
|
+
return if state
|
315
|
+
|
316
|
+
error = conflicts.values.map(&:underlying_error).compact.first
|
317
|
+
raise error || VersionConflict.new(conflicts, specification_provider)
|
318
|
+
end
|
319
|
+
|
320
|
+
# @return [UnwindDetails] Details of the nearest index to which we could unwind
|
321
|
+
def build_details_for_unwind
|
322
|
+
# Get the possible unwinds for the current conflict
|
323
|
+
current_conflict = conflicts[name]
|
324
|
+
binding_requirements = binding_requirements_for_conflict(current_conflict)
|
325
|
+
unwind_details = unwind_options_for_requirements(binding_requirements)
|
326
|
+
|
327
|
+
last_detail_for_current_unwind = unwind_details.sort.last
|
328
|
+
current_detail = last_detail_for_current_unwind
|
329
|
+
|
330
|
+
# Look for past conflicts that could be unwound to affect the
|
331
|
+
# requirement tree for the current conflict
|
332
|
+
all_reqs = last_detail_for_current_unwind.all_requirements
|
333
|
+
all_reqs_size = all_reqs.size
|
334
|
+
relevant_unused_unwinds = unused_unwind_options.select do |alternative|
|
335
|
+
diff_reqs = all_reqs - alternative.requirements_unwound_to_instead
|
336
|
+
next if diff_reqs.size == all_reqs_size
|
337
|
+
# Find the highest index unwind whilst looping through
|
338
|
+
current_detail = alternative if alternative > current_detail
|
339
|
+
alternative
|
340
|
+
end
|
341
|
+
|
342
|
+
# Add the current unwind options to the `unused_unwind_options` array.
|
343
|
+
# The "used" option will be filtered out during `unwind_for_conflict`.
|
344
|
+
state.unused_unwind_options += unwind_details.reject { |detail| detail.state_index == -1 }
|
345
|
+
|
346
|
+
# Update the requirements_unwound_to_instead on any relevant unused unwinds
|
347
|
+
relevant_unused_unwinds.each do |d|
|
348
|
+
(d.requirements_unwound_to_instead << current_detail.state_requirement).uniq!
|
349
|
+
end
|
350
|
+
unwind_details.each do |d|
|
351
|
+
(d.requirements_unwound_to_instead << current_detail.state_requirement).uniq!
|
352
|
+
end
|
353
|
+
|
354
|
+
current_detail
|
355
|
+
end
|
356
|
+
|
357
|
+
# @param [Array<Object>] binding_requirements array of requirements that combine to create a conflict
|
358
|
+
# @return [Array<UnwindDetails>] array of UnwindDetails that have a chance
|
359
|
+
# of resolving the passed requirements
|
360
|
+
def unwind_options_for_requirements(binding_requirements)
|
361
|
+
unwind_details = []
|
362
|
+
|
363
|
+
trees = []
|
364
|
+
binding_requirements.reverse_each do |r|
|
365
|
+
partial_tree = [r]
|
366
|
+
trees << partial_tree
|
367
|
+
unwind_details << UnwindDetails.new(-1, nil, partial_tree, binding_requirements, trees, [])
|
368
|
+
|
369
|
+
# If this requirement has alternative possibilities, check if any would
|
370
|
+
# satisfy the other requirements that created this conflict
|
371
|
+
requirement_state = find_state_for(r)
|
372
|
+
if conflict_fixing_possibilities?(requirement_state, binding_requirements)
|
373
|
+
unwind_details << UnwindDetails.new(
|
374
|
+
states.index(requirement_state),
|
375
|
+
r,
|
376
|
+
partial_tree,
|
377
|
+
binding_requirements,
|
378
|
+
trees,
|
379
|
+
[]
|
380
|
+
)
|
381
|
+
end
|
382
|
+
|
383
|
+
# Next, look at the parent of this requirement, and check if the requirement
|
384
|
+
# could have been avoided if an alternative PossibilitySet had been chosen
|
385
|
+
parent_r = parent_of(r)
|
386
|
+
next if parent_r.nil?
|
387
|
+
partial_tree.unshift(parent_r)
|
388
|
+
requirement_state = find_state_for(parent_r)
|
389
|
+
if requirement_state.possibilities.any? { |set| !set.dependencies.include?(r) }
|
390
|
+
unwind_details << UnwindDetails.new(
|
391
|
+
states.index(requirement_state),
|
392
|
+
parent_r,
|
393
|
+
partial_tree,
|
394
|
+
binding_requirements,
|
395
|
+
trees,
|
396
|
+
[]
|
397
|
+
)
|
398
|
+
end
|
399
|
+
|
400
|
+
# Finally, look at the grandparent and up of this requirement, looking
|
401
|
+
# for any possibilities that wouldn't create their parent requirement
|
402
|
+
grandparent_r = parent_of(parent_r)
|
403
|
+
until grandparent_r.nil?
|
404
|
+
partial_tree.unshift(grandparent_r)
|
405
|
+
requirement_state = find_state_for(grandparent_r)
|
406
|
+
if requirement_state.possibilities.any? { |set| !set.dependencies.include?(parent_r) }
|
407
|
+
unwind_details << UnwindDetails.new(
|
408
|
+
states.index(requirement_state),
|
409
|
+
grandparent_r,
|
410
|
+
partial_tree,
|
411
|
+
binding_requirements,
|
412
|
+
trees,
|
413
|
+
[]
|
414
|
+
)
|
415
|
+
end
|
416
|
+
parent_r = grandparent_r
|
417
|
+
grandparent_r = parent_of(parent_r)
|
418
|
+
end
|
419
|
+
end
|
420
|
+
|
421
|
+
unwind_details
|
422
|
+
end
|
423
|
+
|
424
|
+
# @param [DependencyState] state
|
425
|
+
# @param [Array] binding_requirements array of requirements
|
426
|
+
# @return [Boolean] whether or not the given state has any possibilities
|
427
|
+
# that could satisfy the given requirements
|
428
|
+
def conflict_fixing_possibilities?(state, binding_requirements)
|
429
|
+
return false unless state
|
430
|
+
|
431
|
+
state.possibilities.any? do |possibility_set|
|
432
|
+
possibility_set.possibilities.any? do |poss|
|
433
|
+
possibility_satisfies_requirements?(poss, binding_requirements)
|
434
|
+
end
|
435
|
+
end
|
436
|
+
end
|
437
|
+
|
438
|
+
# Filter's a state's possibilities to remove any that would not fix the
|
439
|
+
# conflict we've just rewound from
|
440
|
+
# @param [UnwindDetails] unwind_details details of the conflict just
|
441
|
+
# unwound from
|
442
|
+
# @return [void]
|
443
|
+
def filter_possibilities_after_unwind(unwind_details)
|
444
|
+
return unless state && !state.possibilities.empty?
|
445
|
+
|
446
|
+
if unwind_details.unwinding_to_primary_requirement?
|
447
|
+
filter_possibilities_for_primary_unwind(unwind_details)
|
448
|
+
else
|
449
|
+
filter_possibilities_for_parent_unwind(unwind_details)
|
189
450
|
end
|
190
451
|
end
|
191
452
|
|
192
|
-
#
|
193
|
-
#
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
453
|
+
# Filter's a state's possibilities to remove any that would not satisfy
|
454
|
+
# the requirements in the conflict we've just rewound from
|
455
|
+
# @param [UnwindDetails] unwind_details details of the conflict just unwound from
|
456
|
+
# @return [void]
|
457
|
+
def filter_possibilities_for_primary_unwind(unwind_details)
|
458
|
+
unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
|
459
|
+
unwinds_to_state << unwind_details
|
460
|
+
unwind_requirement_sets = unwinds_to_state.map(&:conflicting_requirements)
|
461
|
+
|
462
|
+
state.possibilities.reject! do |possibility_set|
|
463
|
+
possibility_set.possibilities.none? do |poss|
|
464
|
+
unwind_requirement_sets.any? do |requirements|
|
465
|
+
possibility_satisfies_requirements?(poss, requirements)
|
205
466
|
end
|
206
|
-
r = parent_of(r)
|
207
467
|
end
|
208
468
|
end
|
469
|
+
end
|
470
|
+
|
471
|
+
# @param [Object] possibility a single possibility
|
472
|
+
# @param [Array] requirements an array of requirements
|
473
|
+
# @return [Boolean] whether the possibility satisfies all of the
|
474
|
+
# given requirements
|
475
|
+
def possibility_satisfies_requirements?(possibility, requirements)
|
476
|
+
name = name_for(possibility)
|
477
|
+
|
478
|
+
activated.tag(:swap)
|
479
|
+
activated.set_payload(name, possibility) if activated.vertex_named(name)
|
480
|
+
satisfied = requirements.all? { |r| requirement_satisfied_by?(r, activated, possibility) }
|
481
|
+
activated.rewind_to(:swap)
|
482
|
+
|
483
|
+
satisfied
|
484
|
+
end
|
485
|
+
|
486
|
+
# Filter's a state's possibilities to remove any that would (eventually)
|
487
|
+
# create a requirement in the conflict we've just rewound from
|
488
|
+
# @param [UnwindDetails] unwind_details details of the conflict just unwound from
|
489
|
+
# @return [void]
|
490
|
+
def filter_possibilities_for_parent_unwind(unwind_details)
|
491
|
+
unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
|
492
|
+
unwinds_to_state << unwind_details
|
493
|
+
|
494
|
+
primary_unwinds = unwinds_to_state.select(&:unwinding_to_primary_requirement?).uniq
|
495
|
+
parent_unwinds = unwinds_to_state.uniq - primary_unwinds
|
496
|
+
|
497
|
+
allowed_possibility_sets = primary_unwinds.flat_map do |unwind|
|
498
|
+
states[unwind.state_index].possibilities.select do |possibility_set|
|
499
|
+
possibility_set.possibilities.any? do |poss|
|
500
|
+
possibility_satisfies_requirements?(poss, unwind.conflicting_requirements)
|
501
|
+
end
|
502
|
+
end
|
503
|
+
end
|
504
|
+
|
505
|
+
requirements_to_avoid = parent_unwinds.flat_map(&:sub_dependencies_to_avoid)
|
506
|
+
|
507
|
+
state.possibilities.reject! do |possibility_set|
|
508
|
+
!allowed_possibility_sets.include?(possibility_set) &&
|
509
|
+
(requirements_to_avoid - possibility_set.dependencies).empty?
|
510
|
+
end
|
511
|
+
end
|
512
|
+
|
513
|
+
# @param [Conflict] conflict
|
514
|
+
# @return [Array] minimal array of requirements that would cause the passed
|
515
|
+
# conflict to occur.
|
516
|
+
def binding_requirements_for_conflict(conflict)
|
517
|
+
return [conflict.requirement] if conflict.possibility.nil?
|
518
|
+
|
519
|
+
possible_binding_requirements = conflict.requirements.values.flatten(1).uniq
|
520
|
+
|
521
|
+
# When there's a `CircularDependency` error the conflicting requirement
|
522
|
+
# (the one causing the circular) won't be `conflict.requirement`
|
523
|
+
# (which won't be for the right state, because we won't have created it,
|
524
|
+
# because it's circular).
|
525
|
+
# We need to make sure we have that requirement in the conflict's list,
|
526
|
+
# otherwise we won't be able to unwind properly, so we just return all
|
527
|
+
# the requirements for the conflict.
|
528
|
+
return possible_binding_requirements if conflict.underlying_error
|
529
|
+
|
530
|
+
possibilities = search_for(conflict.requirement)
|
531
|
+
|
532
|
+
# If all the requirements together don't filter out all possibilities,
|
533
|
+
# then the only two requirements we need to consider are the initial one
|
534
|
+
# (where the dependency's version was first chosen) and the last
|
535
|
+
if binding_requirement_in_set?(nil, possible_binding_requirements, possibilities)
|
536
|
+
return [conflict.requirement, requirement_for_existing_name(name_for(conflict.requirement))].compact
|
537
|
+
end
|
538
|
+
|
539
|
+
# Loop through the possible binding requirements, removing each one
|
540
|
+
# that doesn't bind. Use a `reverse_each` as we want the earliest set of
|
541
|
+
# binding requirements, and don't use `reject!` as we wish to refine the
|
542
|
+
# array *on each iteration*.
|
543
|
+
binding_requirements = possible_binding_requirements.dup
|
544
|
+
possible_binding_requirements.reverse_each do |req|
|
545
|
+
next if req == conflict.requirement
|
546
|
+
unless binding_requirement_in_set?(req, binding_requirements, possibilities)
|
547
|
+
binding_requirements -= [req]
|
548
|
+
end
|
549
|
+
end
|
550
|
+
|
551
|
+
binding_requirements
|
552
|
+
end
|
209
553
|
|
210
|
-
|
554
|
+
# @param [Object] requirement we wish to check
|
555
|
+
# @param [Array] possible_binding_requirements array of requirements
|
556
|
+
# @param [Array] possibilities array of possibilities the requirements will be used to filter
|
557
|
+
# @return [Boolean] whether or not the given requirement is required to filter
|
558
|
+
# out all elements of the array of possibilities.
|
559
|
+
def binding_requirement_in_set?(requirement, possible_binding_requirements, possibilities)
|
560
|
+
possibilities.any? do |poss|
|
561
|
+
possibility_satisfies_requirements?(poss, possible_binding_requirements - [requirement])
|
562
|
+
end
|
211
563
|
end
|
212
564
|
|
565
|
+
# @param [Object] requirement
|
213
566
|
# @return [Object] the requirement that led to `requirement` being added
|
214
567
|
# to the list of requirements.
|
215
568
|
def parent_of(requirement)
|
@@ -219,29 +572,27 @@ module Gem::Resolver::Molinillo
|
|
219
572
|
parent_state.requirement
|
220
573
|
end
|
221
574
|
|
575
|
+
# @param [String] name
|
222
576
|
# @return [Object] the requirement that led to a version of a possibility
|
223
577
|
# with the given name being activated.
|
224
578
|
def requirement_for_existing_name(name)
|
225
|
-
return nil unless activated.vertex_named(name)
|
579
|
+
return nil unless vertex = activated.vertex_named(name)
|
580
|
+
return nil unless vertex.payload
|
226
581
|
states.find { |s| s.name == name }.requirement
|
227
582
|
end
|
228
583
|
|
584
|
+
# @param [Object] requirement
|
229
585
|
# @return [ResolutionState] the state whose `requirement` is the given
|
230
586
|
# `requirement`.
|
231
587
|
def find_state_for(requirement)
|
232
588
|
return nil unless requirement
|
233
|
-
states.
|
234
|
-
end
|
235
|
-
|
236
|
-
# @return [Boolean] whether or not the given state has any possibilities
|
237
|
-
# left.
|
238
|
-
def state_any?(state)
|
239
|
-
state && state.possibilities.any?
|
589
|
+
states.find { |i| requirement == i.requirement }
|
240
590
|
end
|
241
591
|
|
592
|
+
# @param [Object] underlying_error
|
242
593
|
# @return [Conflict] a {Conflict} that reflects the failure to activate
|
243
594
|
# the {#possibility} in conjunction with the current {#state}
|
244
|
-
def create_conflict
|
595
|
+
def create_conflict(underlying_error = nil)
|
245
596
|
vertex = activated.vertex_named(name)
|
246
597
|
locked_requirement = locked_requirement_named(name)
|
247
598
|
|
@@ -250,18 +601,21 @@ module Gem::Resolver::Molinillo
|
|
250
601
|
requirements[name_for_explicit_dependency_source] = vertex.explicit_requirements
|
251
602
|
end
|
252
603
|
requirements[name_for_locking_dependency_source] = [locked_requirement] if locked_requirement
|
253
|
-
vertex.incoming_edges.each
|
604
|
+
vertex.incoming_edges.each do |edge|
|
605
|
+
(requirements[edge.origin.payload.latest_version] ||= []).unshift(edge.requirement)
|
606
|
+
end
|
254
607
|
|
255
608
|
activated_by_name = {}
|
256
|
-
activated.each { |v| activated_by_name[v.name] = v.payload if v.payload }
|
609
|
+
activated.each { |v| activated_by_name[v.name] = v.payload.latest_version if v.payload }
|
257
610
|
conflicts[name] = Conflict.new(
|
258
611
|
requirement,
|
259
612
|
requirements,
|
260
|
-
vertex.payload,
|
613
|
+
vertex.payload && vertex.payload.latest_version,
|
261
614
|
possibility,
|
262
615
|
locked_requirement,
|
263
616
|
requirement_trees,
|
264
|
-
activated_by_name
|
617
|
+
activated_by_name,
|
618
|
+
underlying_error
|
265
619
|
)
|
266
620
|
end
|
267
621
|
|
@@ -272,6 +626,7 @@ module Gem::Resolver::Molinillo
|
|
272
626
|
vertex.requirements.map { |r| requirement_tree_for(r) }
|
273
627
|
end
|
274
628
|
|
629
|
+
# @param [Object] requirement
|
275
630
|
# @return [Array<Object>] the list of requirements that led to
|
276
631
|
# `requirement` being required.
|
277
632
|
def requirement_tree_for(requirement)
|
@@ -311,116 +666,47 @@ module Gem::Resolver::Molinillo
|
|
311
666
|
# @return [void]
|
312
667
|
def attempt_to_activate
|
313
668
|
debug(depth) { 'Attempting to activate ' + possibility.to_s }
|
314
|
-
|
315
|
-
if
|
316
|
-
debug(depth) { "Found existing spec (#{
|
317
|
-
|
669
|
+
existing_vertex = activated.vertex_named(name)
|
670
|
+
if existing_vertex.payload
|
671
|
+
debug(depth) { "Found existing spec (#{existing_vertex.payload})" }
|
672
|
+
attempt_to_filter_existing_spec(existing_vertex)
|
318
673
|
else
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
# Attempts to activate the current {#possibility} (given that it has
|
324
|
-
# already been activated)
|
325
|
-
# @return [void]
|
326
|
-
def attempt_to_activate_existing_spec(existing_node)
|
327
|
-
existing_spec = existing_node.payload
|
328
|
-
if requirement_satisfied_by?(requirement, activated, existing_spec)
|
329
|
-
new_requirements = requirements.dup
|
330
|
-
push_state_for_requirements(new_requirements, false)
|
331
|
-
else
|
332
|
-
return if attempt_to_swap_possibility
|
333
|
-
create_conflict
|
334
|
-
debug(depth) { "Unsatisfied by existing spec (#{existing_node.payload})" }
|
335
|
-
unwind_for_conflict
|
336
|
-
end
|
337
|
-
end
|
338
|
-
|
339
|
-
# Attempts to swp the current {#possibility} with the already-activated
|
340
|
-
# spec with the given name
|
341
|
-
# @return [Boolean] Whether the possibility was swapped into {#activated}
|
342
|
-
def attempt_to_swap_possibility
|
343
|
-
activated.tag(:swap)
|
344
|
-
vertex = activated.vertex_named(name)
|
345
|
-
activated.set_payload(name, possibility)
|
346
|
-
if !vertex.requirements.
|
347
|
-
all? { |r| requirement_satisfied_by?(r, activated, possibility) } ||
|
348
|
-
!new_spec_satisfied?
|
349
|
-
activated.rewind_to(:swap)
|
350
|
-
return
|
351
|
-
end
|
352
|
-
fixup_swapped_children(vertex)
|
353
|
-
activate_spec
|
354
|
-
end
|
355
|
-
|
356
|
-
# Ensures there are no orphaned successors to the given {vertex}.
|
357
|
-
# @param [DependencyGraph::Vertex] vertex the vertex to fix up.
|
358
|
-
# @return [void]
|
359
|
-
def fixup_swapped_children(vertex) # rubocop:disable Metrics/CyclomaticComplexity
|
360
|
-
payload = vertex.payload
|
361
|
-
deps = dependencies_for(payload).group_by(&method(:name_for))
|
362
|
-
vertex.outgoing_edges.each do |outgoing_edge|
|
363
|
-
requirement = outgoing_edge.requirement
|
364
|
-
parent_index = @parents_of[requirement].last
|
365
|
-
succ = outgoing_edge.destination
|
366
|
-
matching_deps = Array(deps[succ.name])
|
367
|
-
dep_matched = matching_deps.include?(requirement)
|
368
|
-
|
369
|
-
# only push the current index when it was originally required by the
|
370
|
-
# same named spec
|
371
|
-
if parent_index && states[parent_index].name == name
|
372
|
-
@parents_of[requirement].push(states.size - 1)
|
674
|
+
latest = possibility.latest_version
|
675
|
+
possibility.possibilities.select! do |possibility|
|
676
|
+
requirement_satisfied_by?(requirement, activated, possibility)
|
373
677
|
end
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
# the only removed vertices are those with no other requirements,
|
382
|
-
# so it's safe to delete only based upon name here
|
383
|
-
removed_names.include?(name_for(r))
|
384
|
-
end
|
385
|
-
elsif !dep_matched
|
386
|
-
debug(depth) { "Removing orphaned dependency #{requirement} after swapping #{name}" }
|
387
|
-
# also reset if we're removing the edge, but only if its parent has
|
388
|
-
# already been fixed up
|
389
|
-
@parents_of[requirement].push(states.size - 1) if @parents_of[requirement].empty?
|
390
|
-
|
391
|
-
activated.delete_edge(outgoing_edge)
|
392
|
-
requirements.delete(requirement)
|
678
|
+
if possibility.latest_version.nil?
|
679
|
+
# ensure there's a possibility for better error messages
|
680
|
+
possibility.possibilities << latest if latest
|
681
|
+
create_conflict
|
682
|
+
unwind_for_conflict
|
683
|
+
else
|
684
|
+
activate_new_spec
|
393
685
|
end
|
394
686
|
end
|
395
687
|
end
|
396
688
|
|
397
|
-
# Attempts to
|
398
|
-
# already been activated)
|
689
|
+
# Attempts to update the existing vertex's `PossibilitySet` with a filtered version
|
399
690
|
# @return [void]
|
400
|
-
def
|
401
|
-
|
402
|
-
|
691
|
+
def attempt_to_filter_existing_spec(vertex)
|
692
|
+
filtered_set = filtered_possibility_set(vertex)
|
693
|
+
if !filtered_set.possibilities.empty?
|
694
|
+
activated.set_payload(name, filtered_set)
|
695
|
+
new_requirements = requirements.dup
|
696
|
+
push_state_for_requirements(new_requirements, false)
|
403
697
|
else
|
404
698
|
create_conflict
|
699
|
+
debug(depth) { "Unsatisfied by existing spec (#{vertex.payload})" }
|
405
700
|
unwind_for_conflict
|
406
701
|
end
|
407
702
|
end
|
408
703
|
|
409
|
-
#
|
410
|
-
#
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
end
|
416
|
-
|
417
|
-
locked_requirement = locked_requirement_named(name)
|
418
|
-
|
419
|
-
locked_spec_satisfied = !locked_requirement ||
|
420
|
-
requirement_satisfied_by?(locked_requirement, activated, possibility)
|
421
|
-
debug(depth) { 'Unsatisfied by locked spec' } unless locked_spec_satisfied
|
422
|
-
|
423
|
-
locked_spec_satisfied
|
704
|
+
# Generates a filtered version of the existing vertex's `PossibilitySet` using the
|
705
|
+
# current state's `requirement`
|
706
|
+
# @param [Object] vertex existing vertex
|
707
|
+
# @return [PossibilitySet] filtered possibility set
|
708
|
+
def filtered_possibility_set(vertex)
|
709
|
+
PossibilitySet.new(vertex.payload.dependencies, vertex.payload.possibilities & possibility.possibilities)
|
424
710
|
end
|
425
711
|
|
426
712
|
# @param [String] requirement_name the spec name to search for
|
@@ -434,7 +720,7 @@ module Gem::Resolver::Molinillo
|
|
434
720
|
# Add the current {#possibility} to the dependency graph of the current
|
435
721
|
# {#state}
|
436
722
|
# @return [void]
|
437
|
-
def
|
723
|
+
def activate_new_spec
|
438
724
|
conflicts.delete(name)
|
439
725
|
debug(depth) { "Activated #{name} at #{possibility}" }
|
440
726
|
activated.set_payload(name, possibility)
|
@@ -442,14 +728,14 @@ module Gem::Resolver::Molinillo
|
|
442
728
|
end
|
443
729
|
|
444
730
|
# Requires the dependencies that the recently activated spec has
|
445
|
-
# @param [Object]
|
731
|
+
# @param [Object] possibility_set the PossibilitySet that has just been
|
446
732
|
# activated
|
447
733
|
# @return [void]
|
448
|
-
def require_nested_dependencies_for(
|
449
|
-
nested_dependencies = dependencies_for(
|
734
|
+
def require_nested_dependencies_for(possibility_set)
|
735
|
+
nested_dependencies = dependencies_for(possibility_set.latest_version)
|
450
736
|
debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
|
451
737
|
nested_dependencies.each do |d|
|
452
|
-
activated.add_child_vertex(name_for(d), nil, [name_for(
|
738
|
+
activated.add_child_vertex(name_for(d), nil, [name_for(possibility_set.latest_version)], d)
|
453
739
|
parent_index = states.size - 1
|
454
740
|
parents = @parents_of[d]
|
455
741
|
parents << parent_index if parents.empty?
|
@@ -461,23 +747,82 @@ module Gem::Resolver::Molinillo
|
|
461
747
|
# Pushes a new {DependencyState} that encapsulates both existing and new
|
462
748
|
# requirements
|
463
749
|
# @param [Array] new_requirements
|
750
|
+
# @param [Boolean] requires_sort
|
751
|
+
# @param [Object] new_activated
|
464
752
|
# @return [void]
|
465
753
|
def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated)
|
466
754
|
new_requirements = sort_dependencies(new_requirements.uniq, new_activated, conflicts) if requires_sort
|
467
|
-
new_requirement =
|
755
|
+
new_requirement = nil
|
756
|
+
loop do
|
757
|
+
new_requirement = new_requirements.shift
|
758
|
+
break if new_requirement.nil? || states.none? { |s| s.requirement == new_requirement }
|
759
|
+
end
|
468
760
|
new_name = new_requirement ? name_for(new_requirement) : ''.freeze
|
469
|
-
possibilities =
|
761
|
+
possibilities = possibilities_for_requirement(new_requirement)
|
470
762
|
handle_missing_or_push_dependency_state DependencyState.new(
|
471
763
|
new_name, new_requirements, new_activated,
|
472
|
-
new_requirement, possibilities, depth, conflicts.dup
|
764
|
+
new_requirement, possibilities, depth, conflicts.dup, unused_unwind_options.dup
|
473
765
|
)
|
474
766
|
end
|
475
767
|
|
768
|
+
# Checks a proposed requirement with any existing locked requirement
|
769
|
+
# before generating an array of possibilities for it.
|
770
|
+
# @param [Object] requirement the proposed requirement
|
771
|
+
# @param [Object] activated
|
772
|
+
# @return [Array] possibilities
|
773
|
+
def possibilities_for_requirement(requirement, activated = self.activated)
|
774
|
+
return [] unless requirement
|
775
|
+
if locked_requirement_named(name_for(requirement))
|
776
|
+
return locked_requirement_possibility_set(requirement, activated)
|
777
|
+
end
|
778
|
+
|
779
|
+
group_possibilities(search_for(requirement))
|
780
|
+
end
|
781
|
+
|
782
|
+
# @param [Object] requirement the proposed requirement
|
783
|
+
# @param [Object] activated
|
784
|
+
# @return [Array] possibility set containing only the locked requirement, if any
|
785
|
+
def locked_requirement_possibility_set(requirement, activated = self.activated)
|
786
|
+
all_possibilities = search_for(requirement)
|
787
|
+
locked_requirement = locked_requirement_named(name_for(requirement))
|
788
|
+
|
789
|
+
# Longwinded way to build a possibilities array with either the locked
|
790
|
+
# requirement or nothing in it. Required, since the API for
|
791
|
+
# locked_requirement isn't guaranteed.
|
792
|
+
locked_possibilities = all_possibilities.select do |possibility|
|
793
|
+
requirement_satisfied_by?(locked_requirement, activated, possibility)
|
794
|
+
end
|
795
|
+
|
796
|
+
group_possibilities(locked_possibilities)
|
797
|
+
end
|
798
|
+
|
799
|
+
# Build an array of PossibilitySets, with each element representing a group of
|
800
|
+
# dependency versions that all have the same sub-dependency version constraints
|
801
|
+
# and are contiguous.
|
802
|
+
# @param [Array] possibilities an array of possibilities
|
803
|
+
# @return [Array<PossibilitySet>] an array of possibility sets
|
804
|
+
def group_possibilities(possibilities)
|
805
|
+
possibility_sets = []
|
806
|
+
current_possibility_set = nil
|
807
|
+
|
808
|
+
possibilities.reverse_each do |possibility|
|
809
|
+
dependencies = dependencies_for(possibility)
|
810
|
+
if current_possibility_set && dependencies_equal?(current_possibility_set.dependencies, dependencies)
|
811
|
+
current_possibility_set.possibilities.unshift(possibility)
|
812
|
+
else
|
813
|
+
possibility_sets.unshift(PossibilitySet.new(dependencies, [possibility]))
|
814
|
+
current_possibility_set = possibility_sets.first
|
815
|
+
end
|
816
|
+
end
|
817
|
+
|
818
|
+
possibility_sets
|
819
|
+
end
|
820
|
+
|
476
821
|
# Pushes a new {DependencyState}.
|
477
822
|
# If the {#specification_provider} says to
|
478
823
|
# {SpecificationProvider#allow_missing?} that particular requirement, and
|
479
824
|
# there are no possibilities for that requirement, then `state` is not
|
480
|
-
# pushed, and the
|
825
|
+
# pushed, and the vertex in {#activated} is removed, and we continue
|
481
826
|
# resolving the remaining requirements.
|
482
827
|
# @param [DependencyState] state
|
483
828
|
# @return [void]
|