bundler 2.1.4 → 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 +2017 -1430
- data/README.md +7 -9
- data/bundler.gemspec +5 -6
- data/exe/bundle +3 -0
- data/lib/bundler/build_metadata.rb +3 -11
- data/lib/bundler/cli/add.rb +1 -1
- data/lib/bundler/cli/binstubs.rb +6 -2
- data/lib/bundler/cli/cache.rb +3 -8
- data/lib/bundler/cli/check.rb +4 -2
- data/lib/bundler/cli/clean.rb +1 -1
- data/lib/bundler/cli/common.rb +29 -2
- data/lib/bundler/cli/console.rb +1 -1
- data/lib/bundler/cli/doctor.rb +16 -5
- data/lib/bundler/cli/exec.rb +5 -10
- data/lib/bundler/cli/fund.rb +36 -0
- data/lib/bundler/cli/gem.rb +209 -28
- data/lib/bundler/cli/info.rb +28 -5
- data/lib/bundler/cli/init.rb +2 -2
- data/lib/bundler/cli/inject.rb +1 -1
- data/lib/bundler/cli/install.rb +22 -34
- data/lib/bundler/cli/issue.rb +5 -4
- data/lib/bundler/cli/list.rb +19 -11
- data/lib/bundler/cli/lock.rb +5 -1
- data/lib/bundler/cli/open.rb +1 -2
- data/lib/bundler/cli/outdated.rb +95 -75
- data/lib/bundler/cli/plugin.rb +10 -0
- data/lib/bundler/cli/pristine.rb +5 -0
- data/lib/bundler/cli/remove.rb +1 -2
- data/lib/bundler/cli/show.rb +1 -1
- data/lib/bundler/cli/update.rb +14 -7
- data/lib/bundler/cli.rb +89 -66
- 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 +13 -22
- data/lib/bundler/compact_index_client.rb +3 -3
- data/lib/bundler/current_ruby.rb +5 -4
- data/lib/bundler/definition.rb +193 -363
- data/lib/bundler/dep_proxy.rb +16 -9
- data/lib/bundler/dependency.rb +3 -10
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +71 -47
- data/lib/bundler/endpoint_specification.rb +1 -1
- data/lib/bundler/env.rb +1 -1
- data/lib/bundler/environment_preserver.rb +29 -2
- data/lib/bundler/errors.rb +20 -3
- data/lib/bundler/feature_flag.rb +0 -8
- data/lib/bundler/fetcher/base.rb +1 -1
- data/lib/bundler/fetcher/compact_index.rb +2 -2
- data/lib/bundler/fetcher/downloader.rb +10 -7
- data/lib/bundler/fetcher/index.rb +3 -5
- data/lib/bundler/fetcher.rb +7 -5
- data/lib/bundler/friendly_errors.rb +25 -43
- data/lib/bundler/gem_helper.rb +53 -31
- data/lib/bundler/gem_helpers.rb +36 -25
- data/lib/bundler/gem_version_promoter.rb +4 -4
- data/lib/bundler/graph.rb +1 -1
- data/lib/bundler/index.rb +9 -9
- data/lib/bundler/injector.rb +23 -5
- data/lib/bundler/inline.rb +3 -2
- data/lib/bundler/installer/gem_installer.rb +6 -19
- data/lib/bundler/installer/parallel_installer.rb +46 -25
- data/lib/bundler/installer/standalone.rb +30 -10
- data/lib/bundler/installer.rb +36 -56
- data/lib/bundler/lazy_specification.rb +62 -26
- data/lib/bundler/lockfile_generator.rb +1 -1
- data/lib/bundler/lockfile_parser.rb +8 -34
- data/lib/bundler/man/.document +1 -0
- data/{man → lib/bundler/man}/bundle-add.1 +1 -1
- data/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-binstubs.1 +5 -3
- data/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
- data/{man → lib/bundler/man}/bundle-cache.1 +1 -1
- data/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +0 -0
- 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 +40 -41
- data/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +50 -53
- 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 +1 -1
- data/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +0 -0
- 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 +1 -1
- data/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +0 -0
- 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 +30 -3
- data/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +25 -3
- 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 +4 -4
- data/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +3 -3
- 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 +1 -1
- data/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +0 -0
- data/{man → lib/bundler/man}/gemfile.5 +30 -4
- data/{man → lib/bundler/man}/gemfile.5.ronn +12 -4
- data/{man → lib/bundler/man}/index.txt +0 -0
- data/lib/bundler/mirror.rb +2 -2
- data/lib/bundler/plugin/api/source.rb +23 -1
- data/lib/bundler/plugin/dsl.rb +1 -1
- data/lib/bundler/plugin/index.rb +13 -1
- data/lib/bundler/plugin/installer/rubygems.rb +1 -1
- data/lib/bundler/plugin/installer.rb +11 -11
- data/lib/bundler/plugin/source_list.rb +5 -1
- data/lib/bundler/plugin.rb +56 -11
- data/lib/bundler/psyched_yaml.rb +0 -15
- data/lib/bundler/remote_specification.rb +5 -2
- data/lib/bundler/resolver/spec_group.rb +56 -53
- data/lib/bundler/resolver.rb +94 -128
- data/lib/bundler/retry.rb +2 -2
- data/lib/bundler/ruby_version.rb +1 -1
- data/lib/bundler/rubygems_ext.rb +96 -16
- data/lib/bundler/rubygems_gem_installer.rb +69 -8
- data/lib/bundler/rubygems_integration.rb +57 -72
- data/lib/bundler/runtime.rb +22 -25
- data/lib/bundler/settings.rb +142 -64
- data/lib/bundler/setup.rb +2 -2
- data/lib/bundler/shared_helpers.rb +5 -13
- data/lib/bundler/similarity_detector.rb +1 -1
- data/lib/bundler/source/git/git_proxy.rb +88 -84
- data/lib/bundler/source/git.rb +43 -23
- data/lib/bundler/source/metadata.rb +0 -4
- data/lib/bundler/source/path/installer.rb +10 -10
- data/lib/bundler/source/path.rb +10 -4
- data/lib/bundler/source/rubygems/remote.rb +1 -1
- data/lib/bundler/source/rubygems.rb +126 -116
- data/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/lib/bundler/source.rb +22 -1
- data/lib/bundler/source_list.rb +101 -63
- data/lib/bundler/source_map.rb +58 -0
- data/lib/bundler/spec_set.rb +26 -41
- data/lib/bundler/stub_specification.rb +25 -7
- data/lib/bundler/templates/Executable.bundler +6 -6
- 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 +12 -1
- data/lib/bundler/templates/newgem/README.md.tt +6 -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 +27 -17
- 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/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -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/ui/shell.rb +5 -5
- data/lib/bundler/uri_credentials_filter.rb +3 -1
- 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 +57 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +39 -74
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- 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/tag.rb +2 -2
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +11 -5
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +36 -4
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +3 -3
- 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 +49 -47
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -1
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +82 -189
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +4 -2
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
- data/lib/bundler/vendor/thor/lib/thor/error.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +5 -1
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +9 -8
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +5 -2
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +5 -1
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +5 -13
- 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/vendored_persistent.rb +0 -7
- data/lib/bundler/vendored_tmpdir.rb +4 -0
- data/lib/bundler/vendored_tsort.rb +4 -0
- data/lib/bundler/version.rb +1 -1
- data/lib/bundler/worker.rb +20 -5
- data/lib/bundler/yaml_serializer.rb +1 -1
- data/lib/bundler.rb +52 -37
- metadata +90 -89
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
- data/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/man/bundle-add.1.txt +0 -58
- data/man/bundle-binstubs.1.txt +0 -48
- data/man/bundle-cache.1.txt +0 -78
- data/man/bundle-check.1.txt +0 -33
- data/man/bundle-clean.1.txt +0 -26
- data/man/bundle-config.1.txt +0 -528
- 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 -401
- 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-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 -390
- data/man/bundle-viz.1.txt +0 -39
- data/man/bundle.1.txt +0 -116
- data/man/gemfile.5.txt +0 -649
@@ -1,7 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require "shellwords"
|
4
|
-
|
5
3
|
module Bundler
|
6
4
|
class Source
|
7
5
|
class Git
|
@@ -17,8 +15,8 @@ module Bundler
|
|
17
15
|
class GitNotAllowedError < GitError
|
18
16
|
def initialize(command)
|
19
17
|
msg = String.new
|
20
|
-
msg << "Bundler is trying to run
|
21
|
-
msg << "this error message could probably be more useful. Please submit a ticket at https://github.com/
|
18
|
+
msg << "Bundler is trying to run `#{command}` at runtime. You probably need to run `bundle install`. However, "
|
19
|
+
msg << "this error message could probably be more useful. Please submit a ticket at https://github.com/rubygems/rubygems/issues/new?labels=Bundler&template=bundler-related-issue.md "
|
22
20
|
msg << "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
|
23
21
|
super msg
|
24
22
|
end
|
@@ -27,21 +25,21 @@ module Bundler
|
|
27
25
|
class GitCommandError < GitError
|
28
26
|
attr_reader :command
|
29
27
|
|
30
|
-
def initialize(command, path
|
28
|
+
def initialize(command, path, extra_info = nil)
|
31
29
|
@command = command
|
32
30
|
|
33
31
|
msg = String.new
|
34
|
-
msg << "Git error: command
|
32
|
+
msg << "Git error: command `#{command}` in directory #{path} has failed."
|
35
33
|
msg << "\n#{extra_info}" if extra_info
|
36
|
-
msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path
|
34
|
+
msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path.exist?
|
37
35
|
super msg
|
38
36
|
end
|
39
37
|
end
|
40
38
|
|
41
39
|
class MissingGitRevisionError < GitCommandError
|
42
|
-
def initialize(command,
|
40
|
+
def initialize(command, destination_path, ref, repo)
|
43
41
|
msg = "Revision #{ref} does not exist in the repository #{repo}. Maybe you misspelled it?"
|
44
|
-
super command,
|
42
|
+
super command, destination_path, msg
|
45
43
|
end
|
46
44
|
end
|
47
45
|
|
@@ -58,30 +56,21 @@ module Bundler
|
|
58
56
|
@ref = ref
|
59
57
|
@revision = revision
|
60
58
|
@git = git
|
61
|
-
raise GitNotInstalledError.new if allow? && !Bundler.git_present?
|
62
59
|
end
|
63
60
|
|
64
61
|
def revision
|
65
|
-
|
66
|
-
|
67
|
-
begin
|
68
|
-
@revision ||= find_local_revision
|
69
|
-
rescue GitCommandError => e
|
70
|
-
raise MissingGitRevisionError.new(e.command, path, ref, URICredentialsFilter.credential_filtered_uri(uri))
|
71
|
-
end
|
72
|
-
|
73
|
-
@revision
|
62
|
+
@revision ||= find_local_revision
|
74
63
|
end
|
75
64
|
|
76
65
|
def branch
|
77
|
-
@branch ||=
|
78
|
-
git("rev-parse --abbrev-ref HEAD").strip
|
66
|
+
@branch ||= allowed_with_path do
|
67
|
+
git("rev-parse", "--abbrev-ref", "HEAD", :dir => path).strip
|
79
68
|
end
|
80
69
|
end
|
81
70
|
|
82
71
|
def contains?(commit)
|
83
|
-
|
84
|
-
result, status = git_null("branch --contains
|
72
|
+
allowed_with_path do
|
73
|
+
result, status = git_null("branch", "--contains", commit, :dir => path)
|
85
74
|
status.success? && result =~ /^\* (.*)$/
|
86
75
|
end
|
87
76
|
end
|
@@ -96,20 +85,22 @@ module Bundler
|
|
96
85
|
|
97
86
|
def checkout
|
98
87
|
return if path.exist? && has_revision_cached?
|
99
|
-
extra_ref = "#{
|
88
|
+
extra_ref = "#{ref}:#{ref}" if ref && ref.start_with?("refs/")
|
100
89
|
|
101
90
|
Bundler.ui.info "Fetching #{URICredentialsFilter.credential_filtered_uri(uri)}"
|
102
91
|
|
92
|
+
configured_uri = configured_uri_for(uri).to_s
|
93
|
+
|
103
94
|
unless path.exist?
|
104
95
|
SharedHelpers.filesystem_access(path.dirname) do |p|
|
105
96
|
FileUtils.mkdir_p(p)
|
106
97
|
end
|
107
|
-
git_retry
|
98
|
+
git_retry "clone", "--bare", "--no-hardlinks", "--quiet", "--", configured_uri, path.to_s
|
108
99
|
return unless extra_ref
|
109
100
|
end
|
110
101
|
|
111
|
-
|
112
|
-
git_retry
|
102
|
+
with_path do
|
103
|
+
git_retry(*["fetch", "--force", "--quiet", "--tags", "--", configured_uri, "refs/heads/*:refs/heads/*", extra_ref].compact, :dir => path)
|
113
104
|
end
|
114
105
|
end
|
115
106
|
|
@@ -123,68 +114,69 @@ module Bundler
|
|
123
114
|
SharedHelpers.filesystem_access(destination) do |p|
|
124
115
|
FileUtils.rm_rf(p)
|
125
116
|
end
|
126
|
-
git_retry
|
117
|
+
git_retry "clone", "--no-checkout", "--quiet", path.to_s, destination.to_s
|
127
118
|
File.chmod(((File.stat(destination).mode | 0o777) & ~File.umask), destination)
|
128
119
|
rescue Errno::EEXIST => e
|
129
|
-
file_path = e.message[%r{.*?(
|
120
|
+
file_path = e.message[%r{.*?((?:[a-zA-Z]:)?/.*)}, 1]
|
130
121
|
raise GitError, "Bundler could not install a gem because it needs to " \
|
131
122
|
"create a directory, but a file exists - #{file_path}. Please delete " \
|
132
123
|
"this file and try again."
|
133
124
|
end
|
134
125
|
end
|
135
126
|
# method 2
|
136
|
-
|
137
|
-
git_retry %(fetch --force --quiet --tags "#{path}")
|
127
|
+
git_retry "fetch", "--force", "--quiet", "--tags", path.to_s, :dir => destination
|
138
128
|
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
129
|
+
begin
|
130
|
+
git "reset", "--hard", @revision, :dir => destination
|
131
|
+
rescue GitCommandError => e
|
132
|
+
raise MissingGitRevisionError.new(e.command, destination, @revision, URICredentialsFilter.credential_filtered_uri(uri))
|
133
|
+
end
|
144
134
|
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
135
|
+
if submodules
|
136
|
+
git_retry "submodule", "update", "--init", "--recursive", :dir => destination
|
137
|
+
elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
|
138
|
+
inner_command = "git -C $toplevel submodule deinit --force $sm_path"
|
139
|
+
git_retry "submodule", "foreach", "--quiet", inner_command, :dir => destination
|
150
140
|
end
|
151
141
|
end
|
152
142
|
|
153
|
-
|
143
|
+
private
|
154
144
|
|
155
|
-
def git_null(command)
|
156
|
-
|
157
|
-
raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
|
145
|
+
def git_null(*command, dir: nil)
|
146
|
+
check_allowed(command)
|
158
147
|
|
159
148
|
out, status = SharedHelpers.with_clean_git_env do
|
160
|
-
capture_and_ignore_stderr(
|
149
|
+
capture_and_ignore_stderr(*capture3_args_for(command, dir))
|
161
150
|
end
|
162
151
|
|
163
152
|
[URICredentialsFilter.credential_filtered_string(out, uri), status]
|
164
153
|
end
|
165
154
|
|
166
|
-
def git_retry(command)
|
167
|
-
|
168
|
-
|
155
|
+
def git_retry(*command, dir: nil)
|
156
|
+
command_with_no_credentials = check_allowed(command)
|
157
|
+
|
158
|
+
Bundler::Retry.new("`#{command_with_no_credentials}` at #{dir || SharedHelpers.pwd}").attempts do
|
159
|
+
git(*command, :dir => dir)
|
169
160
|
end
|
170
161
|
end
|
171
162
|
|
172
|
-
def git(command,
|
173
|
-
command_with_no_credentials =
|
174
|
-
raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
|
163
|
+
def git(*command, dir: nil)
|
164
|
+
command_with_no_credentials = check_allowed(command)
|
175
165
|
|
176
166
|
out, status = SharedHelpers.with_clean_git_env do
|
177
|
-
capture_and_filter_stderr(
|
167
|
+
capture_and_filter_stderr(*capture3_args_for(command, dir))
|
178
168
|
end
|
179
169
|
|
180
|
-
|
181
|
-
|
182
|
-
|
170
|
+
filtered_out = URICredentialsFilter.credential_filtered_string(out, uri)
|
171
|
+
|
172
|
+
raise GitCommandError.new(command_with_no_credentials, dir || SharedHelpers.pwd, filtered_out) unless status.success?
|
173
|
+
|
174
|
+
filtered_out
|
183
175
|
end
|
184
176
|
|
185
177
|
def has_revision_cached?
|
186
178
|
return unless @revision
|
187
|
-
|
179
|
+
with_path { git("cat-file", "-e", @revision, :dir => path) }
|
188
180
|
true
|
189
181
|
rescue GitError
|
190
182
|
false
|
@@ -195,23 +187,11 @@ module Bundler
|
|
195
187
|
end
|
196
188
|
|
197
189
|
def find_local_revision
|
198
|
-
|
199
|
-
git("rev-parse --verify
|
200
|
-
end
|
201
|
-
end
|
202
|
-
|
203
|
-
# Escape the URI for git commands
|
204
|
-
def uri_escaped_with_configured_credentials
|
205
|
-
remote = configured_uri_for(uri)
|
206
|
-
if Bundler::WINDOWS
|
207
|
-
# Windows quoting requires double quotes only, with double quotes
|
208
|
-
# inside the string escaped by being doubled.
|
209
|
-
'"' + remote.gsub('"') { '""' } + '"'
|
210
|
-
else
|
211
|
-
# Bash requires single quoted strings, with the single quotes escaped
|
212
|
-
# by ending the string, escaping the quote, and restarting the string.
|
213
|
-
"'" + remote.gsub("'") { "'\\''" } + "'"
|
190
|
+
allowed_with_path do
|
191
|
+
git("rev-parse", "--verify", ref || "HEAD", :dir => path).strip
|
214
192
|
end
|
193
|
+
rescue GitCommandError => e
|
194
|
+
raise MissingGitRevisionError.new(e.command, path, ref, URICredentialsFilter.credential_filtered_uri(uri))
|
215
195
|
end
|
216
196
|
|
217
197
|
# Adds credentials to the URI as Fetcher#configured_uri_for does
|
@@ -227,32 +207,56 @@ module Bundler
|
|
227
207
|
end
|
228
208
|
|
229
209
|
def allow?
|
230
|
-
@git ? @git.allow_git_ops? : true
|
210
|
+
allowed = @git ? @git.allow_git_ops? : true
|
211
|
+
|
212
|
+
raise GitNotInstalledError.new if allowed && !Bundler.git_present?
|
213
|
+
|
214
|
+
allowed
|
231
215
|
end
|
232
216
|
|
233
|
-
def
|
217
|
+
def with_path(&blk)
|
234
218
|
checkout unless path.exist?
|
235
|
-
|
236
|
-
SharedHelpers.chdir(path, &blk)
|
219
|
+
blk.call
|
237
220
|
end
|
238
221
|
|
239
|
-
def
|
240
|
-
return
|
222
|
+
def allowed_with_path
|
223
|
+
return with_path { yield } if allow?
|
241
224
|
raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
|
242
225
|
end
|
243
226
|
|
244
|
-
def
|
227
|
+
def check_allowed(command)
|
228
|
+
require "shellwords"
|
229
|
+
command_with_no_credentials = URICredentialsFilter.credential_filtered_string("git #{command.shelljoin}", uri)
|
230
|
+
raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
|
231
|
+
command_with_no_credentials
|
232
|
+
end
|
233
|
+
|
234
|
+
def capture_and_filter_stderr(*cmd)
|
245
235
|
require "open3"
|
246
|
-
return_value, captured_err, status = Open3.capture3(cmd)
|
247
|
-
Bundler.ui.warn URICredentialsFilter.credential_filtered_string(captured_err, uri)
|
236
|
+
return_value, captured_err, status = Open3.capture3(*cmd)
|
237
|
+
Bundler.ui.warn URICredentialsFilter.credential_filtered_string(captured_err, uri) unless captured_err.empty?
|
248
238
|
[return_value, status]
|
249
239
|
end
|
250
240
|
|
251
|
-
def capture_and_ignore_stderr(cmd)
|
241
|
+
def capture_and_ignore_stderr(*cmd)
|
252
242
|
require "open3"
|
253
|
-
return_value, _, status = Open3.capture3(cmd)
|
243
|
+
return_value, _, status = Open3.capture3(*cmd)
|
254
244
|
[return_value, status]
|
255
245
|
end
|
246
|
+
|
247
|
+
def capture3_args_for(cmd, dir)
|
248
|
+
return ["git", *cmd] unless dir
|
249
|
+
|
250
|
+
if Bundler.feature_flag.bundler_3_mode? || supports_minus_c?
|
251
|
+
["git", "-C", dir.to_s, *cmd]
|
252
|
+
else
|
253
|
+
["git", *cmd, { :chdir => dir.to_s }]
|
254
|
+
end
|
255
|
+
end
|
256
|
+
|
257
|
+
def supports_minus_c?
|
258
|
+
@supports_minus_c ||= Gem::Version.new(version) >= Gem::Version.new("1.8.5")
|
259
|
+
end
|
256
260
|
end
|
257
261
|
end
|
258
262
|
end
|
data/lib/bundler/source/git.rb
CHANGED
@@ -22,7 +22,7 @@ module Bundler
|
|
22
22
|
@uri = options["uri"] || ""
|
23
23
|
@safe_uri = URICredentialsFilter.credential_filtered_uri(@uri)
|
24
24
|
@branch = options["branch"]
|
25
|
-
@ref = options["ref"] || options["branch"] || options["tag"]
|
25
|
+
@ref = options["ref"] || options["branch"] || options["tag"]
|
26
26
|
@submodules = options["submodules"]
|
27
27
|
@name = options["name"]
|
28
28
|
@version = options["version"].to_s.strip.gsub("-", ".pre.")
|
@@ -42,7 +42,7 @@ module Bundler
|
|
42
42
|
%w[ref branch tag submodules].each do |opt|
|
43
43
|
out << " #{opt}: #{options[opt]}\n" if options[opt]
|
44
44
|
end
|
45
|
-
out << " glob: #{@glob}\n" unless
|
45
|
+
out << " glob: #{@glob}\n" unless default_glob?
|
46
46
|
out << " specs:\n"
|
47
47
|
end
|
48
48
|
|
@@ -60,25 +60,35 @@ module Bundler
|
|
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
|
@@ -146,7 +156,7 @@ module Bundler
|
|
146
156
|
|
147
157
|
changed = cached_revision && cached_revision != git_proxy.revision
|
148
158
|
|
149
|
-
if changed && !@unlocked && !git_proxy.contains?(cached_revision)
|
159
|
+
if !Bundler.settings[:disable_local_revision_check] && changed && !@unlocked && !git_proxy.contains?(cached_revision)
|
150
160
|
raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(cached_revision)} " \
|
151
161
|
"but the current branch in your local override for #{name} does not contain such commit. " \
|
152
162
|
"Please make sure your branch is up to date."
|
@@ -230,7 +240,11 @@ module Bundler
|
|
230
240
|
@allow_remote || @allow_cached
|
231
241
|
end
|
232
242
|
|
233
|
-
|
243
|
+
def local?
|
244
|
+
@local
|
245
|
+
end
|
246
|
+
|
247
|
+
private
|
234
248
|
|
235
249
|
def serialize_gemspecs_in(destination)
|
236
250
|
destination = destination.expand_path(Bundler.root) if destination.relative?
|
@@ -256,10 +270,6 @@ module Bundler
|
|
256
270
|
cached_revision && super
|
257
271
|
end
|
258
272
|
|
259
|
-
def local?
|
260
|
-
@local
|
261
|
-
end
|
262
|
-
|
263
273
|
def requires_checkout?
|
264
274
|
allow_git_ops? && !local? && !cached_revision_checked_out?
|
265
275
|
end
|
@@ -280,6 +290,14 @@ module Bundler
|
|
280
290
|
ref[0..11]
|
281
291
|
end
|
282
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
|
+
|
283
301
|
def uri_hash
|
284
302
|
if uri =~ %r{^\w+://(\w+@)?}
|
285
303
|
# Downcase the domain component of the URI
|
@@ -289,7 +307,9 @@ module Bundler
|
|
289
307
|
# If there is no URI scheme, assume it is an ssh/git URI
|
290
308
|
input = uri
|
291
309
|
end
|
292
|
-
|
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)
|
293
313
|
end
|
294
314
|
|
295
315
|
def cached_revision
|
@@ -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
@@ -82,7 +82,9 @@ module Bundler
|
|
82
82
|
end
|
83
83
|
|
84
84
|
def install(spec, options = {})
|
85
|
-
|
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
|
86
88
|
generate_bin(spec, :disable_extensions => true)
|
87
89
|
nil # no post-install message
|
88
90
|
end
|
@@ -125,14 +127,18 @@ module Bundler
|
|
125
127
|
@expanded_original_path ||= expand(original_path)
|
126
128
|
end
|
127
129
|
|
128
|
-
|
130
|
+
private
|
129
131
|
|
130
132
|
def expanded_path
|
131
133
|
@expanded_path ||= expand(path)
|
132
134
|
end
|
133
135
|
|
134
136
|
def expand(somepath)
|
135
|
-
|
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
|
136
142
|
rescue ArgumentError => e
|
137
143
|
Bundler.ui.debug(e)
|
138
144
|
raise PathError, "There was an error while trying to use the path " \
|
@@ -167,7 +173,7 @@ module Bundler
|
|
167
173
|
|
168
174
|
if File.directory?(expanded_path)
|
169
175
|
# We sort depth-first since `<<` will override the earlier-found specs
|
170
|
-
|
176
|
+
Gem::Util.glob_files_in_dir(@glob, expanded_path).sort_by {|p| -p.split(File::SEPARATOR).size }.each do |file|
|
171
177
|
next unless spec = load_gemspec(file)
|
172
178
|
spec.source = self
|
173
179
|
|