bundler 2.3.26 → 2.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +48 -0
- data/README.md +2 -2
- data/bundler.gemspec +2 -2
- 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/check.rb +1 -1
- data/lib/bundler/cli/common.rb +1 -0
- 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/install.rb +2 -3
- data/lib/bundler/cli/lock.rb +8 -5
- data/lib/bundler/cli/outdated.rb +1 -3
- data/lib/bundler/cli/viz.rb +1 -1
- data/lib/bundler/cli.rb +43 -2
- data/lib/bundler/compact_index_client/cache.rb +1 -1
- data/lib/bundler/compact_index_client/updater.rb +40 -39
- data/lib/bundler/constants.rb +1 -1
- data/lib/bundler/definition.rb +61 -31
- data/lib/bundler/dependency.rb +12 -11
- data/lib/bundler/digest.rb +1 -1
- data/lib/bundler/dsl.rb +1 -1
- data/lib/bundler/env.rb +1 -1
- data/lib/bundler/environment_preserver.rb +1 -0
- data/lib/bundler/errors.rb +1 -11
- 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 +2 -6
- data/lib/bundler/force_platform.rb +18 -0
- data/lib/bundler/friendly_errors.rb +0 -3
- data/lib/bundler/gem_version_promoter.rb +52 -86
- data/lib/bundler/graph.rb +3 -3
- data/lib/bundler/index.rb +5 -13
- data/lib/bundler/injector.rb +1 -1
- data/lib/bundler/inline.rb +2 -2
- data/lib/bundler/installer/parallel_installer.rb +0 -31
- data/lib/bundler/installer.rb +6 -16
- data/lib/bundler/lazy_specification.rb +5 -1
- data/lib/bundler/lockfile_parser.rb +5 -5
- data/lib/bundler/man/bundle-add.1 +1 -1
- data/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/lib/bundler/man/bundle-cache.1 +1 -1
- data/lib/bundler/man/bundle-check.1 +1 -1
- data/lib/bundler/man/bundle-clean.1 +1 -1
- data/lib/bundler/man/bundle-config.1 +1 -1
- data/lib/bundler/man/bundle-console.1 +1 -1
- data/lib/bundler/man/bundle-doctor.1 +1 -1
- data/lib/bundler/man/bundle-exec.1 +1 -1
- 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 +1 -1
- 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 +1 -1
- data/lib/bundler/man/bundle-install.1 +1 -30
- data/lib/bundler/man/bundle-install.1.ronn +0 -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 +1 -1
- data/lib/bundler/man/bundle-outdated.1 +1 -1
- data/lib/bundler/man/bundle-platform.1 +2 -2
- data/lib/bundler/man/bundle-platform.1.ronn +1 -1
- data/lib/bundler/man/bundle-plugin.1 +1 -1
- 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 +1 -1
- data/lib/bundler/man/bundle-viz.1 +1 -1
- data/lib/bundler/man/bundle.1 +1 -1
- data/lib/bundler/man/gemfile.5 +1 -1
- data/lib/bundler/mirror.rb +5 -7
- data/lib/bundler/plugin/index.rb +4 -4
- data/lib/bundler/plugin/installer/rubygems.rb +0 -4
- data/lib/bundler/resolver/base.rb +7 -11
- data/lib/bundler/resolver/candidate.rb +92 -0
- data/lib/bundler/resolver/incompatibility.rb +15 -0
- data/lib/bundler/resolver/package.rb +63 -0
- data/lib/bundler/resolver/root.rb +25 -0
- data/lib/bundler/resolver/spec_group.rb +26 -36
- data/lib/bundler/resolver.rb +285 -277
- data/lib/bundler/rubygems_ext.rb +11 -6
- data/lib/bundler/rubygems_gem_installer.rb +4 -2
- data/lib/bundler/rubygems_integration.rb +1 -9
- data/lib/bundler/runtime.rb +1 -5
- data/lib/bundler/settings.rb +0 -6
- data/lib/bundler/shared_helpers.rb +1 -0
- data/lib/bundler/source/git/git_proxy.rb +190 -67
- data/lib/bundler/source/git.rb +15 -17
- data/lib/bundler/source/metadata.rb +0 -1
- data/lib/bundler/source/path/installer.rb +1 -22
- data/lib/bundler/source/path.rb +5 -5
- data/lib/bundler/source/rubygems.rb +13 -67
- data/lib/bundler/source_list.rb +8 -2
- data/lib/bundler/spec_set.rb +7 -9
- 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.rb.tt → extconf-c.rb.tt} +0 -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 +8 -0
- 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 +124 -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 +20 -64
- metadata +33 -32
- 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
@@ -1,62 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative 'action'
|
4
|
-
module Bundler::Molinillo
|
5
|
-
class DependencyGraph
|
6
|
-
# @!visibility private
|
7
|
-
# (see DependencyGraph#add_vertex)
|
8
|
-
class AddVertex < Action # :nodoc:
|
9
|
-
# @!group Action
|
10
|
-
|
11
|
-
# (see Action.action_name)
|
12
|
-
def self.action_name
|
13
|
-
:add_vertex
|
14
|
-
end
|
15
|
-
|
16
|
-
# (see Action#up)
|
17
|
-
def up(graph)
|
18
|
-
if existing = graph.vertices[name]
|
19
|
-
@existing_payload = existing.payload
|
20
|
-
@existing_root = existing.root
|
21
|
-
end
|
22
|
-
vertex = existing || Vertex.new(name, payload)
|
23
|
-
graph.vertices[vertex.name] = vertex
|
24
|
-
vertex.payload ||= payload
|
25
|
-
vertex.root ||= root
|
26
|
-
vertex
|
27
|
-
end
|
28
|
-
|
29
|
-
# (see Action#down)
|
30
|
-
def down(graph)
|
31
|
-
if defined?(@existing_payload)
|
32
|
-
vertex = graph.vertices[name]
|
33
|
-
vertex.payload = @existing_payload
|
34
|
-
vertex.root = @existing_root
|
35
|
-
else
|
36
|
-
graph.vertices.delete(name)
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
# @!group AddVertex
|
41
|
-
|
42
|
-
# @return [String] the name of the vertex
|
43
|
-
attr_reader :name
|
44
|
-
|
45
|
-
# @return [Object] the payload for the vertex
|
46
|
-
attr_reader :payload
|
47
|
-
|
48
|
-
# @return [Boolean] whether the vertex is root or not
|
49
|
-
attr_reader :root
|
50
|
-
|
51
|
-
# Initialize an action to add a vertex to a dependency graph
|
52
|
-
# @param [String] name the name of the vertex
|
53
|
-
# @param [Object] payload the payload for the vertex
|
54
|
-
# @param [Boolean] root whether the vertex is root or not
|
55
|
-
def initialize(name, payload, root)
|
56
|
-
@name = name
|
57
|
-
@payload = payload
|
58
|
-
@root = root
|
59
|
-
end
|
60
|
-
end
|
61
|
-
end
|
62
|
-
end
|
@@ -1,63 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative 'action'
|
4
|
-
module Bundler::Molinillo
|
5
|
-
class DependencyGraph
|
6
|
-
# @!visibility private
|
7
|
-
# (see DependencyGraph#delete_edge)
|
8
|
-
class DeleteEdge < Action
|
9
|
-
# @!group Action
|
10
|
-
|
11
|
-
# (see Action.action_name)
|
12
|
-
def self.action_name
|
13
|
-
:delete_edge
|
14
|
-
end
|
15
|
-
|
16
|
-
# (see Action#up)
|
17
|
-
def up(graph)
|
18
|
-
edge = make_edge(graph)
|
19
|
-
edge.origin.outgoing_edges.delete(edge)
|
20
|
-
edge.destination.incoming_edges.delete(edge)
|
21
|
-
end
|
22
|
-
|
23
|
-
# (see Action#down)
|
24
|
-
def down(graph)
|
25
|
-
edge = make_edge(graph)
|
26
|
-
edge.origin.outgoing_edges << edge
|
27
|
-
edge.destination.incoming_edges << edge
|
28
|
-
edge
|
29
|
-
end
|
30
|
-
|
31
|
-
# @!group DeleteEdge
|
32
|
-
|
33
|
-
# @return [String] the name of the origin of the edge
|
34
|
-
attr_reader :origin_name
|
35
|
-
|
36
|
-
# @return [String] the name of the destination of the edge
|
37
|
-
attr_reader :destination_name
|
38
|
-
|
39
|
-
# @return [Object] the requirement that the edge represents
|
40
|
-
attr_reader :requirement
|
41
|
-
|
42
|
-
# @param [DependencyGraph] graph the graph to find vertices from
|
43
|
-
# @return [Edge] The edge this action adds
|
44
|
-
def make_edge(graph)
|
45
|
-
Edge.new(
|
46
|
-
graph.vertex_named(origin_name),
|
47
|
-
graph.vertex_named(destination_name),
|
48
|
-
requirement
|
49
|
-
)
|
50
|
-
end
|
51
|
-
|
52
|
-
# Initialize an action to add an edge to a dependency graph
|
53
|
-
# @param [String] origin_name the name of the origin of the edge
|
54
|
-
# @param [String] destination_name the name of the destination of the edge
|
55
|
-
# @param [Object] requirement the requirement that the edge represents
|
56
|
-
def initialize(origin_name, destination_name, requirement)
|
57
|
-
@origin_name = origin_name
|
58
|
-
@destination_name = destination_name
|
59
|
-
@requirement = requirement
|
60
|
-
end
|
61
|
-
end
|
62
|
-
end
|
63
|
-
end
|
@@ -1,61 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative 'action'
|
4
|
-
module Bundler::Molinillo
|
5
|
-
class DependencyGraph
|
6
|
-
# @!visibility private
|
7
|
-
# @see DependencyGraph#detach_vertex_named
|
8
|
-
class DetachVertexNamed < Action
|
9
|
-
# @!group Action
|
10
|
-
|
11
|
-
# (see Action#name)
|
12
|
-
def self.action_name
|
13
|
-
:add_vertex
|
14
|
-
end
|
15
|
-
|
16
|
-
# (see Action#up)
|
17
|
-
def up(graph)
|
18
|
-
return [] unless @vertex = graph.vertices.delete(name)
|
19
|
-
|
20
|
-
removed_vertices = [@vertex]
|
21
|
-
@vertex.outgoing_edges.each do |e|
|
22
|
-
v = e.destination
|
23
|
-
v.incoming_edges.delete(e)
|
24
|
-
if !v.root? && v.incoming_edges.empty?
|
25
|
-
removed_vertices.concat graph.detach_vertex_named(v.name)
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
@vertex.incoming_edges.each do |e|
|
30
|
-
v = e.origin
|
31
|
-
v.outgoing_edges.delete(e)
|
32
|
-
end
|
33
|
-
|
34
|
-
removed_vertices
|
35
|
-
end
|
36
|
-
|
37
|
-
# (see Action#down)
|
38
|
-
def down(graph)
|
39
|
-
return unless @vertex
|
40
|
-
graph.vertices[@vertex.name] = @vertex
|
41
|
-
@vertex.outgoing_edges.each do |e|
|
42
|
-
e.destination.incoming_edges << e
|
43
|
-
end
|
44
|
-
@vertex.incoming_edges.each do |e|
|
45
|
-
e.origin.outgoing_edges << e
|
46
|
-
end
|
47
|
-
end
|
48
|
-
|
49
|
-
# @!group DetachVertexNamed
|
50
|
-
|
51
|
-
# @return [String] the name of the vertex to detach
|
52
|
-
attr_reader :name
|
53
|
-
|
54
|
-
# Initialize an action to detach a vertex from a dependency graph
|
55
|
-
# @param [String] name the name of the vertex to detach
|
56
|
-
def initialize(name)
|
57
|
-
@name = name
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
61
|
-
end
|
@@ -1,126 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative 'add_edge_no_circular'
|
4
|
-
require_relative 'add_vertex'
|
5
|
-
require_relative 'delete_edge'
|
6
|
-
require_relative 'detach_vertex_named'
|
7
|
-
require_relative 'set_payload'
|
8
|
-
require_relative 'tag'
|
9
|
-
|
10
|
-
module Bundler::Molinillo
|
11
|
-
class DependencyGraph
|
12
|
-
# A log for dependency graph actions
|
13
|
-
class Log
|
14
|
-
# Initializes an empty log
|
15
|
-
def initialize
|
16
|
-
@current_action = @first_action = nil
|
17
|
-
end
|
18
|
-
|
19
|
-
# @!macro [new] action
|
20
|
-
# {include:DependencyGraph#$0}
|
21
|
-
# @param [Graph] graph the graph to perform the action on
|
22
|
-
# @param (see DependencyGraph#$0)
|
23
|
-
# @return (see DependencyGraph#$0)
|
24
|
-
|
25
|
-
# @macro action
|
26
|
-
def tag(graph, tag)
|
27
|
-
push_action(graph, Tag.new(tag))
|
28
|
-
end
|
29
|
-
|
30
|
-
# @macro action
|
31
|
-
def add_vertex(graph, name, payload, root)
|
32
|
-
push_action(graph, AddVertex.new(name, payload, root))
|
33
|
-
end
|
34
|
-
|
35
|
-
# @macro action
|
36
|
-
def detach_vertex_named(graph, name)
|
37
|
-
push_action(graph, DetachVertexNamed.new(name))
|
38
|
-
end
|
39
|
-
|
40
|
-
# @macro action
|
41
|
-
def add_edge_no_circular(graph, origin, destination, requirement)
|
42
|
-
push_action(graph, AddEdgeNoCircular.new(origin, destination, requirement))
|
43
|
-
end
|
44
|
-
|
45
|
-
# {include:DependencyGraph#delete_edge}
|
46
|
-
# @param [Graph] graph the graph to perform the action on
|
47
|
-
# @param [String] origin_name
|
48
|
-
# @param [String] destination_name
|
49
|
-
# @param [Object] requirement
|
50
|
-
# @return (see DependencyGraph#delete_edge)
|
51
|
-
def delete_edge(graph, origin_name, destination_name, requirement)
|
52
|
-
push_action(graph, DeleteEdge.new(origin_name, destination_name, requirement))
|
53
|
-
end
|
54
|
-
|
55
|
-
# @macro action
|
56
|
-
def set_payload(graph, name, payload)
|
57
|
-
push_action(graph, SetPayload.new(name, payload))
|
58
|
-
end
|
59
|
-
|
60
|
-
# Pops the most recent action from the log and undoes the action
|
61
|
-
# @param [DependencyGraph] graph
|
62
|
-
# @return [Action] the action that was popped off the log
|
63
|
-
def pop!(graph)
|
64
|
-
return unless action = @current_action
|
65
|
-
unless @current_action = action.previous
|
66
|
-
@first_action = nil
|
67
|
-
end
|
68
|
-
action.down(graph)
|
69
|
-
action
|
70
|
-
end
|
71
|
-
|
72
|
-
extend Enumerable
|
73
|
-
|
74
|
-
# @!visibility private
|
75
|
-
# Enumerates each action in the log
|
76
|
-
# @yield [Action]
|
77
|
-
def each
|
78
|
-
return enum_for unless block_given?
|
79
|
-
action = @first_action
|
80
|
-
loop do
|
81
|
-
break unless action
|
82
|
-
yield action
|
83
|
-
action = action.next
|
84
|
-
end
|
85
|
-
self
|
86
|
-
end
|
87
|
-
|
88
|
-
# @!visibility private
|
89
|
-
# Enumerates each action in the log in reverse order
|
90
|
-
# @yield [Action]
|
91
|
-
def reverse_each
|
92
|
-
return enum_for(:reverse_each) unless block_given?
|
93
|
-
action = @current_action
|
94
|
-
loop do
|
95
|
-
break unless action
|
96
|
-
yield action
|
97
|
-
action = action.previous
|
98
|
-
end
|
99
|
-
self
|
100
|
-
end
|
101
|
-
|
102
|
-
# @macro action
|
103
|
-
def rewind_to(graph, tag)
|
104
|
-
loop do
|
105
|
-
action = pop!(graph)
|
106
|
-
raise "No tag #{tag.inspect} found" unless action
|
107
|
-
break if action.class.action_name == :tag && action.tag == tag
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
|
-
private
|
112
|
-
|
113
|
-
# Adds the given action to the log, running the action
|
114
|
-
# @param [DependencyGraph] graph
|
115
|
-
# @param [Action] action
|
116
|
-
# @return The value returned by `action.up`
|
117
|
-
def push_action(graph, action)
|
118
|
-
action.previous = @current_action
|
119
|
-
@current_action.next = action if @current_action
|
120
|
-
@current_action = action
|
121
|
-
@first_action ||= action
|
122
|
-
action.up(graph)
|
123
|
-
end
|
124
|
-
end
|
125
|
-
end
|
126
|
-
end
|
@@ -1,46 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative 'action'
|
4
|
-
module Bundler::Molinillo
|
5
|
-
class DependencyGraph
|
6
|
-
# @!visibility private
|
7
|
-
# @see DependencyGraph#set_payload
|
8
|
-
class SetPayload < Action # :nodoc:
|
9
|
-
# @!group Action
|
10
|
-
|
11
|
-
# (see Action.action_name)
|
12
|
-
def self.action_name
|
13
|
-
:set_payload
|
14
|
-
end
|
15
|
-
|
16
|
-
# (see Action#up)
|
17
|
-
def up(graph)
|
18
|
-
vertex = graph.vertex_named(name)
|
19
|
-
@old_payload = vertex.payload
|
20
|
-
vertex.payload = payload
|
21
|
-
end
|
22
|
-
|
23
|
-
# (see Action#down)
|
24
|
-
def down(graph)
|
25
|
-
graph.vertex_named(name).payload = @old_payload
|
26
|
-
end
|
27
|
-
|
28
|
-
# @!group SetPayload
|
29
|
-
|
30
|
-
# @return [String] the name of the vertex
|
31
|
-
attr_reader :name
|
32
|
-
|
33
|
-
# @return [Object] the payload for the vertex
|
34
|
-
attr_reader :payload
|
35
|
-
|
36
|
-
# Initialize an action to add set the payload for a vertex in a dependency
|
37
|
-
# graph
|
38
|
-
# @param [String] name the name of the vertex
|
39
|
-
# @param [Object] payload the payload for the vertex
|
40
|
-
def initialize(name, payload)
|
41
|
-
@name = name
|
42
|
-
@payload = payload
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
@@ -1,36 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative 'action'
|
4
|
-
module Bundler::Molinillo
|
5
|
-
class DependencyGraph
|
6
|
-
# @!visibility private
|
7
|
-
# @see DependencyGraph#tag
|
8
|
-
class Tag < Action
|
9
|
-
# @!group Action
|
10
|
-
|
11
|
-
# (see Action.action_name)
|
12
|
-
def self.action_name
|
13
|
-
:tag
|
14
|
-
end
|
15
|
-
|
16
|
-
# (see Action#up)
|
17
|
-
def up(graph)
|
18
|
-
end
|
19
|
-
|
20
|
-
# (see Action#down)
|
21
|
-
def down(graph)
|
22
|
-
end
|
23
|
-
|
24
|
-
# @!group Tag
|
25
|
-
|
26
|
-
# @return [Object] An opaque tag
|
27
|
-
attr_reader :tag
|
28
|
-
|
29
|
-
# Initialize an action to tag a state of a dependency graph
|
30
|
-
# @param [Object] tag an opaque tag
|
31
|
-
def initialize(tag)
|
32
|
-
@tag = tag
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
end
|
@@ -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
|