bundler 2.0.0.pre.1 → 2.1.0.pre.3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of bundler might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +774 -574
- data/LICENSE.md +18 -19
- data/README.md +9 -8
- data/bundler.gemspec +12 -23
- data/exe/bundle +19 -3
- data/lib/bundler.rb +203 -87
- data/lib/bundler/build_metadata.rb +14 -7
- data/lib/bundler/capistrano.rb +5 -5
- data/lib/bundler/cli.rb +181 -143
- data/lib/bundler/cli/add.rb +28 -16
- data/lib/bundler/cli/cache.rb +25 -13
- data/lib/bundler/cli/common.rb +11 -12
- data/lib/bundler/cli/config.rb +161 -86
- data/lib/bundler/cli/console.rb +2 -2
- data/lib/bundler/cli/doctor.rb +4 -4
- data/lib/bundler/cli/exec.rb +4 -16
- data/lib/bundler/cli/gem.rb +5 -5
- data/lib/bundler/cli/info.rb +17 -5
- data/lib/bundler/cli/init.rb +1 -1
- data/lib/bundler/cli/install.rb +12 -11
- data/lib/bundler/cli/issue.rb +3 -3
- data/lib/bundler/cli/open.rb +10 -6
- data/lib/bundler/cli/outdated.rb +85 -81
- data/lib/bundler/cli/plugin.rb +9 -2
- data/lib/bundler/cli/pristine.rb +1 -1
- data/lib/bundler/cli/show.rb +1 -1
- data/lib/bundler/cli/update.rb +32 -12
- data/lib/bundler/compact_index_client.rb +25 -9
- data/lib/bundler/compact_index_client/updater.rb +2 -6
- data/lib/bundler/current_ruby.rb +9 -7
- data/lib/bundler/definition.rb +36 -27
- data/lib/bundler/dependency.rb +16 -4
- data/lib/bundler/deployment.rb +2 -2
- data/lib/bundler/dsl.rb +18 -42
- data/lib/bundler/env.rb +8 -13
- data/lib/bundler/environment_preserver.rb +0 -1
- data/lib/bundler/feature_flag.rb +1 -11
- data/lib/bundler/fetcher.rb +14 -11
- data/lib/bundler/fetcher/compact_index.rb +26 -12
- data/lib/bundler/fetcher/dependency.rb +1 -1
- data/lib/bundler/fetcher/downloader.rb +4 -1
- data/lib/bundler/fetcher/index.rb +4 -2
- data/lib/bundler/friendly_errors.rb +5 -6
- data/lib/bundler/gem_helper.rb +38 -25
- data/lib/bundler/gem_helpers.rb +2 -4
- data/lib/bundler/gem_tasks.rb +1 -1
- data/lib/bundler/gem_version_promoter.rb +3 -3
- data/lib/bundler/graph.rb +2 -2
- data/lib/bundler/injector.rb +10 -8
- data/lib/bundler/inline.rb +25 -20
- data/lib/bundler/installer.rb +7 -14
- data/lib/bundler/installer/gem_installer.rb +5 -1
- data/lib/bundler/installer/parallel_installer.rb +4 -8
- data/lib/bundler/installer/standalone.rb +1 -2
- data/lib/bundler/lazy_specification.rb +2 -2
- data/lib/bundler/lockfile_parser.rb +14 -21
- data/lib/bundler/match_platform.rb +1 -1
- data/lib/bundler/plugin.rb +42 -29
- data/lib/bundler/plugin/api.rb +1 -1
- data/lib/bundler/plugin/api/source.rb +2 -2
- data/lib/bundler/plugin/index.rb +14 -3
- data/lib/bundler/plugin/installer.rb +28 -15
- data/lib/bundler/psyched_yaml.rb +1 -1
- data/lib/bundler/resolver.rb +72 -24
- data/lib/bundler/resolver/spec_group.rb +3 -2
- data/lib/bundler/retry.rb +2 -2
- data/lib/bundler/ruby_version.rb +4 -19
- data/lib/bundler/rubygems_ext.rb +11 -67
- data/lib/bundler/rubygems_gem_installer.rb +1 -1
- data/lib/bundler/rubygems_integration.rb +143 -395
- data/lib/bundler/runtime.rb +2 -9
- data/lib/bundler/settings.rb +15 -48
- data/lib/bundler/setup.rb +7 -13
- data/lib/bundler/shared_helpers.rb +57 -73
- data/lib/bundler/similarity_detector.rb +2 -2
- data/lib/bundler/source.rb +5 -5
- data/lib/bundler/source/git.rb +19 -12
- data/lib/bundler/source/git/git_proxy.rb +36 -40
- data/lib/bundler/source/metadata.rb +9 -5
- data/lib/bundler/source/path.rb +13 -8
- data/lib/bundler/source/rubygems.rb +11 -5
- data/lib/bundler/source/rubygems/remote.rb +1 -2
- data/lib/bundler/source_list.rb +9 -12
- data/lib/bundler/spec_set.rb +23 -12
- data/lib/bundler/stub_specification.rb +18 -30
- data/lib/bundler/templates/Executable.bundler +23 -14
- data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +3 -3
- data/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/lib/bundler/templates/newgem/README.md.tt +4 -3
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -27
- data/lib/bundler/templates/newgem/test/test_helper.rb.tt +1 -1
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -1
- data/lib/bundler/ui.rb +3 -3
- data/lib/bundler/ui/rg_proxy.rb +1 -1
- data/lib/bundler/ui/shell.rb +4 -8
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +161 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +66 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +176 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +273 -147
- data/lib/bundler/vendor/fileutils/lib/fileutils/version.rb +5 -0
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +6 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +2 -2
- 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 +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +30 -8
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +4 -4
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +248 -279
- 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/thor/lib/thor.rb +12 -4
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +22 -11
- data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +7 -17
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +16 -7
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +19 -8
- data/lib/bundler/vendor/thor/lib/thor/base.rb +25 -24
- 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.rb +2 -2
- 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/parser.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +8 -6
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +20 -5
- data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +1 -0
- data/lib/bundler/vendor/thor/lib/thor/runner.rb +8 -6
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +52 -7
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +6 -2
- data/lib/bundler/vendor/thor/lib/thor/shell/html.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/vendored_fileutils.rb +1 -6
- data/lib/bundler/vendored_molinillo.rb +1 -1
- data/lib/bundler/vendored_persistent.rb +7 -5
- data/lib/bundler/vendored_thor.rb +2 -2
- data/lib/bundler/version.rb +1 -20
- data/lib/bundler/version_ranges.rb +51 -5
- data/lib/bundler/vlad.rb +3 -3
- data/lib/bundler/worker.rb +1 -3
- data/lib/bundler/yaml_serializer.rb +2 -3
- data/man/bundle-add.1 +10 -2
- data/man/bundle-add.1.txt +11 -5
- data/man/bundle-add.ronn +7 -1
- data/man/bundle-binstubs.1 +2 -2
- data/man/bundle-binstubs.1.txt +2 -2
- data/man/bundle-binstubs.ronn +1 -1
- data/man/bundle-cache.1 +55 -0
- data/man/bundle-cache.1.txt +78 -0
- data/man/{bundle-package.ronn → bundle-cache.ronn} +15 -15
- data/man/bundle-check.1 +1 -1
- data/man/bundle-check.1.txt +6 -6
- data/man/bundle-clean.1 +1 -1
- data/man/bundle-clean.1.txt +1 -1
- data/man/bundle-config.1 +36 -36
- data/man/bundle-config.1.txt +66 -67
- data/man/bundle-config.ronn +42 -40
- data/man/bundle-doctor.1 +1 -1
- data/man/bundle-doctor.1.txt +1 -1
- data/man/bundle-exec.1 +2 -2
- data/man/bundle-exec.1.txt +2 -2
- data/man/bundle-exec.ronn +1 -1
- data/man/bundle-gem.1 +1 -1
- data/man/bundle-gem.1.txt +3 -3
- data/man/bundle-info.1 +1 -1
- data/man/bundle-info.1.txt +1 -1
- data/man/bundle-init.1 +2 -2
- data/man/bundle-init.1.txt +2 -2
- data/man/bundle-init.ronn +1 -1
- data/man/bundle-inject.1 +1 -1
- data/man/bundle-inject.1.txt +1 -1
- data/man/bundle-install.1 +8 -5
- data/man/bundle-install.1.txt +56 -51
- data/man/bundle-install.ronn +9 -4
- data/man/bundle-list.1 +1 -1
- data/man/bundle-list.1.txt +1 -1
- data/man/bundle-lock.1 +1 -1
- data/man/bundle-lock.1.txt +16 -16
- data/man/bundle-open.1 +1 -1
- data/man/bundle-open.1.txt +1 -1
- data/man/bundle-outdated.1 +1 -1
- data/man/bundle-outdated.1.txt +1 -1
- data/man/bundle-platform.1 +1 -1
- data/man/bundle-platform.1.txt +1 -1
- data/man/bundle-pristine.1 +1 -1
- data/man/bundle-pristine.1.txt +1 -1
- data/man/bundle-remove.1 +1 -1
- data/man/bundle-remove.1.txt +1 -1
- data/man/bundle-show.1 +1 -1
- data/man/bundle-show.1.txt +1 -1
- data/man/bundle-update.1 +4 -4
- data/man/bundle-update.1.txt +64 -65
- data/man/bundle-update.ronn +3 -3
- data/man/bundle-viz.1 +1 -1
- data/man/bundle-viz.1.txt +1 -1
- data/man/bundle.1 +7 -3
- data/man/bundle.1.txt +11 -8
- data/man/bundle.ronn +5 -2
- data/man/gemfile.5 +17 -20
- data/man/gemfile.5.ronn +14 -18
- data/man/gemfile.5.txt +108 -112
- data/man/index.txt +1 -1
- metadata +19 -107
- 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/ssl_certs/.document +0 -1
- 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/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/ordered_hash.rb +0 -129
- data/man/bundle-package.1 +0 -55
- data/man/bundle-package.1.txt +0 -79
data/lib/bundler/runtime.rb
CHANGED
@@ -34,14 +34,7 @@ module Bundler
|
|
34
34
|
spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
|
35
35
|
end.reverse.flatten
|
36
36
|
|
37
|
-
|
38
|
-
if insert_index = Bundler.rubygems.load_path_insert_index
|
39
|
-
# Gem directories must come after -I and ENV['RUBYLIB']
|
40
|
-
$LOAD_PATH.insert(insert_index, *load_paths)
|
41
|
-
else
|
42
|
-
# We are probably testing in core, -I and RUBYLIB don't apply
|
43
|
-
$LOAD_PATH.unshift(*load_paths)
|
44
|
-
end
|
37
|
+
Bundler.rubygems.add_to_load_path(load_paths)
|
45
38
|
|
46
39
|
setup_manpath
|
47
40
|
|
@@ -163,7 +156,7 @@ module Bundler
|
|
163
156
|
gem_dirs = Dir["#{Gem.dir}/gems/*"]
|
164
157
|
gem_files = Dir["#{Gem.dir}/cache/*.gem"]
|
165
158
|
gemspec_files = Dir["#{Gem.dir}/specifications/*.gemspec"]
|
166
|
-
extension_dirs = Dir["#{Gem.dir}/extensions/*/*/*"]
|
159
|
+
extension_dirs = Dir["#{Gem.dir}/extensions/*/*/*"] + Dir["#{Gem.dir}/bundler/gems/extensions/*/*/*"]
|
167
160
|
spec_gem_paths = []
|
168
161
|
# need to keep git sources around
|
169
162
|
spec_git_paths = @definition.spec_git_paths
|
data/lib/bundler/settings.rb
CHANGED
@@ -4,9 +4,9 @@ require "uri"
|
|
4
4
|
|
5
5
|
module Bundler
|
6
6
|
class Settings
|
7
|
-
autoload :Mirror, "
|
8
|
-
autoload :Mirrors, "
|
9
|
-
autoload :Validator, "
|
7
|
+
autoload :Mirror, File.expand_path("mirror", __dir__)
|
8
|
+
autoload :Mirrors, File.expand_path("mirror", __dir__)
|
9
|
+
autoload :Validator, File.expand_path("settings/validator", __dir__)
|
10
10
|
|
11
11
|
BOOL_KEYS = %w[
|
12
12
|
allow_bundler_dependency_conflicts
|
@@ -17,8 +17,6 @@ module Bundler
|
|
17
17
|
auto_config_jobs
|
18
18
|
cache_all
|
19
19
|
cache_all_platforms
|
20
|
-
cache_command_is_package
|
21
|
-
console_command
|
22
20
|
default_install_uses_path
|
23
21
|
deployment
|
24
22
|
deployment_means_frozen
|
@@ -29,29 +27,24 @@ module Bundler
|
|
29
27
|
disable_platform_warnings
|
30
28
|
disable_shared_gems
|
31
29
|
disable_version_check
|
32
|
-
error_on_stderr
|
33
30
|
force_ruby_platform
|
34
31
|
forget_cli_options
|
35
32
|
frozen
|
36
33
|
gem.coc
|
37
34
|
gem.mit
|
38
|
-
global_path_appends_ruby_scope
|
39
35
|
global_gem_cache
|
40
36
|
ignore_messages
|
41
37
|
init_gems_rb
|
42
|
-
list_command
|
43
|
-
lockfile_upgrade_warning
|
44
|
-
lockfile_uses_separate_rubygems_sources
|
45
|
-
major_deprecations
|
46
38
|
no_install
|
47
39
|
no_prune
|
48
40
|
only_update_to_newer_versions
|
49
41
|
path_relative_to_cwd
|
50
42
|
path.system
|
51
43
|
plugins
|
52
|
-
|
44
|
+
prefer_patch
|
53
45
|
print_only_version_number
|
54
46
|
setup_makes_kernel_gem_public
|
47
|
+
silence_deprecations
|
55
48
|
silence_root_warning
|
56
49
|
skip_default_git_sources
|
57
50
|
specific_platform
|
@@ -59,7 +52,6 @@ module Bundler
|
|
59
52
|
unlock_source_unlocks_spec
|
60
53
|
update_requires_all_flag
|
61
54
|
use_gem_version_promoter_for_major_updates
|
62
|
-
viz_command
|
63
55
|
].freeze
|
64
56
|
|
65
57
|
NUMBER_KEYS = %w[
|
@@ -76,7 +68,9 @@ module Bundler
|
|
76
68
|
].freeze
|
77
69
|
|
78
70
|
DEFAULT_CONFIG = {
|
71
|
+
:silence_deprecations => false,
|
79
72
|
:disable_version_check => true,
|
73
|
+
:prefer_patch => false,
|
80
74
|
:redirect => 5,
|
81
75
|
:retry => 3,
|
82
76
|
:timeout => 10,
|
@@ -107,18 +101,6 @@ module Bundler
|
|
107
101
|
temporary(key => value)
|
108
102
|
value
|
109
103
|
else
|
110
|
-
command = if value.nil?
|
111
|
-
"bundle config --delete #{key}"
|
112
|
-
else
|
113
|
-
"bundle config #{key} #{Array(value).join(":")}"
|
114
|
-
end
|
115
|
-
|
116
|
-
Bundler::SharedHelpers.major_deprecation 3,\
|
117
|
-
"flags passed to commands " \
|
118
|
-
"will no longer be automatically remembered. Instead please set flags " \
|
119
|
-
"you want remembered between commands using `bundle config " \
|
120
|
-
"<setting name> <setting value>`, i.e. `#{command}`"
|
121
|
-
|
122
104
|
set_local(key, value)
|
123
105
|
end
|
124
106
|
end
|
@@ -221,23 +203,22 @@ module Bundler
|
|
221
203
|
locations
|
222
204
|
end
|
223
205
|
|
224
|
-
# for legacy reasons, in Bundler
|
225
|
-
# nor do we respect :disable_shared_gems
|
206
|
+
# for legacy reasons, in Bundler 2, we do not respect :disable_shared_gems
|
226
207
|
def path
|
227
208
|
key = key_for(:path)
|
228
209
|
path = ENV[key] || @global_config[key]
|
229
210
|
if path && !@temporary.key?(key) && !@local_config.key?(key)
|
230
|
-
return Path.new(path,
|
211
|
+
return Path.new(path, false, false)
|
231
212
|
end
|
232
213
|
|
233
214
|
system_path = self["path.system"] || (self[:disable_shared_gems] == false)
|
234
|
-
Path.new(self[:path],
|
215
|
+
Path.new(self[:path], system_path, Bundler.feature_flag.default_install_uses_path?)
|
235
216
|
end
|
236
217
|
|
237
|
-
Path = Struct.new(:explicit_path, :
|
218
|
+
Path = Struct.new(:explicit_path, :system_path, :default_install_uses_path) do
|
238
219
|
def path
|
239
220
|
path = base_path
|
240
|
-
path = File.join(path, Bundler.ruby_scope)
|
221
|
+
path = File.join(path, Bundler.ruby_scope) unless use_system_gems?
|
241
222
|
path
|
242
223
|
end
|
243
224
|
|
@@ -372,7 +353,7 @@ module Bundler
|
|
372
353
|
return unless file
|
373
354
|
SharedHelpers.filesystem_access(file) do |p|
|
374
355
|
FileUtils.mkdir_p(p.dirname)
|
375
|
-
|
356
|
+
require_relative "yaml_serializer"
|
376
357
|
p.open("w") {|f| f.write(YAMLSerializer.dump(hash)) }
|
377
358
|
end
|
378
359
|
end
|
@@ -407,26 +388,12 @@ module Bundler
|
|
407
388
|
Pathname.new(@root).join("config") if @root
|
408
389
|
end
|
409
390
|
|
410
|
-
CONFIG_REGEX = %r{ # rubocop:disable Style/RegexpLiteral
|
411
|
-
^
|
412
|
-
(BUNDLE_.+):\s # the key
|
413
|
-
(?: !\s)? # optional exclamation mark found with ruby 1.9.3
|
414
|
-
(['"]?) # optional opening quote
|
415
|
-
(.* # contents of the value
|
416
|
-
(?: # optionally, up until the next key
|
417
|
-
(\n(?!BUNDLE).+)*
|
418
|
-
)
|
419
|
-
)
|
420
|
-
\2 # matching closing quote
|
421
|
-
$
|
422
|
-
}xo
|
423
|
-
|
424
391
|
def load_config(config_file)
|
425
392
|
return {} if !config_file || ignore_config?
|
426
393
|
SharedHelpers.filesystem_access(config_file, :read) do |file|
|
427
394
|
valid_file = file.exist? && !file.size.zero?
|
428
395
|
return {} unless valid_file
|
429
|
-
|
396
|
+
require_relative "yaml_serializer"
|
430
397
|
YAMLSerializer.load file.read
|
431
398
|
end
|
432
399
|
end
|
@@ -442,7 +409,7 @@ module Bundler
|
|
442
409
|
(https?.*?) # URI
|
443
410
|
(\.#{Regexp.union(PER_URI_OPTIONS)})? # optional suffix key
|
444
411
|
\z
|
445
|
-
/ix
|
412
|
+
/ix.freeze
|
446
413
|
|
447
414
|
# TODO: duplicates Rubygems#normalize_uri
|
448
415
|
# TODO: is this the correct place to validate mirror URIs?
|
data/lib/bundler/setup.rb
CHANGED
@@ -1,28 +1,22 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require_relative "shared_helpers"
|
4
4
|
|
5
5
|
if Bundler::SharedHelpers.in_bundle?
|
6
|
-
|
6
|
+
require_relative "../bundler"
|
7
7
|
|
8
8
|
if STDOUT.tty? || ENV["BUNDLER_FORCE_TTY"]
|
9
9
|
begin
|
10
|
-
Bundler.setup
|
10
|
+
Bundler.ui.silence { Bundler.setup }
|
11
11
|
rescue Bundler::BundlerError => e
|
12
|
-
|
13
|
-
|
12
|
+
Bundler.ui.warn "\e[31m#{e.message}\e[0m"
|
13
|
+
Bundler.ui.warn e.backtrace.join("\n") if ENV["DEBUG"]
|
14
14
|
if e.is_a?(Bundler::GemNotFound)
|
15
|
-
|
15
|
+
Bundler.ui.warn "\e[33mRun `bundle install` to install missing gems.\e[0m"
|
16
16
|
end
|
17
17
|
exit e.status_code
|
18
18
|
end
|
19
19
|
else
|
20
|
-
Bundler.setup
|
20
|
+
Bundler.ui.silence { Bundler.setup }
|
21
21
|
end
|
22
|
-
|
23
|
-
# Add bundler to the load path after disabling system gems
|
24
|
-
bundler_lib = File.expand_path("../..", __FILE__)
|
25
|
-
$LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
|
26
|
-
|
27
|
-
Bundler.ui = nil
|
28
22
|
end
|
@@ -1,38 +1,25 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require "bundler/compatibility_guard"
|
4
|
-
|
5
3
|
require "pathname"
|
6
|
-
require "
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
module Gem
|
14
|
-
class Dependency
|
15
|
-
# This is only needed for RubyGems < 1.4
|
16
|
-
unless method_defined? :requirement
|
17
|
-
def requirement
|
18
|
-
version_requirements
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
4
|
+
require "rbconfig"
|
5
|
+
|
6
|
+
require_relative "version"
|
7
|
+
require_relative "constants"
|
8
|
+
require_relative "rubygems_integration"
|
9
|
+
require_relative "current_ruby"
|
23
10
|
|
24
11
|
module Bundler
|
25
12
|
module SharedHelpers
|
26
13
|
def root
|
27
14
|
gemfile = find_gemfile
|
28
15
|
raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
|
29
|
-
Pathname.new(gemfile).untaint.expand_path.parent
|
16
|
+
Pathname.new(gemfile).tap{|x| x.untaint if RUBY_VERSION < "2.7" }.expand_path.parent
|
30
17
|
end
|
31
18
|
|
32
19
|
def default_gemfile
|
33
|
-
gemfile = find_gemfile
|
20
|
+
gemfile = find_gemfile
|
34
21
|
raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
|
35
|
-
Pathname.new(gemfile).untaint.expand_path
|
22
|
+
Pathname.new(gemfile).tap{|x| x.untaint if RUBY_VERSION < "2.7" }.expand_path
|
36
23
|
end
|
37
24
|
|
38
25
|
def default_lockfile
|
@@ -41,7 +28,7 @@ module Bundler
|
|
41
28
|
case gemfile.basename.to_s
|
42
29
|
when "gems.rb" then Pathname.new(gemfile.sub(/.rb$/, ".locked"))
|
43
30
|
else Pathname.new("#{gemfile}.lock")
|
44
|
-
end.untaint
|
31
|
+
end.tap{|x| x.untaint if RUBY_VERSION < "2.7" }
|
45
32
|
end
|
46
33
|
|
47
34
|
def default_bundle_dir
|
@@ -113,9 +100,7 @@ module Bundler
|
|
113
100
|
#
|
114
101
|
# @see {Bundler::PermissionError}
|
115
102
|
def filesystem_access(path, action = :write, &block)
|
116
|
-
|
117
|
-
# See https://github.com/bundler/bundler/issues/5341 for details
|
118
|
-
block.call(path.dup.untaint)
|
103
|
+
yield(path.dup.tap{|x| x.untaint if RUBY_VERSION < "2.7" })
|
119
104
|
rescue Errno::EACCES
|
120
105
|
raise PermissionError.new(path, action)
|
121
106
|
rescue Errno::EAGAIN
|
@@ -139,34 +124,32 @@ module Bundler
|
|
139
124
|
namespace.const_get(constant_name)
|
140
125
|
end
|
141
126
|
|
142
|
-
def major_deprecation(major_version, message)
|
143
|
-
if
|
144
|
-
|
145
|
-
|
127
|
+
def major_deprecation(major_version, message, print_caller_location: false)
|
128
|
+
if print_caller_location
|
129
|
+
caller_location = caller_locations(2, 2).first
|
130
|
+
message = "#{message} (called at #{caller_location.path}:#{caller_location.lineno})"
|
131
|
+
end
|
132
|
+
|
133
|
+
bundler_major_version = Bundler.bundler_major_version
|
134
|
+
if bundler_major_version > major_version
|
135
|
+
require_relative "errors"
|
136
|
+
raise DeprecatedError, "[REMOVED] #{message}"
|
146
137
|
end
|
147
138
|
|
148
|
-
return unless prints_major_deprecations?
|
149
|
-
|
150
|
-
ui = Bundler.ui.is_a?(@major_deprecation_ui.class) ? Bundler.ui : @major_deprecation_ui
|
151
|
-
ui.warn("[DEPRECATED FOR #{major_version}.0] #{message}")
|
139
|
+
return unless bundler_major_version >= major_version && prints_major_deprecations?
|
140
|
+
Bundler.ui.warn("[DEPRECATED] #{message}")
|
152
141
|
end
|
153
142
|
|
154
143
|
def print_major_deprecations!
|
155
144
|
multiple_gemfiles = search_up(".") do |dir|
|
156
145
|
gemfiles = gemfile_names.select {|gf| File.file? File.expand_path(gf, dir) }
|
157
146
|
next if gemfiles.empty?
|
158
|
-
break
|
147
|
+
break gemfiles.size != 1
|
159
148
|
end
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
if RUBY_VERSION < "2"
|
166
|
-
major_deprecation(2, "Bundler will only support ruby >= 2.0, you are running #{RUBY_VERSION}")
|
167
|
-
end
|
168
|
-
return if Bundler.rubygems.provides?(">= 2")
|
169
|
-
major_deprecation(2, "Bundler will only support rubygems >= 2.0, you are running #{Bundler.rubygems.version}")
|
149
|
+
return unless multiple_gemfiles
|
150
|
+
message = "Multiple gemfiles (gems.rb and Gemfile) detected. " \
|
151
|
+
"Make sure you remove Gemfile and Gemfile.lock since bundler is ignoring them in favor of gems.rb and gems.rb.locked."
|
152
|
+
Bundler.ui.warn message
|
170
153
|
end
|
171
154
|
|
172
155
|
def trap(signal, override = false, &block)
|
@@ -243,16 +226,14 @@ module Bundler
|
|
243
226
|
raise Bundler::PathError, message
|
244
227
|
end
|
245
228
|
|
246
|
-
def find_gemfile
|
229
|
+
def find_gemfile
|
247
230
|
given = ENV["BUNDLE_GEMFILE"]
|
248
231
|
return given if given && !given.empty?
|
249
|
-
|
250
|
-
names.reverse! if order_matters && Bundler.feature_flag.prefer_gems_rb?
|
251
|
-
find_file(*names)
|
232
|
+
find_file(*gemfile_names)
|
252
233
|
end
|
253
234
|
|
254
235
|
def gemfile_names
|
255
|
-
["
|
236
|
+
["gems.rb", "Gemfile"]
|
256
237
|
end
|
257
238
|
|
258
239
|
def find_file(*names)
|
@@ -269,12 +250,20 @@ module Bundler
|
|
269
250
|
|
270
251
|
def search_up(*names)
|
271
252
|
previous = nil
|
272
|
-
current = File.expand_path(SharedHelpers.pwd).untaint
|
253
|
+
current = File.expand_path(SharedHelpers.pwd).tap{|x| x.untaint if RUBY_VERSION < "2.7" }
|
273
254
|
|
274
255
|
until !File.directory?(current) || current == previous
|
275
256
|
if ENV["BUNDLE_SPEC_RUN"]
|
276
257
|
# avoid stepping above the tmp directory when testing
|
277
|
-
|
258
|
+
gemspec = if ENV["GEM_COMMAND"]
|
259
|
+
# for Ruby Core
|
260
|
+
"lib/bundler/bundler.gemspec"
|
261
|
+
else
|
262
|
+
"bundler.gemspec"
|
263
|
+
end
|
264
|
+
|
265
|
+
# avoid stepping above the tmp directory when testing
|
266
|
+
return nil if File.file?(File.join(current, gemspec))
|
278
267
|
end
|
279
268
|
|
280
269
|
names.each do |name|
|
@@ -298,19 +287,17 @@ module Bundler
|
|
298
287
|
public :set_env
|
299
288
|
|
300
289
|
def set_bundle_variables
|
301
|
-
|
302
|
-
|
303
|
-
unless File.exist?(exe_file)
|
304
|
-
exe_file = File.expand_path("../../../exe/bundle", __FILE__)
|
305
|
-
end
|
290
|
+
# bundler exe & lib folders have same root folder, typical gem installation
|
291
|
+
exe_file = File.expand_path("../../../exe/bundle", __FILE__)
|
306
292
|
|
307
|
-
|
308
|
-
|
309
|
-
Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", File.expand_path("../../../exe/bundle", __FILE__)
|
310
|
-
end
|
293
|
+
# for Ruby core repository testing
|
294
|
+
exe_file = File.expand_path("../../../libexec/bundle", __FILE__) unless File.exist?(exe_file)
|
311
295
|
|
312
|
-
#
|
313
|
-
Bundler
|
296
|
+
# bundler is a default gem, exe path is separate
|
297
|
+
exe_file = Bundler.rubygems.bin_path("bundler", "bundle", VERSION) unless File.exist?(exe_file)
|
298
|
+
|
299
|
+
Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
|
300
|
+
Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s
|
314
301
|
Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION
|
315
302
|
end
|
316
303
|
|
@@ -323,14 +310,15 @@ module Bundler
|
|
323
310
|
|
324
311
|
def set_rubyopt
|
325
312
|
rubyopt = [ENV["RUBYOPT"]].compact
|
326
|
-
|
327
|
-
rubyopt.
|
313
|
+
setup_require = "-r#{File.expand_path("setup", __dir__)}"
|
314
|
+
return if !rubyopt.empty? && rubyopt.first =~ /#{setup_require}/
|
315
|
+
rubyopt.unshift setup_require
|
328
316
|
Bundler::SharedHelpers.set_env "RUBYOPT", rubyopt.join(" ")
|
329
317
|
end
|
330
318
|
|
331
319
|
def set_rubylib
|
332
320
|
rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
|
333
|
-
rubylib.unshift bundler_ruby_lib
|
321
|
+
rubylib.unshift bundler_ruby_lib unless RbConfig::CONFIG["rubylibdir"] == bundler_ruby_lib
|
334
322
|
Bundler::SharedHelpers.set_env "RUBYLIB", rubylib.uniq.join(File::PATH_SEPARATOR)
|
335
323
|
end
|
336
324
|
|
@@ -339,9 +327,6 @@ module Bundler
|
|
339
327
|
end
|
340
328
|
|
341
329
|
def clean_load_path
|
342
|
-
# handle 1.9 where system gems are always on the load path
|
343
|
-
return unless defined?(::Gem)
|
344
|
-
|
345
330
|
bundler_lib = bundler_ruby_lib
|
346
331
|
|
347
332
|
loaded_gem_paths = Bundler.rubygems.loaded_gem_paths
|
@@ -361,10 +346,9 @@ module Bundler
|
|
361
346
|
end
|
362
347
|
|
363
348
|
def prints_major_deprecations?
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
require "bundler/deprecate"
|
349
|
+
require_relative "../bundler"
|
350
|
+
return false if Bundler.settings[:silence_deprecations]
|
351
|
+
require_relative "deprecate"
|
368
352
|
return false if Bundler::Deprecate.skip
|
369
353
|
true
|
370
354
|
end
|