bundler 2.3.12 → 2.4.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +367 -1
- data/README.md +2 -2
- data/bundler.gemspec +8 -10
- data/exe/bundle +1 -4
- data/lib/bundler/build_metadata.rb +2 -2
- data/lib/bundler/cli/add.rb +1 -1
- data/lib/bundler/cli/binstubs.rb +5 -1
- data/lib/bundler/cli/check.rb +1 -1
- data/lib/bundler/cli/common.rb +3 -1
- data/lib/bundler/cli/console.rb +2 -2
- data/lib/bundler/cli/doctor.rb +4 -6
- data/lib/bundler/cli/gem.rb +62 -40
- data/lib/bundler/cli/init.rb +5 -1
- data/lib/bundler/cli/install.rb +7 -5
- data/lib/bundler/cli/lock.rb +8 -5
- data/lib/bundler/cli/open.rb +6 -4
- data/lib/bundler/cli/outdated.rb +13 -6
- data/lib/bundler/cli/platform.rb +1 -1
- data/lib/bundler/cli/viz.rb +1 -1
- data/lib/bundler/cli.rb +52 -7
- data/lib/bundler/compact_index_client/cache.rb +1 -1
- data/lib/bundler/compact_index_client/updater.rb +53 -39
- data/lib/bundler/constants.rb +1 -1
- data/lib/bundler/current_ruby.rb +15 -6
- data/lib/bundler/definition.rb +203 -110
- data/lib/bundler/dependency.rb +21 -84
- data/lib/bundler/digest.rb +1 -1
- data/lib/bundler/dsl.rb +13 -18
- data/lib/bundler/endpoint_specification.rb +6 -10
- data/lib/bundler/env.rb +1 -1
- data/lib/bundler/environment_preserver.rb +1 -0
- data/lib/bundler/errors.rb +15 -15
- data/lib/bundler/feature_flag.rb +0 -1
- data/lib/bundler/fetcher/base.rb +6 -8
- data/lib/bundler/fetcher/compact_index.rb +9 -11
- data/lib/bundler/fetcher/dependency.rb +1 -1
- data/lib/bundler/fetcher/downloader.rb +2 -5
- data/lib/bundler/fetcher.rb +12 -12
- data/lib/bundler/force_platform.rb +18 -0
- data/lib/bundler/friendly_errors.rb +21 -7
- data/lib/bundler/gem_helpers.rb +9 -2
- data/lib/bundler/gem_version_promoter.rb +53 -98
- data/lib/bundler/graph.rb +3 -3
- data/lib/bundler/index.rb +11 -49
- data/lib/bundler/injector.rb +8 -3
- data/lib/bundler/inline.rb +9 -21
- data/lib/bundler/installer/gem_installer.rb +14 -1
- data/lib/bundler/installer/parallel_installer.rb +0 -31
- data/lib/bundler/installer/standalone.rb +41 -10
- data/lib/bundler/installer.rb +18 -39
- data/lib/bundler/lazy_specification.rb +53 -48
- data/lib/bundler/lockfile_generator.rb +1 -1
- data/lib/bundler/lockfile_parser.rb +9 -5
- data/lib/bundler/man/bundle-add.1 +13 -5
- data/lib/bundler/man/bundle-add.1.ronn +10 -4
- data/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/lib/bundler/man/bundle-cache.1 +7 -1
- data/lib/bundler/man/bundle-cache.1.ronn +7 -0
- data/lib/bundler/man/bundle-check.1 +1 -1
- data/lib/bundler/man/bundle-clean.1 +2 -2
- data/lib/bundler/man/bundle-clean.1.ronn +1 -1
- data/lib/bundler/man/bundle-config.1 +26 -7
- data/lib/bundler/man/bundle-config.1.ronn +17 -7
- data/lib/bundler/man/bundle-console.1 +53 -0
- data/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/lib/bundler/man/bundle-doctor.1 +1 -1
- data/lib/bundler/man/bundle-exec.1 +6 -6
- data/lib/bundler/man/bundle-exec.1.ronn +6 -6
- data/lib/bundler/man/bundle-gem.1 +27 -37
- data/lib/bundler/man/bundle-gem.1.ronn +5 -5
- data/lib/bundler/man/bundle-help.1 +13 -0
- data/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/lib/bundler/man/bundle-info.1 +1 -1
- data/lib/bundler/man/bundle-init.1 +1 -1
- data/lib/bundler/man/bundle-inject.1 +5 -2
- data/lib/bundler/man/bundle-inject.1.ronn +3 -1
- data/lib/bundler/man/bundle-install.1 +5 -30
- data/lib/bundler/man/bundle-install.1.ronn +6 -29
- data/lib/bundler/man/bundle-list.1 +1 -1
- data/lib/bundler/man/bundle-lock.1 +1 -1
- data/lib/bundler/man/bundle-open.1 +22 -2
- data/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/lib/bundler/man/bundle-outdated.1 +1 -1
- data/lib/bundler/man/bundle-platform.1 +16 -6
- data/lib/bundler/man/bundle-platform.1.ronn +14 -7
- data/lib/bundler/man/bundle-plugin.1 +81 -0
- data/lib/bundler/man/bundle-plugin.1.ronn +59 -0
- data/lib/bundler/man/bundle-pristine.1 +1 -1
- data/lib/bundler/man/bundle-remove.1 +1 -1
- data/lib/bundler/man/bundle-show.1 +1 -1
- data/lib/bundler/man/bundle-update.1 +1 -1
- data/lib/bundler/man/bundle-version.1 +35 -0
- data/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/lib/bundler/man/bundle-viz.1 +4 -1
- data/lib/bundler/man/bundle-viz.1.ronn +2 -0
- data/lib/bundler/man/bundle.1 +15 -10
- data/lib/bundler/man/bundle.1.ronn +12 -7
- data/lib/bundler/man/gemfile.5 +92 -81
- data/lib/bundler/man/gemfile.5.ronn +98 -85
- data/lib/bundler/man/index.txt +4 -0
- data/lib/bundler/match_metadata.rb +13 -0
- data/lib/bundler/match_platform.rb +0 -1
- data/lib/bundler/match_remote_metadata.rb +29 -0
- data/lib/bundler/mirror.rb +5 -7
- data/lib/bundler/plugin/api/source.rb +3 -3
- data/lib/bundler/plugin/index.rb +4 -4
- data/lib/bundler/plugin/installer/git.rb +0 -4
- data/lib/bundler/plugin/installer/rubygems.rb +0 -8
- data/lib/bundler/plugin.rb +2 -0
- data/lib/bundler/process_lock.rb +1 -1
- data/lib/bundler/remote_specification.rb +8 -9
- data/lib/bundler/resolver/base.rb +77 -0
- data/lib/bundler/resolver/candidate.rb +94 -0
- data/lib/bundler/resolver/incompatibility.rb +15 -0
- data/lib/bundler/resolver/package.rb +72 -0
- data/lib/bundler/resolver/root.rb +25 -0
- data/lib/bundler/resolver/spec_group.rb +42 -70
- data/lib/bundler/resolver.rb +322 -326
- data/lib/bundler/ruby_dsl.rb +1 -1
- data/lib/bundler/ruby_version.rb +5 -5
- data/lib/bundler/rubygems_ext.rb +102 -12
- data/lib/bundler/rubygems_gem_installer.rb +32 -20
- data/lib/bundler/rubygems_integration.rb +12 -34
- data/lib/bundler/runtime.rb +1 -6
- data/lib/bundler/settings.rb +2 -8
- data/lib/bundler/shared_helpers.rb +7 -7
- data/lib/bundler/source/git/git_proxy.rb +193 -67
- data/lib/bundler/source/git.rb +21 -25
- data/lib/bundler/source/metadata.rb +1 -2
- data/lib/bundler/source/path/installer.rb +1 -22
- data/lib/bundler/source/path.rb +6 -6
- data/lib/bundler/source/rubygems.rb +75 -117
- data/lib/bundler/source.rb +3 -4
- data/lib/bundler/source_list.rb +12 -2
- data/lib/bundler/spec_set.rb +52 -34
- data/lib/bundler/stub_specification.rb +5 -3
- data/lib/bundler/templates/Executable +1 -1
- data/lib/bundler/templates/Executable.bundler +4 -9
- data/lib/bundler/templates/Executable.standalone +2 -0
- data/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/lib/bundler/templates/newgem/Gemfile.tt +3 -0
- data/lib/bundler/templates/newgem/README.md.tt +6 -4
- data/lib/bundler/templates/newgem/Rakefile.tt +2 -1
- 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-rust.rb.tt +6 -0
- data/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +10 -0
- 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 +8 -2
- data/lib/bundler/ui/shell.rb +35 -12
- data/lib/bundler/ui/silent.rb +21 -5
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
- 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 +151 -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 +53 -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 +128 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +409 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +240 -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/lib/thor/shell/basic.rb +1 -1
- data/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
- data/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
- data/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
- data/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +13 -7
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +10 -5
- data/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
- data/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
- data/lib/bundler/vendor/uri/lib/uri.rb +3 -2
- data/lib/bundler/vendored_persistent.rb +1 -33
- data/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
- data/lib/bundler/version.rb +5 -1
- data/lib/bundler/worker.rb +5 -7
- data/lib/bundler.rb +35 -69
- metadata +45 -34
- data/lib/bundler/dep_proxy.rb +0 -55
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/lib/bundler/vendor/molinillo/LICENSE +0 -9
- 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 -149
- 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/vendored_molinillo.rb +0 -4
- data/lib/bundler/version_ranges.rb +0 -122
- /data/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
@@ -1,164 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Bundler::Molinillo
|
4
|
-
class DependencyGraph
|
5
|
-
# A vertex in a {DependencyGraph} that encapsulates a {#name} and a
|
6
|
-
# {#payload}
|
7
|
-
class Vertex
|
8
|
-
# @return [String] the name of the vertex
|
9
|
-
attr_accessor :name
|
10
|
-
|
11
|
-
# @return [Object] the payload the vertex holds
|
12
|
-
attr_accessor :payload
|
13
|
-
|
14
|
-
# @return [Array<Object>] the explicit requirements that required
|
15
|
-
# this vertex
|
16
|
-
attr_reader :explicit_requirements
|
17
|
-
|
18
|
-
# @return [Boolean] whether the vertex is considered a root vertex
|
19
|
-
attr_accessor :root
|
20
|
-
alias root? root
|
21
|
-
|
22
|
-
# Initializes a vertex with the given name and payload.
|
23
|
-
# @param [String] name see {#name}
|
24
|
-
# @param [Object] payload see {#payload}
|
25
|
-
def initialize(name, payload)
|
26
|
-
@name = name.frozen? ? name : name.dup.freeze
|
27
|
-
@payload = payload
|
28
|
-
@explicit_requirements = []
|
29
|
-
@outgoing_edges = []
|
30
|
-
@incoming_edges = []
|
31
|
-
end
|
32
|
-
|
33
|
-
# @return [Array<Object>] all of the requirements that required
|
34
|
-
# this vertex
|
35
|
-
def requirements
|
36
|
-
(incoming_edges.map(&:requirement) + explicit_requirements).uniq
|
37
|
-
end
|
38
|
-
|
39
|
-
# @return [Array<Edge>] the edges of {#graph} that have `self` as their
|
40
|
-
# {Edge#origin}
|
41
|
-
attr_accessor :outgoing_edges
|
42
|
-
|
43
|
-
# @return [Array<Edge>] the edges of {#graph} that have `self` as their
|
44
|
-
# {Edge#destination}
|
45
|
-
attr_accessor :incoming_edges
|
46
|
-
|
47
|
-
# @return [Array<Vertex>] the vertices of {#graph} that have an edge with
|
48
|
-
# `self` as their {Edge#destination}
|
49
|
-
def predecessors
|
50
|
-
incoming_edges.map(&:origin)
|
51
|
-
end
|
52
|
-
|
53
|
-
# @return [Set<Vertex>] the vertices of {#graph} where `self` is a
|
54
|
-
# {#descendent?}
|
55
|
-
def recursive_predecessors
|
56
|
-
_recursive_predecessors
|
57
|
-
end
|
58
|
-
|
59
|
-
# @param [Set<Vertex>] vertices the set to add the predecessors to
|
60
|
-
# @return [Set<Vertex>] the vertices of {#graph} where `self` is a
|
61
|
-
# {#descendent?}
|
62
|
-
def _recursive_predecessors(vertices = new_vertex_set)
|
63
|
-
incoming_edges.each do |edge|
|
64
|
-
vertex = edge.origin
|
65
|
-
next unless vertices.add?(vertex)
|
66
|
-
vertex._recursive_predecessors(vertices)
|
67
|
-
end
|
68
|
-
|
69
|
-
vertices
|
70
|
-
end
|
71
|
-
protected :_recursive_predecessors
|
72
|
-
|
73
|
-
# @return [Array<Vertex>] the vertices of {#graph} that have an edge with
|
74
|
-
# `self` as their {Edge#origin}
|
75
|
-
def successors
|
76
|
-
outgoing_edges.map(&:destination)
|
77
|
-
end
|
78
|
-
|
79
|
-
# @return [Set<Vertex>] the vertices of {#graph} where `self` is an
|
80
|
-
# {#ancestor?}
|
81
|
-
def recursive_successors
|
82
|
-
_recursive_successors
|
83
|
-
end
|
84
|
-
|
85
|
-
# @param [Set<Vertex>] vertices the set to add the successors to
|
86
|
-
# @return [Set<Vertex>] the vertices of {#graph} where `self` is an
|
87
|
-
# {#ancestor?}
|
88
|
-
def _recursive_successors(vertices = new_vertex_set)
|
89
|
-
outgoing_edges.each do |edge|
|
90
|
-
vertex = edge.destination
|
91
|
-
next unless vertices.add?(vertex)
|
92
|
-
vertex._recursive_successors(vertices)
|
93
|
-
end
|
94
|
-
|
95
|
-
vertices
|
96
|
-
end
|
97
|
-
protected :_recursive_successors
|
98
|
-
|
99
|
-
# @return [String] a string suitable for debugging
|
100
|
-
def inspect
|
101
|
-
"#{self.class}:#{name}(#{payload.inspect})"
|
102
|
-
end
|
103
|
-
|
104
|
-
# @return [Boolean] whether the two vertices are equal, determined
|
105
|
-
# by a recursive traversal of each {Vertex#successors}
|
106
|
-
def ==(other)
|
107
|
-
return true if equal?(other)
|
108
|
-
shallow_eql?(other) &&
|
109
|
-
successors.to_set == other.successors.to_set
|
110
|
-
end
|
111
|
-
|
112
|
-
# @param [Vertex] other the other vertex to compare to
|
113
|
-
# @return [Boolean] whether the two vertices are equal, determined
|
114
|
-
# solely by {#name} and {#payload} equality
|
115
|
-
def shallow_eql?(other)
|
116
|
-
return true if equal?(other)
|
117
|
-
other &&
|
118
|
-
name == other.name &&
|
119
|
-
payload == other.payload
|
120
|
-
end
|
121
|
-
|
122
|
-
alias eql? ==
|
123
|
-
|
124
|
-
# @return [Fixnum] a hash for the vertex based upon its {#name}
|
125
|
-
def hash
|
126
|
-
name.hash
|
127
|
-
end
|
128
|
-
|
129
|
-
# Is there a path from `self` to `other` following edges in the
|
130
|
-
# dependency graph?
|
131
|
-
# @return whether there is a path following edges within this {#graph}
|
132
|
-
def path_to?(other)
|
133
|
-
_path_to?(other)
|
134
|
-
end
|
135
|
-
|
136
|
-
alias descendent? path_to?
|
137
|
-
|
138
|
-
# @param [Vertex] other the vertex to check if there's a path to
|
139
|
-
# @param [Set<Vertex>] visited the vertices of {#graph} that have been visited
|
140
|
-
# @return [Boolean] whether there is a path to `other` from `self`
|
141
|
-
def _path_to?(other, visited = new_vertex_set)
|
142
|
-
return false unless visited.add?(self)
|
143
|
-
return true if equal?(other)
|
144
|
-
successors.any? { |v| v._path_to?(other, visited) }
|
145
|
-
end
|
146
|
-
protected :_path_to?
|
147
|
-
|
148
|
-
# Is there a path from `other` to `self` following edges in the
|
149
|
-
# dependency graph?
|
150
|
-
# @return whether there is a path following edges within this {#graph}
|
151
|
-
def ancestor?(other)
|
152
|
-
other.path_to?(self)
|
153
|
-
end
|
154
|
-
|
155
|
-
alias is_reachable_from? ancestor?
|
156
|
-
|
157
|
-
def new_vertex_set
|
158
|
-
require 'set'
|
159
|
-
Set.new
|
160
|
-
end
|
161
|
-
private :new_vertex_set
|
162
|
-
end
|
163
|
-
end
|
164
|
-
end
|
@@ -1,255 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative '../../../../vendored_tsort'
|
4
|
-
|
5
|
-
require_relative 'dependency_graph/log'
|
6
|
-
require_relative 'dependency_graph/vertex'
|
7
|
-
|
8
|
-
module Bundler::Molinillo
|
9
|
-
# A directed acyclic graph that is tuned to hold named dependencies
|
10
|
-
class DependencyGraph
|
11
|
-
include Enumerable
|
12
|
-
|
13
|
-
# Enumerates through the vertices of the graph.
|
14
|
-
# @return [Array<Vertex>] The graph's vertices.
|
15
|
-
def each
|
16
|
-
return vertices.values.each unless block_given?
|
17
|
-
vertices.values.each { |v| yield v }
|
18
|
-
end
|
19
|
-
|
20
|
-
include Bundler::TSort
|
21
|
-
|
22
|
-
# @!visibility private
|
23
|
-
alias tsort_each_node each
|
24
|
-
|
25
|
-
# @!visibility private
|
26
|
-
def tsort_each_child(vertex, &block)
|
27
|
-
vertex.successors.each(&block)
|
28
|
-
end
|
29
|
-
|
30
|
-
# Topologically sorts the given vertices.
|
31
|
-
# @param [Enumerable<Vertex>] vertices the vertices to be sorted, which must
|
32
|
-
# all belong to the same graph.
|
33
|
-
# @return [Array<Vertex>] The sorted vertices.
|
34
|
-
def self.tsort(vertices)
|
35
|
-
Bundler::TSort.tsort(
|
36
|
-
lambda { |b| vertices.each(&b) },
|
37
|
-
lambda { |v, &b| (v.successors & vertices).each(&b) }
|
38
|
-
)
|
39
|
-
end
|
40
|
-
|
41
|
-
# A directed edge of a {DependencyGraph}
|
42
|
-
# @attr [Vertex] origin The origin of the directed edge
|
43
|
-
# @attr [Vertex] destination The destination of the directed edge
|
44
|
-
# @attr [Object] requirement The requirement the directed edge represents
|
45
|
-
Edge = Struct.new(:origin, :destination, :requirement)
|
46
|
-
|
47
|
-
# @return [{String => Vertex}] the vertices of the dependency graph, keyed
|
48
|
-
# by {Vertex#name}
|
49
|
-
attr_reader :vertices
|
50
|
-
|
51
|
-
# @return [Log] the op log for this graph
|
52
|
-
attr_reader :log
|
53
|
-
|
54
|
-
# Initializes an empty dependency graph
|
55
|
-
def initialize
|
56
|
-
@vertices = {}
|
57
|
-
@log = Log.new
|
58
|
-
end
|
59
|
-
|
60
|
-
# Tags the current state of the dependency as the given tag
|
61
|
-
# @param [Object] tag an opaque tag for the current state of the graph
|
62
|
-
# @return [Void]
|
63
|
-
def tag(tag)
|
64
|
-
log.tag(self, tag)
|
65
|
-
end
|
66
|
-
|
67
|
-
# Rewinds the graph to the state tagged as `tag`
|
68
|
-
# @param [Object] tag the tag to rewind to
|
69
|
-
# @return [Void]
|
70
|
-
def rewind_to(tag)
|
71
|
-
log.rewind_to(self, tag)
|
72
|
-
end
|
73
|
-
|
74
|
-
# Initializes a copy of a {DependencyGraph}, ensuring that all {#vertices}
|
75
|
-
# are properly copied.
|
76
|
-
# @param [DependencyGraph] other the graph to copy.
|
77
|
-
def initialize_copy(other)
|
78
|
-
super
|
79
|
-
@vertices = {}
|
80
|
-
@log = other.log.dup
|
81
|
-
traverse = lambda do |new_v, old_v|
|
82
|
-
return if new_v.outgoing_edges.size == old_v.outgoing_edges.size
|
83
|
-
old_v.outgoing_edges.each do |edge|
|
84
|
-
destination = add_vertex(edge.destination.name, edge.destination.payload)
|
85
|
-
add_edge_no_circular(new_v, destination, edge.requirement)
|
86
|
-
traverse.call(destination, edge.destination)
|
87
|
-
end
|
88
|
-
end
|
89
|
-
other.vertices.each do |name, vertex|
|
90
|
-
new_vertex = add_vertex(name, vertex.payload, vertex.root?)
|
91
|
-
new_vertex.explicit_requirements.replace(vertex.explicit_requirements)
|
92
|
-
traverse.call(new_vertex, vertex)
|
93
|
-
end
|
94
|
-
end
|
95
|
-
|
96
|
-
# @return [String] a string suitable for debugging
|
97
|
-
def inspect
|
98
|
-
"#{self.class}:#{vertices.values.inspect}"
|
99
|
-
end
|
100
|
-
|
101
|
-
# @param [Hash] options options for dot output.
|
102
|
-
# @return [String] Returns a dot format representation of the graph
|
103
|
-
def to_dot(options = {})
|
104
|
-
edge_label = options.delete(:edge_label)
|
105
|
-
raise ArgumentError, "Unknown options: #{options.keys}" unless options.empty?
|
106
|
-
|
107
|
-
dot_vertices = []
|
108
|
-
dot_edges = []
|
109
|
-
vertices.each do |n, v|
|
110
|
-
dot_vertices << " #{n} [label=\"{#{n}|#{v.payload}}\"]"
|
111
|
-
v.outgoing_edges.each do |e|
|
112
|
-
label = edge_label ? edge_label.call(e) : e.requirement
|
113
|
-
dot_edges << " #{e.origin.name} -> #{e.destination.name} [label=#{label.to_s.dump}]"
|
114
|
-
end
|
115
|
-
end
|
116
|
-
|
117
|
-
dot_vertices.uniq!
|
118
|
-
dot_vertices.sort!
|
119
|
-
dot_edges.uniq!
|
120
|
-
dot_edges.sort!
|
121
|
-
|
122
|
-
dot = dot_vertices.unshift('digraph G {').push('') + dot_edges.push('}')
|
123
|
-
dot.join("\n")
|
124
|
-
end
|
125
|
-
|
126
|
-
# @param [DependencyGraph] other
|
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(path(destination, origin))
|
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
|
-
|
223
|
-
# Returns the path between two vertices
|
224
|
-
# @raise [ArgumentError] if there is no path between the vertices
|
225
|
-
# @param [Vertex] from
|
226
|
-
# @param [Vertex] to
|
227
|
-
# @return [Array<Vertex>] the shortest path from `from` to `to`
|
228
|
-
def path(from, to)
|
229
|
-
distances = Hash.new(vertices.size + 1)
|
230
|
-
distances[from.name] = 0
|
231
|
-
predecessors = {}
|
232
|
-
each do |vertex|
|
233
|
-
vertex.successors.each do |successor|
|
234
|
-
if distances[successor.name] > distances[vertex.name] + 1
|
235
|
-
distances[successor.name] = distances[vertex.name] + 1
|
236
|
-
predecessors[successor] = vertex
|
237
|
-
end
|
238
|
-
end
|
239
|
-
end
|
240
|
-
|
241
|
-
path = [to]
|
242
|
-
while before = predecessors[to]
|
243
|
-
path << before
|
244
|
-
to = before
|
245
|
-
break if to == from
|
246
|
-
end
|
247
|
-
|
248
|
-
unless path.last.equal?(from)
|
249
|
-
raise ArgumentError, "There is no path from #{from.name} to #{to.name}"
|
250
|
-
end
|
251
|
-
|
252
|
-
path.reverse
|
253
|
-
end
|
254
|
-
end
|
255
|
-
end
|
@@ -1,149 +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 if and only if 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
|
-
conflicts.values.flat_map(&: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_relative '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
|
-
full_message_for_conflict = opts.delete(:full_message_for_conflict) do
|
111
|
-
proc do |name, conflict|
|
112
|
-
o = "\n".dup << incompatible_version_message_for_conflict.call(name, conflict) << "\n"
|
113
|
-
if conflict.locked_requirement
|
114
|
-
o << %( In snapshot (#{name_for_locking_dependency_source}):\n)
|
115
|
-
o << %( #{printable_requirement.call(conflict.locked_requirement)}\n)
|
116
|
-
o << %(\n)
|
117
|
-
end
|
118
|
-
o << %( In #{name_for_explicit_dependency_source}:\n)
|
119
|
-
trees = reduce_trees.call(conflict.requirement_trees)
|
120
|
-
|
121
|
-
o << trees.map do |tree|
|
122
|
-
t = ''.dup
|
123
|
-
depth = 2
|
124
|
-
tree.each do |req|
|
125
|
-
t << ' ' * depth << printable_requirement.call(req)
|
126
|
-
unless tree.last == req
|
127
|
-
if spec = conflict.activated_by_name[name_for(req)]
|
128
|
-
t << %( was resolved to #{version_for_spec.call(spec)}, which)
|
129
|
-
end
|
130
|
-
t << %( depends on)
|
131
|
-
end
|
132
|
-
t << %(\n)
|
133
|
-
depth += 1
|
134
|
-
end
|
135
|
-
t
|
136
|
-
end.join("\n")
|
137
|
-
|
138
|
-
additional_message_for_conflict.call(o, name, conflict)
|
139
|
-
|
140
|
-
o
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
conflicts.sort.reduce(''.dup) do |o, (name, conflict)|
|
145
|
-
o << full_message_for_conflict.call(name, conflict)
|
146
|
-
end.strip
|
147
|
-
end
|
148
|
-
end
|
149
|
-
end
|
@@ -1,112 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Bundler::Molinillo
|
4
|
-
# Provides information about specifications 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
|
-
# Determines whether two arrays of dependencies are equal, and thus can be
|
49
|
-
# grouped.
|
50
|
-
#
|
51
|
-
# @param [Array<Object>] dependencies
|
52
|
-
# @param [Array<Object>] other_dependencies
|
53
|
-
# @return [Boolean] whether `dependencies` and `other_dependencies` should
|
54
|
-
# be considered equal.
|
55
|
-
def dependencies_equal?(dependencies, other_dependencies)
|
56
|
-
dependencies == other_dependencies
|
57
|
-
end
|
58
|
-
|
59
|
-
# Returns the name for the given `dependency`.
|
60
|
-
# @note This method should be 'pure', i.e. the return value should depend
|
61
|
-
# only on the `dependency` parameter.
|
62
|
-
#
|
63
|
-
# @param [Object] dependency
|
64
|
-
# @return [String] the name for the given `dependency`.
|
65
|
-
def name_for(dependency)
|
66
|
-
dependency.to_s
|
67
|
-
end
|
68
|
-
|
69
|
-
# @return [String] the name of the source of explicit dependencies, i.e.
|
70
|
-
# those passed to {Resolver#resolve} directly.
|
71
|
-
def name_for_explicit_dependency_source
|
72
|
-
'user-specified dependency'
|
73
|
-
end
|
74
|
-
|
75
|
-
# @return [String] the name of the source of 'locked' dependencies, i.e.
|
76
|
-
# those passed to {Resolver#resolve} directly as the `base`
|
77
|
-
def name_for_locking_dependency_source
|
78
|
-
'Lockfile'
|
79
|
-
end
|
80
|
-
|
81
|
-
# Sort dependencies so that the ones that are easiest to resolve are first.
|
82
|
-
# Easiest to resolve is (usually) defined by:
|
83
|
-
# 1) Is this dependency already activated?
|
84
|
-
# 2) How relaxed are the requirements?
|
85
|
-
# 3) Are there any conflicts for this dependency?
|
86
|
-
# 4) How many possibilities are there to satisfy this dependency?
|
87
|
-
#
|
88
|
-
# @param [Array<Object>] dependencies
|
89
|
-
# @param [DependencyGraph] activated the current dependency graph in the
|
90
|
-
# resolution process.
|
91
|
-
# @param [{String => Array<Conflict>}] conflicts
|
92
|
-
# @return [Array<Object>] a sorted copy of `dependencies`.
|
93
|
-
def sort_dependencies(dependencies, activated, conflicts)
|
94
|
-
dependencies.sort_by do |dependency|
|
95
|
-
name = name_for(dependency)
|
96
|
-
[
|
97
|
-
activated.vertex_named(name).payload ? 0 : 1,
|
98
|
-
conflicts[name] ? 0 : 1,
|
99
|
-
]
|
100
|
-
end
|
101
|
-
end
|
102
|
-
|
103
|
-
# Returns whether this dependency, which has no possible matching
|
104
|
-
# specifications, can safely be ignored.
|
105
|
-
#
|
106
|
-
# @param [Object] dependency
|
107
|
-
# @return [Boolean] whether this dependency can safely be skipped.
|
108
|
-
def allow_missing?(dependency)
|
109
|
-
false
|
110
|
-
end
|
111
|
-
end
|
112
|
-
end
|