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]>

Author: bundlerbot

.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

@@ -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/cli/install.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/gem_helper.rb

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

lib/bundler/rubygems_integration.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

lib/bundler/version.rb

@@ -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

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

man/bundle-add.1.txt

@@ -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

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