Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.

Commit 14c5584

Browse files
bundlerbotdeivid-rodriguez
bundlerbot
and
deivid-rodriguez
committed
Merge #7532
7532: Release 2.1.3 r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was we should release more bug fixes. ### What is your fix for the problem, implemented in this PR? My fix is to prepare 2.1.3. Co-authored-by: Bundlerbot <[email protected]> Co-authored-by: David Rodríguez <[email protected]>
2 parents 4da3289 + 784c368 commit 14c5584

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+190
-149
lines changed

‎.travis.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ before_script:
55
- travis_retry gem install rake:"~> 12.0"
66
- travis_retry bin/rake override_version
77
- travis_retry bin/rake spec:deps
8-
- bin/rake man:check
98
- if [ "$BUNDLER_SPEC_SUB_VERSION" = "" ];
109
then
1110
travis_retry sudo apt-get install graphviz -y;
@@ -55,10 +54,7 @@ env:
5554
jobs:
5655
include:
5756
- rvm: 2.6.5
58-
script: bin/rake rubocop
59-
stage: linting
60-
- rvm: 2.6.5
61-
script: bin/rake check_rvm_integration
57+
script: bin/rake rubocop check_rvm_integration man:check
6258
stage: linting
6359
# Ruby 2.3 also tested in 2.x mode
6460
- rvm: 2.3.8

‎CHANGELOG.md

+9

‎lib/bundler/cli/install.rb

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ def run
3838
if Bundler.feature_flag.deployment_means_frozen?
3939
Bundler.settings.set_command_option :deployment, true
4040
else
41-
Bundler.settings.set_command_option :frozen, true
41+
Bundler.settings.set_command_option :deployment, true if options[:deployment]
42+
Bundler.settings.set_command_option :frozen, true if options[:frozen]
4243
end
4344
end
4445

@@ -169,7 +170,7 @@ def normalize_groups
169170
def normalize_settings
170171
Bundler.settings.set_command_option :path, nil if options[:system]
171172
Bundler.settings.temporary(:path_relative_to_cwd => false) do
172-
Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment]
173+
Bundler.settings.set_command_option :path, "vendor/bundle" if Bundler.settings[:deployment] && Bundler.settings[:path].nil?
173174
end
174175
Bundler.settings.set_command_option_if_given :path, options[:path]
175176
Bundler.settings.temporary(:path_relative_to_cwd => false) do

‎lib/bundler/gem_helper.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def install
7373

7474
def build_gem
7575
file_name = nil
76-
sh("#{gem_command} build -V #{spec_path}".shellsplit) do
76+
sh("#{gem_command} build -V #{spec_path.shellescape}".shellsplit) do
7777
file_name = File.basename(built_gem_path)
7878
SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) }
7979
FileUtils.mv(built_gem_path, "pkg")
@@ -130,9 +130,8 @@ def gem_push_host
130130

131131
def perform_git_push(options = "")
132132
cmd = "git push #{options}"
133-
out, status = sh_with_status(cmd)
133+
out, status = sh_with_status(cmd.shellsplit)
134134
return if status.success?
135-
cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin)
136135
raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n"
137136
end
138137

‎lib/bundler/rubygems_integration.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require "rubygems"
3+
require "rubygems" unless defined?(Gem)
44

55
module Bundler
66
class RubygemsIntegration

‎lib/bundler/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: false
22

33
module Bundler
4-
VERSION = "2.1.2".freeze
4+
VERSION = "2.1.3".freeze
55

66
def self.bundler_major_version
77
@bundler_major_version ||= VERSION.split(".").first.to_i

‎man/bundle-add.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-ADD" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-ADD" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install

‎man/bundle-add.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ OPTIONS
5555

5656

5757

58-
December 2019 BUNDLE-ADD(1)
58+
January 2020 BUNDLE-ADD(1)

‎man/bundle-binstubs.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-BINSTUBS" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-BINSTUBS" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-binstubs\fR \- Install the binstubs of the listed gems

‎man/bundle-binstubs.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS
4545

4646

4747

48-
December 2019 BUNDLE-BINSTUBS(1)
48+
January 2020 BUNDLE-BINSTUBS(1)

‎man/bundle-cache.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-CACHE" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-CACHE" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application

‎man/bundle-cache.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ REMOTE FETCHING
7575

7676

7777

78-
December 2019 BUNDLE-CACHE(1)
78+
January 2020 BUNDLE-CACHE(1)

‎man/bundle-check.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-CHECK" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-CHECK" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems

‎man/bundle-check.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ OPTIONS
3030

3131

3232

33-
December 2019 BUNDLE-CHECK(1)
33+
January 2020 BUNDLE-CHECK(1)

‎man/bundle-clean.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-CLEAN" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-CLEAN" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory

‎man/bundle-clean.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ OPTIONS
2323

2424

2525

26-
December 2019 BUNDLE-CLEAN(1)
26+
January 2020 BUNDLE-CLEAN(1)

