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 <bot@bundler.io>
Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>

.travis.yml

@@ -5,7 +5,6 @@ before_script:
   - travis_retry gem install rake:"~> 12.0"
   - travis_retry bin/rake override_version
   - travis_retry bin/rake spec:deps
-  - bin/rake man:check
   - if [ "$BUNDLER_SPEC_SUB_VERSION" = "" ];
     then
       travis_retry sudo apt-get install graphviz -y;
@@ -55,10 +54,7 @@ env:
 jobs:
   include:
     - rvm: 2.6.5
-      script: bin/rake rubocop
-      stage: linting
-    - rvm: 2.6.5
-      script: bin/rake check_rvm_integration
+      script: bin/rake rubocop check_rvm_integration man:check
       stage: linting
     # Ruby 2.3 also tested in 2.x mode
     - rvm: 2.3.8

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.1.3 (January 2, 2020)
+
+Bugfixes:
+
+  - Fix `rake build` when path has spaces on it [#7514](https://github.com/bundler/bundler/pull/7514)
+  - Fix `rake release` git push tasks when the running shell has `git` as an alias of another command (like `hub`) [#7510](https://github.com/bundler/bundler/pull/7510)
+  - Fix some circular require warnings [#7520](https://github.com/bundler/bundler/pull/7520)
+  - Fix `bundle config set deployment true` recommended alternative to `bundle config --deployment` to behave in the same way as the `--deployment` flag [#7519](https://github.com/bundler/bundler/pull/7519)
+
 ## 2.1.2 (December 20, 2019)
 
 Bugfixes:

lib/bundler/cli/install.rb

@@ -38,7 +38,8 @@ def run
         if Bundler.feature_flag.deployment_means_frozen?
           Bundler.settings.set_command_option :deployment, true
         else
-          Bundler.settings.set_command_option :frozen, true
+          Bundler.settings.set_command_option :deployment, true if options[:deployment]
+          Bundler.settings.set_command_option :frozen, true if options[:frozen]
         end
       end
 
@@ -169,7 +170,7 @@ def normalize_groups
     def normalize_settings
       Bundler.settings.set_command_option :path, nil if options[:system]
       Bundler.settings.temporary(:path_relative_to_cwd => false) do
-        Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment]
+        Bundler.settings.set_command_option :path, "vendor/bundle" if Bundler.settings[:deployment] && Bundler.settings[:path].nil?
       end
       Bundler.settings.set_command_option_if_given :path, options[:path]
       Bundler.settings.temporary(:path_relative_to_cwd => false) do

lib/bundler/gem_helper.rb

@@ -73,7 +73,7 @@ def install
 
     def build_gem
       file_name = nil
-      sh("#{gem_command} build -V #{spec_path}".shellsplit) do
+      sh("#{gem_command} build -V #{spec_path.shellescape}".shellsplit) do
         file_name = File.basename(built_gem_path)
         SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) }
         FileUtils.mv(built_gem_path, "pkg")
@@ -130,9 +130,8 @@ def gem_push_host
 
     def perform_git_push(options = "")
       cmd = "git push #{options}"
-      out, status = sh_with_status(cmd)
+      out, status = sh_with_status(cmd.shellsplit)
       return if status.success?
-      cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin)
       raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n"
     end
 

lib/bundler/rubygems_integration.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rubygems"
+require "rubygems" unless defined?(Gem)
 
 module Bundler
   class RubygemsIntegration

lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.1.2".freeze
+  VERSION = "2.1.3".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

man/bundle-add.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-ADD" "1" "December 2019" "" ""
+.TH "BUNDLE\-ADD" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install

man/bundle-add.1.txt

@@ -55,4 +55,4 @@ OPTIONS
 
 
 
-				 December 2019			 BUNDLE-ADD(1)
+				 January 2020			 BUNDLE-ADD(1)

man/bundle-binstubs.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-BINSTUBS" "1" "December 2019" "" ""
+.TH "BUNDLE\-BINSTUBS" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems

man/bundle-binstubs.1.txt

@@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS
 
 
 
-				 December 2019		    BUNDLE-BINSTUBS(1)
+				 January 2020		    BUNDLE-BINSTUBS(1)

man/bundle-cache.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CACHE" "1" "December 2019" "" ""
+.TH "BUNDLE\-CACHE" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application

man/bundle-cache.1.txt

@@ -75,4 +75,4 @@ REMOTE FETCHING
 
 
 
-				 December 2019		       BUNDLE-CACHE(1)
+				 January 2020		       BUNDLE-CACHE(1)

man/bundle-check.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CHECK" "1" "December 2019" "" ""
+.TH "BUNDLE\-CHECK" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems

man/bundle-check.1.txt

@@ -30,4 +30,4 @@ OPTIONS
 
 
 
-				 December 2019		       BUNDLE-CHECK(1)
+				 January 2020		       BUNDLE-CHECK(1)

man/bundle-clean.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CLEAN" "1" "December 2019" "" ""
+.TH "BUNDLE\-CLEAN" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory

man/bundle-clean.1.txt

@@ -23,4 +23,4 @@ OPTIONS
 
 
 
-				 December 2019		       BUNDLE-CLEAN(1)
+				 January 2020		       BUNDLE-CLEAN(1)

man/bundle-config.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CONFIG" "1" "December 2019" "" ""
+.TH "BUNDLE\-CONFIG" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options

man/bundle-config.1.txt

@@ -525,4 +525,4 @@ CONFIGURE BUNDLER DIRECTORIES
 
 
 
-				 December 2019		      BUNDLE-CONFIG(1)
+				 January 2020		      BUNDLE-CONFIG(1)

