rubygems-update 3.3.26 → 3.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +35 -0
- data/CONTRIBUTING.md +24 -1
- data/Manifest.txt +30 -27
- data/POLICIES.md +10 -8
- data/README.md +2 -2
- data/bin/gem +1 -4
- data/bin/update_rubygems +1 -1
- data/bundler/CHANGELOG.md +59 -0
- data/bundler/README.md +2 -2
- data/bundler/bundler.gemspec +2 -2
- data/bundler/exe/bundle +1 -4
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/check.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +1 -0
- data/bundler/lib/bundler/cli/console.rb +2 -2
- data/bundler/lib/bundler/cli/doctor.rb +4 -6
- data/bundler/lib/bundler/cli/gem.rb +62 -40
- data/bundler/lib/bundler/cli/install.rb +2 -3
- data/bundler/lib/bundler/cli/lock.rb +8 -5
- data/bundler/lib/bundler/cli/outdated.rb +1 -3
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +43 -2
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/updater.rb +40 -39
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/definition.rb +61 -31
- data/bundler/lib/bundler/dependency.rb +12 -11
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +1 -1
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/environment_preserver.rb +1 -0
- data/bundler/lib/bundler/errors.rb +1 -11
- data/bundler/lib/bundler/fetcher/compact_index.rb +9 -11
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher.rb +2 -6
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +0 -3
- data/bundler/lib/bundler/gem_version_promoter.rb +52 -86
- data/bundler/lib/bundler/graph.rb +3 -3
- data/bundler/lib/bundler/index.rb +5 -13
- data/bundler/lib/bundler/injector.rb +1 -1
- data/bundler/lib/bundler/inline.rb +2 -2
- data/bundler/lib/bundler/installer/parallel_installer.rb +0 -31
- data/bundler/lib/bundler/installer.rb +6 -16
- data/bundler/lib/bundler/lazy_specification.rb +5 -1
- data/bundler/lib/bundler/lockfile_parser.rb +5 -5
- data/bundler/lib/bundler/man/bundle-add.1 +1 -1
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +1 -1
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +1 -1
- data/bundler/lib/bundler/man/bundle-console.1 +1 -1
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +1 -1
- data/bundler/lib/bundler/man/bundle-gem.1 +27 -37
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -5
- data/bundler/lib/bundler/man/bundle-help.1 +1 -1
- data/bundler/lib/bundler/man/bundle-info.1 +1 -1
- data/bundler/lib/bundler/man/bundle-init.1 +1 -1
- data/bundler/lib/bundler/man/bundle-inject.1 +1 -1
- data/bundler/lib/bundler/man/bundle-install.1 +1 -30
- data/bundler/lib/bundler/man/bundle-install.1.ronn +0 -29
- data/bundler/lib/bundler/man/bundle-list.1 +1 -1
- data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
- data/bundler/lib/bundler/man/bundle-open.1 +1 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/lib/bundler/man/bundle-platform.1 +2 -2
- data/bundler/lib/bundler/man/bundle-platform.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-plugin.1 +1 -1
- data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
- data/bundler/lib/bundler/man/bundle-show.1 +1 -1
- data/bundler/lib/bundler/man/bundle-update.1 +1 -1
- data/bundler/lib/bundler/man/bundle-version.1 +1 -1
- data/bundler/lib/bundler/man/bundle-viz.1 +1 -1
- data/bundler/lib/bundler/man/bundle.1 +1 -1
- data/bundler/lib/bundler/man/gemfile.5 +1 -1
- data/bundler/lib/bundler/mirror.rb +5 -7
- data/bundler/lib/bundler/plugin/index.rb +4 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -4
- data/bundler/lib/bundler/resolver/base.rb +7 -11
- data/bundler/lib/bundler/resolver/candidate.rb +92 -0
- data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
- data/bundler/lib/bundler/resolver/package.rb +63 -0
- data/bundler/lib/bundler/resolver/root.rb +25 -0
- data/bundler/lib/bundler/resolver/spec_group.rb +26 -36
- data/bundler/lib/bundler/resolver.rb +294 -277
- data/bundler/lib/bundler/rubygems_ext.rb +11 -6
- data/bundler/lib/bundler/rubygems_gem_installer.rb +4 -2
- data/bundler/lib/bundler/rubygems_integration.rb +1 -9
- data/bundler/lib/bundler/runtime.rb +1 -5
- data/bundler/lib/bundler/settings.rb +0 -6
- data/bundler/lib/bundler/shared_helpers.rb +1 -0
- data/bundler/lib/bundler/source/git/git_proxy.rb +193 -67
- data/bundler/lib/bundler/source/git.rb +15 -17
- data/bundler/lib/bundler/source/metadata.rb +0 -1
- data/bundler/lib/bundler/source/path/installer.rb +1 -22
- data/bundler/lib/bundler/source/path.rb +5 -5
- data/bundler/lib/bundler/source/rubygems.rb +13 -67
- data/bundler/lib/bundler/source_list.rb +8 -2
- data/bundler/lib/bundler/spec_set.rb +7 -9
- data/bundler/lib/bundler/templates/Executable +1 -1
- data/bundler/lib/bundler/templates/Executable.bundler +4 -9
- data/bundler/lib/bundler/templates/Executable.standalone +2 -0
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/README.md.tt +6 -4
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +2 -1
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +8 -2
- data/bundler/lib/bundler/ui/shell.rb +35 -12
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
- data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
- data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +151 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +53 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +124 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +409 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +240 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +13 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +10 -5
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -2
- data/bundler/lib/bundler/vendored_persistent.rb +1 -33
- data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +5 -7
- data/bundler/lib/bundler.rb +20 -64
- data/lib/rubygems/command_manager.rb +2 -2
- data/lib/rubygems/commands/fetch_command.rb +1 -1
- data/lib/rubygems/commands/install_command.rb +7 -3
- data/lib/rubygems/commands/rdoc_command.rb +3 -2
- data/lib/rubygems/commands/setup_command.rb +2 -2
- data/lib/rubygems/commands/unpack_command.rb +1 -1
- data/lib/rubygems/commands/update_command.rb +1 -7
- data/lib/rubygems/config_file.rb +33 -0
- data/lib/rubygems/core_ext/kernel_warn.rb +1 -2
- data/lib/rubygems/defaults.rb +15 -1
- data/lib/rubygems/dependency.rb +4 -1
- data/lib/rubygems/dependency_installer.rb +24 -24
- data/lib/rubygems/exceptions.rb +1 -3
- data/lib/rubygems/ext/builder.rb +3 -3
- data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +9 -5
- data/lib/rubygems/ext/cargo_builder.rb +15 -20
- data/lib/rubygems/ext/ext_conf_builder.rb +2 -0
- data/lib/rubygems/indexer.rb +1 -1
- data/lib/rubygems/installer.rb +5 -5
- data/lib/rubygems/optparse/lib/optparse.rb +20 -15
- data/lib/rubygems/package/tar_header.rb +11 -11
- data/lib/rubygems/platform.rb +0 -2
- data/lib/rubygems/request_set/gem_dependency_api.rb +104 -104
- data/lib/rubygems/requirement.rb +7 -7
- data/lib/rubygems/resolver/installer_set.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/rubygems/security/policies.rb +40 -40
- data/lib/rubygems/security/trust_dir.rb +1 -1
- data/lib/rubygems/security.rb +3 -16
- data/lib/rubygems/source.rb +2 -2
- data/lib/rubygems/specification.rb +37 -49
- data/lib/rubygems/specification_policy.rb +14 -0
- data/lib/rubygems/stub_specification.rb +2 -2
- data/lib/rubygems/text.rb +1 -1
- data/lib/rubygems/tsort/lib/tsort.rb +308 -310
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/util.rb +1 -5
- data/lib/rubygems/validator.rb +1 -1
- data/lib/rubygems.rb +8 -3
- data/rubygems-update.gemspec +2 -2
- data/test/rubygems/helper.rb +7 -3
- data/test/rubygems/test_bundled_ca.rb +1 -1
- data/test/rubygems/test_exit.rb +6 -0
- data/test/rubygems/test_gem.rb +4 -9
- data/test/rubygems/test_gem_bundler_version_finder.rb +2 -1
- data/test/rubygems/test_gem_command_manager.rb +1 -1
- data/test/rubygems/test_gem_commands_install_command.rb +19 -0
- data/test/rubygems/test_gem_commands_setup_command.rb +1 -8
- data/test/rubygems/test_gem_commands_update_command.rb +6 -6
- data/test/rubygems/test_gem_config_file.rb +1 -1
- data/test/rubygems/test_gem_dependency.rb +2 -0
- data/test/rubygems/test_gem_ext_builder.rb +3 -3
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock +22 -32
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +22 -32
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +12 -0
- data/test/rubygems/test_gem_ext_cargo_builder.rb +22 -27
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +16 -16
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +0 -10
- data/test/rubygems/test_gem_indexer.rb +39 -20
- data/test/rubygems/test_gem_installer.rb +68 -2
- data/test/rubygems/test_gem_package_tar_header.rb +13 -13
- data/test/rubygems/test_gem_platform.rb +59 -60
- data/test/rubygems/test_gem_remote_fetcher.rb +4 -4
- data/test/rubygems/test_gem_request_set.rb +2 -2
- data/test/rubygems/test_gem_requirement.rb +1 -1
- data/test/rubygems/test_gem_resolver_api_set.rb +12 -12
- data/test/rubygems/test_gem_resolver_api_specification.rb +19 -19
- data/test/rubygems/test_gem_resolver_git_specification.rb +1 -1
- data/test/rubygems/test_gem_security_policy.rb +10 -10
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_specification.rb +50 -37
- data/test/rubygems/test_gem_uninstaller.rb +1 -1
- data/test/rubygems/test_gem_update_suggestion.rb +208 -0
- data/test/rubygems/test_kernel.rb +10 -8
- data/test/rubygems/test_require.rb +70 -55
- metadata +34 -31
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -149
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/bundler/lib/bundler/vendored_molinillo.rb +0 -4
- data/bundler/lib/bundler/version_ranges.rb +0 -122
@@ -0,0 +1,121 @@
|
|
1
|
+
require_relative 'assignment'
|
2
|
+
|
3
|
+
module Bundler::PubGrub
|
4
|
+
class PartialSolution
|
5
|
+
attr_reader :assignments, :decisions
|
6
|
+
attr_reader :attempted_solutions
|
7
|
+
|
8
|
+
def initialize
|
9
|
+
reset!
|
10
|
+
|
11
|
+
@attempted_solutions = 1
|
12
|
+
@backtracking = false
|
13
|
+
end
|
14
|
+
|
15
|
+
def decision_level
|
16
|
+
@decisions.length
|
17
|
+
end
|
18
|
+
|
19
|
+
def relation(term)
|
20
|
+
package = term.package
|
21
|
+
return :overlap if !@terms.key?(package)
|
22
|
+
|
23
|
+
@relation_cache[package][term] ||=
|
24
|
+
@terms[package].relation(term)
|
25
|
+
end
|
26
|
+
|
27
|
+
def satisfies?(term)
|
28
|
+
relation(term) == :subset
|
29
|
+
end
|
30
|
+
|
31
|
+
def derive(term, cause)
|
32
|
+
add_assignment(Assignment.new(term, cause, decision_level, assignments.length))
|
33
|
+
end
|
34
|
+
|
35
|
+
def satisfier(term)
|
36
|
+
assignment =
|
37
|
+
@assignments_by[term.package].bsearch do |assignment_by|
|
38
|
+
@cumulative_assignments[assignment_by].satisfies?(term)
|
39
|
+
end
|
40
|
+
|
41
|
+
assignment || raise("#{term} unsatisfied")
|
42
|
+
end
|
43
|
+
|
44
|
+
# A list of unsatisfied terms
|
45
|
+
def unsatisfied
|
46
|
+
@required.keys.reject do |package|
|
47
|
+
@decisions.key?(package)
|
48
|
+
end.map do |package|
|
49
|
+
@terms[package]
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
def decide(package, version)
|
54
|
+
@attempted_solutions += 1 if @backtracking
|
55
|
+
@backtracking = false;
|
56
|
+
|
57
|
+
decisions[package] = version
|
58
|
+
assignment = Assignment.decision(package, version, decision_level, assignments.length)
|
59
|
+
add_assignment(assignment)
|
60
|
+
end
|
61
|
+
|
62
|
+
def backtrack(previous_level)
|
63
|
+
@backtracking = true
|
64
|
+
|
65
|
+
new_assignments = assignments.select do |assignment|
|
66
|
+
assignment.decision_level <= previous_level
|
67
|
+
end
|
68
|
+
|
69
|
+
new_decisions = Hash[decisions.first(previous_level)]
|
70
|
+
|
71
|
+
reset!
|
72
|
+
|
73
|
+
@decisions = new_decisions
|
74
|
+
|
75
|
+
new_assignments.each do |assignment|
|
76
|
+
add_assignment(assignment)
|
77
|
+
end
|
78
|
+
end
|
79
|
+
|
80
|
+
private
|
81
|
+
|
82
|
+
def reset!
|
83
|
+
# { Array<Assignment> }
|
84
|
+
@assignments = []
|
85
|
+
|
86
|
+
# { Package => Array<Assignment> }
|
87
|
+
@assignments_by = Hash.new { |h,k| h[k] = [] }
|
88
|
+
@cumulative_assignments = {}.compare_by_identity
|
89
|
+
|
90
|
+
# { Package => Package::Version }
|
91
|
+
@decisions = {}
|
92
|
+
|
93
|
+
# { Package => Term }
|
94
|
+
@terms = {}
|
95
|
+
@relation_cache = Hash.new { |h,k| h[k] = {} }
|
96
|
+
|
97
|
+
# { Package => Boolean }
|
98
|
+
@required = {}
|
99
|
+
end
|
100
|
+
|
101
|
+
def add_assignment(assignment)
|
102
|
+
term = assignment.term
|
103
|
+
package = term.package
|
104
|
+
|
105
|
+
@assignments << assignment
|
106
|
+
@assignments_by[package] << assignment
|
107
|
+
|
108
|
+
@required[package] = true if term.positive?
|
109
|
+
|
110
|
+
if @terms.key?(package)
|
111
|
+
old_term = @terms[package]
|
112
|
+
@terms[package] = old_term.intersect(term)
|
113
|
+
else
|
114
|
+
@terms[package] = term
|
115
|
+
end
|
116
|
+
@relation_cache[package].clear
|
117
|
+
|
118
|
+
@cumulative_assignments[assignment] = @terms[package]
|
119
|
+
end
|
120
|
+
end
|
121
|
+
end
|
@@ -0,0 +1,45 @@
|
|
1
|
+
module Bundler::PubGrub
|
2
|
+
module RubyGems
|
3
|
+
extend self
|
4
|
+
|
5
|
+
def requirement_to_range(requirement)
|
6
|
+
ranges = requirement.requirements.map do |(op, ver)|
|
7
|
+
case op
|
8
|
+
when "~>"
|
9
|
+
name = "~> #{ver}"
|
10
|
+
bump = ver.class.new(ver.bump.to_s + ".A")
|
11
|
+
VersionRange.new(name: name, min: ver, max: bump, include_min: true)
|
12
|
+
when ">"
|
13
|
+
VersionRange.new(min: ver)
|
14
|
+
when ">="
|
15
|
+
VersionRange.new(min: ver, include_min: true)
|
16
|
+
when "<"
|
17
|
+
VersionRange.new(max: ver)
|
18
|
+
when "<="
|
19
|
+
VersionRange.new(max: ver, include_max: true)
|
20
|
+
when "="
|
21
|
+
VersionRange.new(min: ver, max: ver, include_min: true, include_max: true)
|
22
|
+
when "!="
|
23
|
+
VersionRange.new(min: ver, max: ver, include_min: true, include_max: true).invert
|
24
|
+
else
|
25
|
+
raise "bad version specifier: #{op}"
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
ranges.inject(&:intersect)
|
30
|
+
end
|
31
|
+
|
32
|
+
def requirement_to_constraint(package, requirement)
|
33
|
+
Bundler::PubGrub::VersionConstraint.new(package, range: requirement_to_range(requirement))
|
34
|
+
end
|
35
|
+
|
36
|
+
def parse_range(dep)
|
37
|
+
requirement_to_range(Gem::Requirement.new(dep))
|
38
|
+
end
|
39
|
+
|
40
|
+
def parse_constraint(package, dep)
|
41
|
+
range = parse_range(dep)
|
42
|
+
Bundler::PubGrub::VersionConstraint.new(package, range: range)
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
require_relative 'failure_writer'
|
2
|
+
|
3
|
+
module Bundler::PubGrub
|
4
|
+
class SolveFailure < StandardError
|
5
|
+
attr_reader :incompatibility
|
6
|
+
|
7
|
+
def initialize(incompatibility)
|
8
|
+
@incompatibility = incompatibility
|
9
|
+
end
|
10
|
+
|
11
|
+
def to_s
|
12
|
+
"Could not find compatible versions\n\n#{explanation}"
|
13
|
+
end
|
14
|
+
|
15
|
+
def explanation
|
16
|
+
@explanation ||= FailureWriter.new(@incompatibility).write
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,53 @@
|
|
1
|
+
require_relative 'package'
|
2
|
+
require_relative 'version_constraint'
|
3
|
+
require_relative 'incompatibility'
|
4
|
+
require_relative 'basic_package_source'
|
5
|
+
|
6
|
+
module Bundler::PubGrub
|
7
|
+
class StaticPackageSource < BasicPackageSource
|
8
|
+
class DSL
|
9
|
+
def initialize(packages, root_deps)
|
10
|
+
@packages = packages
|
11
|
+
@root_deps = root_deps
|
12
|
+
end
|
13
|
+
|
14
|
+
def root(deps:)
|
15
|
+
@root_deps.update(deps)
|
16
|
+
end
|
17
|
+
|
18
|
+
def add(name, version, deps: {})
|
19
|
+
version = Gem::Version.new(version)
|
20
|
+
@packages[name] ||= {}
|
21
|
+
raise ArgumentError, "#{name} #{version} declared twice" if @packages[name].key?(version)
|
22
|
+
@packages[name][version] = deps
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
def initialize
|
27
|
+
@root_deps = {}
|
28
|
+
@packages = {}
|
29
|
+
|
30
|
+
yield DSL.new(@packages, @root_deps)
|
31
|
+
|
32
|
+
super()
|
33
|
+
end
|
34
|
+
|
35
|
+
def all_versions_for(package)
|
36
|
+
@packages[package].keys
|
37
|
+
end
|
38
|
+
|
39
|
+
def root_dependencies
|
40
|
+
@root_deps
|
41
|
+
end
|
42
|
+
|
43
|
+
def dependencies_for(package, version)
|
44
|
+
@packages[package][version]
|
45
|
+
end
|
46
|
+
|
47
|
+
def parse_dependency(package, dependency)
|
48
|
+
return false unless @packages.key?(package)
|
49
|
+
|
50
|
+
Bundler::PubGrub::RubyGems.parse_constraint(package, dependency)
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
@@ -0,0 +1,105 @@
|
|
1
|
+
module Bundler::PubGrub
|
2
|
+
class Term
|
3
|
+
attr_reader :package, :constraint, :positive
|
4
|
+
|
5
|
+
def initialize(constraint, positive)
|
6
|
+
@constraint = constraint
|
7
|
+
@package = @constraint.package
|
8
|
+
@positive = positive
|
9
|
+
end
|
10
|
+
|
11
|
+
def to_s(allow_every: false)
|
12
|
+
if positive
|
13
|
+
@constraint.to_s(allow_every: allow_every)
|
14
|
+
else
|
15
|
+
"not #{@constraint}"
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
def hash
|
20
|
+
constraint.hash ^ positive.hash
|
21
|
+
end
|
22
|
+
|
23
|
+
def eql?(other)
|
24
|
+
positive == other.positive &&
|
25
|
+
constraint.eql?(other.constraint)
|
26
|
+
end
|
27
|
+
|
28
|
+
def invert
|
29
|
+
self.class.new(@constraint, !@positive)
|
30
|
+
end
|
31
|
+
alias_method :inverse, :invert
|
32
|
+
|
33
|
+
def intersect(other)
|
34
|
+
raise ArgumentError, "packages must match" if package != other.package
|
35
|
+
|
36
|
+
if positive? && other.positive?
|
37
|
+
self.class.new(constraint.intersect(other.constraint), true)
|
38
|
+
elsif negative? && other.negative?
|
39
|
+
self.class.new(constraint.union(other.constraint), false)
|
40
|
+
else
|
41
|
+
positive = positive? ? self : other
|
42
|
+
negative = negative? ? self : other
|
43
|
+
self.class.new(positive.constraint.intersect(negative.constraint.invert), true)
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
def difference(other)
|
48
|
+
intersect(other.invert)
|
49
|
+
end
|
50
|
+
|
51
|
+
def relation(other)
|
52
|
+
if positive? && other.positive?
|
53
|
+
constraint.relation(other.constraint)
|
54
|
+
elsif negative? && other.positive?
|
55
|
+
if constraint.allows_all?(other.constraint)
|
56
|
+
:disjoint
|
57
|
+
else
|
58
|
+
:overlap
|
59
|
+
end
|
60
|
+
elsif positive? && other.negative?
|
61
|
+
if !other.constraint.allows_any?(constraint)
|
62
|
+
:subset
|
63
|
+
elsif other.constraint.allows_all?(constraint)
|
64
|
+
:disjoint
|
65
|
+
else
|
66
|
+
:overlap
|
67
|
+
end
|
68
|
+
elsif negative? && other.negative?
|
69
|
+
if constraint.allows_all?(other.constraint)
|
70
|
+
:subset
|
71
|
+
else
|
72
|
+
:overlap
|
73
|
+
end
|
74
|
+
else
|
75
|
+
raise
|
76
|
+
end
|
77
|
+
end
|
78
|
+
|
79
|
+
def normalized_constraint
|
80
|
+
@normalized_constraint ||= positive ? constraint : constraint.invert
|
81
|
+
end
|
82
|
+
|
83
|
+
def satisfies?(other)
|
84
|
+
raise ArgumentError, "packages must match" unless package == other.package
|
85
|
+
|
86
|
+
relation(other) == :subset
|
87
|
+
end
|
88
|
+
|
89
|
+
def positive?
|
90
|
+
@positive
|
91
|
+
end
|
92
|
+
|
93
|
+
def negative?
|
94
|
+
!positive?
|
95
|
+
end
|
96
|
+
|
97
|
+
def empty?
|
98
|
+
@empty ||= normalized_constraint.empty?
|
99
|
+
end
|
100
|
+
|
101
|
+
def inspect
|
102
|
+
"#<#{self.class} #{self}>"
|
103
|
+
end
|
104
|
+
end
|
105
|
+
end
|
@@ -0,0 +1,124 @@
|
|
1
|
+
require_relative 'version_range'
|
2
|
+
|
3
|
+
module Bundler::PubGrub
|
4
|
+
class VersionConstraint
|
5
|
+
attr_reader :package, :range
|
6
|
+
|
7
|
+
# @param package [Bundler::PubGrub::Package]
|
8
|
+
# @param range [Bundler::PubGrub::VersionRange]
|
9
|
+
def initialize(package, range: nil)
|
10
|
+
@package = package
|
11
|
+
@range = range
|
12
|
+
end
|
13
|
+
|
14
|
+
def hash
|
15
|
+
package.hash ^ range.hash
|
16
|
+
end
|
17
|
+
|
18
|
+
def eql?(other)
|
19
|
+
package.eql?(other.package) &&
|
20
|
+
range.eql?(other.range)
|
21
|
+
end
|
22
|
+
|
23
|
+
class << self
|
24
|
+
def exact(package, version)
|
25
|
+
range = VersionRange.new(min: version, max: version, include_min: true, include_max: true)
|
26
|
+
new(package, range: range)
|
27
|
+
end
|
28
|
+
|
29
|
+
def any(package)
|
30
|
+
new(package, range: VersionRange.any)
|
31
|
+
end
|
32
|
+
|
33
|
+
def empty(package)
|
34
|
+
new(package, range: VersionRange.empty)
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
def intersect(other)
|
39
|
+
unless package == other.package
|
40
|
+
raise ArgumentError, "Can only intersect between VersionConstraint of the same package"
|
41
|
+
end
|
42
|
+
|
43
|
+
self.class.new(package, range: range.intersect(other.range))
|
44
|
+
end
|
45
|
+
|
46
|
+
def union(other)
|
47
|
+
unless package == other.package
|
48
|
+
raise ArgumentError, "Can only intersect between VersionConstraint of the same package"
|
49
|
+
end
|
50
|
+
|
51
|
+
self.class.new(package, range: range.union(other.range))
|
52
|
+
end
|
53
|
+
|
54
|
+
def invert
|
55
|
+
new_range = range.invert
|
56
|
+
self.class.new(package, range: new_range)
|
57
|
+
end
|
58
|
+
|
59
|
+
def difference(other)
|
60
|
+
intersect(other.invert)
|
61
|
+
end
|
62
|
+
|
63
|
+
def allows_all?(other)
|
64
|
+
range.allows_all?(other.range)
|
65
|
+
end
|
66
|
+
|
67
|
+
def allows_any?(other)
|
68
|
+
range.intersects?(other.range)
|
69
|
+
end
|
70
|
+
|
71
|
+
def subset?(other)
|
72
|
+
other.allows_all?(self)
|
73
|
+
end
|
74
|
+
|
75
|
+
def overlap?(other)
|
76
|
+
other.allows_any?(self)
|
77
|
+
end
|
78
|
+
|
79
|
+
def disjoint?(other)
|
80
|
+
!overlap?(other)
|
81
|
+
end
|
82
|
+
|
83
|
+
def relation(other)
|
84
|
+
if subset?(other)
|
85
|
+
:subset
|
86
|
+
elsif overlap?(other)
|
87
|
+
:overlap
|
88
|
+
else
|
89
|
+
:disjoint
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
def to_s(allow_every: false)
|
94
|
+
if Package.root?(package)
|
95
|
+
package.to_s
|
96
|
+
elsif allow_every && any?
|
97
|
+
"every version of #{package}"
|
98
|
+
else
|
99
|
+
"#{package} #{constraint_string}"
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
def constraint_string
|
104
|
+
if any?
|
105
|
+
">= 0"
|
106
|
+
else
|
107
|
+
range.to_s
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
111
|
+
def empty?
|
112
|
+
range.empty?
|
113
|
+
end
|
114
|
+
|
115
|
+
# Does this match every version of the package
|
116
|
+
def any?
|
117
|
+
range.any?
|
118
|
+
end
|
119
|
+
|
120
|
+
def inspect
|
121
|
+
"#<#{self.class} #{self}>"
|
122
|
+
end
|
123
|
+
end
|
124
|
+
end
|