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/source/git.rb
CHANGED
@@ -1,14 +1,13 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
require "uri"
|
3
|
+
require_relative "../vendored_fileutils"
|
5
4
|
|
6
5
|
module Bundler
|
7
6
|
class Source
|
8
7
|
class Git < Path
|
9
|
-
autoload :GitProxy, "
|
8
|
+
autoload :GitProxy, File.expand_path("git/git_proxy", __dir__)
|
10
9
|
|
11
|
-
attr_reader :uri, :ref, :branch, :options, :submodules
|
10
|
+
attr_reader :uri, :ref, :branch, :options, :glob, :submodules
|
12
11
|
|
13
12
|
def initialize(options)
|
14
13
|
@options = options
|
@@ -23,7 +22,7 @@ module Bundler
|
|
23
22
|
@uri = options["uri"] || ""
|
24
23
|
@safe_uri = URICredentialsFilter.credential_filtered_uri(@uri)
|
25
24
|
@branch = options["branch"]
|
26
|
-
@ref = options["ref"] || options["branch"] || options["tag"]
|
25
|
+
@ref = options["ref"] || options["branch"] || options["tag"]
|
27
26
|
@submodules = options["submodules"]
|
28
27
|
@name = options["name"]
|
29
28
|
@version = options["version"].to_s.strip.gsub("-", ".pre.")
|
@@ -43,42 +42,53 @@ module Bundler
|
|
43
42
|
%w[ref branch tag submodules].each do |opt|
|
44
43
|
out << " #{opt}: #{options[opt]}\n" if options[opt]
|
45
44
|
end
|
46
|
-
out << " glob: #{@glob}\n" unless
|
45
|
+
out << " glob: #{@glob}\n" unless default_glob?
|
47
46
|
out << " specs:\n"
|
48
47
|
end
|
49
48
|
|
50
49
|
def hash
|
51
|
-
[self.class, uri, ref, branch, name, version, submodules].hash
|
50
|
+
[self.class, uri, ref, branch, name, version, glob, submodules].hash
|
52
51
|
end
|
53
52
|
|
54
53
|
def eql?(other)
|
55
54
|
other.is_a?(Git) && uri == other.uri && ref == other.ref &&
|
56
55
|
branch == other.branch && name == other.name &&
|
57
|
-
version == other.version &&
|
56
|
+
version == other.version && glob == other.glob &&
|
57
|
+
submodules == other.submodules
|
58
58
|
end
|
59
59
|
|
60
60
|
alias_method :==, :eql?
|
61
61
|
|
62
62
|
def to_s
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
63
|
+
begin
|
64
|
+
at = if local?
|
65
|
+
path
|
66
|
+
elsif user_ref = options["ref"]
|
67
|
+
if ref =~ /\A[a-z0-9]{4,}\z/i
|
68
|
+
shortref_for_display(user_ref)
|
69
|
+
else
|
70
|
+
user_ref
|
71
|
+
end
|
72
|
+
elsif ref
|
73
|
+
ref
|
68
74
|
else
|
69
|
-
|
75
|
+
git_proxy.branch
|
70
76
|
end
|
71
|
-
|
72
|
-
|
77
|
+
|
78
|
+
rev = "at #{at}@#{shortref_for_display(revision)}"
|
79
|
+
rescue GitError
|
80
|
+
""
|
73
81
|
end
|
74
82
|
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
83
|
+
specifiers = [rev, glob_for_display].compact
|
84
|
+
suffix =
|
85
|
+
if specifiers.any?
|
86
|
+
" (#{specifiers.join(", ")})"
|
87
|
+
else
|
88
|
+
""
|
89
|
+
end
|
80
90
|
|
81
|
-
"#{@safe_uri}
|
91
|
+
"#{@safe_uri}#{suffix}"
|
82
92
|
end
|
83
93
|
|
84
94
|
def name
|
@@ -118,18 +128,19 @@ module Bundler
|
|
118
128
|
def local_override!(path)
|
119
129
|
return false if local?
|
120
130
|
|
131
|
+
original_path = path
|
121
132
|
path = Pathname.new(path)
|
122
133
|
path = path.expand_path(Bundler.root) unless path.relative?
|
123
134
|
|
124
135
|
unless options["branch"] || Bundler.settings[:disable_local_branch_check]
|
125
136
|
raise GitError, "Cannot use local override for #{name} at #{path} because " \
|
126
|
-
":branch is not specified in Gemfile. Specify a branch or
|
127
|
-
"`bundle config
|
137
|
+
":branch is not specified in Gemfile. Specify a branch or run " \
|
138
|
+
"`bundle config unset local.#{override_for(original_path)}` to remove the local override"
|
128
139
|
end
|
129
140
|
|
130
141
|
unless path.exist?
|
131
142
|
raise GitError, "Cannot use local override for #{name} because #{path} " \
|
132
|
-
"does not exist.
|
143
|
+
"does not exist. Run `bundle config unset local.#{override_for(original_path)}` to remove the local override"
|
133
144
|
end
|
134
145
|
|
135
146
|
set_local!(path)
|
@@ -145,7 +156,7 @@ module Bundler
|
|
145
156
|
|
146
157
|
changed = cached_revision && cached_revision != git_proxy.revision
|
147
158
|
|
148
|
-
if changed && !@unlocked && !git_proxy.contains?(cached_revision)
|
159
|
+
if !Bundler.settings[:disable_local_revision_check] && changed && !@unlocked && !git_proxy.contains?(cached_revision)
|
149
160
|
raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(cached_revision)} " \
|
150
161
|
"but the current branch in your local override for #{name} does not contain such commit. " \
|
151
162
|
"Please make sure your branch is up to date."
|
@@ -229,7 +240,11 @@ module Bundler
|
|
229
240
|
@allow_remote || @allow_cached
|
230
241
|
end
|
231
242
|
|
232
|
-
|
243
|
+
def local?
|
244
|
+
@local
|
245
|
+
end
|
246
|
+
|
247
|
+
private
|
233
248
|
|
234
249
|
def serialize_gemspecs_in(destination)
|
235
250
|
destination = destination.expand_path(Bundler.root) if destination.relative?
|
@@ -255,12 +270,12 @@ module Bundler
|
|
255
270
|
cached_revision && super
|
256
271
|
end
|
257
272
|
|
258
|
-
def
|
259
|
-
|
273
|
+
def requires_checkout?
|
274
|
+
allow_git_ops? && !local? && !cached_revision_checked_out?
|
260
275
|
end
|
261
276
|
|
262
|
-
def
|
263
|
-
|
277
|
+
def cached_revision_checked_out?
|
278
|
+
cached_revision && cached_revision == revision && install_path.exist?
|
264
279
|
end
|
265
280
|
|
266
281
|
def base_name
|
@@ -275,16 +290,26 @@ module Bundler
|
|
275
290
|
ref[0..11]
|
276
291
|
end
|
277
292
|
|
293
|
+
def glob_for_display
|
294
|
+
default_glob? ? nil : "glob: #{@glob}"
|
295
|
+
end
|
296
|
+
|
297
|
+
def default_glob?
|
298
|
+
@glob == DEFAULT_GLOB
|
299
|
+
end
|
300
|
+
|
278
301
|
def uri_hash
|
279
302
|
if uri =~ %r{^\w+://(\w+@)?}
|
280
303
|
# Downcase the domain component of the URI
|
281
304
|
# and strip off a trailing slash, if one is present
|
282
|
-
input = URI.parse(uri).normalize.to_s.sub(%r{/$}, "")
|
305
|
+
input = Bundler::URI.parse(uri).normalize.to_s.sub(%r{/$}, "")
|
283
306
|
else
|
284
307
|
# If there is no URI scheme, assume it is an ssh/git URI
|
285
308
|
input = uri
|
286
309
|
end
|
287
|
-
|
310
|
+
# We use SHA1 here for historical reason and to preserve backward compatibility.
|
311
|
+
# But a transition to a simpler mangling algorithm would be welcome.
|
312
|
+
Bundler::Digest.sha1(input)
|
288
313
|
end
|
289
314
|
|
290
315
|
def cached_revision
|
@@ -309,12 +334,10 @@ module Bundler
|
|
309
334
|
# no-op, since we validate when re-serializing the gemspec
|
310
335
|
def validate_spec(_spec); end
|
311
336
|
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
StubSpecification.from_stub(stub)
|
317
|
-
end
|
337
|
+
def load_gemspec(file)
|
338
|
+
stub = Gem::StubSpecification.gemspec_stub(file, install_path.parent, install_path.parent)
|
339
|
+
stub.full_gem_path = Pathname.new(file).dirname.expand_path(root).to_s.tap{|x| x.untaint if RUBY_VERSION < "2.7" }
|
340
|
+
StubSpecification.from_stub(stub)
|
318
341
|
end
|
319
342
|
|
320
343
|
def git_scope
|
@@ -324,6 +347,10 @@ module Bundler
|
|
324
347
|
def extension_cache_slug(_)
|
325
348
|
extension_dir_name
|
326
349
|
end
|
350
|
+
|
351
|
+
def override_for(path)
|
352
|
+
Bundler.settings.local_overrides.key(path)
|
353
|
+
end
|
327
354
|
end
|
328
355
|
end
|
329
356
|
end
|
@@ -5,23 +5,27 @@ module Bundler
|
|
5
5
|
class Metadata < Source
|
6
6
|
def specs
|
7
7
|
@specs ||= Index.build do |idx|
|
8
|
-
idx << Gem::Specification.new("
|
9
|
-
idx << Gem::Specification.new("
|
8
|
+
idx << Gem::Specification.new("Ruby\0", RubyVersion.system.to_gem_version_with_patchlevel)
|
9
|
+
idx << Gem::Specification.new("RubyGems\0", Gem::VERSION) do |s|
|
10
|
+
s.required_rubygems_version = Gem::Requirement.default
|
11
|
+
end
|
10
12
|
|
11
13
|
idx << Gem::Specification.new do |s|
|
12
14
|
s.name = "bundler"
|
13
15
|
s.version = VERSION
|
16
|
+
s.license = "MIT"
|
14
17
|
s.platform = Gem::Platform::RUBY
|
15
18
|
s.source = self
|
16
19
|
s.authors = ["bundler team"]
|
17
20
|
s.bindir = "exe"
|
21
|
+
s.homepage = "https://bundler.io"
|
22
|
+
s.summary = "The best way to manage your application's dependencies"
|
18
23
|
s.executables = %w[bundle]
|
19
24
|
# can't point to the actual gemspec or else the require paths will be wrong
|
20
25
|
s.loaded_from = File.expand_path("..", __FILE__)
|
21
26
|
end
|
22
|
-
|
23
|
-
|
24
|
-
elsif local_spec = Bundler.rubygems.find_name("bundler").find {|s| s.version.to_s == VERSION }
|
27
|
+
|
28
|
+
if local_spec = Bundler.rubygems.find_name("bundler").find {|s| s.version.to_s == VERSION }
|
25
29
|
idx << local_spec
|
26
30
|
end
|
27
31
|
|
@@ -29,10 +33,6 @@ module Bundler
|
|
29
33
|
end
|
30
34
|
end
|
31
35
|
|
32
|
-
def cached!; end
|
33
|
-
|
34
|
-
def remote!; end
|
35
|
-
|
36
36
|
def options
|
37
37
|
{}
|
38
38
|
end
|
@@ -1,5 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require_relative "../../rubygems_gem_installer"
|
4
|
+
|
3
5
|
module Bundler
|
4
6
|
class Source
|
5
7
|
class Path
|
@@ -26,23 +28,21 @@ module Bundler
|
|
26
28
|
end
|
27
29
|
|
28
30
|
def post_install
|
29
|
-
|
30
|
-
run_hooks(:pre_install)
|
31
|
+
run_hooks(:pre_install)
|
31
32
|
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
33
|
+
unless @disable_extensions
|
34
|
+
build_extensions
|
35
|
+
run_hooks(:post_build)
|
36
|
+
end
|
36
37
|
|
37
|
-
|
38
|
+
generate_bin unless spec.executables.empty?
|
38
39
|
|
39
|
-
|
40
|
-
end
|
40
|
+
run_hooks(:post_install)
|
41
41
|
ensure
|
42
42
|
Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
|
43
43
|
end
|
44
44
|
|
45
|
-
|
45
|
+
private
|
46
46
|
|
47
47
|
def generate_bin
|
48
48
|
super
|
data/lib/bundler/source/path.rb
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
module Bundler
|
4
4
|
class Source
|
5
5
|
class Path < Source
|
6
|
-
autoload :Installer, "
|
6
|
+
autoload :Installer, File.expand_path("path/installer", __dir__)
|
7
7
|
|
8
8
|
attr_reader :path, :options, :root_path, :original_path
|
9
9
|
attr_writer :name
|
@@ -20,11 +20,16 @@ module Bundler
|
|
20
20
|
@allow_cached = false
|
21
21
|
@allow_remote = false
|
22
22
|
|
23
|
-
@root_path = options["root_path"] ||
|
23
|
+
@root_path = options["root_path"] || root
|
24
24
|
|
25
25
|
if options["path"]
|
26
26
|
@path = Pathname.new(options["path"])
|
27
|
-
|
27
|
+
expanded_path = expand(@path)
|
28
|
+
@path = if @path.relative?
|
29
|
+
expanded_path.relative_path_from(root_path.expand_path)
|
30
|
+
else
|
31
|
+
expanded_path
|
32
|
+
end
|
28
33
|
end
|
29
34
|
|
30
35
|
@name = options["name"]
|
@@ -77,7 +82,9 @@ module Bundler
|
|
77
82
|
end
|
78
83
|
|
79
84
|
def install(spec, options = {})
|
80
|
-
|
85
|
+
using_message = "Using #{version_message(spec)} from #{self}"
|
86
|
+
using_message += " and installing its executables" unless spec.executables.empty?
|
87
|
+
print_using_message using_message
|
81
88
|
generate_bin(spec, :disable_extensions => true)
|
82
89
|
nil # no post-install message
|
83
90
|
end
|
@@ -120,14 +127,18 @@ module Bundler
|
|
120
127
|
@expanded_original_path ||= expand(original_path)
|
121
128
|
end
|
122
129
|
|
123
|
-
|
130
|
+
private
|
124
131
|
|
125
132
|
def expanded_path
|
126
133
|
@expanded_path ||= expand(path)
|
127
134
|
end
|
128
135
|
|
129
136
|
def expand(somepath)
|
130
|
-
|
137
|
+
if Bundler.current_ruby.jruby? # TODO: Unify when https://github.com/rubygems/bundler/issues/7598 fixed upstream and all supported jrubies include the fix
|
138
|
+
somepath.expand_path(root_path).expand_path
|
139
|
+
else
|
140
|
+
somepath.expand_path(root_path)
|
141
|
+
end
|
131
142
|
rescue ArgumentError => e
|
132
143
|
Bundler.ui.debug(e)
|
133
144
|
raise PathError, "There was an error while trying to use the path " \
|
@@ -136,7 +147,7 @@ module Bundler
|
|
136
147
|
|
137
148
|
def lockfile_path
|
138
149
|
return relative_path(original_path) if original_path.absolute?
|
139
|
-
expand(original_path).relative_path_from(
|
150
|
+
expand(original_path).relative_path_from(root)
|
140
151
|
end
|
141
152
|
|
142
153
|
def app_cache_path(custom_path = nil)
|
@@ -162,7 +173,7 @@ module Bundler
|
|
162
173
|
|
163
174
|
if File.directory?(expanded_path)
|
164
175
|
# We sort depth-first since `<<` will override the earlier-found specs
|
165
|
-
|
176
|
+
Gem::Util.glob_files_in_dir(@glob, expanded_path).sort_by {|p| -p.split(File::SEPARATOR).size }.each do |file|
|
166
177
|
next unless spec = load_gemspec(file)
|
167
178
|
spec.source = self
|
168
179
|
|
@@ -191,10 +202,10 @@ module Bundler
|
|
191
202
|
else
|
192
203
|
message = String.new("The path `#{expanded_path}` ")
|
193
204
|
message << if File.exist?(expanded_path)
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
205
|
+
"is not a directory."
|
206
|
+
else
|
207
|
+
"does not exist."
|
208
|
+
end
|
198
209
|
raise PathError, message
|
199
210
|
end
|
200
211
|
|
@@ -25,8 +25,7 @@ module Bundler
|
|
25
25
|
|
26
26
|
cache_uri = original_uri || uri
|
27
27
|
|
28
|
-
|
29
|
-
host = defined?(URI::File) && cache_uri.is_a?(URI::File) ? nil : cache_uri.host
|
28
|
+
host = cache_uri.to_s.start_with?("file://") ? nil : cache_uri.host
|
30
29
|
|
31
30
|
uri_parts = [host, cache_uri.user, cache_uri.port, cache_uri.path]
|
32
31
|
uri_digest = SharedHelpers.digest(:MD5).hexdigest(uri_parts.compact.join("."))
|
@@ -40,7 +39,7 @@ module Bundler
|
|
40
39
|
"rubygems remote at #{anonymized_uri}"
|
41
40
|
end
|
42
41
|
|
43
|
-
|
42
|
+
private
|
44
43
|
|
45
44
|
def apply_auth(uri, auth)
|
46
45
|
if auth && uri.userinfo.nil?
|
@@ -49,7 +48,7 @@ module Bundler
|
|
49
48
|
end
|
50
49
|
|
51
50
|
uri
|
52
|
-
rescue URI::InvalidComponentError
|
51
|
+
rescue Bundler::URI::InvalidComponentError
|
53
52
|
error_message = "Please CGI escape your usernames and passwords before " \
|
54
53
|
"setting them for authentication."
|
55
54
|
raise HTTPError.new(error_message)
|