bundler 2.2.29 → 2.5.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1129 -4
- data/README.md +4 -8
- data/bundler.gemspec +11 -11
- data/exe/bundle +5 -26
- data/exe/bundler +1 -1
- data/lib/bundler/.document +1 -0
- data/lib/bundler/build_metadata.rb +4 -4
- data/lib/bundler/capistrano.rb +1 -1
- data/lib/bundler/checksum.rb +254 -0
- data/lib/bundler/ci_detector.rb +75 -0
- data/lib/bundler/cli/add.rb +4 -4
- data/lib/bundler/cli/binstubs.rb +10 -6
- data/lib/bundler/cli/cache.rb +1 -1
- data/lib/bundler/cli/check.rb +3 -3
- data/lib/bundler/cli/common.rb +13 -3
- data/lib/bundler/cli/config.rb +18 -8
- data/lib/bundler/cli/console.rb +5 -4
- data/lib/bundler/cli/doctor.rb +12 -5
- data/lib/bundler/cli/exec.rb +1 -1
- data/lib/bundler/cli/fund.rb +1 -1
- data/lib/bundler/cli/gem.rb +141 -48
- data/lib/bundler/cli/info.rb +27 -17
- data/lib/bundler/cli/init.rb +6 -2
- data/lib/bundler/cli/install.rb +22 -39
- data/lib/bundler/cli/issue.rb +5 -4
- data/lib/bundler/cli/lock.rb +36 -29
- data/lib/bundler/cli/open.rb +9 -9
- data/lib/bundler/cli/outdated.rb +19 -12
- data/lib/bundler/cli/platform.rb +8 -6
- data/lib/bundler/cli/plugin.rb +9 -15
- data/lib/bundler/cli/pristine.rb +38 -30
- data/lib/bundler/cli/show.rb +3 -3
- data/lib/bundler/cli/update.rb +12 -7
- data/lib/bundler/cli/viz.rb +1 -1
- data/lib/bundler/cli.rb +266 -285
- data/lib/bundler/compact_index_client/cache.rb +53 -67
- data/lib/bundler/compact_index_client/cache_file.rb +153 -0
- data/lib/bundler/compact_index_client/gem_parser.rb +7 -3
- data/lib/bundler/compact_index_client/parser.rb +84 -0
- data/lib/bundler/compact_index_client/updater.rb +83 -76
- data/lib/bundler/compact_index_client.rb +59 -87
- data/lib/bundler/constants.rb +9 -2
- data/lib/bundler/current_ruby.rb +12 -16
- data/lib/bundler/definition.rb +509 -319
- data/lib/bundler/dependency.rb +33 -71
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +88 -69
- data/lib/bundler/endpoint_specification.rb +32 -15
- data/lib/bundler/env.rb +5 -7
- data/lib/bundler/environment_preserver.rb +8 -22
- data/lib/bundler/errors.rb +101 -13
- data/lib/bundler/feature_flag.rb +0 -2
- data/lib/bundler/fetcher/base.rb +11 -11
- data/lib/bundler/fetcher/compact_index.rb +32 -52
- data/lib/bundler/fetcher/dependency.rb +3 -7
- data/lib/bundler/fetcher/downloader.rb +17 -16
- data/lib/bundler/fetcher/gem_remote_fetcher.rb +16 -0
- data/lib/bundler/fetcher/index.rb +2 -29
- data/lib/bundler/fetcher.rb +87 -79
- data/lib/bundler/force_platform.rb +18 -0
- data/lib/bundler/friendly_errors.rb +29 -40
- data/lib/bundler/gem_helper.rb +11 -23
- data/lib/bundler/gem_helpers.rb +30 -6
- data/lib/bundler/gem_version_promoter.rb +68 -109
- data/lib/bundler/graph.rb +9 -9
- data/lib/bundler/index.rb +71 -79
- data/lib/bundler/injector.rb +23 -11
- data/lib/bundler/inline.rb +11 -23
- data/lib/bundler/installer/gem_installer.rb +18 -11
- data/lib/bundler/installer/parallel_installer.rb +17 -65
- data/lib/bundler/installer/standalone.rb +56 -15
- data/lib/bundler/installer.rb +35 -61
- data/lib/bundler/lazy_specification.rb +92 -61
- data/lib/bundler/lockfile_generator.rb +12 -3
- data/lib/bundler/lockfile_parser.rb +137 -70
- data/lib/bundler/man/bundle-add.1 +19 -26
- data/lib/bundler/man/bundle-add.1.ronn +16 -4
- data/lib/bundler/man/bundle-binstubs.1 +4 -16
- data/lib/bundler/man/bundle-cache.1 +9 -24
- data/lib/bundler/man/bundle-cache.1.ronn +9 -2
- data/lib/bundler/man/bundle-check.1 +5 -12
- data/lib/bundler/man/bundle-check.1.ronn +3 -0
- data/lib/bundler/man/bundle-clean.1 +4 -11
- data/lib/bundler/man/bundle-clean.1.ronn +1 -1
- data/lib/bundler/man/bundle-config.1 +47 -224
- data/lib/bundler/man/bundle-config.1.ronn +40 -28
- data/lib/bundler/man/bundle-console.1 +35 -0
- data/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/lib/bundler/man/bundle-doctor.1 +4 -18
- data/lib/bundler/man/bundle-exec.1 +16 -77
- data/lib/bundler/man/bundle-exec.1.ronn +8 -9
- data/lib/bundler/man/bundle-gem.1 +45 -72
- data/lib/bundler/man/bundle-gem.1.ronn +32 -5
- 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 +5 -11
- data/lib/bundler/man/bundle-info.1.ronn +3 -3
- data/lib/bundler/man/bundle-init.1 +6 -11
- data/lib/bundler/man/bundle-init.1.ronn +2 -0
- data/lib/bundler/man/bundle-inject.1 +8 -18
- data/lib/bundler/man/bundle-inject.1.ronn +3 -1
- data/lib/bundler/man/bundle-install.1 +32 -155
- data/lib/bundler/man/bundle-install.1.ronn +11 -33
- data/lib/bundler/man/bundle-list.1 +4 -19
- data/lib/bundler/man/bundle-lock.1 +5 -29
- data/lib/bundler/man/bundle-open.1 +18 -18
- data/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/lib/bundler/man/bundle-outdated.1 +17 -72
- data/lib/bundler/man/bundle-outdated.1.ronn +13 -18
- data/lib/bundler/man/bundle-platform.1 +16 -28
- data/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/lib/bundler/man/bundle-pristine.1 +5 -16
- data/lib/bundler/man/bundle-remove.1 +4 -14
- data/lib/bundler/man/bundle-show.1 +3 -10
- data/lib/bundler/man/bundle-update.1 +19 -138
- data/lib/bundler/man/bundle-update.1.ronn +2 -1
- data/lib/bundler/man/bundle-version.1 +22 -0
- data/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/lib/bundler/man/bundle-viz.1 +6 -15
- data/lib/bundler/man/bundle-viz.1.ronn +2 -0
- data/lib/bundler/man/bundle.1 +17 -51
- data/lib/bundler/man/bundle.1.ronn +12 -7
- data/lib/bundler/man/gemfile.5 +130 -346
- data/lib/bundler/man/gemfile.5.ronn +121 -86
- data/lib/bundler/man/index.txt +4 -0
- data/lib/bundler/match_metadata.rb +17 -0
- data/lib/bundler/match_platform.rb +1 -2
- data/lib/bundler/match_remote_metadata.rb +29 -0
- data/lib/bundler/mirror.rb +8 -10
- data/lib/bundler/plugin/api/source.rb +9 -13
- data/lib/bundler/plugin/index.rb +13 -5
- 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 +0 -8
- data/lib/bundler/plugin/installer.rb +42 -19
- data/lib/bundler/plugin/source_list.rb +4 -4
- data/lib/bundler/plugin.rb +16 -7
- data/lib/bundler/process_lock.rb +1 -1
- data/lib/bundler/remote_specification.rb +11 -5
- data/lib/bundler/resolver/base.rb +111 -0
- data/lib/bundler/resolver/candidate.rb +82 -0
- data/lib/bundler/resolver/incompatibility.rb +15 -0
- data/lib/bundler/resolver/package.rb +81 -0
- data/lib/bundler/resolver/root.rb +25 -0
- data/lib/bundler/resolver/spec_group.rb +53 -66
- data/lib/bundler/resolver.rb +419 -307
- data/lib/bundler/retry.rb +1 -1
- data/lib/bundler/ruby_dsl.rb +42 -7
- data/lib/bundler/ruby_version.rb +16 -22
- data/lib/bundler/rubygems_ext.rb +250 -64
- data/lib/bundler/rubygems_gem_installer.rb +90 -64
- data/lib/bundler/rubygems_integration.rb +81 -190
- data/lib/bundler/runtime.rb +8 -13
- data/lib/bundler/safe_marshal.rb +31 -0
- data/lib/bundler/self_manager.rb +206 -0
- data/lib/bundler/settings.rb +139 -57
- data/lib/bundler/setup.rb +13 -1
- data/lib/bundler/shared_helpers.rb +67 -36
- data/lib/bundler/source/git/git_proxy.rb +285 -82
- data/lib/bundler/source/git.rb +81 -41
- data/lib/bundler/source/metadata.rb +17 -16
- data/lib/bundler/source/path/installer.rb +1 -22
- data/lib/bundler/source/path.rb +13 -25
- data/lib/bundler/source/rubygems/remote.rb +1 -1
- data/lib/bundler/source/rubygems.rb +164 -234
- data/lib/bundler/source/rubygems_aggregate.rb +1 -1
- data/lib/bundler/source.rb +7 -6
- data/lib/bundler/source_list.rb +40 -32
- data/lib/bundler/source_map.rb +15 -2
- data/lib/bundler/spec_set.rb +156 -46
- data/lib/bundler/stub_specification.rb +18 -5
- data/lib/bundler/templates/Executable +3 -5
- data/lib/bundler/templates/Executable.bundler +7 -12
- data/lib/bundler/templates/Executable.standalone +4 -4
- data/lib/bundler/templates/Gemfile +0 -2
- data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +77 -29
- data/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/lib/bundler/templates/newgem/README.md.tt +7 -11
- data/lib/bundler/templates/newgem/Rakefile.tt +28 -4
- data/lib/bundler/templates/newgem/bin/console.tt +0 -4
- data/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -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 +13 -3
- data/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +25 -17
- data/lib/bundler/templates/newgem/rubocop.yml.tt +0 -5
- data/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/lib/bundler/templates/newgem/test/minitest/{newgem_test.rb.tt → test_newgem.rb.tt} +1 -1
- data/lib/bundler/ui/rg_proxy.rb +1 -1
- data/lib/bundler/ui/shell.rb +38 -15
- data/lib/bundler/ui/silent.rb +21 -5
- data/lib/bundler/uri_credentials_filter.rb +2 -2
- 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 +19 -21
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +1 -1
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +92 -78
- data/lib/bundler/vendor/fileutils/.document +1 -0
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1340 -410
- 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 +4 -3
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +23 -11
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +1 -1
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +57 -57
- 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/thor/.document +1 -0
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +3 -2
- data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +12 -14
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +16 -6
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -17
- data/lib/bundler/vendor/thor/lib/thor/base.rb +140 -14
- data/lib/bundler/vendor/thor/lib/thor/command.rb +13 -4
- 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 +16 -20
- data/lib/bundler/vendor/thor/lib/thor/group.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/invocation.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/nested_context.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +20 -1
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +33 -17
- data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +27 -8
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +63 -7
- data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/runner.rb +40 -30
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +48 -154
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -46
- data/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb +29 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/html.rb +0 -45
- data/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb +134 -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 +2 -2
- data/lib/bundler/vendor/thor/lib/thor/util.rb +9 -8
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +155 -8
- 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/LICENSE.txt +22 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +316 -207
- data/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +33 -13
- data/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
- data/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +16 -23
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +105 -47
- data/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- 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 +3 -3
- data/lib/bundler/vendored_net_http.rb +23 -0
- data/lib/bundler/vendored_persistent.rb +0 -36
- data/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/lib/bundler/vendored_timeout.rb +12 -0
- data/lib/bundler/{vendored_tmpdir.rb → vendored_tsort.rb} +1 -1
- data/lib/bundler/vendored_uri.rb +18 -1
- data/lib/bundler/version.rb +5 -1
- data/lib/bundler/vlad.rb +1 -1
- data/lib/bundler/worker.rb +7 -9
- data/lib/bundler/yaml_serializer.rb +21 -12
- data/lib/bundler.rb +114 -121
- metadata +87 -41
- data/lib/bundler/dep_proxy.rb +0 -55
- data/lib/bundler/gemdeps.rb +0 -29
- data/lib/bundler/psyched_yaml.rb +0 -22
- data/lib/bundler/templates/gems.rb +0 -8
- data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
- 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 -88
- 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 -164
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- 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 -112
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- 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 -11
- data/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/lib/bundler/version_ranges.rb +0 -122
@@ -1,46 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative 'dependency_graph'
|
4
|
-
|
5
|
-
module Bundler::Molinillo
|
6
|
-
# This class encapsulates a dependency resolver.
|
7
|
-
# The resolver is responsible for determining which set of dependencies to
|
8
|
-
# activate, with feedback from the {#specification_provider}
|
9
|
-
#
|
10
|
-
#
|
11
|
-
class Resolver
|
12
|
-
require_relative 'resolution'
|
13
|
-
|
14
|
-
# @return [SpecificationProvider] the specification provider used
|
15
|
-
# in the resolution process
|
16
|
-
attr_reader :specification_provider
|
17
|
-
|
18
|
-
# @return [UI] the UI module used to communicate back to the user
|
19
|
-
# during the resolution process
|
20
|
-
attr_reader :resolver_ui
|
21
|
-
|
22
|
-
# Initializes a new resolver.
|
23
|
-
# @param [SpecificationProvider] specification_provider
|
24
|
-
# see {#specification_provider}
|
25
|
-
# @param [UI] resolver_ui
|
26
|
-
# see {#resolver_ui}
|
27
|
-
def initialize(specification_provider, resolver_ui)
|
28
|
-
@specification_provider = specification_provider
|
29
|
-
@resolver_ui = resolver_ui
|
30
|
-
end
|
31
|
-
|
32
|
-
# Resolves the requested dependencies into a {DependencyGraph},
|
33
|
-
# locking to the base dependency graph (if specified)
|
34
|
-
# @param [Array] requested an array of 'requested' dependencies that the
|
35
|
-
# {#specification_provider} can understand
|
36
|
-
# @param [DependencyGraph,nil] base the base dependency graph to which
|
37
|
-
# dependencies should be 'locked'
|
38
|
-
def resolve(requested, base = DependencyGraph.new)
|
39
|
-
Resolution.new(specification_provider,
|
40
|
-
resolver_ui,
|
41
|
-
requested,
|
42
|
-
base).
|
43
|
-
resolve
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
@@ -1,58 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Bundler::Molinillo
|
4
|
-
# A state that a {Resolution} can be in
|
5
|
-
# @attr [String] name the name of the current requirement
|
6
|
-
# @attr [Array<Object>] requirements currently unsatisfied requirements
|
7
|
-
# @attr [DependencyGraph] activated the graph of activated dependencies
|
8
|
-
# @attr [Object] requirement the current requirement
|
9
|
-
# @attr [Object] possibilities the possibilities to satisfy the current requirement
|
10
|
-
# @attr [Integer] depth the depth of the resolution
|
11
|
-
# @attr [Hash] conflicts unresolved conflicts, indexed by dependency name
|
12
|
-
# @attr [Array<UnwindDetails>] unused_unwind_options unwinds for previous conflicts that weren't explored
|
13
|
-
ResolutionState = Struct.new(
|
14
|
-
:name,
|
15
|
-
:requirements,
|
16
|
-
:activated,
|
17
|
-
:requirement,
|
18
|
-
:possibilities,
|
19
|
-
:depth,
|
20
|
-
:conflicts,
|
21
|
-
:unused_unwind_options
|
22
|
-
)
|
23
|
-
|
24
|
-
class ResolutionState
|
25
|
-
# Returns an empty resolution state
|
26
|
-
# @return [ResolutionState] an empty state
|
27
|
-
def self.empty
|
28
|
-
new(nil, [], DependencyGraph.new, nil, nil, 0, {}, [])
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
# A state that encapsulates a set of {#requirements} with an {Array} of
|
33
|
-
# possibilities
|
34
|
-
class DependencyState < ResolutionState
|
35
|
-
# Removes a possibility from `self`
|
36
|
-
# @return [PossibilityState] a state with a single possibility,
|
37
|
-
# the possibility that was removed from `self`
|
38
|
-
def pop_possibility_state
|
39
|
-
PossibilityState.new(
|
40
|
-
name,
|
41
|
-
requirements.dup,
|
42
|
-
activated,
|
43
|
-
requirement,
|
44
|
-
[possibilities.pop],
|
45
|
-
depth + 1,
|
46
|
-
conflicts.dup,
|
47
|
-
unused_unwind_options.dup
|
48
|
-
).tap do |state|
|
49
|
-
state.activated.tag(state)
|
50
|
-
end
|
51
|
-
end
|
52
|
-
end
|
53
|
-
|
54
|
-
# A state that encapsulates a single possibility to fulfill the given
|
55
|
-
# {#requirement}
|
56
|
-
class PossibilityState < ResolutionState
|
57
|
-
end
|
58
|
-
end
|
@@ -1,11 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative 'molinillo/gem_metadata'
|
4
|
-
require_relative 'molinillo/errors'
|
5
|
-
require_relative 'molinillo/resolver'
|
6
|
-
require_relative 'molinillo/modules/ui'
|
7
|
-
require_relative 'molinillo/modules/specification_provider'
|
8
|
-
|
9
|
-
# Bundler::Molinillo is a generic dependency resolution algorithm.
|
10
|
-
module Bundler::Molinillo
|
11
|
-
end
|
@@ -1,154 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
#
|
3
|
-
# tmpdir - retrieve temporary directory path
|
4
|
-
#
|
5
|
-
# $Id$
|
6
|
-
#
|
7
|
-
|
8
|
-
require_relative '../../fileutils/lib/fileutils'
|
9
|
-
begin
|
10
|
-
require 'etc.so'
|
11
|
-
rescue LoadError # rescue LoadError for miniruby
|
12
|
-
end
|
13
|
-
|
14
|
-
class Bundler::Dir < Dir
|
15
|
-
|
16
|
-
@systmpdir ||= defined?(Etc.systmpdir) ? Etc.systmpdir : '/tmp'
|
17
|
-
|
18
|
-
##
|
19
|
-
# Returns the operating system's temporary file path.
|
20
|
-
|
21
|
-
def self.tmpdir
|
22
|
-
tmp = nil
|
23
|
-
['TMPDIR', 'TMP', 'TEMP', ['system temporary path', @systmpdir], ['/tmp']*2, ['.']*2].each do |name, dir = ENV[name]|
|
24
|
-
next if !dir
|
25
|
-
dir = File.expand_path(dir)
|
26
|
-
stat = File.stat(dir) rescue next
|
27
|
-
case
|
28
|
-
when !stat.directory?
|
29
|
-
warn "#{name} is not a directory: #{dir}"
|
30
|
-
when !stat.writable?
|
31
|
-
warn "#{name} is not writable: #{dir}"
|
32
|
-
when stat.world_writable? && !stat.sticky?
|
33
|
-
warn "#{name} is world-writable: #{dir}"
|
34
|
-
else
|
35
|
-
tmp = dir
|
36
|
-
break
|
37
|
-
end
|
38
|
-
end
|
39
|
-
raise ArgumentError, "could not find a temporary directory" unless tmp
|
40
|
-
tmp
|
41
|
-
end
|
42
|
-
|
43
|
-
# Bundler::Dir.mktmpdir creates a temporary directory.
|
44
|
-
#
|
45
|
-
# The directory is created with 0700 permission.
|
46
|
-
# Application should not change the permission to make the temporary directory accessible from other users.
|
47
|
-
#
|
48
|
-
# The prefix and suffix of the name of the directory is specified by
|
49
|
-
# the optional first argument, <i>prefix_suffix</i>.
|
50
|
-
# - If it is not specified or nil, "d" is used as the prefix and no suffix is used.
|
51
|
-
# - If it is a string, it is used as the prefix and no suffix is used.
|
52
|
-
# - If it is an array, first element is used as the prefix and second element is used as a suffix.
|
53
|
-
#
|
54
|
-
# Bundler::Dir.mktmpdir {|dir| dir is ".../d..." }
|
55
|
-
# Bundler::Dir.mktmpdir("foo") {|dir| dir is ".../foo..." }
|
56
|
-
# Bundler::Dir.mktmpdir(["foo", "bar"]) {|dir| dir is ".../foo...bar" }
|
57
|
-
#
|
58
|
-
# The directory is created under Bundler::Dir.tmpdir or
|
59
|
-
# the optional second argument <i>tmpdir</i> if non-nil value is given.
|
60
|
-
#
|
61
|
-
# Bundler::Dir.mktmpdir {|dir| dir is "#{Bundler::Dir.tmpdir}/d..." }
|
62
|
-
# Bundler::Dir.mktmpdir(nil, "/var/tmp") {|dir| dir is "/var/tmp/d..." }
|
63
|
-
#
|
64
|
-
# If a block is given,
|
65
|
-
# it is yielded with the path of the directory.
|
66
|
-
# The directory and its contents are removed
|
67
|
-
# using Bundler::FileUtils.remove_entry before Bundler::Dir.mktmpdir returns.
|
68
|
-
# The value of the block is returned.
|
69
|
-
#
|
70
|
-
# Bundler::Dir.mktmpdir {|dir|
|
71
|
-
# # use the directory...
|
72
|
-
# open("#{dir}/foo", "w") { ... }
|
73
|
-
# }
|
74
|
-
#
|
75
|
-
# If a block is not given,
|
76
|
-
# The path of the directory is returned.
|
77
|
-
# In this case, Bundler::Dir.mktmpdir doesn't remove the directory.
|
78
|
-
#
|
79
|
-
# dir = Bundler::Dir.mktmpdir
|
80
|
-
# begin
|
81
|
-
# # use the directory...
|
82
|
-
# open("#{dir}/foo", "w") { ... }
|
83
|
-
# ensure
|
84
|
-
# # remove the directory.
|
85
|
-
# Bundler::FileUtils.remove_entry dir
|
86
|
-
# end
|
87
|
-
#
|
88
|
-
def self.mktmpdir(prefix_suffix=nil, *rest, **options)
|
89
|
-
base = nil
|
90
|
-
path = Tmpname.create(prefix_suffix || "d", *rest, **options) {|p, _, _, d|
|
91
|
-
base = d
|
92
|
-
mkdir(p, 0700)
|
93
|
-
}
|
94
|
-
if block_given?
|
95
|
-
begin
|
96
|
-
yield path.dup
|
97
|
-
ensure
|
98
|
-
unless base
|
99
|
-
stat = File.stat(File.dirname(path))
|
100
|
-
if stat.world_writable? and !stat.sticky?
|
101
|
-
raise ArgumentError, "parent directory is world writable but not sticky"
|
102
|
-
end
|
103
|
-
end
|
104
|
-
Bundler::FileUtils.remove_entry path
|
105
|
-
end
|
106
|
-
else
|
107
|
-
path
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
|
-
module Tmpname # :nodoc:
|
112
|
-
module_function
|
113
|
-
|
114
|
-
def tmpdir
|
115
|
-
Bundler::Dir.tmpdir
|
116
|
-
end
|
117
|
-
|
118
|
-
UNUSABLE_CHARS = "^,-.0-9A-Z_a-z~"
|
119
|
-
|
120
|
-
class << (RANDOM = Random.new)
|
121
|
-
MAX = 36**6 # < 0x100000000
|
122
|
-
def next
|
123
|
-
rand(MAX).to_s(36)
|
124
|
-
end
|
125
|
-
end
|
126
|
-
private_constant :RANDOM
|
127
|
-
|
128
|
-
def create(basename, tmpdir=nil, max_try: nil, **opts)
|
129
|
-
origdir = tmpdir
|
130
|
-
tmpdir ||= tmpdir()
|
131
|
-
n = nil
|
132
|
-
prefix, suffix = basename
|
133
|
-
prefix = (String.try_convert(prefix) or
|
134
|
-
raise ArgumentError, "unexpected prefix: #{prefix.inspect}")
|
135
|
-
prefix = prefix.delete(UNUSABLE_CHARS)
|
136
|
-
suffix &&= (String.try_convert(suffix) or
|
137
|
-
raise ArgumentError, "unexpected suffix: #{suffix.inspect}")
|
138
|
-
suffix &&= suffix.delete(UNUSABLE_CHARS)
|
139
|
-
begin
|
140
|
-
t = Time.now.strftime("%Y%m%d")
|
141
|
-
path = "#{prefix}#{t}-#{$$}-#{RANDOM.next}"\
|
142
|
-
"#{n ? %[-#{n}] : ''}#{suffix||''}"
|
143
|
-
path = File.join(tmpdir, path)
|
144
|
-
yield(path, n, opts, origdir)
|
145
|
-
rescue Errno::EEXIST
|
146
|
-
n ||= 0
|
147
|
-
n += 1
|
148
|
-
retry if !max_try or n < max_try
|
149
|
-
raise "cannot generate temporary name using `#{basename}' under `#{tmpdir}'"
|
150
|
-
end
|
151
|
-
path
|
152
|
-
end
|
153
|
-
end
|
154
|
-
end
|
@@ -1,122 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Bundler
|
4
|
-
module VersionRanges
|
5
|
-
NEq = Struct.new(:version)
|
6
|
-
ReqR = Struct.new(:left, :right)
|
7
|
-
class ReqR
|
8
|
-
Endpoint = Struct.new(:version, :inclusive) do
|
9
|
-
def <=>(other)
|
10
|
-
if version.equal?(INFINITY)
|
11
|
-
return 0 if other.version.equal?(INFINITY)
|
12
|
-
return 1
|
13
|
-
elsif other.version.equal?(INFINITY)
|
14
|
-
return -1
|
15
|
-
end
|
16
|
-
|
17
|
-
comp = version <=> other.version
|
18
|
-
return comp unless comp.zero?
|
19
|
-
|
20
|
-
if inclusive && !other.inclusive
|
21
|
-
1
|
22
|
-
elsif !inclusive && other.inclusive
|
23
|
-
-1
|
24
|
-
else
|
25
|
-
0
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
def to_s
|
31
|
-
"#{left.inclusive ? "[" : "("}#{left.version}, #{right.version}#{right.inclusive ? "]" : ")"}"
|
32
|
-
end
|
33
|
-
INFINITY = begin
|
34
|
-
inf = Object.new
|
35
|
-
def inf.to_s
|
36
|
-
"∞"
|
37
|
-
end
|
38
|
-
def inf.<=>(other)
|
39
|
-
return 0 if other.equal?(self)
|
40
|
-
1
|
41
|
-
end
|
42
|
-
inf.freeze
|
43
|
-
end
|
44
|
-
ZERO = Gem::Version.new("0.a")
|
45
|
-
|
46
|
-
def cover?(v)
|
47
|
-
return false if left.inclusive && left.version > v
|
48
|
-
return false if !left.inclusive && left.version >= v
|
49
|
-
|
50
|
-
if right.version != INFINITY
|
51
|
-
return false if right.inclusive && right.version < v
|
52
|
-
return false if !right.inclusive && right.version <= v
|
53
|
-
end
|
54
|
-
|
55
|
-
true
|
56
|
-
end
|
57
|
-
|
58
|
-
def empty?
|
59
|
-
left.version == right.version && !(left.inclusive && right.inclusive)
|
60
|
-
end
|
61
|
-
|
62
|
-
def single?
|
63
|
-
left.version == right.version
|
64
|
-
end
|
65
|
-
|
66
|
-
def <=>(other)
|
67
|
-
return -1 if other.equal?(INFINITY)
|
68
|
-
|
69
|
-
comp = left <=> other.left
|
70
|
-
return comp unless comp.zero?
|
71
|
-
|
72
|
-
right <=> other.right
|
73
|
-
end
|
74
|
-
|
75
|
-
UNIVERSAL = ReqR.new(ReqR::Endpoint.new(Gem::Version.new("0.a"), true), ReqR::Endpoint.new(ReqR::INFINITY, false)).freeze
|
76
|
-
end
|
77
|
-
|
78
|
-
def self.for_many(requirements)
|
79
|
-
requirements = requirements.map(&:requirements).flatten(1).map {|r| r.join(" ") }
|
80
|
-
requirements << ">= 0.a" if requirements.empty?
|
81
|
-
requirement = Gem::Requirement.new(requirements)
|
82
|
-
self.for(requirement)
|
83
|
-
end
|
84
|
-
|
85
|
-
def self.for(requirement)
|
86
|
-
ranges = requirement.requirements.map do |op, v|
|
87
|
-
case op
|
88
|
-
when "=" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(v, true))
|
89
|
-
when "!=" then NEq.new(v)
|
90
|
-
when ">=" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(ReqR::INFINITY, false))
|
91
|
-
when ">" then ReqR.new(ReqR::Endpoint.new(v, false), ReqR::Endpoint.new(ReqR::INFINITY, false))
|
92
|
-
when "<" then ReqR.new(ReqR::Endpoint.new(ReqR::ZERO, true), ReqR::Endpoint.new(v, false))
|
93
|
-
when "<=" then ReqR.new(ReqR::Endpoint.new(ReqR::ZERO, true), ReqR::Endpoint.new(v, true))
|
94
|
-
when "~>" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(v.bump, false))
|
95
|
-
else raise "unknown version op #{op} in requirement #{requirement}"
|
96
|
-
end
|
97
|
-
end.uniq
|
98
|
-
ranges, neqs = ranges.partition {|r| !r.is_a?(NEq) }
|
99
|
-
|
100
|
-
[ranges.sort, neqs.map(&:version)]
|
101
|
-
end
|
102
|
-
|
103
|
-
def self.empty?(ranges, neqs)
|
104
|
-
!ranges.reduce(ReqR::UNIVERSAL) do |last_range, curr_range|
|
105
|
-
next false unless last_range
|
106
|
-
next false if curr_range.single? && neqs.include?(curr_range.left.version)
|
107
|
-
next curr_range if last_range.right.version == ReqR::INFINITY
|
108
|
-
case last_range.right.version <=> curr_range.left.version
|
109
|
-
# higher
|
110
|
-
when 1 then next ReqR.new(curr_range.left, last_range.right)
|
111
|
-
# equal
|
112
|
-
when 0
|
113
|
-
if last_range.right.inclusive && curr_range.left.inclusive && !neqs.include?(curr_range.left.version)
|
114
|
-
ReqR.new(curr_range.left, [curr_range.right, last_range.right].max)
|
115
|
-
end
|
116
|
-
# lower
|
117
|
-
when -1 then next false
|
118
|
-
end
|
119
|
-
end
|
120
|
-
end
|
121
|
-
end
|
122
|
-
end
|