‎man/bundle-config.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-CONFIG" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-CONFIG" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-config\fR \- Set bundler configuration options

‎man/bundle-config.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -525,4 +525,4 @@ CONFIGURE BUNDLER DIRECTORIES
525525

526526

527527

528-
December 2019 BUNDLE-CONFIG(1)
528+
January 2020 BUNDLE-CONFIG(1)

‎man/bundle-doctor.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-DOCTOR" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-DOCTOR" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-doctor\fR \- Checks the bundle for common problems

‎man/bundle-doctor.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ OPTIONS
4141

4242

4343

44-
December 2019 BUNDLE-DOCTOR(1)
44+
January 2020 BUNDLE-DOCTOR(1)

‎man/bundle-exec.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-EXEC" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-EXEC" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-exec\fR \- Execute a command in the context of the bundle

‎man/bundle-exec.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,4 +175,4 @@ RUBYGEMS PLUGINS
175175

176176

177177

178-
December 2019 BUNDLE-EXEC(1)
178+
January 2020 BUNDLE-EXEC(1)

‎man/bundle-gem.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-GEM" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-GEM" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem

‎man/bundle-gem.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ SEE ALSO
8888

8989

9090

91-
December 2019 BUNDLE-GEM(1)
91+
January 2020 BUNDLE-GEM(1)

‎man/bundle-info.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-INFO" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-INFO" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-info\fR \- Show information for the given gem in your bundle

‎man/bundle-info.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ OPTIONS
1818

1919

2020

21-
December 2019 BUNDLE-INFO(1)
21+
January 2020 BUNDLE-INFO(1)

‎man/bundle-init.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-INIT" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-INIT" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-init\fR \- Generates a Gemfile into the current working directory

‎man/bundle-init.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ SEE ALSO
3131

3232

3333

34-
December 2019 BUNDLE-INIT(1)
34+
January 2020 BUNDLE-INIT(1)

‎man/bundle-inject.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-INJECT" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-INJECT" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile

‎man/bundle-inject.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ DESCRIPTION
2929

3030

3131

32-
December 2019 BUNDLE-INJECT(1)
32+
January 2020 BUNDLE-INJECT(1)

‎man/bundle-install.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-INSTALL" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-INSTALL" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-install\fR \- Install the dependencies specified in your Gemfile

‎man/bundle-install.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -398,4 +398,4 @@ SEE ALSO
398398

399399

400400

401-
December 2019 BUNDLE-INSTALL(1)
401+
January 2020 BUNDLE-INSTALL(1)

‎man/bundle-list.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-LIST" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-LIST" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-list\fR \- List all the gems in the bundle

‎man/bundle-list.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ OPTIONS
4040

4141

4242

43-
December 2019 BUNDLE-LIST(1)
43+
January 2020 BUNDLE-LIST(1)

‎man/bundle-lock.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-LOCK" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-LOCK" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-lock\fR \- Creates / Updates a lockfile without installing

‎man/bundle-lock.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ PATCH LEVEL OPTIONS
9090

9191

9292

93-
December 2019 BUNDLE-LOCK(1)
93+
January 2020 BUNDLE-LOCK(1)

‎man/bundle-open.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-OPEN" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-OPEN" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-open\fR \- Opens the source directory for a gem in your bundle

‎man/bundle-open.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ DESCRIPTION
2626

2727

2828

29-
December 2019 BUNDLE-OPEN(1)
29+
January 2020 BUNDLE-OPEN(1)

‎man/bundle-outdated.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-OUTDATED" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-OUTDATED" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-outdated\fR \- List installed gems with newer versions available

‎man/bundle-outdated.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@ FILTERING OUTPUT
128128

129129

130130

131-
December 2019 BUNDLE-OUTDATED(1)
131+
January 2020 BUNDLE-OUTDATED(1)

‎man/bundle-platform.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-PLATFORM" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-PLATFORM" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-platform\fR \- Displays platform compatibility information

‎man/bundle-platform.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ OPTIONS
5454

5555

5656

57-
December 2019 BUNDLE-PLATFORM(1)
57+
January 2020 BUNDLE-PLATFORM(1)

‎man/bundle-pristine.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-PRISTINE" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-PRISTINE" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-pristine\fR \- Restores installed gems to their pristine condition

‎man/bundle-pristine.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ DESCRIPTION
4141

4242

4343

44-
December 2019 BUNDLE-PRISTINE(1)
44+
January 2020 BUNDLE-PRISTINE(1)

‎man/bundle-remove.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-REMOVE" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-REMOVE" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-remove\fR \- Removes gems from the Gemfile

‎man/bundle-remove.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ OPTIONS
3131

3232

3333

34-
December 2019 BUNDLE-REMOVE(1)
34+
January 2020 BUNDLE-REMOVE(1)

‎man/bundle-show.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "BUNDLE\-SHOW" "1" "December 2019" "" ""
4+
.TH "BUNDLE\-SHOW" "1" "January 2020" "" ""
55
.
66
.SH "NAME"
77
\fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem

0 commit comments

Comments
 (0)