bundler 1.17.2 → 2.2.33
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +2095 -1251
- data/LICENSE.md +18 -19
- data/README.md +10 -11
- data/bundler.gemspec +10 -28
- data/exe/bundle +22 -3
- data/lib/bundler/build_metadata.rb +4 -12
- data/lib/bundler/capistrano.rb +4 -4
- data/lib/bundler/cli/add.rb +28 -16
- data/lib/bundler/cli/binstubs.rb +6 -2
- data/lib/bundler/cli/cache.rb +24 -17
- data/lib/bundler/cli/check.rb +4 -2
- data/lib/bundler/cli/clean.rb +1 -1
- data/lib/bundler/cli/common.rb +39 -13
- data/lib/bundler/cli/config.rb +161 -86
- data/lib/bundler/cli/console.rb +1 -1
- data/lib/bundler/cli/doctor.rb +20 -9
- data/lib/bundler/cli/exec.rb +8 -25
- data/lib/bundler/cli/fund.rb +36 -0
- data/lib/bundler/cli/gem.rb +213 -32
- data/lib/bundler/cli/info.rb +42 -7
- data/lib/bundler/cli/init.rb +2 -2
- data/lib/bundler/cli/inject.rb +1 -1
- data/lib/bundler/cli/install.rb +34 -44
- data/lib/bundler/cli/issue.rb +8 -7
- data/lib/bundler/cli/list.rb +19 -11
- data/lib/bundler/cli/lock.rb +5 -1
- data/lib/bundler/cli/open.rb +11 -8
- data/lib/bundler/cli/outdated.rb +142 -118
- data/lib/bundler/cli/plugin.rb +19 -2
- data/lib/bundler/cli/pristine.rb +6 -1
- data/lib/bundler/cli/remove.rb +1 -2
- data/lib/bundler/cli/show.rb +2 -2
- data/lib/bundler/cli/update.rb +43 -16
- data/lib/bundler/cli.rb +211 -150
- data/lib/bundler/compact_index_client/cache.rb +6 -14
- data/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/lib/bundler/compact_index_client/updater.rb +15 -28
- data/lib/bundler/compact_index_client.rb +28 -12
- data/lib/bundler/current_ruby.rb +14 -11
- data/lib/bundler/definition.rb +207 -368
- data/lib/bundler/dep_proxy.rb +16 -9
- data/lib/bundler/dependency.rb +19 -14
- data/lib/bundler/deployment.rb +1 -1
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +81 -81
- data/lib/bundler/endpoint_specification.rb +1 -1
- data/lib/bundler/env.rb +9 -14
- data/lib/bundler/environment_preserver.rb +29 -3
- data/lib/bundler/errors.rb +20 -3
- data/lib/bundler/feature_flag.rb +14 -33
- data/lib/bundler/fetcher/base.rb +1 -1
- data/lib/bundler/fetcher/compact_index.rb +28 -14
- data/lib/bundler/fetcher/dependency.rb +1 -1
- data/lib/bundler/fetcher/downloader.rb +14 -8
- data/lib/bundler/fetcher/index.rb +8 -8
- data/lib/bundler/fetcher.rb +22 -17
- data/lib/bundler/friendly_errors.rb +29 -48
- data/lib/bundler/gem_helper.rb +79 -43
- data/lib/bundler/gem_helpers.rb +38 -29
- data/lib/bundler/gem_tasks.rb +1 -1
- data/lib/bundler/gem_version_promoter.rb +5 -5
- data/lib/bundler/graph.rb +3 -3
- data/lib/bundler/index.rb +9 -9
- data/lib/bundler/injector.rb +33 -13
- data/lib/bundler/inline.rb +41 -30
- data/lib/bundler/installer/gem_installer.rb +9 -18
- data/lib/bundler/installer/parallel_installer.rb +50 -33
- data/lib/bundler/installer/standalone.rb +30 -11
- data/lib/bundler/installer.rb +39 -66
- data/lib/bundler/lazy_specification.rb +63 -28
- data/lib/bundler/lockfile_generator.rb +1 -1
- data/lib/bundler/lockfile_parser.rb +19 -52
- data/lib/bundler/{ssl_certs → man}/.document +0 -0
- data/{man → lib/bundler/man}/bundle-add.1 +10 -2
- data/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +7 -1
- data/{man → lib/bundler/man}/bundle-binstubs.1 +6 -4
- data/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +3 -5
- data/lib/bundler/man/bundle-cache.1 +55 -0
- data/{man/bundle-package.ronn → lib/bundler/man/bundle-cache.1.ronn} +15 -15
- data/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-clean.1 +1 -1
- data/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-config.1 +59 -60
- data/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +77 -78
- data/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-exec.1 +2 -2
- data/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-gem.1 +38 -3
- data/{man/bundle-gem.ronn → lib/bundler/man/bundle-gem.1.ronn} +46 -7
- data/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-init.1 +2 -2
- data/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-inject.1 +1 -1
- data/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-install.1 +37 -7
- data/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +34 -7
- data/{man → lib/bundler/man}/bundle-list.1 +7 -7
- data/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
- data/{man → lib/bundler/man}/bundle-lock.1 +1 -1
- data/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-open.1 +1 -1
- data/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-outdated.1 +1 -1
- data/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-platform.1 +1 -1
- data/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-update.1 +7 -7
- data/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +6 -6
- data/{man → lib/bundler/man}/bundle-viz.1 +1 -1
- data/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle.1 +7 -3
- data/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +5 -2
- data/{man → lib/bundler/man}/gemfile.5 +44 -21
- data/{man → lib/bundler/man}/gemfile.5.ronn +24 -20
- data/{man → lib/bundler/man}/index.txt +1 -1
- data/lib/bundler/match_platform.rb +1 -1
- data/lib/bundler/mirror.rb +5 -5
- data/lib/bundler/plugin/api/source.rb +27 -7
- data/lib/bundler/plugin/api.rb +1 -1
- data/lib/bundler/plugin/dsl.rb +1 -1
- data/lib/bundler/plugin/index.rb +27 -4
- data/lib/bundler/plugin/installer/rubygems.rb +1 -1
- data/lib/bundler/plugin/installer.rb +35 -22
- data/lib/bundler/plugin/source_list.rb +5 -1
- data/lib/bundler/plugin.rb +100 -42
- data/lib/bundler/psyched_yaml.rb +0 -15
- data/lib/bundler/remote_specification.rb +5 -4
- data/lib/bundler/resolver/spec_group.rb +57 -53
- data/lib/bundler/resolver.rb +127 -113
- data/lib/bundler/retry.rb +4 -4
- data/lib/bundler/ruby_version.rb +5 -20
- data/lib/bundler/rubygems_ext.rb +103 -79
- data/lib/bundler/rubygems_gem_installer.rb +69 -8
- data/lib/bundler/rubygems_integration.rb +181 -446
- data/lib/bundler/runtime.rb +24 -34
- data/lib/bundler/settings.rb +159 -110
- data/lib/bundler/setup.rb +11 -12
- data/lib/bundler/shared_helpers.rb +56 -90
- data/lib/bundler/similarity_detector.rb +3 -3
- data/lib/bundler/source/git/git_proxy.rb +106 -105
- data/lib/bundler/source/git.rb +66 -39
- data/lib/bundler/source/metadata.rb +9 -9
- data/lib/bundler/source/path/installer.rb +10 -10
- data/lib/bundler/source/path.rb +23 -12
- data/lib/bundler/source/rubygems/remote.rb +3 -4
- data/lib/bundler/source/rubygems.rb +136 -120
- data/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/lib/bundler/source.rb +27 -6
- data/lib/bundler/source_list.rb +101 -66
- data/lib/bundler/source_map.rb +58 -0
- data/lib/bundler/spec_set.rb +49 -53
- data/lib/bundler/stub_specification.rb +40 -34
- data/lib/bundler/templates/Executable.bundler +24 -15
- data/lib/bundler/templates/Gemfile +1 -1
- data/lib/bundler/templates/gems.rb +1 -1
- data/lib/bundler/templates/newgem/CHANGELOG.md.tt +5 -0
- data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/lib/bundler/templates/newgem/Gemfile.tt +19 -2
- data/lib/bundler/templates/newgem/README.md.tt +7 -5
- data/lib/bundler/templates/newgem/Rakefile.tt +23 -5
- data/lib/bundler/templates/newgem/bin/console.tt +1 -0
- data/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
- data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +27 -0
- data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -0
- data/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +29 -40
- data/lib/bundler/templates/newgem/rubocop.yml.tt +13 -0
- data/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
- data/lib/bundler/templates/newgem/standard.yml.tt +2 -0
- data/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
- data/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt +6 -0
- data/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -1
- data/lib/bundler/ui/rg_proxy.rb +1 -1
- data/lib/bundler/ui/shell.rb +7 -11
- data/lib/bundler/ui.rb +3 -3
- data/lib/bundler/uri_credentials_filter.rb +10 -4
- data/lib/bundler/vendor/.document +1 -0
- data/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +174 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +57 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +126 -0
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +273 -147
- data/lib/bundler/vendor/molinillo/LICENSE +9 -0
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +7 -0
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +3 -3
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +39 -11
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +38 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +4 -4
- data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +12 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +53 -51
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +5 -6
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +302 -462
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +3 -2
- data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +7 -17
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +20 -9
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +19 -8
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +28 -13
- data/lib/bundler/vendor/thor/lib/thor/base.rb +63 -43
- data/lib/bundler/vendor/thor/lib/thor/command.rb +21 -14
- data/lib/bundler/vendor/thor/lib/thor/error.rb +78 -0
- data/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/lib/bundler/vendor/thor/lib/thor/invocation.rb +1 -0
- data/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb +6 -6
- data/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/nested_context.rb +29 -0
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +7 -3
- data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +20 -7
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +21 -5
- data/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +1 -0
- data/lib/bundler/vendor/thor/lib/thor/runner.rb +15 -14
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +65 -8
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +10 -2
- data/lib/bundler/vendor/thor/lib/thor/shell/html.rb +3 -3
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/util.rb +18 -2
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +16 -9
- data/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +154 -0
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +453 -0
- data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +744 -0
- data/lib/bundler/vendor/uri/lib/uri/file.rb +94 -0
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +267 -0
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +1568 -0
- data/lib/bundler/vendor/uri/lib/uri/http.rb +88 -0
- data/lib/bundler/vendor/uri/lib/uri/https.rb +23 -0
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +261 -0
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +21 -0
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +294 -0
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +546 -0
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +125 -0
- data/lib/bundler/vendor/uri/lib/uri/version.rb +6 -0
- data/lib/bundler/vendor/uri/lib/uri.rb +104 -0
- data/lib/bundler/vendored_fileutils.rb +1 -6
- data/lib/bundler/vendored_molinillo.rb +1 -1
- data/lib/bundler/vendored_persistent.rb +7 -12
- data/lib/bundler/vendored_thor.rb +2 -2
- data/lib/bundler/vendored_tmpdir.rb +4 -0
- data/lib/bundler/vendored_tsort.rb +4 -0
- data/lib/bundler/vendored_uri.rb +4 -0
- data/lib/bundler/version.rb +1 -20
- data/lib/bundler/version_ranges.rb +51 -5
- data/lib/bundler/vlad.rb +2 -2
- data/lib/bundler/worker.rb +21 -8
- data/lib/bundler/yaml_serializer.rb +3 -4
- data/lib/bundler.rb +248 -118
- metadata +115 -190
- data/exe/bundle_ruby +0 -60
- data/lib/bundler/cli/package.rb +0 -49
- data/lib/bundler/compatibility_guard.rb +0 -14
- data/lib/bundler/gem_remote_fetcher.rb +0 -43
- data/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -21
- data/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/lib/bundler/templates/newgem/test/test_helper.rb.tt +0 -4
- data/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +0 -12
- data/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +0 -129
- data/man/bundle-add.1.txt +0 -52
- data/man/bundle-binstubs.1.txt +0 -48
- data/man/bundle-check.1.txt +0 -33
- data/man/bundle-clean.1.txt +0 -26
- data/man/bundle-config.1.txt +0 -529
- data/man/bundle-doctor.1.txt +0 -44
- data/man/bundle-exec.1.txt +0 -178
- data/man/bundle-gem.1.txt +0 -91
- data/man/bundle-info.1.txt +0 -21
- data/man/bundle-init.1.txt +0 -34
- data/man/bundle-inject.1.txt +0 -32
- data/man/bundle-install.1.txt +0 -396
- data/man/bundle-list.1.txt +0 -43
- data/man/bundle-lock.1.txt +0 -93
- data/man/bundle-open.1.txt +0 -29
- data/man/bundle-outdated.1.txt +0 -131
- data/man/bundle-package.1 +0 -55
- data/man/bundle-package.1.txt +0 -79
- data/man/bundle-platform.1.txt +0 -57
- data/man/bundle-pristine.1.txt +0 -44
- data/man/bundle-remove.1.txt +0 -34
- data/man/bundle-show.1.txt +0 -27
- data/man/bundle-update.1.txt +0 -391
- data/man/bundle-viz.1.txt +0 -39
- data/man/bundle.1.txt +0 -113
- data/man/gemfile.5.txt +0 -653
data/lib/bundler/resolver.rb
CHANGED
@@ -2,8 +2,10 @@
|
|
2
2
|
|
3
3
|
module Bundler
|
4
4
|
class Resolver
|
5
|
-
|
6
|
-
|
5
|
+
require_relative "vendored_molinillo"
|
6
|
+
require_relative "resolver/spec_group"
|
7
|
+
|
8
|
+
include GemHelpers
|
7
9
|
|
8
10
|
# Figures out the best possible configuration of gems that satisfies
|
9
11
|
# the list of passed dependencies and any child dependencies without
|
@@ -15,16 +17,14 @@ module Bundler
|
|
15
17
|
# ==== Returns
|
16
18
|
# <GemBundle>,nil:: If the list of dependencies can be resolved, a
|
17
19
|
# collection of gemspecs is returned. Otherwise, nil is returned.
|
18
|
-
def self.resolve(requirements,
|
19
|
-
platforms = Set.new(platforms) if platforms
|
20
|
+
def self.resolve(requirements, source_requirements = {}, base = [], gem_version_promoter = GemVersionPromoter.new, additional_base_requirements = [], platforms = nil)
|
20
21
|
base = SpecSet.new(base) unless base.is_a?(SpecSet)
|
21
|
-
resolver = new(
|
22
|
+
resolver = new(source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
|
22
23
|
result = resolver.start(requirements)
|
23
|
-
SpecSet.new(result)
|
24
|
+
SpecSet.new(SpecSet.new(result).for(requirements.reject{|dep| dep.name.end_with?("\0") }))
|
24
25
|
end
|
25
26
|
|
26
|
-
def initialize(
|
27
|
-
@index = index
|
27
|
+
def initialize(source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
|
28
28
|
@source_requirements = source_requirements
|
29
29
|
@base = base
|
30
30
|
@resolver = Molinillo::Resolver.new(self, self)
|
@@ -32,13 +32,12 @@ module Bundler
|
|
32
32
|
@base_dg = Molinillo::DependencyGraph.new
|
33
33
|
@base.each do |ls|
|
34
34
|
dep = Dependency.new(ls.name, ls.version)
|
35
|
-
@base_dg.add_vertex(ls.name, DepProxy.
|
35
|
+
@base_dg.add_vertex(ls.name, DepProxy.get_proxy(dep, ls.platform), true)
|
36
36
|
end
|
37
37
|
additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) }
|
38
|
-
@platforms = platforms
|
38
|
+
@platforms = platforms.reject {|p| p != Gem::Platform::RUBY && (platforms - [p]).any? {|pl| generic(pl) == p } }
|
39
|
+
@resolving_only_for_ruby = platforms == [Gem::Platform::RUBY]
|
39
40
|
@gem_version_promoter = gem_version_promoter
|
40
|
-
@allow_bundler_dependency_conflicts = Bundler.feature_flag.allow_bundler_dependency_conflicts?
|
41
|
-
@lockfile_uses_separate_rubygems_sources = Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
|
42
41
|
@use_gvp = Bundler.feature_flag.use_gem_version_promoter_for_major_updates? || !@gem_version_promoter.major?
|
43
42
|
end
|
44
43
|
|
@@ -48,9 +47,11 @@ module Bundler
|
|
48
47
|
|
49
48
|
verify_gemfile_dependencies_are_found!(requirements)
|
50
49
|
dg = @resolver.resolve(requirements, @base_dg)
|
51
|
-
dg.
|
50
|
+
dg.
|
51
|
+
map(&:payload).
|
52
52
|
reject {|sg| sg.name.end_with?("\0") }.
|
53
|
-
map(&:to_specs).
|
53
|
+
map(&:to_specs).
|
54
|
+
flatten
|
54
55
|
rescue Molinillo::VersionConflict => e
|
55
56
|
message = version_conflict_message(e)
|
56
57
|
raise VersionConflict.new(e.conflicts.keys.uniq, message)
|
@@ -72,12 +73,17 @@ module Bundler
|
|
72
73
|
return unless debug?
|
73
74
|
debug_info = yield
|
74
75
|
debug_info = debug_info.inspect unless debug_info.is_a?(String)
|
75
|
-
|
76
|
+
puts debug_info.split("\n").map {|s| depth == 0 ? "BUNDLER: #{s}" : "BUNDLER(#{depth}): #{s}" }
|
76
77
|
end
|
77
78
|
|
78
79
|
def debug?
|
79
80
|
return @debug_mode if defined?(@debug_mode)
|
80
|
-
@debug_mode =
|
81
|
+
@debug_mode =
|
82
|
+
ENV["BUNDLER_DEBUG_RESOLVER"] ||
|
83
|
+
ENV["BUNDLER_DEBUG_RESOLVER_TREE"] ||
|
84
|
+
ENV["DEBUG_RESOLVER"] ||
|
85
|
+
ENV["DEBUG_RESOLVER_TREE"] ||
|
86
|
+
false
|
81
87
|
end
|
82
88
|
|
83
89
|
def before_resolution
|
@@ -98,18 +104,18 @@ module Bundler
|
|
98
104
|
specification.dependencies_for_activated_platforms
|
99
105
|
end
|
100
106
|
|
101
|
-
def search_for(
|
102
|
-
platform =
|
103
|
-
dependency =
|
104
|
-
|
105
|
-
|
106
|
-
results =
|
107
|
+
def search_for(dependency_proxy)
|
108
|
+
platform = dependency_proxy.__platform
|
109
|
+
dependency = dependency_proxy.dep
|
110
|
+
name = dependency.name
|
111
|
+
@search_for[dependency_proxy] ||= begin
|
112
|
+
results = results_for(dependency, @base[name])
|
107
113
|
|
108
|
-
if vertex = @base_dg.vertex_named(
|
114
|
+
if vertex = @base_dg.vertex_named(name)
|
109
115
|
locked_requirement = vertex.payload.requirement
|
110
116
|
end
|
111
117
|
|
112
|
-
if !@prerelease_specified[
|
118
|
+
if !@prerelease_specified[name] && (!@use_gvp || locked_requirement.nil?)
|
113
119
|
# Move prereleases to the beginning of the list, so they're considered
|
114
120
|
# last during resolution.
|
115
121
|
pre, results = results.partition {|spec| spec.version.prerelease? }
|
@@ -128,9 +134,20 @@ module Bundler
|
|
128
134
|
end
|
129
135
|
nested.reduce([]) do |groups, (version, specs)|
|
130
136
|
next groups if locked_requirement && !locked_requirement.satisfied_by?(version)
|
131
|
-
|
132
|
-
|
133
|
-
|
137
|
+
|
138
|
+
specs_by_platform = Hash.new do |current_specs, current_platform|
|
139
|
+
current_specs[current_platform] = select_best_platform_match(specs, current_platform)
|
140
|
+
end
|
141
|
+
|
142
|
+
spec_group_ruby = SpecGroup.create_for(specs_by_platform, [Gem::Platform::RUBY], Gem::Platform::RUBY)
|
143
|
+
groups << spec_group_ruby if spec_group_ruby
|
144
|
+
|
145
|
+
next groups if @resolving_only_for_ruby
|
146
|
+
|
147
|
+
spec_group = SpecGroup.create_for(specs_by_platform, @platforms, platform)
|
148
|
+
groups << spec_group if spec_group
|
149
|
+
|
150
|
+
groups
|
134
151
|
end
|
135
152
|
else
|
136
153
|
[]
|
@@ -143,24 +160,18 @@ module Bundler
|
|
143
160
|
@gem_version_promoter.sort_versions(dependency, spec_groups)
|
144
161
|
end
|
145
162
|
end
|
146
|
-
search.select {|sg| sg.for?(platform) }.each {|sg| sg.activate_platform!(platform) }
|
147
163
|
end
|
148
164
|
|
149
165
|
def index_for(dependency)
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
end
|
160
|
-
end
|
161
|
-
else
|
162
|
-
@index
|
163
|
-
end
|
166
|
+
source_for(dependency.name).specs
|
167
|
+
end
|
168
|
+
|
169
|
+
def source_for(name)
|
170
|
+
@source_requirements[name] || @source_requirements[:default]
|
171
|
+
end
|
172
|
+
|
173
|
+
def results_for(dependency, base)
|
174
|
+
index_for(dependency).search(dependency, base)
|
164
175
|
end
|
165
176
|
|
166
177
|
def name_for(dependency)
|
@@ -169,35 +180,26 @@ module Bundler
|
|
169
180
|
|
170
181
|
def name_for_explicit_dependency_source
|
171
182
|
Bundler.default_gemfile.basename.to_s
|
172
|
-
rescue
|
183
|
+
rescue StandardError
|
173
184
|
"Gemfile"
|
174
185
|
end
|
175
186
|
|
176
187
|
def name_for_locking_dependency_source
|
177
188
|
Bundler.default_lockfile.basename.to_s
|
178
|
-
rescue
|
189
|
+
rescue StandardError
|
179
190
|
"Gemfile.lock"
|
180
191
|
end
|
181
192
|
|
182
193
|
def requirement_satisfied_by?(requirement, activated, spec)
|
183
|
-
|
184
|
-
spec.activate_platform!(requirement.__platform) if !@platforms || @platforms.include?(requirement.__platform)
|
185
|
-
true
|
194
|
+
requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
|
186
195
|
end
|
187
196
|
|
188
|
-
def
|
189
|
-
|
190
|
-
[@source_requirements[vertex.name]]
|
191
|
-
elsif @lockfile_uses_separate_rubygems_sources
|
192
|
-
vertex.recursive_predecessors.map do |v|
|
193
|
-
@source_requirements[v.name]
|
194
|
-
end << @source_requirements[:default]
|
195
|
-
end
|
197
|
+
def dependencies_equal?(dependencies, other_dependencies)
|
198
|
+
dependencies.map(&:dep) == other_dependencies.map(&:dep)
|
196
199
|
end
|
197
200
|
|
198
201
|
def sort_dependencies(dependencies, activated, conflicts)
|
199
202
|
dependencies.sort_by do |dependency|
|
200
|
-
dependency.all_sources = relevant_sources_for_vertex(activated.vertex_named(dependency.name))
|
201
203
|
name = name_for(dependency)
|
202
204
|
vertex = activated.vertex_named(name)
|
203
205
|
[
|
@@ -212,19 +214,13 @@ module Bundler
|
|
212
214
|
end
|
213
215
|
end
|
214
216
|
|
215
|
-
# Sort platforms from most general to most specific
|
216
|
-
def self.sort_platforms(platforms)
|
217
|
-
platforms.sort_by do |platform|
|
218
|
-
platform_sort_key(platform)
|
219
|
-
end
|
220
|
-
end
|
221
|
-
|
222
217
|
def self.platform_sort_key(platform)
|
223
|
-
|
224
|
-
|
218
|
+
# Prefer specific platform to not specific platform
|
219
|
+
return ["99-LAST", "", "", ""] if Gem::Platform::RUBY == platform
|
220
|
+
["00", *platform.to_a.map {|part| part || "" }]
|
225
221
|
end
|
226
222
|
|
227
|
-
|
223
|
+
private
|
228
224
|
|
229
225
|
# returns an integer \in (-\infty, 0]
|
230
226
|
# a number closer to 0 means the dependency is less constraining
|
@@ -257,12 +253,6 @@ module Bundler
|
|
257
253
|
next if name == "bundler"
|
258
254
|
next unless search_for(requirement).empty?
|
259
255
|
|
260
|
-
cache_message = begin
|
261
|
-
" or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
|
262
|
-
rescue GemfileNotFound
|
263
|
-
nil
|
264
|
-
end
|
265
|
-
|
266
256
|
if (base = @base[name]) && !base.empty?
|
267
257
|
version = base.first.version
|
268
258
|
message = "You have requested:\n" \
|
@@ -271,18 +261,17 @@ module Bundler
|
|
271
261
|
"Try running `bundle update #{name}`\n\n" \
|
272
262
|
"If you are updating multiple gems in your Gemfile at once,\n" \
|
273
263
|
"try passing them all to `bundle update`"
|
274
|
-
|
275
|
-
|
264
|
+
else
|
265
|
+
source = source_for(name)
|
266
|
+
specs = source.specs.search(name)
|
276
267
|
versions_with_platforms = specs.map {|s| [s.version, s.platform] }
|
268
|
+
cache_message = begin
|
269
|
+
" or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
|
270
|
+
rescue GemfileNotFound
|
271
|
+
nil
|
272
|
+
end
|
277
273
|
message = String.new("Could not find gem '#{SharedHelpers.pretty_dependency(requirement)}' in #{source}#{cache_message}.\n")
|
278
|
-
message << if versions_with_platforms.any?
|
279
|
-
"The source contains '#{name}' at: #{formatted_versions_with_platforms(versions_with_platforms)}"
|
280
|
-
else
|
281
|
-
"The source does not contain any versions of '#{name}'"
|
282
|
-
end
|
283
|
-
else
|
284
|
-
message = "Could not find gem '#{requirement}' in any of the gem sources " \
|
285
|
-
"listed in your Gemfile#{cache_message}."
|
274
|
+
message << "The source contains the following versions of '#{name}': #{formatted_versions_with_platforms(versions_with_platforms)}" if versions_with_platforms.any?
|
286
275
|
end
|
287
276
|
raise GemNotFound, message
|
288
277
|
end
|
@@ -300,9 +289,25 @@ module Bundler
|
|
300
289
|
end
|
301
290
|
|
302
291
|
def version_conflict_message(e)
|
292
|
+
# only show essential conflicts, if possible
|
293
|
+
conflicts = e.conflicts.dup
|
294
|
+
|
295
|
+
if conflicts["bundler"]
|
296
|
+
conflicts.replace("bundler" => conflicts["bundler"])
|
297
|
+
else
|
298
|
+
conflicts.delete_if do |_name, conflict|
|
299
|
+
deps = conflict.requirement_trees.map(&:last).flatten(1)
|
300
|
+
!Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
|
301
|
+
end
|
302
|
+
end
|
303
|
+
|
304
|
+
e = Molinillo::VersionConflict.new(conflicts, e.specification_provider) unless conflicts.empty?
|
305
|
+
|
306
|
+
solver_name = "Bundler"
|
307
|
+
possibility_type = "gem"
|
303
308
|
e.message_with_trees(
|
304
|
-
:solver_name =>
|
305
|
-
:possibility_type =>
|
309
|
+
:solver_name => solver_name,
|
310
|
+
:possibility_type => possibility_type,
|
306
311
|
:reduce_trees => lambda do |trees|
|
307
312
|
# called first, because we want to reduce the amount of work required to find maximal empty sets
|
308
313
|
trees = trees.uniq {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
|
@@ -314,10 +319,8 @@ module Bundler
|
|
314
319
|
end.flatten(1).select do |deps|
|
315
320
|
Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
|
316
321
|
end.min_by(&:size)
|
317
|
-
trees.reject! {|t| !maximal.include?(t.last) } if maximal
|
318
322
|
|
319
|
-
trees
|
320
|
-
trees.uniq! {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
|
323
|
+
trees.reject! {|t| !maximal.include?(t.last) } if maximal
|
321
324
|
|
322
325
|
trees.sort_by {|t| t.reverse.map(&:name) }
|
323
326
|
end,
|
@@ -325,48 +328,59 @@ module Bundler
|
|
325
328
|
:additional_message_for_conflict => lambda do |o, name, conflict|
|
326
329
|
if name == "bundler"
|
327
330
|
o << %(\n Current Bundler version:\n bundler (#{Bundler::VERSION}))
|
328
|
-
other_bundler_required = !conflict.requirement.requirement.satisfied_by?(Gem::Version.new Bundler::VERSION)
|
329
|
-
end
|
330
331
|
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
332
|
+
conflict_dependency = conflict.requirement
|
333
|
+
conflict_requirement = conflict_dependency.requirement
|
334
|
+
other_bundler_required = !conflict_requirement.satisfied_by?(Gem::Version.new(Bundler::VERSION))
|
335
|
+
|
336
|
+
if other_bundler_required
|
337
|
+
o << "\n\n"
|
338
|
+
|
339
|
+
candidate_specs = source_for(:default_bundler).specs.search(conflict_dependency)
|
340
|
+
if candidate_specs.any?
|
341
|
+
target_version = candidate_specs.last.version
|
342
|
+
new_command = [File.basename($PROGRAM_NAME), "_#{target_version}_", *ARGV].join(" ")
|
343
|
+
o << "Your bundle requires a different version of Bundler than the one you're running.\n"
|
344
|
+
o << "Install the necessary version with `gem install bundler:#{target_version}` and rerun bundler using `#{new_command}`\n"
|
345
|
+
else
|
346
|
+
o << "Your bundle requires a different version of Bundler than the one you're running, and that version could not be found.\n"
|
347
|
+
end
|
348
|
+
end
|
349
|
+
elsif conflict.locked_requirement
|
337
350
|
o << "\n"
|
338
351
|
o << %(Running `bundle update` will rebuild your snapshot from scratch, using only\n)
|
339
352
|
o << %(the gems in your Gemfile, which may resolve the conflict.\n)
|
340
353
|
elsif !conflict.existing
|
341
354
|
o << "\n"
|
342
355
|
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
conflict.requirement.all_sources
|
347
|
-
elsif @lockfile_uses_separate_rubygems_sources
|
348
|
-
# every conflict should have an explicit group of sources when we
|
349
|
-
# enforce strict pinning
|
350
|
-
raise "no source set for #{conflict}"
|
351
|
-
else
|
352
|
-
[]
|
353
|
-
end.compact.map(&:to_s).uniq.sort
|
356
|
+
relevant_source = conflict.requirement.source || source_for(name)
|
357
|
+
|
358
|
+
metadata_requirement = name.end_with?("\0")
|
354
359
|
|
355
|
-
o << "Could not find gem '
|
360
|
+
o << "Could not find gem '" unless metadata_requirement
|
361
|
+
o << SharedHelpers.pretty_dependency(conflict.requirement)
|
362
|
+
o << "'" unless metadata_requirement
|
356
363
|
if conflict.requirement_trees.first.size > 1
|
357
364
|
o << ", which is required by "
|
358
365
|
o << "gem '#{SharedHelpers.pretty_dependency(conflict.requirement_trees.first[-2])}',"
|
359
366
|
end
|
360
367
|
o << " "
|
361
368
|
|
362
|
-
o << if
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
369
|
+
o << if metadata_requirement
|
370
|
+
"is not available in #{relevant_source}"
|
371
|
+
else
|
372
|
+
"in #{relevant_source}.\n"
|
373
|
+
end
|
367
374
|
end
|
368
375
|
end,
|
369
|
-
:version_for_spec => lambda {|spec| spec.version }
|
376
|
+
:version_for_spec => lambda {|spec| spec.version },
|
377
|
+
:incompatible_version_message_for_conflict => lambda do |name, _conflict|
|
378
|
+
if name.end_with?("\0")
|
379
|
+
%(#{solver_name} found conflicting requirements for the #{name} version:)
|
380
|
+
else
|
381
|
+
%(#{solver_name} could not find compatible versions for #{possibility_type} "#{name}":)
|
382
|
+
end
|
383
|
+
end
|
370
384
|
)
|
371
385
|
end
|
372
386
|
end
|
data/lib/bundler/retry.rb
CHANGED
@@ -32,13 +32,13 @@ module Bundler
|
|
32
32
|
end
|
33
33
|
alias_method :attempts, :attempt
|
34
34
|
|
35
|
-
|
35
|
+
private
|
36
36
|
|
37
37
|
def run(&block)
|
38
|
-
@failed
|
38
|
+
@failed = false
|
39
39
|
@current_run += 1
|
40
40
|
@result = block.call
|
41
|
-
rescue => e
|
41
|
+
rescue StandardError => e
|
42
42
|
fail_attempt(e)
|
43
43
|
end
|
44
44
|
|
@@ -49,7 +49,7 @@ module Bundler
|
|
49
49
|
raise e
|
50
50
|
end
|
51
51
|
return true unless name
|
52
|
-
Bundler.ui.info "" unless Bundler.ui.debug? # Add new line
|
52
|
+
Bundler.ui.info "" unless Bundler.ui.debug? # Add new line in case dots preceded this
|
53
53
|
Bundler.ui.warn "Retrying #{name} due to error (#{current_run.next}/#{total_runs}): #{e.class} #{e.message}", Bundler.ui.debug?
|
54
54
|
end
|
55
55
|
|
data/lib/bundler/ruby_version.rb
CHANGED
@@ -49,7 +49,7 @@ module Bundler
|
|
49
49
|
([\d.]+) # ruby version
|
50
50
|
(?:p(-?\d+))? # optional patchlevel
|
51
51
|
(?:\s\((\S+)\s(.+)\))? # optional engine info
|
52
|
-
/xo
|
52
|
+
/xo.freeze
|
53
53
|
|
54
54
|
# Returns a RubyVersion from the given string.
|
55
55
|
# @param [String] the version string to match.
|
@@ -74,7 +74,7 @@ module Bundler
|
|
74
74
|
@host ||= [
|
75
75
|
RbConfig::CONFIG["host_cpu"],
|
76
76
|
RbConfig::CONFIG["host_vendor"],
|
77
|
-
RbConfig::CONFIG["host_os"]
|
77
|
+
RbConfig::CONFIG["host_os"],
|
78
78
|
].join("-")
|
79
79
|
end
|
80
80
|
|
@@ -102,24 +102,9 @@ module Bundler
|
|
102
102
|
end
|
103
103
|
|
104
104
|
def self.system
|
105
|
-
ruby_engine =
|
106
|
-
RUBY_ENGINE.dup
|
107
|
-
else
|
108
|
-
# not defined in ruby 1.8.7
|
109
|
-
"ruby"
|
110
|
-
end
|
111
|
-
# :sob: mocking RUBY_VERSION breaks stuff on 1.8.7
|
105
|
+
ruby_engine = RUBY_ENGINE.dup
|
112
106
|
ruby_version = ENV.fetch("BUNDLER_SPEC_RUBY_VERSION") { RUBY_VERSION }.dup
|
113
|
-
ruby_engine_version =
|
114
|
-
when "ruby"
|
115
|
-
ruby_version
|
116
|
-
when "rbx"
|
117
|
-
Rubinius::VERSION.dup
|
118
|
-
when "jruby"
|
119
|
-
JRUBY_VERSION.dup
|
120
|
-
else
|
121
|
-
RUBY_ENGINE_VERSION.dup
|
122
|
-
end
|
107
|
+
ruby_engine_version = RUBY_ENGINE_VERSION.dup
|
123
108
|
patchlevel = RUBY_PATCHLEVEL.to_s
|
124
109
|
|
125
110
|
@ruby_version ||= RubyVersion.new(ruby_version, patchlevel, ruby_engine, ruby_engine_version)
|
@@ -138,7 +123,7 @@ module Bundler
|
|
138
123
|
@exact = versions.all? {|v| Gem::Requirement.create(v).exact? }
|
139
124
|
end
|
140
125
|
|
141
|
-
|
126
|
+
private
|
142
127
|
|
143
128
|
def matches?(requirements, version)
|
144
129
|
# Handles RUBY_PATCHLEVEL of -1 for instances like ruby-head
|