bundler 2.2.16 → 2.4.19
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +971 -7
- data/README.md +4 -7
- data/bundler.gemspec +10 -13
- data/exe/bundle +12 -24
- data/exe/bundler +1 -1
- data/lib/bundler/.document +1 -0
- data/lib/bundler/build_metadata.rb +3 -3
- data/lib/bundler/cli/add.rb +1 -1
- data/lib/bundler/cli/binstubs.rb +6 -2
- data/lib/bundler/cli/cache.rb +1 -1
- data/lib/bundler/cli/check.rb +5 -3
- data/lib/bundler/cli/common.rb +6 -2
- data/lib/bundler/cli/config.rb +10 -1
- data/lib/bundler/cli/console.rb +2 -2
- data/lib/bundler/cli/doctor.rb +22 -5
- data/lib/bundler/cli/exec.rb +1 -6
- data/lib/bundler/cli/gem.rb +147 -35
- data/lib/bundler/cli/info.rb +28 -7
- data/lib/bundler/cli/init.rb +6 -2
- data/lib/bundler/cli/install.rb +26 -58
- data/lib/bundler/cli/issue.rb +4 -3
- data/lib/bundler/cli/list.rb +7 -1
- data/lib/bundler/cli/lock.rb +11 -4
- data/lib/bundler/cli/open.rb +7 -6
- data/lib/bundler/cli/outdated.rb +23 -17
- data/lib/bundler/cli/platform.rb +8 -6
- data/lib/bundler/cli/remove.rb +1 -2
- data/lib/bundler/cli/show.rb +1 -1
- data/lib/bundler/cli/update.rb +17 -8
- data/lib/bundler/cli/viz.rb +1 -1
- data/lib/bundler/cli.rb +95 -65
- data/lib/bundler/compact_index_client/cache.rb +1 -10
- data/lib/bundler/compact_index_client/updater.rb +56 -43
- data/lib/bundler/compact_index_client.rb +2 -8
- data/lib/bundler/constants.rb +1 -1
- data/lib/bundler/current_ruby.rb +19 -6
- data/lib/bundler/definition.rb +386 -419
- data/lib/bundler/dependency.rb +24 -71
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +48 -63
- data/lib/bundler/endpoint_specification.rb +15 -13
- data/lib/bundler/env.rb +3 -3
- data/lib/bundler/environment_preserver.rb +7 -3
- data/lib/bundler/errors.rb +30 -14
- data/lib/bundler/feature_flag.rb +0 -5
- data/lib/bundler/fetcher/base.rb +6 -8
- data/lib/bundler/fetcher/compact_index.rb +21 -28
- data/lib/bundler/fetcher/dependency.rb +2 -6
- data/lib/bundler/fetcher/downloader.rb +12 -10
- data/lib/bundler/fetcher/index.rb +1 -29
- data/lib/bundler/fetcher.rb +35 -30
- data/lib/bundler/force_platform.rb +18 -0
- data/lib/bundler/friendly_errors.rb +26 -39
- data/lib/bundler/gem_helper.rb +10 -22
- data/lib/bundler/gem_helpers.rb +9 -2
- data/lib/bundler/gem_version_promoter.rb +53 -98
- data/lib/bundler/graph.rb +3 -3
- data/lib/bundler/index.rb +14 -57
- data/lib/bundler/injector.rb +20 -6
- data/lib/bundler/inline.rb +10 -22
- data/lib/bundler/installer/gem_installer.rb +16 -21
- data/lib/bundler/installer/parallel_installer.rb +4 -34
- data/lib/bundler/installer/standalone.rb +53 -17
- data/lib/bundler/installer.rb +26 -58
- data/lib/bundler/lazy_specification.rb +72 -55
- data/lib/bundler/lockfile_generator.rb +3 -3
- data/lib/bundler/lockfile_parser.rb +31 -45
- data/lib/bundler/man/bundle-add.1 +21 -5
- data/lib/bundler/man/bundle-add.1.ronn +16 -4
- data/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/lib/bundler/man/bundle-cache.1 +9 -3
- data/lib/bundler/man/bundle-cache.1.ronn +9 -2
- data/lib/bundler/man/bundle-check.1 +1 -1
- data/lib/bundler/man/bundle-clean.1 +2 -2
- data/lib/bundler/man/bundle-clean.1.ronn +1 -1
- data/lib/bundler/man/bundle-config.1 +50 -26
- data/lib/bundler/man/bundle-config.1.ronn +47 -32
- data/lib/bundler/man/bundle-console.1 +53 -0
- data/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/lib/bundler/man/bundle-doctor.1 +1 -1
- data/lib/bundler/man/bundle-exec.1 +6 -6
- data/lib/bundler/man/bundle-exec.1.ronn +6 -6
- data/lib/bundler/man/bundle-gem.1 +37 -34
- data/lib/bundler/man/bundle-gem.1.ronn +21 -5
- data/lib/bundler/man/bundle-help.1 +13 -0
- data/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/lib/bundler/man/bundle-info.1 +3 -3
- data/lib/bundler/man/bundle-info.1.ronn +3 -3
- data/lib/bundler/man/bundle-init.1 +5 -1
- data/lib/bundler/man/bundle-init.1.ronn +2 -0
- data/lib/bundler/man/bundle-inject.1 +5 -2
- data/lib/bundler/man/bundle-inject.1.ronn +3 -1
- data/lib/bundler/man/bundle-install.1 +6 -31
- data/lib/bundler/man/bundle-install.1.ronn +8 -31
- data/lib/bundler/man/bundle-list.1 +1 -1
- data/lib/bundler/man/bundle-lock.1 +1 -1
- data/lib/bundler/man/bundle-open.1 +22 -2
- data/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/lib/bundler/man/bundle-outdated.1 +15 -18
- data/lib/bundler/man/bundle-outdated.1.ronn +13 -19
- data/lib/bundler/man/bundle-platform.1 +16 -6
- data/lib/bundler/man/bundle-platform.1.ronn +14 -7
- data/lib/bundler/man/bundle-plugin.1 +81 -0
- data/lib/bundler/man/bundle-plugin.1.ronn +59 -0
- data/lib/bundler/man/bundle-pristine.1 +1 -1
- data/lib/bundler/man/bundle-remove.1 +1 -1
- data/lib/bundler/man/bundle-show.1 +1 -1
- data/lib/bundler/man/bundle-update.1 +5 -5
- data/lib/bundler/man/bundle-update.1.ronn +5 -4
- data/lib/bundler/man/bundle-version.1 +35 -0
- data/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/lib/bundler/man/bundle-viz.1 +4 -1
- data/lib/bundler/man/bundle-viz.1.ronn +2 -0
- data/lib/bundler/man/bundle.1 +15 -10
- data/lib/bundler/man/bundle.1.ronn +12 -7
- data/lib/bundler/man/gemfile.5 +131 -81
- data/lib/bundler/man/gemfile.5.ronn +111 -85
- data/lib/bundler/man/index.txt +4 -0
- data/lib/bundler/match_metadata.rb +13 -0
- data/lib/bundler/match_platform.rb +0 -1
- data/lib/bundler/match_remote_metadata.rb +29 -0
- data/lib/bundler/mirror.rb +5 -7
- data/lib/bundler/plugin/api/source.rb +17 -8
- data/lib/bundler/plugin/index.rb +9 -6
- data/lib/bundler/plugin/installer/git.rb +0 -4
- data/lib/bundler/plugin/installer/rubygems.rb +0 -8
- data/lib/bundler/plugin/installer.rb +9 -4
- data/lib/bundler/plugin.rb +30 -9
- data/lib/bundler/process_lock.rb +1 -1
- data/lib/bundler/remote_specification.rb +7 -5
- data/lib/bundler/resolver/base.rb +107 -0
- data/lib/bundler/resolver/candidate.rb +94 -0
- data/lib/bundler/resolver/incompatibility.rb +15 -0
- data/lib/bundler/resolver/package.rb +72 -0
- data/lib/bundler/resolver/root.rb +25 -0
- data/lib/bundler/resolver/spec_group.rb +42 -94
- data/lib/bundler/resolver.rb +331 -381
- data/lib/bundler/retry.rb +1 -1
- data/lib/bundler/ruby_dsl.rb +7 -1
- data/lib/bundler/ruby_version.rb +8 -21
- data/lib/bundler/rubygems_ext.rb +175 -34
- data/lib/bundler/rubygems_gem_installer.rb +46 -14
- data/lib/bundler/rubygems_integration.rb +57 -108
- data/lib/bundler/runtime.rb +20 -18
- data/lib/bundler/safe_marshal.rb +31 -0
- data/lib/bundler/self_manager.rb +168 -0
- data/lib/bundler/settings.rb +101 -30
- data/lib/bundler/setup.rb +5 -2
- data/lib/bundler/shared_helpers.rb +17 -32
- data/lib/bundler/source/git/git_proxy.rb +242 -77
- data/lib/bundler/source/git.rb +82 -41
- data/lib/bundler/source/metadata.rb +3 -4
- data/lib/bundler/source/path/installer.rb +1 -22
- data/lib/bundler/source/path.rb +7 -7
- data/lib/bundler/source/rubygems.rb +158 -212
- data/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/lib/bundler/source.rb +19 -5
- data/lib/bundler/source_list.rb +91 -52
- data/lib/bundler/source_map.rb +71 -0
- data/lib/bundler/spec_set.rb +69 -57
- data/lib/bundler/stub_specification.rb +5 -3
- data/lib/bundler/templates/Executable +3 -5
- data/lib/bundler/templates/Executable.bundler +11 -16
- data/lib/bundler/templates/Executable.standalone +4 -4
- data/lib/bundler/templates/Gemfile +0 -2
- 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 +27 -3
- 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 +24 -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 +27 -18
- 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 +36 -13
- data/lib/bundler/ui/silent.rb +21 -5
- data/lib/bundler/uri_normalizer.rb +23 -0
- 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 +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 +41 -74
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1351 -409
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- 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 +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 +60 -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/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +5 -5
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -2
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +6 -2
- data/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +6 -0
- data/lib/bundler/vendor/thor/lib/thor/error.rb +9 -4
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +19 -1
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +23 -5
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +452 -0
- data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +76 -91
- 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 +32 -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 +12 -18
- 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_persistent.rb +1 -33
- data/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/lib/bundler/{vendored_tmpdir.rb → vendored_tsort.rb} +1 -1
- data/lib/bundler/version.rb +5 -1
- data/lib/bundler/worker.rb +24 -11
- data/lib/bundler.rb +66 -110
- metadata +70 -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
data/lib/bundler/gem_helpers.rb
CHANGED
@@ -10,6 +10,7 @@ module Bundler
|
|
10
10
|
[Gem::Platform.new("universal-mingw32"), Gem::Platform.new("universal-mingw32")],
|
11
11
|
[Gem::Platform.new("x64-mingw32"), Gem::Platform.new("x64-mingw32")],
|
12
12
|
[Gem::Platform.new("x86_64-mingw32"), Gem::Platform.new("x64-mingw32")],
|
13
|
+
[Gem::Platform.new("x64-mingw-ucrt"), Gem::Platform.new("x64-mingw-ucrt")],
|
13
14
|
[Gem::Platform.new("mingw32"), Gem::Platform.new("x86-mingw32")],
|
14
15
|
].freeze
|
15
16
|
|
@@ -42,15 +43,21 @@ module Bundler
|
|
42
43
|
|
43
44
|
def select_best_platform_match(specs, platform)
|
44
45
|
matching = specs.select {|spec| spec.match_platform(platform) }
|
46
|
+
|
47
|
+
sort_best_platform_match(matching, platform)
|
48
|
+
end
|
49
|
+
module_function :select_best_platform_match
|
50
|
+
|
51
|
+
def sort_best_platform_match(matching, platform)
|
45
52
|
exact = matching.select {|spec| spec.platform == platform }
|
46
53
|
return exact if exact.any?
|
47
54
|
|
48
55
|
sorted_matching = matching.sort_by {|spec| platform_specificity_match(spec.platform, platform) }
|
49
56
|
exemplary_spec = sorted_matching.first
|
50
57
|
|
51
|
-
sorted_matching.take_while{|spec| same_specificity(platform, spec, exemplary_spec) && same_deps(spec, exemplary_spec) }
|
58
|
+
sorted_matching.take_while {|spec| same_specificity(platform, spec, exemplary_spec) && same_deps(spec, exemplary_spec) }
|
52
59
|
end
|
53
|
-
module_function :
|
60
|
+
module_function :sort_best_platform_match
|
54
61
|
|
55
62
|
class PlatformMatch
|
56
63
|
def self.specificity_score(spec_platform, user_platform)
|
@@ -7,14 +7,13 @@ module Bundler
|
|
7
7
|
# available dependency versions as found in its index, before returning it to
|
8
8
|
# to the resolution engine to select the best version.
|
9
9
|
class GemVersionPromoter
|
10
|
-
|
11
|
-
|
12
|
-
attr_reader :level, :locked_specs, :unlock_gems
|
10
|
+
attr_reader :level
|
11
|
+
attr_accessor :pre
|
13
12
|
|
14
13
|
# By default, strict is false, meaning every available version of a gem
|
15
14
|
# is returned from sort_versions. The order gives preference to the
|
16
15
|
# requested level (:patch, :minor, :major) but in complicated requirement
|
17
|
-
# cases some gems will by necessity
|
16
|
+
# cases some gems will by necessity be promoted past the requested level,
|
18
17
|
# or even reverted to older versions.
|
19
18
|
#
|
20
19
|
# If strict is set to true, the results from sort_versions will be
|
@@ -24,24 +23,13 @@ module Bundler
|
|
24
23
|
# existing in the referenced source.
|
25
24
|
attr_accessor :strict
|
26
25
|
|
27
|
-
|
28
|
-
|
29
|
-
# Given a list of locked_specs and a list of gems to unlock creates a
|
30
|
-
# GemVersionPromoter instance.
|
26
|
+
# Creates a GemVersionPromoter instance.
|
31
27
|
#
|
32
|
-
# @param locked_specs [SpecSet] All current locked specs. Unlike Definition
|
33
|
-
# where this list is empty if all gems are being updated, this should
|
34
|
-
# always be populated for all gems so this class can properly function.
|
35
|
-
# @param unlock_gems [String] List of gem names being unlocked. If empty,
|
36
|
-
# all gems will be considered unlocked.
|
37
28
|
# @return [GemVersionPromoter]
|
38
|
-
def initialize
|
29
|
+
def initialize
|
39
30
|
@level = :major
|
40
31
|
@strict = false
|
41
|
-
@
|
42
|
-
@unlock_gems = unlock_gems
|
43
|
-
@sort_versions = {}
|
44
|
-
@prerelease_specified = {}
|
32
|
+
@pre = false
|
45
33
|
end
|
46
34
|
|
47
35
|
# @param value [Symbol] One of three Symbols: :major, :minor or :patch.
|
@@ -55,37 +43,19 @@ module Bundler
|
|
55
43
|
@level = v
|
56
44
|
end
|
57
45
|
|
58
|
-
# Given a
|
59
|
-
# gem, this method will return the Array of
|
60
|
-
# truncated if strict is true) in an order to give
|
61
|
-
# level (:major, :minor or :patch) when resolution
|
62
|
-
# best resolve all dependencies in the bundle.
|
63
|
-
# @param
|
64
|
-
# @param
|
65
|
-
#
|
66
|
-
# @return [SpecGroup] A new instance of the SpecGroup Array sorted and
|
46
|
+
# Given a Resolver::Package and an Array of Specifications of available
|
47
|
+
# versions for a gem, this method will return the Array of Specifications
|
48
|
+
# sorted (and possibly truncated if strict is true) in an order to give
|
49
|
+
# preference to the current level (:major, :minor or :patch) when resolution
|
50
|
+
# is deciding what versions best resolve all dependencies in the bundle.
|
51
|
+
# @param package [Resolver::Package] The package being resolved.
|
52
|
+
# @param specs [Specification] An array of Specifications for the package.
|
53
|
+
# @return [Specification] A new instance of the Specification Array sorted and
|
67
54
|
# possibly filtered.
|
68
|
-
def sort_versions(
|
69
|
-
|
70
|
-
|
71
|
-
@sort_versions[dep] ||= begin
|
72
|
-
gem_name = dep.name
|
55
|
+
def sort_versions(package, specs)
|
56
|
+
specs = filter_dep_specs(specs, package) if strict
|
73
57
|
|
74
|
-
|
75
|
-
# We only need the version here so it's ok to hard code this to the first instance.
|
76
|
-
locked_spec = locked_specs[gem_name].first
|
77
|
-
|
78
|
-
if strict
|
79
|
-
filter_dep_specs(spec_groups, locked_spec)
|
80
|
-
else
|
81
|
-
sort_dep_specs(spec_groups, locked_spec)
|
82
|
-
end.tap do |specs|
|
83
|
-
if DEBUG
|
84
|
-
puts before_result
|
85
|
-
puts " after sort_versions: #{debug_format_result(dep, specs).inspect}"
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
58
|
+
sort_dep_specs(specs, package)
|
89
59
|
end
|
90
60
|
|
91
61
|
# @return [bool] Convenience method for testing value of level variable.
|
@@ -98,80 +68,72 @@ module Bundler
|
|
98
68
|
level == :minor
|
99
69
|
end
|
100
70
|
|
71
|
+
# @return [bool] Convenience method for testing value of pre variable.
|
72
|
+
def pre?
|
73
|
+
pre == true
|
74
|
+
end
|
75
|
+
|
101
76
|
private
|
102
77
|
|
103
|
-
def filter_dep_specs(
|
104
|
-
|
105
|
-
|
106
|
-
gsv = spec_group.version
|
107
|
-
lsv = locked_spec.version
|
78
|
+
def filter_dep_specs(specs, package)
|
79
|
+
locked_version = package.locked_version
|
80
|
+
return specs if locked_version.nil? || major?
|
108
81
|
|
109
|
-
|
82
|
+
specs.select do |spec|
|
83
|
+
gsv = spec.version
|
110
84
|
|
111
|
-
|
112
|
-
matches.uniq == [true] ? (gsv >= lsv) : false
|
113
|
-
else
|
114
|
-
true
|
115
|
-
end
|
116
|
-
end
|
85
|
+
must_match = minor? ? [0] : [0, 1]
|
117
86
|
|
118
|
-
|
87
|
+
all_match = must_match.all? {|idx| gsv.segments[idx] == locked_version.segments[idx] }
|
88
|
+
all_match && gsv >= locked_version
|
89
|
+
end
|
119
90
|
end
|
120
91
|
|
121
|
-
def sort_dep_specs(
|
122
|
-
|
123
|
-
@gem_name = locked_spec.name
|
124
|
-
@locked_version = locked_spec.version
|
125
|
-
|
126
|
-
result = spec_groups.sort do |a, b|
|
127
|
-
@a_ver = a.version
|
128
|
-
@b_ver = b.version
|
92
|
+
def sort_dep_specs(specs, package)
|
93
|
+
locked_version = package.locked_version
|
129
94
|
|
130
|
-
|
131
|
-
|
132
|
-
|
95
|
+
result = specs.sort do |a, b|
|
96
|
+
unless package.prerelease_specified? || pre?
|
97
|
+
a_pre = a.prerelease?
|
98
|
+
b_pre = b.prerelease?
|
133
99
|
|
134
100
|
next -1 if a_pre && !b_pre
|
135
101
|
next 1 if b_pre && !a_pre
|
136
102
|
end
|
137
103
|
|
138
104
|
if major?
|
139
|
-
|
140
|
-
elsif either_version_older_than_locked
|
141
|
-
|
142
|
-
elsif segments_do_not_match(:major)
|
143
|
-
|
144
|
-
elsif !minor? && segments_do_not_match(:minor)
|
145
|
-
|
105
|
+
a <=> b
|
106
|
+
elsif either_version_older_than_locked?(a, b, locked_version)
|
107
|
+
a <=> b
|
108
|
+
elsif segments_do_not_match?(a, b, :major)
|
109
|
+
b <=> a
|
110
|
+
elsif !minor? && segments_do_not_match?(a, b, :minor)
|
111
|
+
b <=> a
|
146
112
|
else
|
147
|
-
|
113
|
+
a <=> b
|
148
114
|
end
|
149
115
|
end
|
150
|
-
post_sort(result)
|
116
|
+
post_sort(result, package.unlock?, locked_version)
|
151
117
|
end
|
152
118
|
|
153
|
-
def either_version_older_than_locked
|
154
|
-
|
119
|
+
def either_version_older_than_locked?(a, b, locked_version)
|
120
|
+
locked_version && (a.version < locked_version || b.version < locked_version)
|
155
121
|
end
|
156
122
|
|
157
|
-
def segments_do_not_match(level)
|
123
|
+
def segments_do_not_match?(a, b, level)
|
158
124
|
index = [:major, :minor].index(level)
|
159
|
-
|
160
|
-
end
|
161
|
-
|
162
|
-
def unlocking_gem?
|
163
|
-
unlock_gems.empty? || unlock_gems.include?(@gem_name)
|
125
|
+
a.segments[index] != b.segments[index]
|
164
126
|
end
|
165
127
|
|
166
128
|
# Specific version moves can't always reliably be done during sorting
|
167
129
|
# as not all elements are compared against each other.
|
168
|
-
def post_sort(result)
|
130
|
+
def post_sort(result, unlock, locked_version)
|
169
131
|
# default :major behavior in Bundler does not do this
|
170
132
|
return result if major?
|
171
|
-
if
|
133
|
+
if unlock || locked_version.nil?
|
172
134
|
result
|
173
135
|
else
|
174
|
-
move_version_to_end(result,
|
136
|
+
move_version_to_end(result, locked_version)
|
175
137
|
end
|
176
138
|
end
|
177
139
|
|
@@ -179,12 +141,5 @@ module Bundler
|
|
179
141
|
move, keep = result.partition {|s| s.version.to_s == version.to_s }
|
180
142
|
keep.concat(move)
|
181
143
|
end
|
182
|
-
|
183
|
-
def debug_format_result(dep, spec_groups)
|
184
|
-
a = [dep.to_s,
|
185
|
-
spec_groups.map {|sg| [sg.version, sg.dependencies_for_activated_platforms.map {|dp| [dp.name, dp.requirement.to_s] }] }]
|
186
|
-
last_map = a.last.map {|sg_data| [sg_data.first.version, sg_data.last.map {|aa| aa.join(" ") }] }
|
187
|
-
[a.first, last_map, level, strict ? :strict : :not_strict]
|
188
|
-
end
|
189
144
|
end
|
190
145
|
end
|
data/lib/bundler/graph.rb
CHANGED
@@ -114,10 +114,10 @@ module Bundler
|
|
114
114
|
@groups.each do |group|
|
115
115
|
g.add_nodes(
|
116
116
|
group, {
|
117
|
-
:style
|
117
|
+
:style => "filled",
|
118
118
|
:fillcolor => "#B9B9D5",
|
119
|
-
:shape
|
120
|
-
:fontsize
|
119
|
+
:shape => "box3d",
|
120
|
+
:fontsize => 16,
|
121
121
|
}.merge(@node_options[group])
|
122
122
|
)
|
123
123
|
end
|
data/lib/bundler/index.rb
CHANGED
@@ -13,8 +13,8 @@ module Bundler
|
|
13
13
|
attr_reader :specs, :all_specs, :sources
|
14
14
|
protected :specs, :all_specs
|
15
15
|
|
16
|
-
RUBY = "ruby"
|
17
|
-
NULL = "\0"
|
16
|
+
RUBY = "ruby"
|
17
|
+
NULL = "\0"
|
18
18
|
|
19
19
|
def initialize
|
20
20
|
@sources = []
|
@@ -56,45 +56,21 @@ module Bundler
|
|
56
56
|
|
57
57
|
# Search this index's specs, and any source indexes that this index knows
|
58
58
|
# about, returning all of the results.
|
59
|
-
def search(query
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
def unsorted_search(query, base)
|
64
|
-
results = local_search(query, base)
|
65
|
-
|
66
|
-
seen = results.map(&:full_name).uniq unless @sources.empty?
|
59
|
+
def search(query)
|
60
|
+
results = local_search(query)
|
61
|
+
return results unless @sources.any?
|
67
62
|
|
68
63
|
@sources.each do |source|
|
69
|
-
source.
|
70
|
-
next if seen.include?(spec.full_name)
|
71
|
-
|
72
|
-
seen << spec.full_name
|
73
|
-
results << spec
|
74
|
-
end
|
75
|
-
end
|
76
|
-
|
77
|
-
results
|
78
|
-
end
|
79
|
-
protected :unsorted_search
|
80
|
-
|
81
|
-
def self.sort_specs(specs)
|
82
|
-
specs.sort_by do |s|
|
83
|
-
platform_string = s.platform.to_s
|
84
|
-
[s.version, platform_string == RUBY ? NULL : platform_string]
|
64
|
+
results.concat(source.search(query))
|
85
65
|
end
|
66
|
+
results.uniq(&:full_name)
|
86
67
|
end
|
87
68
|
|
88
|
-
def
|
89
|
-
self.class.sort_specs(specs)
|
90
|
-
end
|
91
|
-
|
92
|
-
def local_search(query, base = nil)
|
69
|
+
def local_search(query)
|
93
70
|
case query
|
94
71
|
when Gem::Specification, RemoteSpecification, LazySpecification, EndpointSpecification then search_by_spec(query)
|
95
72
|
when String then specs_by_name(query)
|
96
|
-
when
|
97
|
-
when DepProxy then search_by_dependency(query.dep, base)
|
73
|
+
when Array then specs_by_name_and_version(*query)
|
98
74
|
else
|
99
75
|
raise "You can't search for a #{query.inspect}."
|
100
76
|
end
|
@@ -122,10 +98,9 @@ module Bundler
|
|
122
98
|
names
|
123
99
|
end
|
124
100
|
|
125
|
-
# returns a list of the dependencies
|
126
101
|
def unmet_dependency_names
|
127
102
|
dependency_names.select do |name|
|
128
|
-
|
103
|
+
search(name).empty?
|
129
104
|
end
|
130
105
|
end
|
131
106
|
|
@@ -182,30 +157,12 @@ module Bundler
|
|
182
157
|
|
183
158
|
private
|
184
159
|
|
185
|
-
def
|
186
|
-
|
160
|
+
def specs_by_name_and_version(name, version)
|
161
|
+
specs_by_name(name).select {|spec| spec.version == version }
|
187
162
|
end
|
188
163
|
|
189
|
-
def
|
190
|
-
@
|
191
|
-
@cache[base || false][dependency] ||= begin
|
192
|
-
specs = specs_by_name(dependency.name)
|
193
|
-
specs += base if base
|
194
|
-
found = specs.select do |spec|
|
195
|
-
next true if spec.source.is_a?(Source::Gemspec)
|
196
|
-
if base # allow all platforms when searching from a lockfile
|
197
|
-
dependency.matches_spec?(spec)
|
198
|
-
else
|
199
|
-
if Gem::Platform.respond_to? :match_spec?
|
200
|
-
dependency.matches_spec?(spec) && Gem::Platform.match_spec?(spec)
|
201
|
-
else
|
202
|
-
dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform)
|
203
|
-
end
|
204
|
-
end
|
205
|
-
end
|
206
|
-
|
207
|
-
found
|
208
|
-
end
|
164
|
+
def specs_by_name(name)
|
165
|
+
@specs[name].values
|
209
166
|
end
|
210
167
|
|
211
168
|
EMPTY_SEARCH = [].freeze
|
data/lib/bundler/injector.rb
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
module Bundler
|
4
4
|
class Injector
|
5
|
-
INJECTED_GEMS = "injected gems"
|
5
|
+
INJECTED_GEMS = "injected gems"
|
6
6
|
|
7
7
|
def self.inject(new_deps, options = {})
|
8
8
|
injector = new(new_deps, options)
|
@@ -70,8 +70,12 @@ module Bundler
|
|
70
70
|
|
71
71
|
show_warning("No gems were removed from the gemfile.") if deps.empty?
|
72
72
|
|
73
|
-
deps.each {|dep| Bundler.ui.confirm "#{SharedHelpers.pretty_dependency(dep
|
73
|
+
deps.each {|dep| Bundler.ui.confirm "#{SharedHelpers.pretty_dependency(dep)} was removed." }
|
74
74
|
end
|
75
|
+
|
76
|
+
# Invalidate the cached Bundler.definition.
|
77
|
+
# This prevents e.g. `bundle remove ...` from using outdated information.
|
78
|
+
Bundler.reset_paths!
|
75
79
|
end
|
76
80
|
|
77
81
|
private
|
@@ -111,10 +115,14 @@ module Bundler
|
|
111
115
|
end
|
112
116
|
|
113
117
|
source = ", :source => \"#{d.source}\"" unless d.source.nil?
|
118
|
+
path = ", :path => \"#{d.path}\"" unless d.path.nil?
|
114
119
|
git = ", :git => \"#{d.git}\"" unless d.git.nil?
|
120
|
+
github = ", :github => \"#{d.github}\"" unless d.github.nil?
|
115
121
|
branch = ", :branch => \"#{d.branch}\"" unless d.branch.nil?
|
122
|
+
ref = ", :ref => \"#{d.ref}\"" unless d.ref.nil?
|
123
|
+
require_path = ", :require => #{convert_autorequire(d.autorequire)}" unless d.autorequire.nil?
|
116
124
|
|
117
|
-
%(gem #{name}#{requirement}#{group}#{source}#{git}#{branch})
|
125
|
+
%(gem #{name}#{requirement}#{group}#{source}#{path}#{git}#{github}#{branch}#{ref}#{require_path})
|
118
126
|
end.join("\n")
|
119
127
|
end
|
120
128
|
|
@@ -128,7 +136,7 @@ module Bundler
|
|
128
136
|
# evaluates a gemfile to remove the specified gem
|
129
137
|
# from it.
|
130
138
|
def remove_deps(gemfile_path)
|
131
|
-
initial_gemfile =
|
139
|
+
initial_gemfile = File.readlines(gemfile_path)
|
132
140
|
|
133
141
|
Bundler.ui.info "Removing gems from #{gemfile_path}"
|
134
142
|
|
@@ -181,7 +189,7 @@ module Bundler
|
|
181
189
|
patterns = /gem\s+(['"])#{Regexp.union(gems)}\1|gem\s*\((['"])#{Regexp.union(gems)}\2\)/
|
182
190
|
new_gemfile = []
|
183
191
|
multiline_removal = false
|
184
|
-
|
192
|
+
File.readlines(gemfile_path).each do |line|
|
185
193
|
match_data = line.match(patterns)
|
186
194
|
if match_data && is_not_within_comment?(line, match_data)
|
187
195
|
multiline_removal = line.rstrip.end_with?(",")
|
@@ -227,7 +235,7 @@ module Bundler
|
|
227
235
|
|
228
236
|
gemfile.each_with_index do |line, index|
|
229
237
|
next unless !line.nil? && line.strip.start_with?(block_name)
|
230
|
-
if gemfile[index + 1]
|
238
|
+
if /^\s*end\s*$/.match?(gemfile[index + 1])
|
231
239
|
gemfile[index] = nil
|
232
240
|
gemfile[index + 1] = nil
|
233
241
|
end
|
@@ -269,5 +277,11 @@ module Bundler
|
|
269
277
|
def show_warning(message)
|
270
278
|
Bundler.ui.info Bundler.ui.add_color(message, :yellow)
|
271
279
|
end
|
280
|
+
|
281
|
+
def convert_autorequire(autorequire)
|
282
|
+
autorequire = autorequire.first
|
283
|
+
return autorequire if autorequire == "false"
|
284
|
+
autorequire.inspect
|
285
|
+
end
|
272
286
|
end
|
273
287
|
end
|
data/lib/bundler/inline.rb
CHANGED
@@ -31,20 +31,16 @@
|
|
31
31
|
#
|
32
32
|
def gemfile(install = false, options = {}, &gemfile)
|
33
33
|
require_relative "../bundler"
|
34
|
+
Bundler.reset!
|
34
35
|
|
35
36
|
opts = options.dup
|
36
37
|
ui = opts.delete(:ui) { Bundler::UI::Shell.new }
|
37
|
-
ui.level = "silent" if opts.delete(:quiet)
|
38
|
+
ui.level = "silent" if opts.delete(:quiet) || !install
|
39
|
+
Bundler.ui = ui
|
38
40
|
raise ArgumentError, "Unknown options: #{opts.keys.join(", ")}" unless opts.empty?
|
39
41
|
|
40
|
-
|
41
|
-
|
42
|
-
bundler_module = class << Bundler; self; end
|
43
|
-
bundler_module.send(:remove_method, :root)
|
44
|
-
def Bundler.root
|
45
|
-
Bundler::SharedHelpers.pwd.expand_path
|
46
|
-
end
|
47
|
-
old_gemfile = ENV["BUNDLE_GEMFILE"]
|
42
|
+
Bundler.with_unbundled_env do
|
43
|
+
Bundler.instance_variable_set(:@bundle_path, Pathname.new(Gem.dir))
|
48
44
|
Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", "Gemfile"
|
49
45
|
|
50
46
|
Bundler::Plugin.gemfile_install(&gemfile) if Bundler.feature_flag.plugins?
|
@@ -52,14 +48,13 @@ def gemfile(install = false, options = {}, &gemfile)
|
|
52
48
|
builder.instance_eval(&gemfile)
|
53
49
|
builder.check_primary_source_safety
|
54
50
|
|
55
|
-
Bundler.settings.temporary(:frozen => false) do
|
51
|
+
Bundler.settings.temporary(:deployment => false, :frozen => false) do
|
56
52
|
definition = builder.to_definition(nil, true)
|
57
53
|
def definition.lock(*); end
|
58
54
|
definition.validate_runtime!
|
59
55
|
|
60
|
-
Bundler.ui = install ? ui : Bundler::UI::Silent.new
|
61
56
|
if install || definition.missing_specs?
|
62
|
-
Bundler.settings.temporary(:inline => true) do
|
57
|
+
Bundler.settings.temporary(:inline => true, :no_install => false) do
|
63
58
|
installer = Bundler::Installer.install(Bundler.root, definition, :system => true)
|
64
59
|
installer.post_install_messages.each do |name, message|
|
65
60
|
Bundler.ui.info "Post-install message from #{name}:\n#{message}"
|
@@ -70,16 +65,9 @@ def gemfile(install = false, options = {}, &gemfile)
|
|
70
65
|
runtime = Bundler::Runtime.new(nil, definition)
|
71
66
|
runtime.setup.require
|
72
67
|
end
|
73
|
-
|
74
|
-
if bundler_module
|
75
|
-
bundler_module.send(:remove_method, :root)
|
76
|
-
bundler_module.send(:define_method, :root, old_root)
|
77
|
-
end
|
68
|
+
end
|
78
69
|
|
79
|
-
|
80
|
-
|
81
|
-
else
|
82
|
-
ENV["BUNDLE_GEMFILE"] = ""
|
83
|
-
end
|
70
|
+
if ENV["BUNDLE_GEMFILE"].nil?
|
71
|
+
ENV["BUNDLE_GEMFILE"] = ""
|
84
72
|
end
|
85
73
|
end
|
@@ -1,7 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require "shellwords"
|
4
|
-
|
5
3
|
module Bundler
|
6
4
|
class GemInstaller
|
7
5
|
attr_reader :spec, :standalone, :worker, :force, :installer
|
@@ -15,7 +13,7 @@ module Bundler
|
|
15
13
|
end
|
16
14
|
|
17
15
|
def install_from_spec
|
18
|
-
post_install_message =
|
16
|
+
post_install_message = install
|
19
17
|
Bundler.ui.debug "#{worker}: #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
|
20
18
|
generate_executable_stubs
|
21
19
|
return true, post_install_message
|
@@ -31,45 +29,42 @@ module Bundler
|
|
31
29
|
|
32
30
|
def specific_failure_message(e)
|
33
31
|
message = "#{e.class}: #{e.message}\n"
|
34
|
-
message += " " + e.backtrace.join("\n ") + "\n\n"
|
32
|
+
message += " " + e.backtrace.join("\n ") + "\n\n"
|
35
33
|
message = message.lines.first + Bundler.ui.add_color(message.lines.drop(1).join, :clear)
|
36
34
|
message + Bundler.ui.add_color(failure_message, :red)
|
37
35
|
end
|
38
36
|
|
39
37
|
def failure_message
|
40
|
-
|
41
|
-
"#{install_error_message}\n#{gem_install_message}"
|
38
|
+
install_error_message
|
42
39
|
end
|
43
40
|
|
44
41
|
def install_error_message
|
45
42
|
"An error occurred while installing #{spec.name} (#{spec.version}), and Bundler cannot continue."
|
46
43
|
end
|
47
44
|
|
48
|
-
def gem_install_message
|
49
|
-
source = spec.source
|
50
|
-
return unless source.respond_to?(:remotes)
|
51
|
-
|
52
|
-
if source.remotes.size == 1
|
53
|
-
"Make sure that `gem install #{spec.name} -v '#{spec.version}' --source '#{source.remotes.first}'` succeeds before bundling."
|
54
|
-
else
|
55
|
-
"Make sure that `gem install #{spec.name} -v '#{spec.version}'` succeeds before bundling."
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
45
|
def spec_settings
|
60
46
|
# Fetch the build settings, if there are any
|
61
47
|
if settings = Bundler.settings["build.#{spec.name}"]
|
48
|
+
require "shellwords"
|
62
49
|
Shellwords.shellsplit(settings)
|
63
50
|
end
|
64
51
|
end
|
65
52
|
|
66
53
|
def install
|
67
|
-
spec.source.install(
|
54
|
+
spec.source.install(
|
55
|
+
spec,
|
56
|
+
:force => force,
|
57
|
+
:ensure_builtin_gems_cached => standalone,
|
58
|
+
:build_args => Array(spec_settings),
|
59
|
+
:previous_spec => previous_spec,
|
60
|
+
)
|
68
61
|
end
|
69
62
|
|
70
|
-
def
|
71
|
-
|
72
|
-
|
63
|
+
def previous_spec
|
64
|
+
locked_gems = installer.definition.locked_gems
|
65
|
+
return unless locked_gems
|
66
|
+
|
67
|
+
locked_gems.specs.find {|s| s.name == spec.name }
|
73
68
|
end
|
74
69
|
|
75
70
|
def out_of_space_message
|
@@ -53,10 +53,6 @@ module Bundler
|
|
53
53
|
@dependencies ||= all_dependencies.reject {|dep| ignorable_dependency? dep }
|
54
54
|
end
|
55
55
|
|
56
|
-
def missing_lockfile_dependencies(all_spec_names)
|
57
|
-
dependencies.reject {|dep| all_spec_names.include? dep.name }
|
58
|
-
end
|
59
|
-
|
60
56
|
# Represents all dependencies
|
61
57
|
def all_dependencies
|
62
58
|
@spec.dependencies
|
@@ -84,8 +80,6 @@ module Bundler
|
|
84
80
|
end
|
85
81
|
|
86
82
|
def call
|
87
|
-
check_for_corrupt_lockfile
|
88
|
-
|
89
83
|
if @rake
|
90
84
|
do_install(@rake, 0)
|
91
85
|
Gem::Specification.reset
|
@@ -102,7 +96,7 @@ module Bundler
|
|
102
96
|
handle_error if failed_specs.any?
|
103
97
|
@specs
|
104
98
|
ensure
|
105
|
-
worker_pool
|
99
|
+
worker_pool&.stop
|
106
100
|
end
|
107
101
|
|
108
102
|
def check_for_unmet_dependencies
|
@@ -116,43 +110,19 @@ module Bundler
|
|
116
110
|
|
117
111
|
warning = []
|
118
112
|
warning << "Your lockfile doesn't include a valid resolution."
|
119
|
-
warning << "You can fix this by regenerating your lockfile or
|
113
|
+
warning << "You can fix this by regenerating your lockfile or manually editing the bad locked gems to a version that satisfies all dependencies."
|
120
114
|
warning << "The unmet dependencies are:"
|
121
115
|
|
122
116
|
unmet_dependencies.each do |spec, unmet_spec_dependencies|
|
123
117
|
unmet_spec_dependencies.each do |unmet_spec_dependency|
|
124
|
-
|
118
|
+
found = @specs.find {|s| s.name == unmet_spec_dependency.name && !unmet_spec_dependency.matches_spec?(s.spec) }
|
119
|
+
warning << "* #{unmet_spec_dependency}, dependency of #{spec.full_name}, unsatisfied by #{found.full_name}"
|
125
120
|
end
|
126
121
|
end
|
127
122
|
|
128
123
|
Bundler.ui.warn(warning.join("\n"))
|
129
124
|
end
|
130
125
|
|
131
|
-
def check_for_corrupt_lockfile
|
132
|
-
missing_dependencies = @specs.map do |s|
|
133
|
-
[
|
134
|
-
s,
|
135
|
-
s.missing_lockfile_dependencies(@specs.map(&:name)),
|
136
|
-
]
|
137
|
-
end.reject {|a| a.last.empty? }
|
138
|
-
return if missing_dependencies.empty?
|
139
|
-
|
140
|
-
warning = []
|
141
|
-
warning << "Your lockfile was created by an old Bundler that left some things out."
|
142
|
-
if @size != 1
|
143
|
-
warning << "Because of the missing DEPENDENCIES, we can only install gems one at a time, instead of installing #{@size} at a time."
|
144
|
-
@size = 1
|
145
|
-
end
|
146
|
-
warning << "You can fix this by adding the missing gems to your Gemfile, running bundle install, and then removing the gems from your Gemfile."
|
147
|
-
warning << "The missing gems are:"
|
148
|
-
|
149
|
-
missing_dependencies.each do |spec, missing|
|
150
|
-
warning << "* #{missing.map(&:name).join(", ")} depended upon by #{spec.name}"
|
151
|
-
end
|
152
|
-
|
153
|
-
Bundler.ui.warn(warning.join("\n"))
|
154
|
-
end
|
155
|
-
|
156
126
|
private
|
157
127
|
|
158
128
|
def failed_specs
|