bundler 1.17.3 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of bundler might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +32 -8
- data/bundler.gemspec +4 -4
- data/exe/bundle_ruby +1 -1
- data/lib/bundler/build_metadata.rb +2 -2
- data/lib/bundler/capistrano.rb +1 -1
- data/lib/bundler/cli/console.rb +1 -1
- data/lib/bundler/cli/install.rb +1 -1
- data/lib/bundler/cli/update.rb +1 -1
- data/lib/bundler/cli.rb +5 -5
- data/lib/bundler/current_ruby.rb +1 -0
- data/lib/bundler/definition.rb +1 -1
- data/lib/bundler/deployment.rb +1 -1
- data/lib/bundler/dsl.rb +8 -8
- data/lib/bundler/feature_flag.rb +30 -29
- data/lib/bundler/rubygems_gem_installer.rb +0 -7
- data/lib/bundler/rubygems_integration.rb +1 -1
- data/lib/bundler/settings.rb +2 -1
- data/lib/bundler/shared_helpers.rb +2 -2
- data/lib/bundler/spec_set.rb +22 -6
- data/lib/bundler/templates/newgem/Gemfile.tt +0 -2
- data/lib/bundler/version.rb +1 -1
- data/lib/bundler/vlad.rb +1 -1
- data/lib/bundler.rb +2 -2
- data/man/bundle-binstubs.1 +1 -1
- data/man/bundle-binstubs.1.txt +1 -1
- data/man/bundle-check.1 +1 -1
- data/man/bundle-check.1.txt +1 -1
- data/man/bundle-config.1 +1 -1
- data/man/bundle-config.1.txt +1 -1
- data/man/bundle-doctor.1 +1 -1
- data/man/bundle-doctor.1.txt +1 -1
- data/man/bundle-exec.1 +1 -1
- data/man/bundle-exec.1.txt +1 -1
- data/man/bundle-gem.1 +1 -1
- data/man/bundle-gem.1.txt +1 -1
- data/man/bundle-info.1 +1 -1
- data/man/bundle-info.1.txt +1 -1
- data/man/bundle-init.1 +1 -1
- data/man/bundle-init.1.txt +1 -1
- data/man/bundle-inject.1 +1 -1
- data/man/bundle-inject.1.txt +1 -1
- data/man/bundle-install.1 +1 -1
- data/man/bundle-install.1.txt +1 -1
- data/man/bundle-lock.1 +1 -1
- data/man/bundle-lock.1.txt +1 -1
- data/man/bundle-open.1 +1 -1
- data/man/bundle-open.1.txt +1 -1
- data/man/bundle-package.1 +1 -1
- data/man/bundle-package.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-show.1 +1 -1
- data/man/bundle-show.1.txt +1 -1
- data/man/bundle-update.1 +1 -1
- data/man/bundle-update.1.txt +1 -1
- data/man/bundle-viz.1 +1 -1
- data/man/bundle-viz.1.txt +1 -1
- data/man/gemfile.5 +5 -5
- data/man/gemfile.5.ronn +4 -4
- data/man/gemfile.5.txt +5 -5
- metadata +5 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0424a751794fff3534541950a63e76f2ee2af0b7717a00bd64ac5c2a14de057b
|
4
|
+
data.tar.gz: 28d31f489fbaf222d5bd0d0a0b4218c2a8a9326e758ca0f2fd262ba3656ba476
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7344a00844ac670c630910508359117e7d36745d8333f6d4cc0f2771a0a2800c0b5252f29ba1ac674a053dd048eb337b152a8ce43496f38cb4f83a3d3dde10d6
|
7
|
+
data.tar.gz: 922f48a0784c50d8294b9702e241e28b2804fbc48a45661d65f40855c95ace8222965dcd344658e8df7385f31281b2c8cdbdadeb06bba2a29f104b78b1282379
|
data/CHANGELOG.md
CHANGED
@@ -1,17 +1,41 @@
|
|
1
|
-
##
|
1
|
+
## 2.0.0 (2019-01-03)
|
2
2
|
|
3
|
-
|
3
|
+
No new changes
|
4
4
|
|
5
|
-
|
6
|
-
- Fix a rare issue where Bundler was removing itself after a `bundle clean` ([#6829](https://github.com/bundler/bundler/issues/6829), @colby-swandale)
|
5
|
+
## 2.0.0.pre.3 (2018-12-30)
|
7
6
|
|
8
|
-
|
7
|
+
Breaking Changes:
|
8
|
+
|
9
|
+
- Bundler 2 now requires RubyGems 3.0.0 at minimum
|
10
|
+
|
11
|
+
Changes:
|
12
|
+
|
13
|
+
- Ruby 2.6 compatibility fixes (@segiddins)
|
14
|
+
- Import changes from Bundler 1.17.3 release
|
15
|
+
|
16
|
+
Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
|
17
|
+
|
18
|
+
## 2.0.0.pre.2 (2018-11-27)
|
19
|
+
|
20
|
+
Breaking Changes:
|
21
|
+
|
22
|
+
- `:github` source in the Gemfile now defaults to using HTTPS
|
23
|
+
|
24
|
+
Changes
|
25
|
+
|
26
|
+
- Add compatibility for Bundler merge into ruby-src
|
27
|
+
|
28
|
+
Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
|
29
|
+
|
30
|
+
## 2.0.0.pre.1 (2018-11-09)
|
9
31
|
|
10
|
-
|
32
|
+
Breaking Changes:
|
11
33
|
|
12
|
-
|
34
|
+
- Dropped support for versions of Ruby < 2.3
|
35
|
+
- Dropped support for version of RubyGems < 2.5
|
36
|
+
- Moved error messages from STDOUT to STDERR
|
13
37
|
|
14
|
-
|
38
|
+
Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
|
15
39
|
|
16
40
|
## 1.17.1 (2018-10-25)
|
17
41
|
|
data/bundler.gemspec
CHANGED
@@ -8,8 +8,6 @@ rescue LoadError
|
|
8
8
|
require File.expand_path("../bundler/version", __FILE__)
|
9
9
|
end
|
10
10
|
|
11
|
-
require "shellwords"
|
12
|
-
|
13
11
|
Gem::Specification.new do |s|
|
14
12
|
s.name = "bundler"
|
15
13
|
s.version = Bundler::VERSION
|
@@ -36,7 +34,7 @@ Gem::Specification.new do |s|
|
|
36
34
|
|
37
35
|
if s.version >= Gem::Version.new("2.a".dup)
|
38
36
|
s.required_ruby_version = ">= 2.3.0"
|
39
|
-
s.required_rubygems_version = ">=
|
37
|
+
s.required_rubygems_version = ">= 3.0.0"
|
40
38
|
else
|
41
39
|
s.required_ruby_version = ">= 1.8.7"
|
42
40
|
s.required_rubygems_version = ">= 1.3.6"
|
@@ -49,7 +47,9 @@ Gem::Specification.new do |s|
|
|
49
47
|
s.add_development_dependency "ronn", "~> 0.7.3"
|
50
48
|
s.add_development_dependency "rspec", "~> 3.6"
|
51
49
|
|
52
|
-
|
50
|
+
base_dir = File.dirname(__FILE__).gsub(%r{([^A-Za-z0-9_\-.,:\/@\n])}, "\\\\\\1")
|
51
|
+
s.files = IO.popen("git -C #{base_dir} ls-files -z", &:read).split("\x0").select {|f| f.match(%r{^(lib|exe)/}) }
|
52
|
+
|
53
53
|
# we don't check in man pages, but we need to ship them because
|
54
54
|
# we use them to generate the long-form help for each command.
|
55
55
|
s.files += Dir.glob("man/**/*")
|
data/exe/bundle_ruby
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
|
4
4
|
require "bundler/shared_helpers"
|
5
5
|
|
6
|
-
Bundler::SharedHelpers.major_deprecation(
|
6
|
+
Bundler::SharedHelpers.major_deprecation(3, "the bundle_ruby executable has been removed in favor of `bundle platform --ruby`")
|
7
7
|
|
8
8
|
Signal.trap("INT") { exit 1 }
|
9
9
|
|
@@ -4,8 +4,8 @@ module Bundler
|
|
4
4
|
# Represents metadata from when the Bundler gem was built.
|
5
5
|
module BuildMetadata
|
6
6
|
# begin ivars
|
7
|
-
@built_at = "
|
8
|
-
@git_commit_sha = "
|
7
|
+
@built_at = "2019-01-03".freeze
|
8
|
+
@git_commit_sha = "d715ae9e6".freeze
|
9
9
|
@release = true
|
10
10
|
# end ivars
|
11
11
|
|
data/lib/bundler/capistrano.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "bundler/shared_helpers"
|
4
|
-
Bundler::SharedHelpers.major_deprecation
|
4
|
+
Bundler::SharedHelpers.major_deprecation 3,
|
5
5
|
"The Bundler task for Capistrano. Please use http://github.com/capistrano/bundler"
|
6
6
|
|
7
7
|
# Capistrano task for Bundler.
|
data/lib/bundler/cli/console.rb
CHANGED
@@ -9,7 +9,7 @@ module Bundler
|
|
9
9
|
end
|
10
10
|
|
11
11
|
def run
|
12
|
-
Bundler::SharedHelpers.major_deprecation
|
12
|
+
Bundler::SharedHelpers.major_deprecation 3, "bundle console will be replaced " \
|
13
13
|
"by `bin/console` generated by `bundle gem <name>`"
|
14
14
|
|
15
15
|
group ? Bundler.require(:default, *(group.split.map!(&:to_sym))) : Bundler.require
|
data/lib/bundler/cli/install.rb
CHANGED
@@ -53,7 +53,7 @@ module Bundler
|
|
53
53
|
Bundler::Fetcher.disable_endpoint = options["full-index"]
|
54
54
|
|
55
55
|
if options["binstubs"]
|
56
|
-
Bundler::SharedHelpers.major_deprecation
|
56
|
+
Bundler::SharedHelpers.major_deprecation 3,
|
57
57
|
"The --binstubs option will be removed in favor of `bundle binstubs`"
|
58
58
|
end
|
59
59
|
|
data/lib/bundler/cli/update.rb
CHANGED
@@ -22,7 +22,7 @@ module Bundler
|
|
22
22
|
if Bundler.feature_flag.update_requires_all_flag?
|
23
23
|
raise InvalidOption, "To update everything, pass the `--all` flag."
|
24
24
|
end
|
25
|
-
SharedHelpers.major_deprecation
|
25
|
+
SharedHelpers.major_deprecation 3, "Pass --all to `bundle update` to update everything"
|
26
26
|
elsif !full_update && options[:all]
|
27
27
|
raise InvalidOption, "Cannot specify --all along with specific options."
|
28
28
|
end
|
data/lib/bundler/cli.rb
CHANGED
@@ -229,7 +229,7 @@ module Bundler
|
|
229
229
|
"Include gems that are part of the specified named group."
|
230
230
|
map "i" => "install"
|
231
231
|
def install
|
232
|
-
SharedHelpers.major_deprecation(
|
232
|
+
SharedHelpers.major_deprecation(3, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
|
233
233
|
require "bundler/cli/install"
|
234
234
|
Bundler.settings.temporary(:no_install => false) do
|
235
235
|
Install.new(options.dup).run
|
@@ -275,7 +275,7 @@ module Bundler
|
|
275
275
|
method_option "all", :type => :boolean, :banner =>
|
276
276
|
"Update everything."
|
277
277
|
def update(*gems)
|
278
|
-
SharedHelpers.major_deprecation(
|
278
|
+
SharedHelpers.major_deprecation(3, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
|
279
279
|
require "bundler/cli/update"
|
280
280
|
Update.new(options, gems).run
|
281
281
|
end
|
@@ -303,7 +303,7 @@ module Bundler
|
|
303
303
|
old_argv = ARGV.join(" ")
|
304
304
|
new_argv = [new_command, *new_arguments.compact].join(" ")
|
305
305
|
|
306
|
-
Bundler::SharedHelpers.major_deprecation(
|
306
|
+
Bundler::SharedHelpers.major_deprecation(3, "use `bundle #{new_argv}` instead of `bundle #{old_argv}`")
|
307
307
|
end
|
308
308
|
require "bundler/cli/show"
|
309
309
|
Show.new(options, gem_name).run
|
@@ -537,7 +537,7 @@ module Bundler
|
|
537
537
|
method_option :version, :type => :boolean, :default => false, :aliases => "-v", :desc => "Set to show each gem version."
|
538
538
|
method_option :without, :type => :array, :default => [], :aliases => "-W", :banner => "GROUP[ GROUP...]", :desc => "Exclude gems that are part of the specified named group."
|
539
539
|
def viz
|
540
|
-
SharedHelpers.major_deprecation
|
540
|
+
SharedHelpers.major_deprecation 3, "The `viz` command has been moved to the `bundle-viz` gem, see https://github.com/bundler/bundler-viz"
|
541
541
|
require "bundler/cli/viz"
|
542
542
|
Viz.new(options.dup).run
|
543
543
|
end
|
@@ -608,7 +608,7 @@ module Bundler
|
|
608
608
|
method_option "group", :type => :string, :banner =>
|
609
609
|
"Install gem into a bundler group"
|
610
610
|
def inject(name, version)
|
611
|
-
SharedHelpers.major_deprecation
|
611
|
+
SharedHelpers.major_deprecation 3, "The `inject` command has been replaced by the `add` command"
|
612
612
|
require "bundler/cli/inject"
|
613
613
|
Inject.new(options.dup, name, version).run
|
614
614
|
end
|
data/lib/bundler/current_ruby.rb
CHANGED
data/lib/bundler/definition.rb
CHANGED
@@ -331,7 +331,7 @@ module Bundler
|
|
331
331
|
# i.e., Windows with `git config core.autocrlf=true`
|
332
332
|
contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match("\r\n")
|
333
333
|
|
334
|
-
if @locked_bundler_version
|
334
|
+
if @locked_bundler_version && Bundler.feature_flag.lockfile_upgrade_warning?
|
335
335
|
locked_major = @locked_bundler_version.segments.first
|
336
336
|
current_major = Gem::Version.create(Bundler::VERSION).segments.first
|
337
337
|
|
data/lib/bundler/deployment.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "bundler/shared_helpers"
|
4
|
-
Bundler::SharedHelpers.major_deprecation
|
4
|
+
Bundler::SharedHelpers.major_deprecation 3, "Bundler no longer integrates with " \
|
5
5
|
"Capistrano, but Capistrano provides its own integration with " \
|
6
6
|
"Bundler via the capistrano-bundler gem. Use it instead."
|
7
7
|
|
data/lib/bundler/dsl.rb
CHANGED
@@ -194,7 +194,7 @@ module Bundler
|
|
194
194
|
" end\n\n"
|
195
195
|
|
196
196
|
raise DeprecatedError, msg if Bundler.feature_flag.disable_multisource?
|
197
|
-
SharedHelpers.major_deprecation(
|
197
|
+
SharedHelpers.major_deprecation(3, msg.strip)
|
198
198
|
end
|
199
199
|
|
200
200
|
source_options = normalize_hash(options).merge(
|
@@ -305,8 +305,8 @@ module Bundler
|
|
305
305
|
# end
|
306
306
|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
|
307
307
|
# TODO: 2.0 upgrade this setting to the default
|
308
|
-
if Bundler.
|
309
|
-
Bundler::SharedHelpers.major_deprecation
|
308
|
+
if Bundler.settings["github.https"]
|
309
|
+
Bundler::SharedHelpers.major_deprecation 3, "The `github.https` setting will be removed"
|
310
310
|
"https://github.com/#{repo_name}.git"
|
311
311
|
else
|
312
312
|
"git://github.com/#{repo_name}.git"
|
@@ -456,7 +456,7 @@ repo_name ||= user_name
|
|
456
456
|
def normalize_source(source)
|
457
457
|
case source
|
458
458
|
when :gemcutter, :rubygems, :rubyforge
|
459
|
-
Bundler::SharedHelpers.major_deprecation
|
459
|
+
Bundler::SharedHelpers.major_deprecation 3, "The source :#{source} is deprecated because HTTP " \
|
460
460
|
"requests are insecure.\nPlease change your source to 'https://" \
|
461
461
|
"rubygems.org' if possible, or 'http://rubygems.org' if not."
|
462
462
|
"http://rubygems.org"
|
@@ -474,13 +474,13 @@ repo_name ||= user_name
|
|
474
474
|
msg = "This Gemfile contains multiple primary sources. " \
|
475
475
|
"Each source after the first must include a block to indicate which gems " \
|
476
476
|
"should come from that source"
|
477
|
-
unless Bundler.feature_flag.
|
477
|
+
unless Bundler.feature_flag.bundler_3_mode?
|
478
478
|
msg += ". To downgrade this error to a warning, run " \
|
479
479
|
"`bundle config --delete disable_multisource`"
|
480
480
|
end
|
481
481
|
raise GemfileEvalError, msg
|
482
482
|
else
|
483
|
-
Bundler::SharedHelpers.major_deprecation
|
483
|
+
Bundler::SharedHelpers.major_deprecation 3, "Your Gemfile contains multiple primary sources. " \
|
484
484
|
"Using `source` more than once without a block is a security risk, and " \
|
485
485
|
"may result in installing unexpected gems. To resolve this warning, use " \
|
486
486
|
"a block to indicate which gems should come from the secondary source. " \
|
@@ -498,8 +498,8 @@ repo_name ||= user_name
|
|
498
498
|
"do |repo_name|\n#{replacement.to_s.gsub(/^/, " ")}\n end"
|
499
499
|
end
|
500
500
|
|
501
|
-
Bundler::SharedHelpers.major_deprecation
|
502
|
-
The :#{name} git source is deprecated, and will be removed in Bundler
|
501
|
+
Bundler::SharedHelpers.major_deprecation 3, <<-EOS
|
502
|
+
The :#{name} git source is deprecated, and will be removed in Bundler 3.0.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work:
|
503
503
|
|
504
504
|
git_source(:#{name}) #{replacement}
|
505
505
|
|
data/lib/bundler/feature_flag.rb
CHANGED
@@ -27,38 +27,39 @@ module Bundler
|
|
27
27
|
|
28
28
|
(1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
|
29
29
|
|
30
|
-
settings_flag(:allow_bundler_dependency_conflicts) {
|
31
|
-
settings_flag(:allow_offline_install) {
|
32
|
-
settings_flag(:auto_clean_without_path) {
|
33
|
-
settings_flag(:auto_config_jobs) {
|
34
|
-
settings_flag(:cache_all) {
|
35
|
-
settings_flag(:cache_command_is_package) {
|
36
|
-
settings_flag(:console_command) { !
|
37
|
-
settings_flag(:default_install_uses_path) {
|
38
|
-
settings_flag(:deployment_means_frozen) {
|
39
|
-
settings_flag(:disable_multisource) {
|
30
|
+
settings_flag(:allow_bundler_dependency_conflicts) { bundler_3_mode? }
|
31
|
+
settings_flag(:allow_offline_install) { bundler_3_mode? }
|
32
|
+
settings_flag(:auto_clean_without_path) { bundler_3_mode? }
|
33
|
+
settings_flag(:auto_config_jobs) { bundler_3_mode? }
|
34
|
+
settings_flag(:cache_all) { bundler_3_mode? }
|
35
|
+
settings_flag(:cache_command_is_package) { bundler_3_mode? }
|
36
|
+
settings_flag(:console_command) { !bundler_3_mode? }
|
37
|
+
settings_flag(:default_install_uses_path) { bundler_3_mode? }
|
38
|
+
settings_flag(:deployment_means_frozen) { bundler_3_mode? }
|
39
|
+
settings_flag(:disable_multisource) { bundler_3_mode? }
|
40
40
|
settings_flag(:error_on_stderr) { bundler_2_mode? }
|
41
|
-
settings_flag(:forget_cli_options) {
|
42
|
-
settings_flag(:global_path_appends_ruby_scope) {
|
43
|
-
settings_flag(:global_gem_cache) {
|
44
|
-
settings_flag(:init_gems_rb) {
|
45
|
-
settings_flag(:list_command) {
|
46
|
-
settings_flag(:lockfile_uses_separate_rubygems_sources) {
|
47
|
-
settings_flag(:
|
48
|
-
settings_flag(:
|
41
|
+
settings_flag(:forget_cli_options) { bundler_3_mode? }
|
42
|
+
settings_flag(:global_path_appends_ruby_scope) { bundler_3_mode? }
|
43
|
+
settings_flag(:global_gem_cache) { bundler_3_mode? }
|
44
|
+
settings_flag(:init_gems_rb) { bundler_3_mode? }
|
45
|
+
settings_flag(:list_command) { bundler_3_mode? }
|
46
|
+
settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_3_mode? }
|
47
|
+
settings_flag(:lockfile_upgrade_warning) { bundler_3_mode? }
|
48
|
+
settings_flag(:only_update_to_newer_versions) { bundler_3_mode? }
|
49
|
+
settings_flag(:path_relative_to_cwd) { bundler_3_mode? }
|
49
50
|
settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
|
50
|
-
settings_flag(:prefer_gems_rb) {
|
51
|
-
settings_flag(:print_only_version_number) {
|
52
|
-
settings_flag(:setup_makes_kernel_gem_public) { !
|
53
|
-
settings_flag(:skip_default_git_sources) {
|
54
|
-
settings_flag(:specific_platform) {
|
55
|
-
settings_flag(:suppress_install_using_messages) {
|
56
|
-
settings_flag(:unlock_source_unlocks_spec) { !
|
57
|
-
settings_flag(:update_requires_all_flag) {
|
58
|
-
settings_flag(:use_gem_version_promoter_for_major_updates) {
|
59
|
-
settings_flag(:viz_command) { !
|
51
|
+
settings_flag(:prefer_gems_rb) { bundler_3_mode? }
|
52
|
+
settings_flag(:print_only_version_number) { bundler_3_mode? }
|
53
|
+
settings_flag(:setup_makes_kernel_gem_public) { !bundler_3_mode? }
|
54
|
+
settings_flag(:skip_default_git_sources) { bundler_3_mode? }
|
55
|
+
settings_flag(:specific_platform) { bundler_3_mode? }
|
56
|
+
settings_flag(:suppress_install_using_messages) { bundler_3_mode? }
|
57
|
+
settings_flag(:unlock_source_unlocks_spec) { !bundler_3_mode? }
|
58
|
+
settings_flag(:update_requires_all_flag) { bundler_3_mode? }
|
59
|
+
settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_3_mode? }
|
60
|
+
settings_flag(:viz_command) { !bundler_3_mode? }
|
60
61
|
|
61
|
-
settings_option(:default_cli_command) {
|
62
|
+
settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }
|
62
63
|
|
63
64
|
settings_method(:github_https?, "github.https") { bundler_2_mode? }
|
64
65
|
|
@@ -10,13 +10,6 @@ module Bundler
|
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
13
|
-
attr_reader :options
|
14
|
-
|
15
|
-
def initialize(gem, options = {})
|
16
|
-
@options = {}
|
17
|
-
super
|
18
|
-
end
|
19
|
-
|
20
13
|
def check_executable_overwrite(filename)
|
21
14
|
# Bundler needs to install gems regardless of binstub overwriting
|
22
15
|
end
|
@@ -465,7 +465,7 @@ module Bundler
|
|
465
465
|
raise Gem::Exception, "no default executable for #{spec.full_name}" unless exec_name ||= spec.default_executable
|
466
466
|
|
467
467
|
unless spec.name == gem_name
|
468
|
-
Bundler::SharedHelpers.major_deprecation
|
468
|
+
Bundler::SharedHelpers.major_deprecation 3,
|
469
469
|
"Bundler is using a binstub that was created for a different gem (#{spec.name}).\n" \
|
470
470
|
"You should run `bundle binstub #{gem_name}` " \
|
471
471
|
"to work around a system/bundle conflict."
|
data/lib/bundler/settings.rb
CHANGED
@@ -40,6 +40,7 @@ module Bundler
|
|
40
40
|
ignore_messages
|
41
41
|
init_gems_rb
|
42
42
|
list_command
|
43
|
+
lockfile_upgrade_warning
|
43
44
|
lockfile_uses_separate_rubygems_sources
|
44
45
|
major_deprecations
|
45
46
|
no_install
|
@@ -112,7 +113,7 @@ module Bundler
|
|
112
113
|
"bundle config #{key} #{Array(value).join(":")}"
|
113
114
|
end
|
114
115
|
|
115
|
-
Bundler::SharedHelpers.major_deprecation
|
116
|
+
Bundler::SharedHelpers.major_deprecation 3,\
|
116
117
|
"flags passed to commands " \
|
117
118
|
"will no longer be automatically remembered. Instead please set flags " \
|
118
119
|
"you want remembered between commands using `bundle config " \
|
@@ -157,8 +157,8 @@ module Bundler
|
|
157
157
|
next if gemfiles.empty?
|
158
158
|
break false if gemfiles.size == 1
|
159
159
|
end
|
160
|
-
if multiple_gemfiles && Bundler.bundler_major_version ==
|
161
|
-
Bundler::SharedHelpers.major_deprecation
|
160
|
+
if multiple_gemfiles && Bundler.bundler_major_version == 2
|
161
|
+
Bundler::SharedHelpers.major_deprecation 3, \
|
162
162
|
"gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock."
|
163
163
|
end
|
164
164
|
|
data/lib/bundler/spec_set.rb
CHANGED
@@ -1,16 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "tsort"
|
4
|
-
require "forwardable"
|
5
4
|
require "set"
|
6
5
|
|
7
6
|
module Bundler
|
8
7
|
class SpecSet
|
9
|
-
|
10
|
-
include TSort
|
11
|
-
|
12
|
-
def_delegators :@specs, :<<, :length, :add, :remove, :size, :empty?
|
13
|
-
def_delegators :sorted, :each
|
8
|
+
include Enumerable
|
9
|
+
include TSort
|
14
10
|
|
15
11
|
def initialize(specs)
|
16
12
|
@specs = specs
|
@@ -132,6 +128,26 @@ module Bundler
|
|
132
128
|
what_required(req) << spec
|
133
129
|
end
|
134
130
|
|
131
|
+
def <<(spec)
|
132
|
+
@specs << spec
|
133
|
+
end
|
134
|
+
|
135
|
+
def length
|
136
|
+
@specs.length
|
137
|
+
end
|
138
|
+
|
139
|
+
def size
|
140
|
+
@specs.size
|
141
|
+
end
|
142
|
+
|
143
|
+
def empty?
|
144
|
+
@specs.empty?
|
145
|
+
end
|
146
|
+
|
147
|
+
def each(&b)
|
148
|
+
sorted.each(&b)
|
149
|
+
end
|
150
|
+
|
135
151
|
private
|
136
152
|
|
137
153
|
def sorted
|
data/lib/bundler/version.rb
CHANGED
@@ -7,7 +7,7 @@ module Bundler
|
|
7
7
|
# We're doing this because we might write tests that deal
|
8
8
|
# with other versions of bundler and we are unsure how to
|
9
9
|
# handle this better.
|
10
|
-
VERSION = "
|
10
|
+
VERSION = "2.0.0" unless defined?(::Bundler::VERSION)
|
11
11
|
|
12
12
|
def self.overwrite_loaded_gem_version
|
13
13
|
begin
|
data/lib/bundler/vlad.rb
CHANGED
data/lib/bundler.rb
CHANGED
@@ -119,7 +119,7 @@ module Bundler
|
|
119
119
|
end
|
120
120
|
|
121
121
|
def environment
|
122
|
-
SharedHelpers.major_deprecation
|
122
|
+
SharedHelpers.major_deprecation 3, "Bundler.environment has been removed in favor of Bundler.load"
|
123
123
|
load
|
124
124
|
end
|
125
125
|
|
@@ -283,7 +283,7 @@ EOF
|
|
283
283
|
# @deprecated Use `original_env` instead
|
284
284
|
# @return [Hash] Environment with all bundler-related variables removed
|
285
285
|
def clean_env
|
286
|
-
Bundler::SharedHelpers.major_deprecation(
|
286
|
+
Bundler::SharedHelpers.major_deprecation(3, "`Bundler.clean_env` has weird edge cases, use `.original_env` instead")
|
287
287
|
env = original_env
|
288
288
|
|
289
289
|
if env.key?("BUNDLER_ORIG_MANPATH")
|
data/man/bundle-binstubs.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-BINSTUBS" "1" "
|
4
|
+
.TH "BUNDLE\-BINSTUBS" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
|
data/man/bundle-binstubs.1.txt
CHANGED
data/man/bundle-check.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-CHECK" "1" "
|
4
|
+
.TH "BUNDLE\-CHECK" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
|
data/man/bundle-check.1.txt
CHANGED
data/man/bundle-config.1
CHANGED
data/man/bundle-config.1.txt
CHANGED
data/man/bundle-doctor.1
CHANGED
data/man/bundle-doctor.1.txt
CHANGED
data/man/bundle-exec.1
CHANGED
data/man/bundle-exec.1.txt
CHANGED
data/man/bundle-gem.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-GEM" "1" "
|
4
|
+
.TH "BUNDLE\-GEM" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem
|
data/man/bundle-gem.1.txt
CHANGED
data/man/bundle-info.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-INFO" "1" "
|
4
|
+
.TH "BUNDLE\-INFO" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-info\fR \- Show information for the given gem in your bundle
|
data/man/bundle-info.1.txt
CHANGED
data/man/bundle-init.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-INIT" "1" "
|
4
|
+
.TH "BUNDLE\-INIT" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-init\fR \- Generates a Gemfile into the current working directory
|
data/man/bundle-init.1.txt
CHANGED
data/man/bundle-inject.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-INJECT" "1" "
|
4
|
+
.TH "BUNDLE\-INJECT" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile
|
data/man/bundle-inject.1.txt
CHANGED
data/man/bundle-install.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-INSTALL" "1" "
|
4
|
+
.TH "BUNDLE\-INSTALL" "1" "January 2019" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
|
data/man/bundle-install.1.txt
CHANGED
data/man/bundle-lock.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-LOCK" "1" "
|
4
|
+
.TH "BUNDLE\-LOCK" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-lock\fR \- Creates / Updates a lockfile without installing
|
data/man/bundle-lock.1.txt
CHANGED
data/man/bundle-open.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-OPEN" "1" "
|
4
|
+
.TH "BUNDLE\-OPEN" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-open\fR \- Opens the source directory for a gem in your bundle
|
data/man/bundle-open.1.txt
CHANGED
data/man/bundle-package.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-PACKAGE" "1" "
|
4
|
+
.TH "BUNDLE\-PACKAGE" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-package\fR \- Package your needed \fB\.gem\fR files into your application
|
data/man/bundle-package.1.txt
CHANGED
data/man/bundle-platform.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-PLATFORM" "1" "
|
4
|
+
.TH "BUNDLE\-PLATFORM" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-platform\fR \- Displays platform compatibility information
|
data/man/bundle-platform.1.txt
CHANGED
data/man/bundle-pristine.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-PRISTINE" "1" "
|
4
|
+
.TH "BUNDLE\-PRISTINE" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-pristine\fR \- Restores installed gems to their pristine condition
|
data/man/bundle-pristine.1.txt
CHANGED
data/man/bundle-show.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-SHOW" "1" "
|
4
|
+
.TH "BUNDLE\-SHOW" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem
|
data/man/bundle-show.1.txt
CHANGED
data/man/bundle-update.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-UPDATE" "1" "
|
4
|
+
.TH "BUNDLE\-UPDATE" "1" "January 2019" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-update\fR \- Update your gems to the latest available versions
|
data/man/bundle-update.1.txt
CHANGED
data/man/bundle-viz.1
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-VIZ" "1" "
|
4
|
+
.TH "BUNDLE\-VIZ" "1" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile
|
data/man/bundle-viz.1.txt
CHANGED
data/man/gemfile.5
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "GEMFILE" "5" "
|
4
|
+
.TH "GEMFILE" "5" "December 2018" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
|
@@ -299,19 +299,19 @@ The full list of platforms and supported versions includes:
|
|
299
299
|
.
|
300
300
|
.TP
|
301
301
|
\fBruby\fR
|
302
|
-
1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5
|
302
|
+
1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5, 2\.6
|
303
303
|
.
|
304
304
|
.TP
|
305
305
|
\fBmri\fR
|
306
|
-
1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5
|
306
|
+
1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5, 2\.6
|
307
307
|
.
|
308
308
|
.TP
|
309
309
|
\fBmingw\fR
|
310
|
-
1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5
|
310
|
+
1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5, 2\.6
|
311
311
|
.
|
312
312
|
.TP
|
313
313
|
\fBx64_mingw\fR
|
314
|
-
2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5
|
314
|
+
2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5, 2\.6
|
315
315
|
.
|
316
316
|
.P
|
317
317
|
As with groups, you can specify one or more platforms:
|
data/man/gemfile.5.ronn
CHANGED
@@ -216,13 +216,13 @@ used on platforms with Ruby 2.3, use:
|
|
216
216
|
The full list of platforms and supported versions includes:
|
217
217
|
|
218
218
|
* `ruby`:
|
219
|
-
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
|
219
|
+
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
|
220
220
|
* `mri`:
|
221
|
-
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
|
221
|
+
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
|
222
222
|
* `mingw`:
|
223
|
-
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
|
223
|
+
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
|
224
224
|
* `x64_mingw`:
|
225
|
-
2.0, 2.1, 2.2, 2.3, 2.4, 2.5
|
225
|
+
2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
|
226
226
|
|
227
227
|
As with groups, you can specify one or more platforms:
|
228
228
|
|
data/man/gemfile.5.txt
CHANGED
@@ -271,14 +271,14 @@ GEMS
|
|
271
271
|
|
272
272
|
The full list of platforms and supported versions includes:
|
273
273
|
|
274
|
-
ruby 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
|
274
|
+
ruby 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
|
275
275
|
|
276
|
-
mri 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
|
276
|
+
mri 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
|
277
277
|
|
278
|
-
mingw 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
|
278
|
+
mingw 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
|
279
279
|
|
280
280
|
x64_mingw
|
281
|
-
2.0, 2.1, 2.2, 2.3, 2.4, 2.5
|
281
|
+
2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
|
282
282
|
|
283
283
|
As with groups, you can specify one or more platforms:
|
284
284
|
|
@@ -650,4 +650,4 @@ SOURCE PRIORITY
|
|
650
650
|
|
651
651
|
|
652
652
|
|
653
|
-
|
653
|
+
December 2018 GEMFILE(5)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bundler
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- André Arko
|
@@ -22,7 +22,7 @@ authors:
|
|
22
22
|
autorequire:
|
23
23
|
bindir: exe
|
24
24
|
cert_chain: []
|
25
|
-
date:
|
25
|
+
date: 2019-01-03 00:00:00.000000000 Z
|
26
26
|
dependencies:
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: automatiek
|
@@ -434,15 +434,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
434
434
|
requirements:
|
435
435
|
- - ">="
|
436
436
|
- !ruby/object:Gem::Version
|
437
|
-
version:
|
437
|
+
version: 2.3.0
|
438
438
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
439
439
|
requirements:
|
440
440
|
- - ">="
|
441
441
|
- !ruby/object:Gem::Version
|
442
|
-
version:
|
442
|
+
version: 3.0.0
|
443
443
|
requirements: []
|
444
|
-
|
445
|
-
rubygems_version: 2.7.6
|
444
|
+
rubygems_version: 3.0.1
|
446
445
|
signing_key:
|
447
446
|
specification_version: 4
|
448
447
|
summary: The best way to manage your application's dependencies
|