man/bundle-doctor.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-DOCTOR" "1" "December 2019" "" ""
+.TH "BUNDLE\-DOCTOR" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-doctor\fR \- Checks the bundle for common problems

man/bundle-doctor.1.txt

@@ -41,4 +41,4 @@ OPTIONS
 
 
 
-				 December 2019		      BUNDLE-DOCTOR(1)
+				 January 2020		      BUNDLE-DOCTOR(1)

man/bundle-exec.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-EXEC" "1" "December 2019" "" ""
+.TH "BUNDLE\-EXEC" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-exec\fR \- Execute a command in the context of the bundle

man/bundle-exec.1.txt

@@ -175,4 +175,4 @@ RUBYGEMS PLUGINS
 
 
 
-				 December 2019			BUNDLE-EXEC(1)
+				 January 2020			BUNDLE-EXEC(1)

man/bundle-gem.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-GEM" "1" "December 2019" "" ""
+.TH "BUNDLE\-GEM" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem

man/bundle-gem.1.txt

@@ -88,4 +88,4 @@ SEE ALSO
 
 
 
-				 December 2019			 BUNDLE-GEM(1)
+				 January 2020			 BUNDLE-GEM(1)

man/bundle-info.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INFO" "1" "December 2019" "" ""
+.TH "BUNDLE\-INFO" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-info\fR \- Show information for the given gem in your bundle

man/bundle-info.1.txt

@@ -18,4 +18,4 @@ OPTIONS
 
 
 
-				 December 2019			BUNDLE-INFO(1)
+				 January 2020			BUNDLE-INFO(1)

man/bundle-init.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INIT" "1" "December 2019" "" ""
+.TH "BUNDLE\-INIT" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-init\fR \- Generates a Gemfile into the current working directory

man/bundle-init.1.txt

@@ -31,4 +31,4 @@ SEE ALSO
 
 
 
-				 December 2019			BUNDLE-INIT(1)
+				 January 2020			BUNDLE-INIT(1)

man/bundle-inject.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INJECT" "1" "December 2019" "" ""
+.TH "BUNDLE\-INJECT" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile

man/bundle-inject.1.txt

@@ -29,4 +29,4 @@ DESCRIPTION
 
 
 
-				 December 2019		      BUNDLE-INJECT(1)
+				 January 2020		      BUNDLE-INJECT(1)

man/bundle-install.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INSTALL" "1" "December 2019" "" ""
+.TH "BUNDLE\-INSTALL" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile

man/bundle-install.1.txt

@@ -398,4 +398,4 @@ SEE ALSO
 
 
 
-				 December 2019		     BUNDLE-INSTALL(1)
+				 January 2020		     BUNDLE-INSTALL(1)

man/bundle-list.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-LIST" "1" "December 2019" "" ""
+.TH "BUNDLE\-LIST" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-list\fR \- List all the gems in the bundle

man/bundle-list.1.txt

@@ -40,4 +40,4 @@ OPTIONS
 
 
 
-				 December 2019			BUNDLE-LIST(1)
+				 January 2020			BUNDLE-LIST(1)

man/bundle-lock.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-LOCK" "1" "December 2019" "" ""
+.TH "BUNDLE\-LOCK" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing

man/bundle-lock.1.txt

@@ -90,4 +90,4 @@ PATCH LEVEL OPTIONS
 
 
 
-				 December 2019			BUNDLE-LOCK(1)
+				 January 2020			BUNDLE-LOCK(1)

man/bundle-open.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-OPEN" "1" "December 2019" "" ""
+.TH "BUNDLE\-OPEN" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-open\fR \- Opens the source directory for a gem in your bundle

man/bundle-open.1.txt

@@ -26,4 +26,4 @@ DESCRIPTION
 
 
 
-				 December 2019			BUNDLE-OPEN(1)
+				 January 2020			BUNDLE-OPEN(1)

man/bundle-outdated.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-OUTDATED" "1" "December 2019" "" ""
+.TH "BUNDLE\-OUTDATED" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-outdated\fR \- List installed gems with newer versions available

man/bundle-outdated.1.txt

@@ -128,4 +128,4 @@ FILTERING OUTPUT
 
 
 
-				 December 2019		    BUNDLE-OUTDATED(1)
+				 January 2020		    BUNDLE-OUTDATED(1)

man/bundle-platform.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-PLATFORM" "1" "December 2019" "" ""
+.TH "BUNDLE\-PLATFORM" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-platform\fR \- Displays platform compatibility information

man/bundle-platform.1.txt

@@ -54,4 +54,4 @@ OPTIONS
 
 
 
-				 December 2019		    BUNDLE-PLATFORM(1)
+				 January 2020		    BUNDLE-PLATFORM(1)

man/bundle-pristine.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-PRISTINE" "1" "December 2019" "" ""
+.TH "BUNDLE\-PRISTINE" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-pristine\fR \- Restores installed gems to their pristine condition

man/bundle-pristine.1.txt

@@ -41,4 +41,4 @@ DESCRIPTION
 
 
 
-				 December 2019		    BUNDLE-PRISTINE(1)
+				 January 2020		    BUNDLE-PRISTINE(1)

man/bundle-remove.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-REMOVE" "1" "December 2019" "" ""
+.TH "BUNDLE\-REMOVE" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-remove\fR \- Removes gems from the Gemfile

man/bundle-remove.1.txt

@@ -31,4 +31,4 @@ OPTIONS
 
 
 
-				 December 2019		      BUNDLE-REMOVE(1)
+				 January 2020		      BUNDLE-REMOVE(1)

man/bundle-show.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-SHOW" "1" "December 2019" "" ""
+.TH "BUNDLE\-SHOW" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem