bundler 1.17.3 → 2.6.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3354 -1258
- data/LICENSE.md +18 -19
- data/README.md +10 -15
- data/bundler.gemspec +15 -33
- data/exe/bundle +8 -10
- data/exe/bundler +1 -1
- data/lib/bundler/.document +1 -0
- data/lib/bundler/build_metadata.rb +5 -13
- data/lib/bundler/capistrano.rb +5 -5
- data/lib/bundler/checksum.rb +254 -0
- data/lib/bundler/ci_detector.rb +75 -0
- data/lib/bundler/cli/add.rb +29 -15
- data/lib/bundler/cli/binstubs.rb +13 -5
- data/lib/bundler/cli/cache.rb +24 -17
- data/lib/bundler/cli/check.rb +7 -5
- data/lib/bundler/cli/clean.rb +1 -1
- data/lib/bundler/cli/common.rb +50 -14
- data/lib/bundler/cli/config.rb +171 -86
- data/lib/bundler/cli/console.rb +3 -6
- data/lib/bundler/cli/doctor.rb +29 -12
- data/lib/bundler/cli/exec.rb +9 -25
- data/lib/bundler/cli/fund.rb +36 -0
- data/lib/bundler/cli/gem.rb +268 -53
- data/lib/bundler/cli/info.rb +51 -18
- data/lib/bundler/cli/init.rb +7 -3
- data/lib/bundler/cli/inject.rb +2 -2
- data/lib/bundler/cli/install.rb +55 -73
- data/lib/bundler/cli/issue.rb +9 -8
- data/lib/bundler/cli/list.rb +19 -11
- data/lib/bundler/cli/lock.rb +56 -26
- data/lib/bundler/cli/open.rb +10 -7
- data/lib/bundler/cli/outdated.rb +159 -128
- data/lib/bundler/cli/platform.rb +8 -6
- data/lib/bundler/cli/plugin.rb +23 -12
- data/lib/bundler/cli/pristine.rb +39 -26
- data/lib/bundler/cli/remove.rb +1 -2
- data/lib/bundler/cli/show.rb +7 -7
- data/lib/bundler/cli/update.rb +51 -19
- data/lib/bundler/cli/viz.rb +1 -1
- data/lib/bundler/cli.rb +399 -390
- data/lib/bundler/compact_index_client/cache.rb +55 -77
- data/lib/bundler/compact_index_client/cache_file.rb +148 -0
- data/lib/bundler/compact_index_client/gem_parser.rb +32 -0
- data/lib/bundler/compact_index_client/parser.rb +84 -0
- data/lib/bundler/compact_index_client/updater.rb +72 -84
- data/lib/bundler/compact_index_client.rb +61 -73
- data/lib/bundler/constants.rb +9 -2
- data/lib/bundler/current_ruby.rb +20 -21
- data/lib/bundler/definition.rb +663 -505
- data/lib/bundler/dependency.rb +38 -71
- data/lib/bundler/deployment.rb +1 -1
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +171 -152
- data/lib/bundler/endpoint_specification.rb +43 -17
- data/lib/bundler/env.rb +11 -18
- data/lib/bundler/environment_preserver.rb +17 -8
- data/lib/bundler/errors.rb +115 -14
- data/lib/bundler/feature_flag.rb +15 -39
- data/lib/bundler/fetcher/base.rb +12 -12
- data/lib/bundler/fetcher/compact_index.rb +41 -47
- data/lib/bundler/fetcher/dependency.rb +4 -8
- data/lib/bundler/fetcher/downloader.rb +27 -20
- data/lib/bundler/fetcher/gem_remote_fetcher.rb +16 -0
- data/lib/bundler/fetcher/index.rb +6 -33
- data/lib/bundler/fetcher.rb +109 -90
- data/lib/bundler/force_platform.rb +16 -0
- data/lib/bundler/friendly_errors.rb +50 -55
- data/lib/bundler/gem_helper.rb +81 -46
- data/lib/bundler/gem_helpers.rb +78 -29
- data/lib/bundler/gem_tasks.rb +1 -1
- data/lib/bundler/gem_version_promoter.rb +68 -109
- data/lib/bundler/graph.rb +11 -11
- data/lib/bundler/index.rb +74 -82
- data/lib/bundler/injector.rb +58 -26
- data/lib/bundler/inline.rb +59 -35
- data/lib/bundler/installer/gem_installer.rb +29 -29
- data/lib/bundler/installer/parallel_installer.rb +38 -68
- data/lib/bundler/installer/standalone.rb +76 -16
- data/lib/bundler/installer.rb +60 -135
- data/lib/bundler/lazy_specification.rb +161 -63
- data/lib/bundler/lockfile_generator.rb +14 -5
- data/lib/bundler/lockfile_parser.rb +150 -109
- data/lib/bundler/man/bundle-add.1 +76 -0
- data/lib/bundler/man/bundle-add.1.ronn +87 -0
- data/{man → lib/bundler/man}/bundle-binstubs.1 +15 -22
- data/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +8 -7
- data/lib/bundler/man/bundle-cache.1 +68 -0
- data/lib/bundler/man/bundle-cache.1.ronn +108 -0
- data/{man → lib/bundler/man}/bundle-check.1 +7 -14
- data/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +7 -2
- data/{man → lib/bundler/man}/bundle-clean.1 +4 -11
- data/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-config.1 +80 -260
- data/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +104 -98
- data/lib/bundler/man/bundle-console.1 +33 -0
- data/lib/bundler/man/bundle-console.1.ronn +39 -0
- data/{man → lib/bundler/man}/bundle-doctor.1 +5 -19
- data/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +1 -1
- data/lib/bundler/man/bundle-env.1 +9 -0
- data/lib/bundler/man/bundle-env.1.ronn +10 -0
- data/{man → lib/bundler/man}/bundle-exec.1 +20 -78
- data/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +12 -10
- data/lib/bundler/man/bundle-fund.1 +22 -0
- data/lib/bundler/man/bundle-fund.1.ronn +25 -0
- data/lib/bundler/man/bundle-gem.1 +87 -0
- data/lib/bundler/man/bundle-gem.1.ronn +149 -0
- data/lib/bundler/man/bundle-help.1 +9 -0
- data/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/lib/bundler/man/bundle-info.1 +17 -0
- data/lib/bundler/man/bundle-info.1.ronn +21 -0
- data/{man → lib/bundler/man}/bundle-init.1 +8 -13
- data/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +5 -2
- data/lib/bundler/man/bundle-inject.1 +31 -0
- data/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +12 -2
- data/{man → lib/bundler/man}/bundle-install.1 +65 -155
- data/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +66 -57
- data/lib/bundler/man/bundle-issue.1 +45 -0
- data/lib/bundler/man/bundle-issue.1.ronn +37 -0
- data/lib/bundler/man/bundle-licenses.1 +9 -0
- data/lib/bundler/man/bundle-licenses.1.ronn +10 -0
- data/{man → lib/bundler/man}/bundle-list.1 +9 -24
- data/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +10 -7
- data/{man → lib/bundler/man}/bundle-lock.1 +25 -34
- data/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +25 -4
- data/lib/bundler/man/bundle-open.1 +32 -0
- data/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +10 -1
- data/{man → lib/bundler/man}/bundle-outdated.1 +23 -75
- data/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +21 -22
- data/lib/bundler/man/bundle-platform.1 +49 -0
- data/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +14 -7
- data/lib/bundler/man/bundle-plugin.1 +58 -0
- data/lib/bundler/man/bundle-plugin.1.ronn +63 -0
- data/{man → lib/bundler/man}/bundle-pristine.1 +5 -16
- data/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-remove.1 +4 -14
- data/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-show.1 +7 -11
- data/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +4 -0
- data/{man → lib/bundler/man}/bundle-update.1 +35 -148
- data/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +21 -12
- data/lib/bundler/man/bundle-version.1 +22 -0
- data/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/{man → lib/bundler/man}/bundle-viz.1 +9 -18
- data/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +9 -3
- data/{man → lib/bundler/man}/bundle.1 +19 -53
- data/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +14 -9
- data/{man → lib/bundler/man}/gemfile.5 +139 -356
- data/{man → lib/bundler/man}/gemfile.5.ronn +134 -97
- data/{man → lib/bundler/man}/index.txt +9 -1
- data/lib/bundler/match_metadata.rb +17 -0
- data/lib/bundler/match_platform.rb +2 -3
- data/lib/bundler/match_remote_metadata.rb +29 -0
- data/lib/bundler/materialization.rb +59 -0
- data/lib/bundler/mirror.rb +10 -12
- data/lib/bundler/plugin/api/source.rb +34 -18
- data/lib/bundler/plugin/api.rb +1 -1
- data/lib/bundler/plugin/dsl.rb +1 -1
- data/lib/bundler/plugin/events.rb +24 -0
- data/lib/bundler/plugin/index.rb +44 -9
- data/lib/bundler/plugin/installer/git.rb +0 -4
- data/lib/bundler/plugin/installer/path.rb +18 -0
- data/lib/bundler/plugin/installer/rubygems.rb +1 -9
- data/lib/bundler/plugin/installer.rb +63 -27
- data/lib/bundler/plugin/source_list.rb +5 -1
- data/lib/bundler/plugin.rb +131 -45
- data/lib/bundler/process_lock.rb +10 -14
- data/lib/bundler/remote_specification.rb +22 -10
- data/lib/bundler/resolver/base.rb +118 -0
- data/lib/bundler/resolver/candidate.rb +82 -0
- data/lib/bundler/resolver/incompatibility.rb +15 -0
- data/lib/bundler/resolver/package.rb +90 -0
- data/lib/bundler/resolver/root.rb +25 -0
- data/lib/bundler/resolver/spec_group.rb +60 -68
- data/lib/bundler/resolver.rb +454 -303
- data/lib/bundler/retry.rb +6 -6
- data/lib/bundler/ruby_dsl.rb +51 -7
- data/lib/bundler/ruby_version.rb +23 -38
- data/lib/bundler/rubygems_ext.rb +357 -98
- data/lib/bundler/rubygems_gem_installer.rb +131 -65
- data/lib/bundler/rubygems_integration.rb +149 -591
- data/lib/bundler/runtime.rb +51 -51
- data/lib/bundler/safe_marshal.rb +31 -0
- data/lib/bundler/self_manager.rb +206 -0
- data/lib/bundler/settings.rb +271 -135
- data/lib/bundler/setup.rb +23 -12
- data/lib/bundler/shared_helpers.rb +127 -117
- data/lib/bundler/similarity_detector.rb +3 -3
- data/lib/bundler/source/git/git_proxy.rb +326 -127
- data/lib/bundler/source/git.rb +207 -88
- data/lib/bundler/source/metadata.rb +19 -18
- data/lib/bundler/source/path/installer.rb +11 -32
- data/lib/bundler/source/path.rb +39 -38
- data/lib/bundler/source/rubygems/remote.rb +3 -4
- data/lib/bundler/source/rubygems.rb +223 -255
- data/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/lib/bundler/source.rb +33 -11
- data/lib/bundler/source_list.rb +131 -66
- data/lib/bundler/source_map.rb +71 -0
- data/lib/bundler/spec_set.rb +239 -94
- data/lib/bundler/stub_specification.rb +77 -39
- data/lib/bundler/templates/Executable +3 -5
- data/lib/bundler/templates/Executable.bundler +23 -19
- data/lib/bundler/templates/Executable.standalone +4 -4
- data/lib/bundler/templates/Gemfile +0 -2
- data/lib/bundler/templates/newgem/CHANGELOG.md.tt +5 -0
- data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +104 -46
- data/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/lib/bundler/templates/newgem/Gemfile.tt +19 -2
- data/lib/bundler/templates/newgem/README.md.tt +18 -16
- data/lib/bundler/templates/newgem/Rakefile.tt +44 -6
- data/lib/bundler/templates/newgem/bin/console.tt +1 -4
- data/lib/bundler/templates/newgem/circleci/config.yml.tt +25 -0
- data/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
- data/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +37 -0
- data/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +18 -0
- data/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +37 -40
- data/lib/bundler/templates/newgem/rubocop.yml.tt +8 -0
- data/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
- data/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt +6 -0
- data/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/test_newgem.rb.tt} +3 -1
- data/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/lib/bundler/ui/rg_proxy.rb +2 -2
- data/lib/bundler/ui/shell.rb +64 -23
- data/lib/bundler/ui/silent.rb +33 -6
- data/lib/bundler/ui.rb +3 -3
- data/lib/bundler/uri_credentials_filter.rb +11 -5
- data/lib/bundler/uri_normalizer.rb +23 -0
- data/lib/bundler/vendor/.document +1 -0
- data/lib/bundler/vendor/connection_pool/.document +1 -0
- data/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +174 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +175 -0
- data/lib/bundler/vendor/fileutils/.document +1 -0
- data/lib/bundler/vendor/fileutils/COPYING +56 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1490 -432
- data/lib/bundler/vendor/net-http-persistent/.document +1 -0
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +41 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +65 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +362 -484
- data/lib/bundler/vendor/pub_grub/.document +1 -0
- data/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +61 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/lib/bundler/vendor/securerandom/.document +1 -0
- data/lib/bundler/vendor/securerandom/COPYING +56 -0
- data/lib/bundler/vendor/securerandom/lib/securerandom.rb +102 -0
- data/lib/bundler/vendor/thor/.document +1 -0
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +4 -3
- data/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +3 -2
- data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +8 -18
- data/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +27 -20
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +34 -13
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +47 -28
- data/lib/bundler/vendor/thor/lib/thor/base.rb +200 -54
- data/lib/bundler/vendor/thor/lib/thor/command.rb +34 -18
- data/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +10 -0
- data/lib/bundler/vendor/thor/lib/thor/error.rb +74 -0
- data/lib/bundler/vendor/thor/lib/thor/group.rb +15 -4
- data/lib/bundler/vendor/thor/lib/thor/invocation.rb +2 -1
- data/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb +6 -6
- data/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/nested_context.rb +29 -0
- data/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +17 -1
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +35 -15
- data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +45 -13
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +86 -13
- data/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +3 -2
- data/lib/bundler/vendor/thor/lib/thor/runner.rb +51 -40
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +99 -148
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +6 -43
- data/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb +29 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/html.rb +4 -49
- data/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb +118 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/terminal.rb +42 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb +38 -0
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +6 -6
- data/lib/bundler/vendor/thor/lib/thor/util.rb +26 -9
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +182 -17
- data/lib/bundler/vendor/tsort/.document +1 -0
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +455 -0
- data/lib/bundler/vendor/uri/.document +1 -0
- data/lib/bundler/vendor/uri/COPYING +56 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +876 -0
- data/lib/bundler/vendor/uri/lib/uri/file.rb +100 -0
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +267 -0
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +1578 -0
- data/lib/bundler/vendor/uri/lib/uri/http.rb +125 -0
- data/lib/bundler/vendor/uri/lib/uri/https.rb +23 -0
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +261 -0
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +22 -0
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +293 -0
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +546 -0
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +206 -0
- data/lib/bundler/vendor/uri/lib/uri/version.rb +6 -0
- data/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
- data/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
- data/lib/bundler/vendor/uri/lib/uri.rb +104 -0
- data/lib/bundler/vendored_fileutils.rb +1 -6
- data/lib/bundler/vendored_net_http.rb +23 -0
- data/lib/bundler/vendored_persistent.rb +1 -42
- data/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/lib/bundler/vendored_securerandom.rb +12 -0
- data/lib/bundler/vendored_thor.rb +2 -2
- data/lib/bundler/vendored_timeout.rb +12 -0
- data/lib/bundler/vendored_tsort.rb +4 -0
- data/lib/bundler/vendored_uri.rb +21 -0
- data/lib/bundler/version.rb +5 -20
- data/lib/bundler/vlad.rb +3 -3
- data/lib/bundler/worker.rb +26 -15
- data/lib/bundler/yaml_serializer.rb +21 -13
- data/lib/bundler.rb +364 -230
- metadata +186 -218
- data/exe/bundle_ruby +0 -60
- data/lib/bundler/cli/package.rb +0 -49
- data/lib/bundler/compatibility_guard.rb +0 -14
- data/lib/bundler/dep_proxy.rb +0 -48
- data/lib/bundler/gem_remote_fetcher.rb +0 -43
- data/lib/bundler/gemdeps.rb +0 -29
- data/lib/bundler/psyched_yaml.rb +0 -37
- data/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -21
- data/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/lib/bundler/templates/gems.rb +0 -8
- data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -3
- data/lib/bundler/templates/newgem/test/test_helper.rb.tt +0 -4
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -7
- data/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -81
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -136
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -223
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
- data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -101
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -837
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -12
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +0 -12
- data/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +0 -129
- data/lib/bundler/version_ranges.rb +0 -76
- data/man/bundle-add.1 +0 -58
- data/man/bundle-add.1.txt +0 -52
- data/man/bundle-add.ronn +0 -40
- data/man/bundle-binstubs.1.txt +0 -48
- data/man/bundle-check.1.txt +0 -33
- data/man/bundle-clean.1.txt +0 -26
- data/man/bundle-config.1.txt +0 -529
- data/man/bundle-doctor.1.txt +0 -44
- data/man/bundle-exec.1.txt +0 -178
- data/man/bundle-gem.1 +0 -80
- data/man/bundle-gem.1.txt +0 -91
- data/man/bundle-gem.ronn +0 -78
- data/man/bundle-info.1 +0 -20
- data/man/bundle-info.1.txt +0 -21
- data/man/bundle-info.ronn +0 -17
- data/man/bundle-init.1.txt +0 -34
- data/man/bundle-inject.1 +0 -33
- data/man/bundle-inject.1.txt +0 -32
- data/man/bundle-install.1.txt +0 -396
- data/man/bundle-list.1.txt +0 -43
- data/man/bundle-lock.1.txt +0 -93
- data/man/bundle-open.1 +0 -32
- data/man/bundle-open.1.txt +0 -29
- data/man/bundle-outdated.1.txt +0 -131
- data/man/bundle-package.1 +0 -55
- data/man/bundle-package.1.txt +0 -79
- data/man/bundle-package.ronn +0 -72
- data/man/bundle-platform.1 +0 -61
- data/man/bundle-platform.1.txt +0 -57
- data/man/bundle-pristine.1.txt +0 -44
- data/man/bundle-remove.1.txt +0 -34
- data/man/bundle-show.1.txt +0 -27
- data/man/bundle-update.1.txt +0 -391
- data/man/bundle-viz.1.txt +0 -39
- data/man/bundle.1.txt +0 -116
- data/man/gemfile.5.txt +0 -653
- /data/lib/bundler/{ssl_certs → man}/.document +0 -0
@@ -1,223 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'set'
|
4
|
-
require 'tsort'
|
5
|
-
|
6
|
-
require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/log'
|
7
|
-
require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex'
|
8
|
-
|
9
|
-
module Bundler::Molinillo
|
10
|
-
# A directed acyclic graph that is tuned to hold named dependencies
|
11
|
-
class DependencyGraph
|
12
|
-
include Enumerable
|
13
|
-
|
14
|
-
# Enumerates through the vertices of the graph.
|
15
|
-
# @return [Array<Vertex>] The graph's vertices.
|
16
|
-
def each
|
17
|
-
return vertices.values.each unless block_given?
|
18
|
-
vertices.values.each { |v| yield v }
|
19
|
-
end
|
20
|
-
|
21
|
-
include TSort
|
22
|
-
|
23
|
-
# @!visibility private
|
24
|
-
alias tsort_each_node each
|
25
|
-
|
26
|
-
# @!visibility private
|
27
|
-
def tsort_each_child(vertex, &block)
|
28
|
-
vertex.successors.each(&block)
|
29
|
-
end
|
30
|
-
|
31
|
-
# Topologically sorts the given vertices.
|
32
|
-
# @param [Enumerable<Vertex>] vertices the vertices to be sorted, which must
|
33
|
-
# all belong to the same graph.
|
34
|
-
# @return [Array<Vertex>] The sorted vertices.
|
35
|
-
def self.tsort(vertices)
|
36
|
-
TSort.tsort(
|
37
|
-
lambda { |b| vertices.each(&b) },
|
38
|
-
lambda { |v, &b| (v.successors & vertices).each(&b) }
|
39
|
-
)
|
40
|
-
end
|
41
|
-
|
42
|
-
# A directed edge of a {DependencyGraph}
|
43
|
-
# @attr [Vertex] origin The origin of the directed edge
|
44
|
-
# @attr [Vertex] destination The destination of the directed edge
|
45
|
-
# @attr [Object] requirement The requirement the directed edge represents
|
46
|
-
Edge = Struct.new(:origin, :destination, :requirement)
|
47
|
-
|
48
|
-
# @return [{String => Vertex}] the vertices of the dependency graph, keyed
|
49
|
-
# by {Vertex#name}
|
50
|
-
attr_reader :vertices
|
51
|
-
|
52
|
-
# @return [Log] the op log for this graph
|
53
|
-
attr_reader :log
|
54
|
-
|
55
|
-
# Initializes an empty dependency graph
|
56
|
-
def initialize
|
57
|
-
@vertices = {}
|
58
|
-
@log = Log.new
|
59
|
-
end
|
60
|
-
|
61
|
-
# Tags the current state of the dependency as the given tag
|
62
|
-
# @param [Object] tag an opaque tag for the current state of the graph
|
63
|
-
# @return [Void]
|
64
|
-
def tag(tag)
|
65
|
-
log.tag(self, tag)
|
66
|
-
end
|
67
|
-
|
68
|
-
# Rewinds the graph to the state tagged as `tag`
|
69
|
-
# @param [Object] tag the tag to rewind to
|
70
|
-
# @return [Void]
|
71
|
-
def rewind_to(tag)
|
72
|
-
log.rewind_to(self, tag)
|
73
|
-
end
|
74
|
-
|
75
|
-
# Initializes a copy of a {DependencyGraph}, ensuring that all {#vertices}
|
76
|
-
# are properly copied.
|
77
|
-
# @param [DependencyGraph] other the graph to copy.
|
78
|
-
def initialize_copy(other)
|
79
|
-
super
|
80
|
-
@vertices = {}
|
81
|
-
@log = other.log.dup
|
82
|
-
traverse = lambda do |new_v, old_v|
|
83
|
-
return if new_v.outgoing_edges.size == old_v.outgoing_edges.size
|
84
|
-
old_v.outgoing_edges.each do |edge|
|
85
|
-
destination = add_vertex(edge.destination.name, edge.destination.payload)
|
86
|
-
add_edge_no_circular(new_v, destination, edge.requirement)
|
87
|
-
traverse.call(destination, edge.destination)
|
88
|
-
end
|
89
|
-
end
|
90
|
-
other.vertices.each do |name, vertex|
|
91
|
-
new_vertex = add_vertex(name, vertex.payload, vertex.root?)
|
92
|
-
new_vertex.explicit_requirements.replace(vertex.explicit_requirements)
|
93
|
-
traverse.call(new_vertex, vertex)
|
94
|
-
end
|
95
|
-
end
|
96
|
-
|
97
|
-
# @return [String] a string suitable for debugging
|
98
|
-
def inspect
|
99
|
-
"#{self.class}:#{vertices.values.inspect}"
|
100
|
-
end
|
101
|
-
|
102
|
-
# @param [Hash] options options for dot output.
|
103
|
-
# @return [String] Returns a dot format representation of the graph
|
104
|
-
def to_dot(options = {})
|
105
|
-
edge_label = options.delete(:edge_label)
|
106
|
-
raise ArgumentError, "Unknown options: #{options.keys}" unless options.empty?
|
107
|
-
|
108
|
-
dot_vertices = []
|
109
|
-
dot_edges = []
|
110
|
-
vertices.each do |n, v|
|
111
|
-
dot_vertices << " #{n} [label=\"{#{n}|#{v.payload}}\"]"
|
112
|
-
v.outgoing_edges.each do |e|
|
113
|
-
label = edge_label ? edge_label.call(e) : e.requirement
|
114
|
-
dot_edges << " #{e.origin.name} -> #{e.destination.name} [label=#{label.to_s.dump}]"
|
115
|
-
end
|
116
|
-
end
|
117
|
-
|
118
|
-
dot_vertices.uniq!
|
119
|
-
dot_vertices.sort!
|
120
|
-
dot_edges.uniq!
|
121
|
-
dot_edges.sort!
|
122
|
-
|
123
|
-
dot = dot_vertices.unshift('digraph G {').push('') + dot_edges.push('}')
|
124
|
-
dot.join("\n")
|
125
|
-
end
|
126
|
-
|
127
|
-
# @return [Boolean] whether the two dependency graphs are equal, determined
|
128
|
-
# by a recursive traversal of each {#root_vertices} and its
|
129
|
-
# {Vertex#successors}
|
130
|
-
def ==(other)
|
131
|
-
return false unless other
|
132
|
-
return true if equal?(other)
|
133
|
-
vertices.each do |name, vertex|
|
134
|
-
other_vertex = other.vertex_named(name)
|
135
|
-
return false unless other_vertex
|
136
|
-
return false unless vertex.payload == other_vertex.payload
|
137
|
-
return false unless other_vertex.successors.to_set == vertex.successors.to_set
|
138
|
-
end
|
139
|
-
end
|
140
|
-
|
141
|
-
# @param [String] name
|
142
|
-
# @param [Object] payload
|
143
|
-
# @param [Array<String>] parent_names
|
144
|
-
# @param [Object] requirement the requirement that is requiring the child
|
145
|
-
# @return [void]
|
146
|
-
def add_child_vertex(name, payload, parent_names, requirement)
|
147
|
-
root = !parent_names.delete(nil) { true }
|
148
|
-
vertex = add_vertex(name, payload, root)
|
149
|
-
vertex.explicit_requirements << requirement if root
|
150
|
-
parent_names.each do |parent_name|
|
151
|
-
parent_vertex = vertex_named(parent_name)
|
152
|
-
add_edge(parent_vertex, vertex, requirement)
|
153
|
-
end
|
154
|
-
vertex
|
155
|
-
end
|
156
|
-
|
157
|
-
# Adds a vertex with the given name, or updates the existing one.
|
158
|
-
# @param [String] name
|
159
|
-
# @param [Object] payload
|
160
|
-
# @return [Vertex] the vertex that was added to `self`
|
161
|
-
def add_vertex(name, payload, root = false)
|
162
|
-
log.add_vertex(self, name, payload, root)
|
163
|
-
end
|
164
|
-
|
165
|
-
# Detaches the {#vertex_named} `name` {Vertex} from the graph, recursively
|
166
|
-
# removing any non-root vertices that were orphaned in the process
|
167
|
-
# @param [String] name
|
168
|
-
# @return [Array<Vertex>] the vertices which have been detached
|
169
|
-
def detach_vertex_named(name)
|
170
|
-
log.detach_vertex_named(self, name)
|
171
|
-
end
|
172
|
-
|
173
|
-
# @param [String] name
|
174
|
-
# @return [Vertex,nil] the vertex with the given name
|
175
|
-
def vertex_named(name)
|
176
|
-
vertices[name]
|
177
|
-
end
|
178
|
-
|
179
|
-
# @param [String] name
|
180
|
-
# @return [Vertex,nil] the root vertex with the given name
|
181
|
-
def root_vertex_named(name)
|
182
|
-
vertex = vertex_named(name)
|
183
|
-
vertex if vertex && vertex.root?
|
184
|
-
end
|
185
|
-
|
186
|
-
# Adds a new {Edge} to the dependency graph
|
187
|
-
# @param [Vertex] origin
|
188
|
-
# @param [Vertex] destination
|
189
|
-
# @param [Object] requirement the requirement that this edge represents
|
190
|
-
# @return [Edge] the added edge
|
191
|
-
def add_edge(origin, destination, requirement)
|
192
|
-
if destination.path_to?(origin)
|
193
|
-
raise CircularDependencyError.new([origin, destination])
|
194
|
-
end
|
195
|
-
add_edge_no_circular(origin, destination, requirement)
|
196
|
-
end
|
197
|
-
|
198
|
-
# Deletes an {Edge} from the dependency graph
|
199
|
-
# @param [Edge] edge
|
200
|
-
# @return [Void]
|
201
|
-
def delete_edge(edge)
|
202
|
-
log.delete_edge(self, edge.origin.name, edge.destination.name, edge.requirement)
|
203
|
-
end
|
204
|
-
|
205
|
-
# Sets the payload of the vertex with the given name
|
206
|
-
# @param [String] name the name of the vertex
|
207
|
-
# @param [Object] payload the payload
|
208
|
-
# @return [Void]
|
209
|
-
def set_payload(name, payload)
|
210
|
-
log.set_payload(self, name, payload)
|
211
|
-
end
|
212
|
-
|
213
|
-
private
|
214
|
-
|
215
|
-
# Adds a new {Edge} to the dependency graph without checking for
|
216
|
-
# circularity.
|
217
|
-
# @param (see #add_edge)
|
218
|
-
# @return (see #add_edge)
|
219
|
-
def add_edge_no_circular(origin, destination, requirement)
|
220
|
-
log.add_edge_no_circular(self, origin.name, destination.name, requirement)
|
221
|
-
end
|
222
|
-
end
|
223
|
-
end
|
@@ -1,143 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Bundler::Molinillo
|
4
|
-
# An error that occurred during the resolution process
|
5
|
-
class ResolverError < StandardError; end
|
6
|
-
|
7
|
-
# An error caused by searching for a dependency that is completely unknown,
|
8
|
-
# i.e. has no versions available whatsoever.
|
9
|
-
class NoSuchDependencyError < ResolverError
|
10
|
-
# @return [Object] the dependency that could not be found
|
11
|
-
attr_accessor :dependency
|
12
|
-
|
13
|
-
# @return [Array<Object>] the specifications that depended upon {#dependency}
|
14
|
-
attr_accessor :required_by
|
15
|
-
|
16
|
-
# Initializes a new error with the given missing dependency.
|
17
|
-
# @param [Object] dependency @see {#dependency}
|
18
|
-
# @param [Array<Object>] required_by @see {#required_by}
|
19
|
-
def initialize(dependency, required_by = [])
|
20
|
-
@dependency = dependency
|
21
|
-
@required_by = required_by.uniq
|
22
|
-
super()
|
23
|
-
end
|
24
|
-
|
25
|
-
# The error message for the missing dependency, including the specifications
|
26
|
-
# that had this dependency.
|
27
|
-
def message
|
28
|
-
sources = required_by.map { |r| "`#{r}`" }.join(' and ')
|
29
|
-
message = "Unable to find a specification for `#{dependency}`"
|
30
|
-
message += " depended upon by #{sources}" unless sources.empty?
|
31
|
-
message
|
32
|
-
end
|
33
|
-
end
|
34
|
-
|
35
|
-
# An error caused by attempting to fulfil a dependency that was circular
|
36
|
-
#
|
37
|
-
# @note This exception will be thrown iff a {Vertex} is added to a
|
38
|
-
# {DependencyGraph} that has a {DependencyGraph::Vertex#path_to?} an
|
39
|
-
# existing {DependencyGraph::Vertex}
|
40
|
-
class CircularDependencyError < ResolverError
|
41
|
-
# [Set<Object>] the dependencies responsible for causing the error
|
42
|
-
attr_reader :dependencies
|
43
|
-
|
44
|
-
# Initializes a new error with the given circular vertices.
|
45
|
-
# @param [Array<DependencyGraph::Vertex>] vertices the vertices in the dependency
|
46
|
-
# that caused the error
|
47
|
-
def initialize(vertices)
|
48
|
-
super "There is a circular dependency between #{vertices.map(&:name).join(' and ')}"
|
49
|
-
@dependencies = vertices.map { |vertex| vertex.payload.possibilities.last }.to_set
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
# An error caused by conflicts in version
|
54
|
-
class VersionConflict < ResolverError
|
55
|
-
# @return [{String => Resolution::Conflict}] the conflicts that caused
|
56
|
-
# resolution to fail
|
57
|
-
attr_reader :conflicts
|
58
|
-
|
59
|
-
# @return [SpecificationProvider] the specification provider used during
|
60
|
-
# resolution
|
61
|
-
attr_reader :specification_provider
|
62
|
-
|
63
|
-
# Initializes a new error with the given version conflicts.
|
64
|
-
# @param [{String => Resolution::Conflict}] conflicts see {#conflicts}
|
65
|
-
# @param [SpecificationProvider] specification_provider see {#specification_provider}
|
66
|
-
def initialize(conflicts, specification_provider)
|
67
|
-
pairs = []
|
68
|
-
Compatibility.flat_map(conflicts.values.flatten, &:requirements).each do |conflicting|
|
69
|
-
conflicting.each do |source, conflict_requirements|
|
70
|
-
conflict_requirements.each do |c|
|
71
|
-
pairs << [c, source]
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
75
|
-
|
76
|
-
super "Unable to satisfy the following requirements:\n\n" \
|
77
|
-
"#{pairs.map { |r, d| "- `#{r}` required by `#{d}`" }.join("\n")}"
|
78
|
-
|
79
|
-
@conflicts = conflicts
|
80
|
-
@specification_provider = specification_provider
|
81
|
-
end
|
82
|
-
|
83
|
-
require 'bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider'
|
84
|
-
include Delegates::SpecificationProvider
|
85
|
-
|
86
|
-
# @return [String] An error message that includes requirement trees,
|
87
|
-
# which is much more detailed & customizable than the default message
|
88
|
-
# @param [Hash] opts the options to create a message with.
|
89
|
-
# @option opts [String] :solver_name The user-facing name of the solver
|
90
|
-
# @option opts [String] :possibility_type The generic name of a possibility
|
91
|
-
# @option opts [Proc] :reduce_trees A proc that reduced the list of requirement trees
|
92
|
-
# @option opts [Proc] :printable_requirement A proc that pretty-prints requirements
|
93
|
-
# @option opts [Proc] :additional_message_for_conflict A proc that appends additional
|
94
|
-
# messages for each conflict
|
95
|
-
# @option opts [Proc] :version_for_spec A proc that returns the version number for a
|
96
|
-
# possibility
|
97
|
-
def message_with_trees(opts = {})
|
98
|
-
solver_name = opts.delete(:solver_name) { self.class.name.split('::').first }
|
99
|
-
possibility_type = opts.delete(:possibility_type) { 'possibility named' }
|
100
|
-
reduce_trees = opts.delete(:reduce_trees) { proc { |trees| trees.uniq.sort_by(&:to_s) } }
|
101
|
-
printable_requirement = opts.delete(:printable_requirement) { proc { |req| req.to_s } }
|
102
|
-
additional_message_for_conflict = opts.delete(:additional_message_for_conflict) { proc {} }
|
103
|
-
version_for_spec = opts.delete(:version_for_spec) { proc(&:to_s) }
|
104
|
-
incompatible_version_message_for_conflict = opts.delete(:incompatible_version_message_for_conflict) do
|
105
|
-
proc do |name, _conflict|
|
106
|
-
%(#{solver_name} could not find compatible versions for #{possibility_type} "#{name}":)
|
107
|
-
end
|
108
|
-
end
|
109
|
-
|
110
|
-
conflicts.sort.reduce(''.dup) do |o, (name, conflict)|
|
111
|
-
o << "\n" << incompatible_version_message_for_conflict.call(name, conflict) << "\n"
|
112
|
-
if conflict.locked_requirement
|
113
|
-
o << %( In snapshot (#{name_for_locking_dependency_source}):\n)
|
114
|
-
o << %( #{printable_requirement.call(conflict.locked_requirement)}\n)
|
115
|
-
o << %(\n)
|
116
|
-
end
|
117
|
-
o << %( In #{name_for_explicit_dependency_source}:\n)
|
118
|
-
trees = reduce_trees.call(conflict.requirement_trees)
|
119
|
-
|
120
|
-
o << trees.map do |tree|
|
121
|
-
t = ''.dup
|
122
|
-
depth = 2
|
123
|
-
tree.each do |req|
|
124
|
-
t << ' ' * depth << req.to_s
|
125
|
-
unless tree.last == req
|
126
|
-
if spec = conflict.activated_by_name[name_for(req)]
|
127
|
-
t << %( was resolved to #{version_for_spec.call(spec)}, which)
|
128
|
-
end
|
129
|
-
t << %( depends on)
|
130
|
-
end
|
131
|
-
t << %(\n)
|
132
|
-
depth += 1
|
133
|
-
end
|
134
|
-
t
|
135
|
-
end.join("\n")
|
136
|
-
|
137
|
-
additional_message_for_conflict.call(o, name, conflict)
|
138
|
-
|
139
|
-
o
|
140
|
-
end.strip
|
141
|
-
end
|
142
|
-
end
|
143
|
-
end
|
@@ -1,101 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Bundler::Molinillo
|
4
|
-
# Provides information about specifcations and dependencies to the resolver,
|
5
|
-
# allowing the {Resolver} class to remain generic while still providing power
|
6
|
-
# and flexibility.
|
7
|
-
#
|
8
|
-
# This module contains the methods that users of Bundler::Molinillo must to implement,
|
9
|
-
# using knowledge of their own model classes.
|
10
|
-
module SpecificationProvider
|
11
|
-
# Search for the specifications that match the given dependency.
|
12
|
-
# The specifications in the returned array will be considered in reverse
|
13
|
-
# order, so the latest version ought to be last.
|
14
|
-
# @note This method should be 'pure', i.e. the return value should depend
|
15
|
-
# only on the `dependency` parameter.
|
16
|
-
#
|
17
|
-
# @param [Object] dependency
|
18
|
-
# @return [Array<Object>] the specifications that satisfy the given
|
19
|
-
# `dependency`.
|
20
|
-
def search_for(dependency)
|
21
|
-
[]
|
22
|
-
end
|
23
|
-
|
24
|
-
# Returns the dependencies of `specification`.
|
25
|
-
# @note This method should be 'pure', i.e. the return value should depend
|
26
|
-
# only on the `specification` parameter.
|
27
|
-
#
|
28
|
-
# @param [Object] specification
|
29
|
-
# @return [Array<Object>] the dependencies that are required by the given
|
30
|
-
# `specification`.
|
31
|
-
def dependencies_for(specification)
|
32
|
-
[]
|
33
|
-
end
|
34
|
-
|
35
|
-
# Determines whether the given `requirement` is satisfied by the given
|
36
|
-
# `spec`, in the context of the current `activated` dependency graph.
|
37
|
-
#
|
38
|
-
# @param [Object] requirement
|
39
|
-
# @param [DependencyGraph] activated the current dependency graph in the
|
40
|
-
# resolution process.
|
41
|
-
# @param [Object] spec
|
42
|
-
# @return [Boolean] whether `requirement` is satisfied by `spec` in the
|
43
|
-
# context of the current `activated` dependency graph.
|
44
|
-
def requirement_satisfied_by?(requirement, activated, spec)
|
45
|
-
true
|
46
|
-
end
|
47
|
-
|
48
|
-
# Returns the name for the given `dependency`.
|
49
|
-
# @note This method should be 'pure', i.e. the return value should depend
|
50
|
-
# only on the `dependency` parameter.
|
51
|
-
#
|
52
|
-
# @param [Object] dependency
|
53
|
-
# @return [String] the name for the given `dependency`.
|
54
|
-
def name_for(dependency)
|
55
|
-
dependency.to_s
|
56
|
-
end
|
57
|
-
|
58
|
-
# @return [String] the name of the source of explicit dependencies, i.e.
|
59
|
-
# those passed to {Resolver#resolve} directly.
|
60
|
-
def name_for_explicit_dependency_source
|
61
|
-
'user-specified dependency'
|
62
|
-
end
|
63
|
-
|
64
|
-
# @return [String] the name of the source of 'locked' dependencies, i.e.
|
65
|
-
# those passed to {Resolver#resolve} directly as the `base`
|
66
|
-
def name_for_locking_dependency_source
|
67
|
-
'Lockfile'
|
68
|
-
end
|
69
|
-
|
70
|
-
# Sort dependencies so that the ones that are easiest to resolve are first.
|
71
|
-
# Easiest to resolve is (usually) defined by:
|
72
|
-
# 1) Is this dependency already activated?
|
73
|
-
# 2) How relaxed are the requirements?
|
74
|
-
# 3) Are there any conflicts for this dependency?
|
75
|
-
# 4) How many possibilities are there to satisfy this dependency?
|
76
|
-
#
|
77
|
-
# @param [Array<Object>] dependencies
|
78
|
-
# @param [DependencyGraph] activated the current dependency graph in the
|
79
|
-
# resolution process.
|
80
|
-
# @param [{String => Array<Conflict>}] conflicts
|
81
|
-
# @return [Array<Object>] a sorted copy of `dependencies`.
|
82
|
-
def sort_dependencies(dependencies, activated, conflicts)
|
83
|
-
dependencies.sort_by do |dependency|
|
84
|
-
name = name_for(dependency)
|
85
|
-
[
|
86
|
-
activated.vertex_named(name).payload ? 0 : 1,
|
87
|
-
conflicts[name] ? 0 : 1,
|
88
|
-
]
|
89
|
-
end
|
90
|
-
end
|
91
|
-
|
92
|
-
# Returns whether this dependency, which has no possible matching
|
93
|
-
# specifications, can safely be ignored.
|
94
|
-
#
|
95
|
-
# @param [Object] dependency
|
96
|
-
# @return [Boolean] whether this dependency can safely be skipped.
|
97
|
-
def allow_missing?(dependency)
|
98
|
-
false
|
99
|
-
end
|
100
|
-
end
|
101
|
-
end
|
@@ -1,67 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Bundler::Molinillo
|
4
|
-
# Conveys information about the resolution process to a user.
|
5
|
-
module UI
|
6
|
-
# The {IO} object that should be used to print output. `STDOUT`, by default.
|
7
|
-
#
|
8
|
-
# @return [IO]
|
9
|
-
def output
|
10
|
-
STDOUT
|
11
|
-
end
|
12
|
-
|
13
|
-
# Called roughly every {#progress_rate}, this method should convey progress
|
14
|
-
# to the user.
|
15
|
-
#
|
16
|
-
# @return [void]
|
17
|
-
def indicate_progress
|
18
|
-
output.print '.' unless debug?
|
19
|
-
end
|
20
|
-
|
21
|
-
# How often progress should be conveyed to the user via
|
22
|
-
# {#indicate_progress}, in seconds. A third of a second, by default.
|
23
|
-
#
|
24
|
-
# @return [Float]
|
25
|
-
def progress_rate
|
26
|
-
0.33
|
27
|
-
end
|
28
|
-
|
29
|
-
# Called before resolution begins.
|
30
|
-
#
|
31
|
-
# @return [void]
|
32
|
-
def before_resolution
|
33
|
-
output.print 'Resolving dependencies...'
|
34
|
-
end
|
35
|
-
|
36
|
-
# Called after resolution ends (either successfully or with an error).
|
37
|
-
# By default, prints a newline.
|
38
|
-
#
|
39
|
-
# @return [void]
|
40
|
-
def after_resolution
|
41
|
-
output.puts
|
42
|
-
end
|
43
|
-
|
44
|
-
# Conveys debug information to the user.
|
45
|
-
#
|
46
|
-
# @param [Integer] depth the current depth of the resolution process.
|
47
|
-
# @return [void]
|
48
|
-
def debug(depth = 0)
|
49
|
-
if debug?
|
50
|
-
debug_info = yield
|
51
|
-
debug_info = debug_info.inspect unless debug_info.is_a?(String)
|
52
|
-
debug_info = debug_info.split("\n").map { |s| ":#{depth.to_s.rjust 4}: #{s}" }
|
53
|
-
output.puts debug_info
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
# Whether or not debug messages should be printed.
|
58
|
-
# By default, whether or not the `MOLINILLO_DEBUG` environment variable is
|
59
|
-
# set.
|
60
|
-
#
|
61
|
-
# @return [Boolean]
|
62
|
-
def debug?
|
63
|
-
return @debug_mode if defined?(@debug_mode)
|
64
|
-
@debug_mode = ENV['MOLINILLO_DEBUG']
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|