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
@@ -34,10 +34,12 @@ module Bundler
|
|
34
34
|
end
|
35
35
|
|
36
36
|
def build_args
|
37
|
+
require "rubygems/command"
|
37
38
|
Gem::Command.build_args
|
38
39
|
end
|
39
40
|
|
40
41
|
def build_args=(args)
|
42
|
+
require "rubygems/command"
|
41
43
|
Gem::Command.build_args = args
|
42
44
|
end
|
43
45
|
|
@@ -84,16 +86,12 @@ module Bundler
|
|
84
86
|
def spec_missing_extensions?(spec, default = true)
|
85
87
|
return spec.missing_extensions? if spec.respond_to?(:missing_extensions?)
|
86
88
|
|
87
|
-
return false if
|
89
|
+
return false if spec.default_gem?
|
88
90
|
return false if spec.extensions.empty?
|
89
91
|
|
90
92
|
default
|
91
93
|
end
|
92
94
|
|
93
|
-
def spec_default_gem?(spec)
|
94
|
-
spec.respond_to?(:default_gem?) && spec.default_gem?
|
95
|
-
end
|
96
|
-
|
97
95
|
def spec_matches_for_glob(spec, glob)
|
98
96
|
return spec.matches_for_glob(glob) if spec.respond_to?(:matches_for_glob)
|
99
97
|
|
@@ -102,11 +100,6 @@ module Bundler
|
|
102
100
|
end.flatten(1)
|
103
101
|
end
|
104
102
|
|
105
|
-
def spec_extension_dir(spec)
|
106
|
-
return unless spec.respond_to?(:extension_dir)
|
107
|
-
spec.extension_dir
|
108
|
-
end
|
109
|
-
|
110
103
|
def stub_set_spec(stub, spec)
|
111
104
|
stub.instance_variable_set(:@spec, spec)
|
112
105
|
end
|
@@ -115,11 +108,6 @@ module Bundler
|
|
115
108
|
obj.to_s
|
116
109
|
end
|
117
110
|
|
118
|
-
def platforms
|
119
|
-
return [Gem::Platform::RUBY] if Bundler.settings[:force_ruby_platform]
|
120
|
-
Gem.platforms
|
121
|
-
end
|
122
|
-
|
123
111
|
def configuration
|
124
112
|
require_relative "psyched_yaml"
|
125
113
|
Gem.configuration
|
@@ -141,14 +129,10 @@ module Bundler
|
|
141
129
|
end
|
142
130
|
|
143
131
|
def inflate(obj)
|
144
|
-
require "rubygems/util"
|
145
|
-
|
146
132
|
Gem::Util.inflate(obj)
|
147
133
|
end
|
148
134
|
|
149
135
|
def correct_for_windows_path(path)
|
150
|
-
require "rubygems/util"
|
151
|
-
|
152
136
|
if Gem::Util.respond_to?(:correct_for_windows_path)
|
153
137
|
Gem::Util.correct_for_windows_path(path)
|
154
138
|
elsif path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":"
|
@@ -223,11 +207,6 @@ module Bundler
|
|
223
207
|
Gem.bin_path(gem, bin, ver)
|
224
208
|
end
|
225
209
|
|
226
|
-
def preserve_paths
|
227
|
-
# this is a no-op outside of RubyGems 1.8
|
228
|
-
yield
|
229
|
-
end
|
230
|
-
|
231
210
|
def loaded_gem_paths
|
232
211
|
loaded_gem_paths = Gem.loaded_specs.map {|_, s| s.full_require_paths }
|
233
212
|
loaded_gem_paths.flatten
|
@@ -241,6 +220,10 @@ module Bundler
|
|
241
220
|
Gem.load_plugin_files(files) if Gem.respond_to?(:load_plugin_files)
|
242
221
|
end
|
243
222
|
|
223
|
+
def load_env_plugins
|
224
|
+
Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
|
225
|
+
end
|
226
|
+
|
244
227
|
def ui=(obj)
|
245
228
|
Gem::DefaultUserInteraction.ui = obj
|
246
229
|
end
|
@@ -265,8 +248,6 @@ module Bundler
|
|
265
248
|
require "rubygems/security"
|
266
249
|
require_relative "psyched_yaml"
|
267
250
|
gem_from_path(path, security_policies[policy]).spec
|
268
|
-
rescue Gem::Package::FormatError
|
269
|
-
raise GemspecError, "Could not read gem at #{path}. It may be corrupted."
|
270
251
|
rescue Exception, Gem::Exception, Gem::Security::Exception => e # rubocop:disable Lint/RescueException
|
271
252
|
if e.is_a?(Gem::Security::Exception) ||
|
272
253
|
e.message =~ /unknown trust policy|unsigned gem/i ||
|
@@ -329,8 +310,13 @@ module Bundler
|
|
329
310
|
end
|
330
311
|
|
331
312
|
message = if spec.nil?
|
313
|
+
target_file = begin
|
314
|
+
Bundler.default_gemfile.basename
|
315
|
+
rescue GemfileNotFound
|
316
|
+
"inline Gemfile"
|
317
|
+
end
|
332
318
|
"#{dep.name} is not part of the bundle." \
|
333
|
-
" Add it to your #{
|
319
|
+
" Add it to your #{target_file}."
|
334
320
|
else
|
335
321
|
"can't activate #{dep}, already activated #{spec.full_name}. " \
|
336
322
|
"Make sure all dependencies are added to Gemfile."
|
@@ -346,7 +332,7 @@ module Bundler
|
|
346
332
|
raise e
|
347
333
|
end
|
348
334
|
|
349
|
-
# backwards compatibility shim, see https://github.com/
|
335
|
+
# backwards compatibility shim, see https://github.com/rubygems/bundler/issues/5102
|
350
336
|
kernel_class.send(:public, :gem) if Bundler.feature_flag.setup_makes_kernel_gem_public?
|
351
337
|
end
|
352
338
|
end
|
@@ -422,6 +408,17 @@ module Bundler
|
|
422
408
|
# Replace or hook into RubyGems to provide a bundlerized view
|
423
409
|
# of the world.
|
424
410
|
def replace_entrypoints(specs)
|
411
|
+
specs_by_name = add_default_gems_to(specs)
|
412
|
+
|
413
|
+
replace_gem(specs, specs_by_name)
|
414
|
+
stub_rubygems(specs)
|
415
|
+
replace_bin_path(specs_by_name)
|
416
|
+
|
417
|
+
Gem.clear_paths
|
418
|
+
end
|
419
|
+
|
420
|
+
# Add default gems not already present in specs, and return them as a hash.
|
421
|
+
def add_default_gems_to(specs)
|
425
422
|
specs_by_name = specs.reduce({}) do |h, s|
|
426
423
|
h[s.name] = s
|
427
424
|
h
|
@@ -436,40 +433,7 @@ module Bundler
|
|
436
433
|
specs_by_name[default_spec_name] = default_spec
|
437
434
|
end
|
438
435
|
|
439
|
-
|
440
|
-
stub_rubygems(specs)
|
441
|
-
replace_bin_path(specs_by_name)
|
442
|
-
|
443
|
-
Gem.clear_paths
|
444
|
-
end
|
445
|
-
|
446
|
-
# This backports base_dir which replaces installation path
|
447
|
-
# RubyGems 1.8+
|
448
|
-
def backport_base_dir
|
449
|
-
redefine_method(Gem::Specification, :base_dir) do
|
450
|
-
return Gem.dir unless loaded_from
|
451
|
-
File.dirname File.dirname loaded_from
|
452
|
-
end
|
453
|
-
end
|
454
|
-
|
455
|
-
def backport_cache_file
|
456
|
-
redefine_method(Gem::Specification, :cache_dir) do
|
457
|
-
@cache_dir ||= File.join base_dir, "cache"
|
458
|
-
end
|
459
|
-
|
460
|
-
redefine_method(Gem::Specification, :cache_file) do
|
461
|
-
@cache_file ||= File.join cache_dir, "#{full_name}.gem"
|
462
|
-
end
|
463
|
-
end
|
464
|
-
|
465
|
-
def backport_spec_file
|
466
|
-
redefine_method(Gem::Specification, :spec_dir) do
|
467
|
-
@spec_dir ||= File.join base_dir, "specifications"
|
468
|
-
end
|
469
|
-
|
470
|
-
redefine_method(Gem::Specification, :spec_file) do
|
471
|
-
@spec_file ||= File.join spec_dir, "#{full_name}.gemspec"
|
472
|
-
end
|
436
|
+
specs_by_name
|
473
437
|
end
|
474
438
|
|
475
439
|
def undo_replacements
|
@@ -536,14 +500,15 @@ module Bundler
|
|
536
500
|
end
|
537
501
|
|
538
502
|
def fetch_specs(remote, name)
|
503
|
+
require "rubygems/remote_fetcher"
|
539
504
|
path = remote.uri.to_s + "#{name}.#{Gem.marshal_version}.gz"
|
540
505
|
fetcher = gem_remote_fetcher
|
541
506
|
fetcher.headers = { "X-Gemfile-Source" => remote.original_uri.to_s } if remote.original_uri
|
542
507
|
string = fetcher.fetch_path(path)
|
543
508
|
Bundler.load_marshal(string)
|
544
|
-
rescue Gem::RemoteFetcher::FetchError
|
509
|
+
rescue Gem::RemoteFetcher::FetchError
|
545
510
|
# it's okay for prerelease to fail
|
546
|
-
raise
|
511
|
+
raise unless name == "prerelease_specs"
|
547
512
|
end
|
548
513
|
|
549
514
|
def fetch_all_remote_specs(remote)
|
@@ -553,20 +518,41 @@ module Bundler
|
|
553
518
|
specs.concat(pres)
|
554
519
|
end
|
555
520
|
|
556
|
-
def download_gem(spec, uri,
|
521
|
+
def download_gem(spec, uri, cache_dir)
|
522
|
+
require "rubygems/remote_fetcher"
|
557
523
|
uri = Bundler.settings.mirror_for(uri)
|
558
524
|
fetcher = gem_remote_fetcher
|
559
525
|
fetcher.headers = { "X-Gemfile-Source" => spec.remote.original_uri.to_s } if spec.remote.original_uri
|
560
526
|
Bundler::Retry.new("download gem from #{uri}").attempts do
|
561
|
-
|
527
|
+
gem_file_name = spec.file_name
|
528
|
+
local_gem_path = File.join cache_dir, gem_file_name
|
529
|
+
return if File.exist? local_gem_path
|
530
|
+
|
531
|
+
begin
|
532
|
+
remote_gem_path = uri + "gems/#{gem_file_name}"
|
533
|
+
remote_gem_path = remote_gem_path.to_s if provides?("< 3.2.0.rc.1")
|
534
|
+
|
535
|
+
SharedHelpers.filesystem_access(local_gem_path) do
|
536
|
+
fetcher.cache_update_path remote_gem_path, local_gem_path
|
537
|
+
end
|
538
|
+
rescue Gem::RemoteFetcher::FetchError
|
539
|
+
raise if spec.original_platform == spec.platform
|
540
|
+
|
541
|
+
original_gem_file_name = "#{spec.original_name}.gem"
|
542
|
+
raise if gem_file_name == original_gem_file_name
|
543
|
+
|
544
|
+
gem_file_name = original_gem_file_name
|
545
|
+
retry
|
546
|
+
end
|
562
547
|
end
|
548
|
+
rescue Gem::RemoteFetcher::FetchError => e
|
549
|
+
raise Bundler::HTTPError, "Could not download gem from #{uri} due to underlying error <#{e.message}>"
|
563
550
|
end
|
564
551
|
|
565
552
|
def gem_remote_fetcher
|
566
|
-
require "
|
553
|
+
require "rubygems/remote_fetcher"
|
567
554
|
proxy = configuration[:http_proxy]
|
568
|
-
|
569
|
-
Gem::RemoteFetcher.new(proxy, dns)
|
555
|
+
Gem::RemoteFetcher.new(proxy)
|
570
556
|
end
|
571
557
|
|
572
558
|
def gem_from_path(path, policy = nil)
|
@@ -594,7 +580,6 @@ module Bundler
|
|
594
580
|
end
|
595
581
|
|
596
582
|
def all_specs
|
597
|
-
require_relative "remote_specification"
|
598
583
|
Gem::Specification.stubs.map do |stub|
|
599
584
|
StubSpecification.from_stub(stub)
|
600
585
|
end
|
@@ -602,10 +587,10 @@ module Bundler
|
|
602
587
|
|
603
588
|
def backport_ext_builder_monitor
|
604
589
|
# So we can avoid requiring "rubygems/ext" in its entirety
|
605
|
-
Gem.module_eval <<-
|
590
|
+
Gem.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
606
591
|
module Ext
|
607
592
|
end
|
608
|
-
|
593
|
+
RUBY
|
609
594
|
|
610
595
|
require "rubygems/ext/builder"
|
611
596
|
|
data/lib/bundler/runtime.rb
CHANGED
@@ -12,22 +12,16 @@ module Bundler
|
|
12
12
|
def setup(*groups)
|
13
13
|
@definition.ensure_equivalent_gemfile_and_lockfile if Bundler.frozen_bundle?
|
14
14
|
|
15
|
-
groups.map!(&:to_sym)
|
16
|
-
|
17
15
|
# Has to happen first
|
18
16
|
clean_load_path
|
19
17
|
|
20
|
-
specs =
|
18
|
+
specs = @definition.specs_for(groups)
|
21
19
|
|
22
20
|
SharedHelpers.set_bundle_environment
|
23
21
|
Bundler.rubygems.replace_entrypoints(specs)
|
24
22
|
|
25
23
|
# Activate the specs
|
26
24
|
load_paths = specs.map do |spec|
|
27
|
-
unless spec.loaded_from
|
28
|
-
raise GemNotFound, "#{spec.full_name} is missing. Run `bundle install` to get it."
|
29
|
-
end
|
30
|
-
|
31
25
|
check_for_activated_spec!(spec)
|
32
26
|
|
33
27
|
Bundler.rubygems.mark_loaded(spec)
|
@@ -43,14 +37,6 @@ module Bundler
|
|
43
37
|
self
|
44
38
|
end
|
45
39
|
|
46
|
-
REQUIRE_ERRORS = [
|
47
|
-
/^no such file to load -- (.+)$/i,
|
48
|
-
/^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
|
49
|
-
/^Missing API definition file in (.+)$/i,
|
50
|
-
/^cannot load such file -- (.+)$/i,
|
51
|
-
/^dlopen\([^)]*\): Library not loaded: (.+)$/i,
|
52
|
-
].freeze
|
53
|
-
|
54
40
|
def require(*groups)
|
55
41
|
groups.map!(&:to_sym)
|
56
42
|
groups = [:default] if groups.empty?
|
@@ -79,16 +65,14 @@ module Bundler
|
|
79
65
|
end
|
80
66
|
end
|
81
67
|
rescue LoadError => e
|
82
|
-
|
83
|
-
raise if dep.autorequire || $1 != required_file
|
68
|
+
raise if dep.autorequire || e.path != required_file
|
84
69
|
|
85
70
|
if dep.autorequire.nil? && dep.name.include?("-")
|
86
71
|
begin
|
87
72
|
namespaced_file = dep.name.tr("-", "/")
|
88
73
|
Kernel.require namespaced_file
|
89
74
|
rescue LoadError => e
|
90
|
-
|
91
|
-
raise if $1 != namespaced_file
|
75
|
+
raise if e.path != namespaced_file
|
92
76
|
end
|
93
77
|
end
|
94
78
|
end
|
@@ -116,7 +100,7 @@ module Bundler
|
|
116
100
|
|
117
101
|
alias_method :gems, :specs
|
118
102
|
|
119
|
-
def cache(custom_path = nil)
|
103
|
+
def cache(custom_path = nil, local = false)
|
120
104
|
cache_path = Bundler.app_cache(custom_path)
|
121
105
|
SharedHelpers.filesystem_access(cache_path) do |p|
|
122
106
|
FileUtils.mkdir_p(p)
|
@@ -124,7 +108,20 @@ module Bundler
|
|
124
108
|
|
125
109
|
Bundler.ui.info "Updating files in #{Bundler.settings.app_cache_path}"
|
126
110
|
|
127
|
-
specs_to_cache = Bundler.settings[:cache_all_platforms]
|
111
|
+
specs_to_cache = if Bundler.settings[:cache_all_platforms]
|
112
|
+
@definition.resolve.materialized_for_all_platforms
|
113
|
+
else
|
114
|
+
begin
|
115
|
+
specs
|
116
|
+
rescue GemNotFound
|
117
|
+
if local
|
118
|
+
Bundler.ui.warn "Some gems seem to be missing from your #{Bundler.settings.app_cache_path} directory."
|
119
|
+
end
|
120
|
+
|
121
|
+
raise
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
128
125
|
specs_to_cache.each do |spec|
|
129
126
|
next if spec.name == "bundler"
|
130
127
|
next if spec.source.is_a?(Source::Gemspec)
|
@@ -165,7 +162,7 @@ module Bundler
|
|
165
162
|
spec_cache_paths = []
|
166
163
|
spec_gemspec_paths = []
|
167
164
|
spec_extension_paths = []
|
168
|
-
specs.each do |spec|
|
165
|
+
Bundler.rubygems.add_default_gems_to(specs).values.each do |spec|
|
169
166
|
spec_gem_paths << spec.full_gem_path
|
170
167
|
# need to check here in case gems are nested like for the rails git repo
|
171
168
|
md = %r{(.+bundler/gems/.+-[a-f0-9]{7,12})}.match(spec.full_gem_path)
|
@@ -213,7 +210,7 @@ module Bundler
|
|
213
210
|
output
|
214
211
|
end
|
215
212
|
|
216
|
-
|
213
|
+
private
|
217
214
|
|
218
215
|
def prune_gem_cache(resolve, cache_path)
|
219
216
|
cached = Dir["#{cache_path}/*.gem"]
|
@@ -268,7 +265,7 @@ module Bundler
|
|
268
265
|
|
269
266
|
return if manuals.empty?
|
270
267
|
Bundler::SharedHelpers.set_env "MANPATH", manuals.concat(
|
271
|
-
ENV["MANPATH"].to_s.split(File::PATH_SEPARATOR)
|
268
|
+
ENV["MANPATH"] ? ENV["MANPATH"].to_s.split(File::PATH_SEPARATOR) : [""]
|
272
269
|
).uniq.join(File::PATH_SEPARATOR)
|
273
270
|
end
|
274
271
|
|
@@ -294,7 +291,7 @@ module Bundler
|
|
294
291
|
return unless activated_spec = Bundler.rubygems.loaded_specs(spec.name)
|
295
292
|
return if activated_spec.version == spec.version
|
296
293
|
|
297
|
-
suggestion = if
|
294
|
+
suggestion = if activated_spec.default_gem?
|
298
295
|
"Since #{spec.name} is a default gem, you can either remove your dependency on it" \
|
299
296
|
" or try updating to a newer version of bundler that supports #{spec.name} as a default gem."
|
300
297
|
else
|