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/plugin.rb
CHANGED
@@ -13,8 +13,9 @@ module Bundler
|
|
13
13
|
class MalformattedPlugin < PluginError; end
|
14
14
|
class UndefinedCommandError < PluginError; end
|
15
15
|
class UnknownSourceError < PluginError; end
|
16
|
+
class PluginInstallError < PluginError; end
|
16
17
|
|
17
|
-
PLUGIN_FILE_NAME = "plugins.rb"
|
18
|
+
PLUGIN_FILE_NAME = "plugins.rb"
|
18
19
|
|
19
20
|
module_function
|
20
21
|
|
@@ -35,15 +36,16 @@ module Bundler
|
|
35
36
|
# @param [Hash] options various parameters as described in description.
|
36
37
|
# Refer to cli/plugin for available options
|
37
38
|
def install(names, options)
|
39
|
+
raise InvalidOption, "You cannot specify `--branch` and `--ref` at the same time." if options["branch"] && options["ref"]
|
40
|
+
|
38
41
|
specs = Installer.new.install(names, options)
|
39
42
|
|
40
43
|
save_plugins names, specs
|
41
|
-
rescue PluginError
|
44
|
+
rescue PluginError
|
42
45
|
specs_to_delete = specs.select {|k, _v| names.include?(k) && !index.commands.values.include?(k) }
|
43
46
|
specs_to_delete.each_value {|spec| Bundler.rm_rf(spec.full_gem_path) }
|
44
47
|
|
45
|
-
|
46
|
-
Bundler.ui.error "Failed to install the following plugins: #{names_list}. The underlying error was: #{e.message}.\n #{e.backtrace.join("\n ")}"
|
48
|
+
raise
|
47
49
|
end
|
48
50
|
|
49
51
|
# Uninstalls plugins by the given names
|
@@ -164,7 +166,7 @@ module Bundler
|
|
164
166
|
end
|
165
167
|
|
166
168
|
# To be called from Cli class to pass the command and argument to
|
167
|
-
#
|
169
|
+
# appropriate plugin class
|
168
170
|
def exec_command(command, args)
|
169
171
|
raise UndefinedCommandError, "Command `#{command}` not found" unless command? command
|
170
172
|
|
@@ -183,7 +185,7 @@ module Bundler
|
|
183
185
|
!index.source_plugin(name.to_s).nil?
|
184
186
|
end
|
185
187
|
|
186
|
-
# @return [Class] that handles the source. The
|
188
|
+
# @return [Class] that handles the source. The class includes API::Source
|
187
189
|
def source(name)
|
188
190
|
raise UnknownSourceError, "Source #{name} not found" unless source? name
|
189
191
|
|
@@ -245,10 +247,11 @@ module Bundler
|
|
245
247
|
# @param [Array<String>] names of inferred source plugins that can be ignored
|
246
248
|
def save_plugins(plugins, specs, optional_plugins = [])
|
247
249
|
plugins.each do |name|
|
250
|
+
next if index.installed?(name)
|
251
|
+
|
248
252
|
spec = specs[name]
|
249
|
-
|
250
|
-
|
251
|
-
Bundler.ui.info "Installed plugin #{name}" if installed
|
253
|
+
|
254
|
+
save_plugin(name, spec, optional_plugins.include?(name))
|
252
255
|
end
|
253
256
|
end
|
254
257
|
|
@@ -263,6 +266,22 @@ module Bundler
|
|
263
266
|
raise MalformattedPlugin, "#{PLUGIN_FILE_NAME} was not found in the plugin." unless plugin_file.file?
|
264
267
|
end
|
265
268
|
|
269
|
+
# Validates and registers a plugin.
|
270
|
+
#
|
271
|
+
# @param [String] name the name of the plugin
|
272
|
+
# @param [Specification] spec of installed plugin
|
273
|
+
# @param [Boolean] optional_plugin, removed if there is conflict with any
|
274
|
+
# other plugin (used for default source plugins)
|
275
|
+
#
|
276
|
+
# @raise [PluginInstallError] if validation or registration raises any error
|
277
|
+
def save_plugin(name, spec, optional_plugin = false)
|
278
|
+
validate_plugin! Pathname.new(spec.full_gem_path)
|
279
|
+
installed = register_plugin(name, spec, optional_plugin)
|
280
|
+
Bundler.ui.info "Installed plugin #{name}" if installed
|
281
|
+
rescue PluginError => e
|
282
|
+
raise PluginInstallError, "Failed to install plugin `#{spec.name}`, due to #{e.class} (#{e.message})"
|
283
|
+
end
|
284
|
+
|
266
285
|
# Runs the plugins.rb file in an isolated namespace, records the plugin
|
267
286
|
# actions it registers for and then passes the data to index to be stored.
|
268
287
|
#
|
@@ -309,6 +328,8 @@ module Bundler
|
|
309
328
|
#
|
310
329
|
# @param [String] name of the plugin
|
311
330
|
def load_plugin(name)
|
331
|
+
return unless name && !name.empty?
|
332
|
+
|
312
333
|
# Need to ensure before this that plugin root where the rest of gems
|
313
334
|
# are installed to be on load path to support plugin deps. Currently not
|
314
335
|
# done to avoid conflicts
|
data/lib/bundler/process_lock.rb
CHANGED
@@ -12,7 +12,7 @@ module Bundler
|
|
12
12
|
yield
|
13
13
|
f.flock(File::LOCK_UN)
|
14
14
|
end
|
15
|
-
rescue Errno::EACCES, Errno::ENOLCK,
|
15
|
+
rescue Errno::EACCES, Errno::ENOLCK, Errno::ENOTSUP, Errno::EPERM, Errno::EROFS
|
16
16
|
# In the case the user does not have access to
|
17
17
|
# create the lock file or is using NFS where
|
18
18
|
# locks are not available we skip locking.
|
@@ -6,6 +6,7 @@ module Bundler
|
|
6
6
|
# be seeded with what we're given from the source's abbreviated index - the
|
7
7
|
# full specification will only be fetched when necessary.
|
8
8
|
class RemoteSpecification
|
9
|
+
include MatchRemoteMetadata
|
9
10
|
include MatchPlatform
|
10
11
|
include Comparable
|
11
12
|
|
@@ -16,7 +17,8 @@ module Bundler
|
|
16
17
|
def initialize(name, version, platform, spec_fetcher)
|
17
18
|
@name = name
|
18
19
|
@version = Gem::Version.create version
|
19
|
-
@
|
20
|
+
@original_platform = platform || Gem::Platform::RUBY
|
21
|
+
@platform = Gem::Platform.new(platform)
|
20
22
|
@spec_fetcher = spec_fetcher
|
21
23
|
@dependencies = nil
|
22
24
|
end
|
@@ -28,10 +30,10 @@ module Bundler
|
|
28
30
|
end
|
29
31
|
|
30
32
|
def full_name
|
31
|
-
if platform == Gem::Platform::RUBY
|
33
|
+
@full_name ||= if @platform == Gem::Platform::RUBY
|
32
34
|
"#{@name}-#{@version}"
|
33
35
|
else
|
34
|
-
"#{@name}-#{@version}-#{platform}"
|
36
|
+
"#{@name}-#{@version}-#{@platform}"
|
35
37
|
end
|
36
38
|
end
|
37
39
|
|
@@ -98,9 +100,9 @@ module Bundler
|
|
98
100
|
end
|
99
101
|
|
100
102
|
def _remote_specification
|
101
|
-
@_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @
|
103
|
+
@_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @original_platform])
|
102
104
|
@_remote_specification || raise(GemspecError, "Gemspec data for #{full_name} was" \
|
103
|
-
" missing from the server!
|
105
|
+
" missing from the server!")
|
104
106
|
end
|
105
107
|
|
106
108
|
def method_missing(method, *args, &blk)
|
@@ -0,0 +1,107 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative "package"
|
4
|
+
|
5
|
+
module Bundler
|
6
|
+
class Resolver
|
7
|
+
class Base
|
8
|
+
attr_reader :packages, :requirements, :source_requirements
|
9
|
+
|
10
|
+
def initialize(source_requirements, dependencies, base, platforms, options)
|
11
|
+
@source_requirements = source_requirements
|
12
|
+
|
13
|
+
@base = base
|
14
|
+
|
15
|
+
@packages = Hash.new do |hash, name|
|
16
|
+
hash[name] = Package.new(name, platforms, **options)
|
17
|
+
end
|
18
|
+
|
19
|
+
@requirements = dependencies.map do |dep|
|
20
|
+
dep_platforms = dep.gem_platforms(platforms)
|
21
|
+
|
22
|
+
# Dependencies scoped to external platforms are ignored
|
23
|
+
next if dep_platforms.empty?
|
24
|
+
|
25
|
+
name = dep.name
|
26
|
+
|
27
|
+
@packages[name] = Package.new(name, dep_platforms, **options.merge(:dependency => dep))
|
28
|
+
|
29
|
+
dep
|
30
|
+
end.compact
|
31
|
+
end
|
32
|
+
|
33
|
+
def [](name)
|
34
|
+
@base[name]
|
35
|
+
end
|
36
|
+
|
37
|
+
def delete(specs)
|
38
|
+
@base.delete(specs)
|
39
|
+
end
|
40
|
+
|
41
|
+
def get_package(name)
|
42
|
+
@packages[name]
|
43
|
+
end
|
44
|
+
|
45
|
+
def base_requirements
|
46
|
+
@base_requirements ||= build_base_requirements
|
47
|
+
end
|
48
|
+
|
49
|
+
def unlock_names(names)
|
50
|
+
indirect_pins = indirect_pins(names)
|
51
|
+
|
52
|
+
if indirect_pins.any?
|
53
|
+
loosen_names(indirect_pins)
|
54
|
+
else
|
55
|
+
pins = pins(names)
|
56
|
+
|
57
|
+
if pins.any?
|
58
|
+
loosen_names(pins)
|
59
|
+
else
|
60
|
+
unrestrict_names(names)
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
def include_prereleases(names)
|
66
|
+
names.each do |name|
|
67
|
+
get_package(name).consider_prereleases!
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
private
|
72
|
+
|
73
|
+
def indirect_pins(names)
|
74
|
+
names.select {|name| @base_requirements[name].exact? && @requirements.none? {|dep| dep.name == name } }
|
75
|
+
end
|
76
|
+
|
77
|
+
def pins(names)
|
78
|
+
names.select {|name| @base_requirements[name].exact? }
|
79
|
+
end
|
80
|
+
|
81
|
+
def loosen_names(names)
|
82
|
+
names.each do |name|
|
83
|
+
version = @base_requirements[name].requirements.first[1]
|
84
|
+
|
85
|
+
@base_requirements[name] = Gem::Requirement.new(">= #{version}")
|
86
|
+
|
87
|
+
@base.delete_by_name(name)
|
88
|
+
end
|
89
|
+
end
|
90
|
+
|
91
|
+
def unrestrict_names(names)
|
92
|
+
names.each do |name|
|
93
|
+
@base_requirements.delete(name)
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
def build_base_requirements
|
98
|
+
base_requirements = {}
|
99
|
+
@base.each do |ls|
|
100
|
+
req = Gem::Requirement.new(ls.version)
|
101
|
+
base_requirements[ls.name] = req
|
102
|
+
end
|
103
|
+
base_requirements
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
@@ -0,0 +1,94 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative "spec_group"
|
4
|
+
|
5
|
+
module Bundler
|
6
|
+
class Resolver
|
7
|
+
#
|
8
|
+
# This class is a PubGrub compatible "Version" class that takes Bundler
|
9
|
+
# resolution complexities into account.
|
10
|
+
#
|
11
|
+
# Each Resolver::Candidate has a underlying `Gem::Version` plus a set of
|
12
|
+
# platforms. For example, 1.1.0-x86_64-linux is a different resolution candidate
|
13
|
+
# from 1.1.0 (generic). This is because different platform variants of the
|
14
|
+
# same gem version can bring different dependencies, so they need to be
|
15
|
+
# considered separately.
|
16
|
+
#
|
17
|
+
# Some candidates may also keep some information explicitly about the
|
18
|
+
# package the refer to. These candidates are referred to as "canonical" and
|
19
|
+
# are used when materializing resolution results back into RubyGems
|
20
|
+
# specifications that can be installed, written to lock files, and so on.
|
21
|
+
#
|
22
|
+
class Candidate
|
23
|
+
include Comparable
|
24
|
+
|
25
|
+
attr_reader :version
|
26
|
+
|
27
|
+
def initialize(version, specs: [])
|
28
|
+
@spec_group = Resolver::SpecGroup.new(specs)
|
29
|
+
@version = Gem::Version.new(version)
|
30
|
+
@ruby_only = specs.map(&:platform).uniq == [Gem::Platform::RUBY]
|
31
|
+
end
|
32
|
+
|
33
|
+
def dependencies
|
34
|
+
@spec_group.dependencies
|
35
|
+
end
|
36
|
+
|
37
|
+
def to_specs(package)
|
38
|
+
return [] if package.meta?
|
39
|
+
|
40
|
+
@spec_group.to_specs(package.force_ruby_platform?)
|
41
|
+
end
|
42
|
+
|
43
|
+
def generic!
|
44
|
+
@ruby_only = true
|
45
|
+
|
46
|
+
self
|
47
|
+
end
|
48
|
+
|
49
|
+
def platform_specific!
|
50
|
+
@ruby_only = false
|
51
|
+
|
52
|
+
self
|
53
|
+
end
|
54
|
+
|
55
|
+
def prerelease?
|
56
|
+
@version.prerelease?
|
57
|
+
end
|
58
|
+
|
59
|
+
def segments
|
60
|
+
@version.segments
|
61
|
+
end
|
62
|
+
|
63
|
+
def sort_obj
|
64
|
+
[@version, @ruby_only ? -1 : 1]
|
65
|
+
end
|
66
|
+
|
67
|
+
def <=>(other)
|
68
|
+
return unless other.is_a?(self.class)
|
69
|
+
|
70
|
+
sort_obj <=> other.sort_obj
|
71
|
+
end
|
72
|
+
|
73
|
+
def ==(other)
|
74
|
+
return unless other.is_a?(self.class)
|
75
|
+
|
76
|
+
sort_obj == other.sort_obj
|
77
|
+
end
|
78
|
+
|
79
|
+
def eql?(other)
|
80
|
+
return unless other.is_a?(self.class)
|
81
|
+
|
82
|
+
sort_obj.eql?(other.sort_obj)
|
83
|
+
end
|
84
|
+
|
85
|
+
def hash
|
86
|
+
sort_obj.hash
|
87
|
+
end
|
88
|
+
|
89
|
+
def to_s
|
90
|
+
@version.to_s
|
91
|
+
end
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
class Resolver
|
5
|
+
class Incompatibility < PubGrub::Incompatibility
|
6
|
+
attr_reader :extended_explanation
|
7
|
+
|
8
|
+
def initialize(terms, cause:, custom_explanation: nil, extended_explanation: nil)
|
9
|
+
@extended_explanation = extended_explanation
|
10
|
+
|
11
|
+
super(terms, :cause => cause, :custom_explanation => custom_explanation)
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,72 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
class Resolver
|
5
|
+
#
|
6
|
+
# Represents a gem being resolved, in a format PubGrub likes.
|
7
|
+
#
|
8
|
+
# The class holds the following information:
|
9
|
+
#
|
10
|
+
# * Platforms this gem will be resolved on.
|
11
|
+
# * The locked version of this gem resolution should favor (if any).
|
12
|
+
# * Whether the gem should be unlocked to its latest version.
|
13
|
+
# * The dependency explicit set in the Gemfile for this gem (if any).
|
14
|
+
#
|
15
|
+
class Package
|
16
|
+
attr_reader :name, :platforms, :dependency, :locked_version
|
17
|
+
|
18
|
+
def initialize(name, platforms, locked_specs:, unlock:, prerelease: false, dependency: nil)
|
19
|
+
@name = name
|
20
|
+
@platforms = platforms
|
21
|
+
@locked_version = locked_specs[name].first&.version
|
22
|
+
@unlock = unlock
|
23
|
+
@dependency = dependency || Dependency.new(name, @locked_version)
|
24
|
+
@prerelease = @dependency.prerelease? || @locked_version&.prerelease? || prerelease ? :consider_first : :ignore
|
25
|
+
end
|
26
|
+
|
27
|
+
def to_s
|
28
|
+
@name.delete("\0")
|
29
|
+
end
|
30
|
+
|
31
|
+
def root?
|
32
|
+
false
|
33
|
+
end
|
34
|
+
|
35
|
+
def meta?
|
36
|
+
@name.end_with?("\0")
|
37
|
+
end
|
38
|
+
|
39
|
+
def ==(other)
|
40
|
+
self.class == other.class && @name == other.name
|
41
|
+
end
|
42
|
+
|
43
|
+
def hash
|
44
|
+
@name.hash
|
45
|
+
end
|
46
|
+
|
47
|
+
def unlock?
|
48
|
+
@unlock.empty? || @unlock.include?(name)
|
49
|
+
end
|
50
|
+
|
51
|
+
def ignores_prereleases?
|
52
|
+
@prerelease == :ignore
|
53
|
+
end
|
54
|
+
|
55
|
+
def prerelease_specified?
|
56
|
+
@prerelease == :consider_first
|
57
|
+
end
|
58
|
+
|
59
|
+
def consider_prereleases!
|
60
|
+
@prerelease = :consider_last
|
61
|
+
end
|
62
|
+
|
63
|
+
def force_ruby_platform?
|
64
|
+
@dependency.force_ruby_platform
|
65
|
+
end
|
66
|
+
|
67
|
+
def current_platform?
|
68
|
+
@dependency.current_platform?
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative "package"
|
4
|
+
|
5
|
+
module Bundler
|
6
|
+
class Resolver
|
7
|
+
#
|
8
|
+
# Represents the Gemfile from the resolver's perspective. It's the root
|
9
|
+
# package and Gemfile entries depend on it.
|
10
|
+
#
|
11
|
+
class Root < Package
|
12
|
+
def initialize(name)
|
13
|
+
@name = name
|
14
|
+
end
|
15
|
+
|
16
|
+
def meta?
|
17
|
+
true
|
18
|
+
end
|
19
|
+
|
20
|
+
def root?
|
21
|
+
true
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
@@ -3,131 +3,79 @@
|
|
3
3
|
module Bundler
|
4
4
|
class Resolver
|
5
5
|
class SpecGroup
|
6
|
-
|
7
|
-
attr_accessor :activated_platforms
|
8
|
-
|
9
|
-
def self.create_for(specs, all_platforms, specific_platform)
|
10
|
-
specific_platform_specs = specs[specific_platform]
|
11
|
-
return unless specific_platform_specs.any?
|
12
|
-
|
13
|
-
platforms = all_platforms.select {|p| specs[p].any? }
|
14
|
-
|
15
|
-
new(specific_platform_specs.first, specs, platforms)
|
16
|
-
end
|
17
|
-
|
18
|
-
def initialize(exemplary_spec, specs, relevant_platforms)
|
19
|
-
@exemplary_spec = exemplary_spec
|
20
|
-
@name = exemplary_spec.name
|
21
|
-
@version = exemplary_spec.version
|
22
|
-
@source = exemplary_spec.source
|
23
|
-
|
24
|
-
@all_platforms = relevant_platforms
|
25
|
-
@activated_platforms = relevant_platforms
|
26
|
-
@dependencies = Hash.new do |dependencies, platforms|
|
27
|
-
dependencies[platforms] = dependencies_for(platforms)
|
28
|
-
end
|
29
|
-
@partitioned_dependency_names = Hash.new do |partitioned_dependency_names, platforms|
|
30
|
-
partitioned_dependency_names[platforms] = partitioned_dependency_names_for(platforms)
|
31
|
-
end
|
6
|
+
def initialize(specs)
|
32
7
|
@specs = specs
|
33
8
|
end
|
34
9
|
|
35
|
-
def
|
36
|
-
|
37
|
-
specs = @specs[p]
|
38
|
-
next unless specs.any?
|
39
|
-
|
40
|
-
specs.map do |s|
|
41
|
-
lazy_spec = LazySpecification.new(name, version, s.platform, source)
|
42
|
-
lazy_spec.dependencies.replace s.dependencies
|
43
|
-
lazy_spec
|
44
|
-
end
|
45
|
-
end.flatten.compact.uniq
|
46
|
-
end
|
47
|
-
|
48
|
-
def activate_platform!(platform)
|
49
|
-
self.activated_platforms = [platform]
|
10
|
+
def empty?
|
11
|
+
@specs.empty?
|
50
12
|
end
|
51
13
|
|
52
|
-
def
|
53
|
-
|
54
|
-
end
|
55
|
-
|
56
|
-
def to_s
|
57
|
-
activated_platforms_string = sorted_activated_platforms.join(", ")
|
58
|
-
"#{name} (#{version}) (#{activated_platforms_string})"
|
14
|
+
def name
|
15
|
+
@name ||= exemplary_spec.name
|
59
16
|
end
|
60
17
|
|
61
|
-
def
|
62
|
-
@
|
18
|
+
def version
|
19
|
+
@version ||= exemplary_spec.version
|
63
20
|
end
|
64
21
|
|
65
|
-
def
|
66
|
-
@
|
22
|
+
def source
|
23
|
+
@source ||= exemplary_spec.source
|
67
24
|
end
|
68
25
|
|
69
|
-
def
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
26
|
+
def to_specs(force_ruby_platform)
|
27
|
+
@specs.map do |s|
|
28
|
+
lazy_spec = LazySpecification.new(name, version, s.platform, source)
|
29
|
+
lazy_spec.force_ruby_platform = force_ruby_platform
|
30
|
+
lazy_spec.dependencies.replace s.dependencies
|
31
|
+
lazy_spec
|
32
|
+
end
|
75
33
|
end
|
76
34
|
|
77
|
-
def
|
78
|
-
|
79
|
-
name.eql?(other.name) &&
|
80
|
-
version.eql?(other.version) &&
|
81
|
-
sorted_activated_platforms.eql?(other.sorted_activated_platforms) &&
|
82
|
-
source.eql?(other.source)
|
35
|
+
def to_s
|
36
|
+
sorted_spec_names.join(", ")
|
83
37
|
end
|
84
38
|
|
85
|
-
def
|
86
|
-
|
39
|
+
def dependencies
|
40
|
+
@dependencies ||= @specs.map do |spec|
|
41
|
+
__dependencies(spec) + metadata_dependencies(spec)
|
42
|
+
end.flatten.uniq
|
87
43
|
end
|
88
44
|
|
89
45
|
protected
|
90
46
|
|
91
|
-
def
|
92
|
-
|
47
|
+
def sorted_spec_names
|
48
|
+
@sorted_spec_names ||= @specs.map(&:full_name).sort
|
93
49
|
end
|
94
50
|
|
95
51
|
private
|
96
52
|
|
97
|
-
def
|
98
|
-
|
99
|
-
__dependencies(platform) + metadata_dependencies(platform)
|
100
|
-
end.flatten
|
53
|
+
def exemplary_spec
|
54
|
+
@specs.first
|
101
55
|
end
|
102
56
|
|
103
|
-
def
|
104
|
-
return @dependencies[platforms].map(&:name), [] if platforms.size == 1
|
105
|
-
|
106
|
-
@dependencies[platforms].partition do |dep_proxy|
|
107
|
-
@dependencies[platforms].count {|dp| dp.dep == dep_proxy.dep } == platforms.size
|
108
|
-
end.map {|deps| deps.map(&:name) }
|
109
|
-
end
|
110
|
-
|
111
|
-
def __dependencies(platform)
|
57
|
+
def __dependencies(spec)
|
112
58
|
dependencies = []
|
113
|
-
|
59
|
+
spec.dependencies.each do |dep|
|
114
60
|
next if dep.type == :development
|
115
|
-
dependencies <<
|
61
|
+
dependencies << Dependency.new(dep.name, dep.requirement)
|
116
62
|
end
|
117
63
|
dependencies
|
118
64
|
end
|
119
65
|
|
120
|
-
def metadata_dependencies(
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
66
|
+
def metadata_dependencies(spec)
|
67
|
+
return [] if spec.is_a?(LazySpecification)
|
68
|
+
|
69
|
+
[
|
70
|
+
metadata_dependency("Ruby", spec.required_ruby_version),
|
71
|
+
metadata_dependency("RubyGems", spec.required_rubygems_version),
|
72
|
+
].compact
|
73
|
+
end
|
74
|
+
|
75
|
+
def metadata_dependency(name, requirement)
|
76
|
+
return if requirement.nil? || requirement.none?
|
77
|
+
|
78
|
+
Dependency.new("#{name}\0", requirement)
|
131
79
|
end
|
132
80
|
end
|
133
81
|
end
|