bundler 2.2.29 → 2.5.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1129 -4
- data/README.md +4 -8
- data/bundler.gemspec +11 -11
- data/exe/bundle +5 -26
- data/exe/bundler +1 -1
- data/lib/bundler/.document +1 -0
- data/lib/bundler/build_metadata.rb +4 -4
- data/lib/bundler/capistrano.rb +1 -1
- data/lib/bundler/checksum.rb +254 -0
- data/lib/bundler/ci_detector.rb +75 -0
- data/lib/bundler/cli/add.rb +4 -4
- data/lib/bundler/cli/binstubs.rb +10 -6
- data/lib/bundler/cli/cache.rb +1 -1
- data/lib/bundler/cli/check.rb +3 -3
- data/lib/bundler/cli/common.rb +13 -3
- data/lib/bundler/cli/config.rb +18 -8
- data/lib/bundler/cli/console.rb +5 -4
- data/lib/bundler/cli/doctor.rb +12 -5
- data/lib/bundler/cli/exec.rb +1 -1
- data/lib/bundler/cli/fund.rb +1 -1
- data/lib/bundler/cli/gem.rb +141 -48
- data/lib/bundler/cli/info.rb +27 -17
- data/lib/bundler/cli/init.rb +6 -2
- data/lib/bundler/cli/install.rb +22 -39
- data/lib/bundler/cli/issue.rb +5 -4
- data/lib/bundler/cli/lock.rb +36 -29
- data/lib/bundler/cli/open.rb +9 -9
- data/lib/bundler/cli/outdated.rb +19 -12
- data/lib/bundler/cli/platform.rb +8 -6
- data/lib/bundler/cli/plugin.rb +9 -15
- data/lib/bundler/cli/pristine.rb +38 -30
- data/lib/bundler/cli/show.rb +3 -3
- data/lib/bundler/cli/update.rb +12 -7
- data/lib/bundler/cli/viz.rb +1 -1
- data/lib/bundler/cli.rb +266 -285
- data/lib/bundler/compact_index_client/cache.rb +53 -67
- data/lib/bundler/compact_index_client/cache_file.rb +153 -0
- data/lib/bundler/compact_index_client/gem_parser.rb +7 -3
- data/lib/bundler/compact_index_client/parser.rb +84 -0
- data/lib/bundler/compact_index_client/updater.rb +83 -76
- data/lib/bundler/compact_index_client.rb +59 -87
- data/lib/bundler/constants.rb +9 -2
- data/lib/bundler/current_ruby.rb +12 -16
- data/lib/bundler/definition.rb +509 -319
- data/lib/bundler/dependency.rb +33 -71
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +88 -69
- data/lib/bundler/endpoint_specification.rb +32 -15
- data/lib/bundler/env.rb +5 -7
- data/lib/bundler/environment_preserver.rb +8 -22
- data/lib/bundler/errors.rb +101 -13
- data/lib/bundler/feature_flag.rb +0 -2
- data/lib/bundler/fetcher/base.rb +11 -11
- data/lib/bundler/fetcher/compact_index.rb +32 -52
- data/lib/bundler/fetcher/dependency.rb +3 -7
- data/lib/bundler/fetcher/downloader.rb +17 -16
- data/lib/bundler/fetcher/gem_remote_fetcher.rb +16 -0
- data/lib/bundler/fetcher/index.rb +2 -29
- data/lib/bundler/fetcher.rb +87 -79
- data/lib/bundler/force_platform.rb +18 -0
- data/lib/bundler/friendly_errors.rb +29 -40
- data/lib/bundler/gem_helper.rb +11 -23
- data/lib/bundler/gem_helpers.rb +30 -6
- data/lib/bundler/gem_version_promoter.rb +68 -109
- data/lib/bundler/graph.rb +9 -9
- data/lib/bundler/index.rb +71 -79
- data/lib/bundler/injector.rb +23 -11
- data/lib/bundler/inline.rb +11 -23
- data/lib/bundler/installer/gem_installer.rb +18 -11
- data/lib/bundler/installer/parallel_installer.rb +17 -65
- data/lib/bundler/installer/standalone.rb +56 -15
- data/lib/bundler/installer.rb +35 -61
- data/lib/bundler/lazy_specification.rb +92 -61
- data/lib/bundler/lockfile_generator.rb +12 -3
- data/lib/bundler/lockfile_parser.rb +137 -70
- data/lib/bundler/man/bundle-add.1 +19 -26
- data/lib/bundler/man/bundle-add.1.ronn +16 -4
- data/lib/bundler/man/bundle-binstubs.1 +4 -16
- data/lib/bundler/man/bundle-cache.1 +9 -24
- data/lib/bundler/man/bundle-cache.1.ronn +9 -2
- data/lib/bundler/man/bundle-check.1 +5 -12
- data/lib/bundler/man/bundle-check.1.ronn +3 -0
- data/lib/bundler/man/bundle-clean.1 +4 -11
- data/lib/bundler/man/bundle-clean.1.ronn +1 -1
- data/lib/bundler/man/bundle-config.1 +47 -224
- data/lib/bundler/man/bundle-config.1.ronn +40 -28
- data/lib/bundler/man/bundle-console.1 +35 -0
- data/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/lib/bundler/man/bundle-doctor.1 +4 -18
- data/lib/bundler/man/bundle-exec.1 +16 -77
- data/lib/bundler/man/bundle-exec.1.ronn +8 -9
- data/lib/bundler/man/bundle-gem.1 +45 -72
- data/lib/bundler/man/bundle-gem.1.ronn +32 -5
- data/lib/bundler/man/bundle-help.1 +9 -0
- data/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/lib/bundler/man/bundle-info.1 +5 -11
- data/lib/bundler/man/bundle-info.1.ronn +3 -3
- data/lib/bundler/man/bundle-init.1 +6 -11
- data/lib/bundler/man/bundle-init.1.ronn +2 -0
- data/lib/bundler/man/bundle-inject.1 +8 -18
- data/lib/bundler/man/bundle-inject.1.ronn +3 -1
- data/lib/bundler/man/bundle-install.1 +32 -155
- data/lib/bundler/man/bundle-install.1.ronn +11 -33
- data/lib/bundler/man/bundle-list.1 +4 -19
- data/lib/bundler/man/bundle-lock.1 +5 -29
- data/lib/bundler/man/bundle-open.1 +18 -18
- data/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/lib/bundler/man/bundle-outdated.1 +17 -72
- data/lib/bundler/man/bundle-outdated.1.ronn +13 -18
- data/lib/bundler/man/bundle-platform.1 +16 -28
- data/lib/bundler/man/bundle-platform.1.ronn +14 -7
- data/lib/bundler/man/bundle-plugin.1 +58 -0
- data/lib/bundler/man/bundle-plugin.1.ronn +63 -0
- data/lib/bundler/man/bundle-pristine.1 +5 -16
- data/lib/bundler/man/bundle-remove.1 +4 -14
- data/lib/bundler/man/bundle-show.1 +3 -10
- data/lib/bundler/man/bundle-update.1 +19 -138
- data/lib/bundler/man/bundle-update.1.ronn +2 -1
- data/lib/bundler/man/bundle-version.1 +22 -0
- data/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/lib/bundler/man/bundle-viz.1 +6 -15
- data/lib/bundler/man/bundle-viz.1.ronn +2 -0
- data/lib/bundler/man/bundle.1 +17 -51
- data/lib/bundler/man/bundle.1.ronn +12 -7
- data/lib/bundler/man/gemfile.5 +130 -346
- data/lib/bundler/man/gemfile.5.ronn +121 -86
- data/lib/bundler/man/index.txt +4 -0
- data/lib/bundler/match_metadata.rb +17 -0
- data/lib/bundler/match_platform.rb +1 -2
- data/lib/bundler/match_remote_metadata.rb +29 -0
- data/lib/bundler/mirror.rb +8 -10
- data/lib/bundler/plugin/api/source.rb +9 -13
- data/lib/bundler/plugin/index.rb +13 -5
- data/lib/bundler/plugin/installer/git.rb +0 -4
- data/lib/bundler/plugin/installer/path.rb +18 -0
- data/lib/bundler/plugin/installer/rubygems.rb +0 -8
- data/lib/bundler/plugin/installer.rb +42 -19
- data/lib/bundler/plugin/source_list.rb +4 -4
- data/lib/bundler/plugin.rb +16 -7
- data/lib/bundler/process_lock.rb +1 -1
- data/lib/bundler/remote_specification.rb +11 -5
- data/lib/bundler/resolver/base.rb +111 -0
- data/lib/bundler/resolver/candidate.rb +82 -0
- data/lib/bundler/resolver/incompatibility.rb +15 -0
- data/lib/bundler/resolver/package.rb +81 -0
- data/lib/bundler/resolver/root.rb +25 -0
- data/lib/bundler/resolver/spec_group.rb +53 -66
- data/lib/bundler/resolver.rb +419 -307
- data/lib/bundler/retry.rb +1 -1
- data/lib/bundler/ruby_dsl.rb +42 -7
- data/lib/bundler/ruby_version.rb +16 -22
- data/lib/bundler/rubygems_ext.rb +250 -64
- data/lib/bundler/rubygems_gem_installer.rb +90 -64
- data/lib/bundler/rubygems_integration.rb +81 -190
- data/lib/bundler/runtime.rb +8 -13
- data/lib/bundler/safe_marshal.rb +31 -0
- data/lib/bundler/self_manager.rb +206 -0
- data/lib/bundler/settings.rb +139 -57
- data/lib/bundler/setup.rb +13 -1
- data/lib/bundler/shared_helpers.rb +67 -36
- data/lib/bundler/source/git/git_proxy.rb +285 -82
- data/lib/bundler/source/git.rb +81 -41
- data/lib/bundler/source/metadata.rb +17 -16
- data/lib/bundler/source/path/installer.rb +1 -22
- data/lib/bundler/source/path.rb +13 -25
- data/lib/bundler/source/rubygems/remote.rb +1 -1
- data/lib/bundler/source/rubygems.rb +164 -234
- data/lib/bundler/source/rubygems_aggregate.rb +1 -1
- data/lib/bundler/source.rb +7 -6
- data/lib/bundler/source_list.rb +40 -32
- data/lib/bundler/source_map.rb +15 -2
- data/lib/bundler/spec_set.rb +156 -46
- data/lib/bundler/stub_specification.rb +18 -5
- data/lib/bundler/templates/Executable +3 -5
- data/lib/bundler/templates/Executable.bundler +7 -12
- data/lib/bundler/templates/Executable.standalone +4 -4
- data/lib/bundler/templates/Gemfile +0 -2
- data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +77 -29
- data/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/lib/bundler/templates/newgem/README.md.tt +7 -11
- data/lib/bundler/templates/newgem/Rakefile.tt +28 -4
- data/lib/bundler/templates/newgem/bin/console.tt +0 -4
- data/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
- data/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
- data/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +13 -3
- data/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +25 -17
- data/lib/bundler/templates/newgem/rubocop.yml.tt +0 -5
- data/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/lib/bundler/templates/newgem/test/minitest/{newgem_test.rb.tt → test_newgem.rb.tt} +1 -1
- data/lib/bundler/ui/rg_proxy.rb +1 -1
- data/lib/bundler/ui/shell.rb +38 -15
- data/lib/bundler/ui/silent.rb +21 -5
- data/lib/bundler/uri_credentials_filter.rb +2 -2
- data/lib/bundler/uri_normalizer.rb +23 -0
- data/lib/bundler/vendor/.document +1 -0
- data/lib/bundler/vendor/connection_pool/.document +1 -0
- data/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +19 -21
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +1 -1
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +92 -78
- data/lib/bundler/vendor/fileutils/.document +1 -0
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1340 -410
- data/lib/bundler/vendor/net-http-persistent/.document +1 -0
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +4 -3
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +23 -11
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +1 -1
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +57 -57
- data/lib/bundler/vendor/pub_grub/.document +1 -0
- data/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +61 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/lib/bundler/vendor/thor/.document +1 -0
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +3 -2
- data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +12 -14
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +16 -6
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -17
- data/lib/bundler/vendor/thor/lib/thor/base.rb +140 -14
- data/lib/bundler/vendor/thor/lib/thor/command.rb +13 -4
- data/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +10 -0
- data/lib/bundler/vendor/thor/lib/thor/error.rb +16 -20
- data/lib/bundler/vendor/thor/lib/thor/group.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/invocation.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/nested_context.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +20 -1
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +33 -17
- data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +27 -8
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +63 -7
- data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/runner.rb +40 -30
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +48 -154
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -46
- data/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb +29 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/html.rb +0 -45
- data/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb +134 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/terminal.rb +42 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb +38 -0
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/util.rb +9 -8
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +155 -8
- data/lib/bundler/vendor/tsort/.document +1 -0
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +455 -0
- data/lib/bundler/vendor/uri/.document +1 -0
- data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +316 -207
- data/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +33 -13
- data/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
- data/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +16 -23
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +105 -47
- data/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
- data/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
- data/lib/bundler/vendor/uri/lib/uri.rb +3 -3
- data/lib/bundler/vendored_net_http.rb +23 -0
- data/lib/bundler/vendored_persistent.rb +0 -36
- data/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/lib/bundler/vendored_timeout.rb +12 -0
- data/lib/bundler/{vendored_tmpdir.rb → vendored_tsort.rb} +1 -1
- data/lib/bundler/vendored_uri.rb +18 -1
- data/lib/bundler/version.rb +5 -1
- data/lib/bundler/vlad.rb +1 -1
- data/lib/bundler/worker.rb +7 -9
- data/lib/bundler/yaml_serializer.rb +21 -12
- data/lib/bundler.rb +114 -121
- metadata +87 -41
- data/lib/bundler/dep_proxy.rb +0 -55
- data/lib/bundler/gemdeps.rb +0 -29
- data/lib/bundler/psyched_yaml.rb +0 -22
- data/lib/bundler/templates/gems.rb +0 -8
- data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
- data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
- data/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/lib/bundler/version_ranges.rb +0 -122
@@ -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,61 @@
|
|
1
|
+
require_relative 'package'
|
2
|
+
require_relative 'rubygems'
|
3
|
+
require_relative 'version_constraint'
|
4
|
+
require_relative 'incompatibility'
|
5
|
+
require_relative 'basic_package_source'
|
6
|
+
|
7
|
+
module Bundler::PubGrub
|
8
|
+
class StaticPackageSource < BasicPackageSource
|
9
|
+
class DSL
|
10
|
+
def initialize(packages, root_deps)
|
11
|
+
@packages = packages
|
12
|
+
@root_deps = root_deps
|
13
|
+
end
|
14
|
+
|
15
|
+
def root(deps:)
|
16
|
+
@root_deps.update(deps)
|
17
|
+
end
|
18
|
+
|
19
|
+
def add(name, version, deps: {})
|
20
|
+
version = Gem::Version.new(version)
|
21
|
+
@packages[name] ||= {}
|
22
|
+
raise ArgumentError, "#{name} #{version} declared twice" if @packages[name].key?(version)
|
23
|
+
@packages[name][version] = clean_deps(name, version, deps)
|
24
|
+
end
|
25
|
+
|
26
|
+
private
|
27
|
+
|
28
|
+
# Exclude redundant self-referencing dependencies
|
29
|
+
def clean_deps(name, version, deps)
|
30
|
+
deps.reject {|dep_name, req| name == dep_name && Bundler::PubGrub::RubyGems.parse_range(req).include?(version) }
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
def initialize
|
35
|
+
@root_deps = {}
|
36
|
+
@packages = {}
|
37
|
+
|
38
|
+
yield DSL.new(@packages, @root_deps)
|
39
|
+
|
40
|
+
super()
|
41
|
+
end
|
42
|
+
|
43
|
+
def all_versions_for(package)
|
44
|
+
@packages[package].keys
|
45
|
+
end
|
46
|
+
|
47
|
+
def root_dependencies
|
48
|
+
@root_deps
|
49
|
+
end
|
50
|
+
|
51
|
+
def dependencies_for(package, version)
|
52
|
+
@packages[package][version]
|
53
|
+
end
|
54
|
+
|
55
|
+
def parse_dependency(package, dependency)
|
56
|
+
return false unless @packages.key?(package)
|
57
|
+
|
58
|
+
Bundler::PubGrub::RubyGems.parse_constraint(package, dependency)
|
59
|
+
end
|
60
|
+
end
|
61
|
+
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,129 @@
|
|
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 ==(other)
|
19
|
+
package == other.package &&
|
20
|
+
range == other.range
|
21
|
+
end
|
22
|
+
|
23
|
+
def eql?(other)
|
24
|
+
package.eql?(other.package) &&
|
25
|
+
range.eql?(other.range)
|
26
|
+
end
|
27
|
+
|
28
|
+
class << self
|
29
|
+
def exact(package, version)
|
30
|
+
range = VersionRange.new(min: version, max: version, include_min: true, include_max: true)
|
31
|
+
new(package, range: range)
|
32
|
+
end
|
33
|
+
|
34
|
+
def any(package)
|
35
|
+
new(package, range: VersionRange.any)
|
36
|
+
end
|
37
|
+
|
38
|
+
def empty(package)
|
39
|
+
new(package, range: VersionRange.empty)
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
def intersect(other)
|
44
|
+
unless package == other.package
|
45
|
+
raise ArgumentError, "Can only intersect between VersionConstraint of the same package"
|
46
|
+
end
|
47
|
+
|
48
|
+
self.class.new(package, range: range.intersect(other.range))
|
49
|
+
end
|
50
|
+
|
51
|
+
def union(other)
|
52
|
+
unless package == other.package
|
53
|
+
raise ArgumentError, "Can only intersect between VersionConstraint of the same package"
|
54
|
+
end
|
55
|
+
|
56
|
+
self.class.new(package, range: range.union(other.range))
|
57
|
+
end
|
58
|
+
|
59
|
+
def invert
|
60
|
+
new_range = range.invert
|
61
|
+
self.class.new(package, range: new_range)
|
62
|
+
end
|
63
|
+
|
64
|
+
def difference(other)
|
65
|
+
intersect(other.invert)
|
66
|
+
end
|
67
|
+
|
68
|
+
def allows_all?(other)
|
69
|
+
range.allows_all?(other.range)
|
70
|
+
end
|
71
|
+
|
72
|
+
def allows_any?(other)
|
73
|
+
range.intersects?(other.range)
|
74
|
+
end
|
75
|
+
|
76
|
+
def subset?(other)
|
77
|
+
other.allows_all?(self)
|
78
|
+
end
|
79
|
+
|
80
|
+
def overlap?(other)
|
81
|
+
other.allows_any?(self)
|
82
|
+
end
|
83
|
+
|
84
|
+
def disjoint?(other)
|
85
|
+
!overlap?(other)
|
86
|
+
end
|
87
|
+
|
88
|
+
def relation(other)
|
89
|
+
if subset?(other)
|
90
|
+
:subset
|
91
|
+
elsif overlap?(other)
|
92
|
+
:overlap
|
93
|
+
else
|
94
|
+
:disjoint
|
95
|
+
end
|
96
|
+
end
|
97
|
+
|
98
|
+
def to_s(allow_every: false)
|
99
|
+
if Package.root?(package)
|
100
|
+
package.to_s
|
101
|
+
elsif allow_every && any?
|
102
|
+
"every version of #{package}"
|
103
|
+
else
|
104
|
+
"#{package} #{constraint_string}"
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
def constraint_string
|
109
|
+
if any?
|
110
|
+
">= 0"
|
111
|
+
else
|
112
|
+
range.to_s
|
113
|
+
end
|
114
|
+
end
|
115
|
+
|
116
|
+
def empty?
|
117
|
+
range.empty?
|
118
|
+
end
|
119
|
+
|
120
|
+
# Does this match every version of the package
|
121
|
+
def any?
|
122
|
+
range.any?
|
123
|
+
end
|
124
|
+
|
125
|
+
def inspect
|
126
|
+
"#<#{self.class} #{self}>"
|
127
|
+
end
|
128
|
+
end
|
129
|
+
end
|