From cc59e39de82c540e0d50d7033f913b359e5f694f Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Sat, 21 Dec 2019 23:41:35 +0000
Subject: [PATCH 01/11] Merge #7514
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

7514: Fix `rake build` when path has spaces on it r=colby-swandale a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that `rake build` can no longer be run from a path that has spaces on it.

### What was your diagnosis of the problem?

My diagnosis was that we need to escape the path for the shell somewhere.

### What is your fix for the problem, implemented in this PR?

My fix is to add `.shellescape` at the right place.

### Why did you choose this fix out of the possible options?

I chose this fix because it fixes the problem.

Fixes #7512.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
(cherry picked from commit 26888b6dcf420d050f4e7d963926ea97de8c7804)
---
 lib/bundler/gem_helper.rb      |  2 +-
 spec/runtime/gem_tasks_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb
index 7d4e382be8c..a09d03a448c 100644
--- a/lib/bundler/gem_helper.rb
+++ b/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")
diff --git a/spec/runtime/gem_tasks_spec.rb b/spec/runtime/gem_tasks_spec.rb
index 4b92de76bba..74270a23164 100644
--- a/spec/runtime/gem_tasks_spec.rb
+++ b/spec/runtime/gem_tasks_spec.rb
@@ -57,6 +57,20 @@
     expect(err).to be_empty
   end
 
+  context "rake build when path has spaces" do
+    before do
+      spaced_bundled_app = tmp.join("bundled app")
+      FileUtils.mv bundled_app, spaced_bundled_app
+      Dir.chdir(spaced_bundled_app)
+    end
+
+    it "still runs successfully" do
+      bundle! "exec rake build"
+
+      expect(err).to be_empty
+    end
+  end
+
   it "adds 'pkg' to rake/clean's CLOBBER" do
     with_gem_path_as(Spec::Path.base_system_gems.to_s) do
       sys_exec! %(#{rake} -e 'load "Rakefile"; puts CLOBBER.inspect')

From da4d63b2f06b1a6468b54baff9910b87b1a530a7 Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Sun, 22 Dec 2019 13:07:37 +0000
Subject: [PATCH 02/11] Merge #7515
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

7515: Move `bin/rake man:check` to `linting` phase r=colby-swandale a=deivid-rodriguez

So that it's only run once.

### What was the end-user problem that led to this PR?

The problem was that `bin/rake man:check` is run for every CI matrix entry and that's useless.

### What was your diagnosis of the problem?

My diagnosis was that we should move the check to the linting phase and run it only once, like we did for `rubocop` at https://github.com/bundler/bundler/pull/6830.

### What is your fix for the problem, implemented in this PR?

My fix is to do that.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
(cherry picked from commit 833faa964d3fed873742c03d1584b9d5a8172bee)
---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 14091cadea8..a428231133d 100644
--- a/.travis.yml
+++ b/.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

From 4e3ce16575e902e0853dbc1fcd2d42a4dcfb3d74 Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Mon, 23 Dec 2019 21:28:55 +0000
Subject: [PATCH 03/11] Merge #7510
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

7510: Don't spawn a shell when git pushing on release r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that I almost went crazy when trying to release the last bundler version. `rake release` was hanging and I didn't know why.

### What was your diagnosis of the problem?

Thanks to passing `DEBUG=true` to the task, I noticed that it was `git push` and `git push --tags` commands that were hanging:

```
$ DEBUG=true bin/rake release
["gem", "build", "-V", "/home/deivid/Code/bundler/bundler.gemspec"]
bundler 2.1.2 built to pkg/bundler-2.1.2.gem.
["git", "diff", "--exit-code"]
["git", "diff-index", "--quiet", "--cached", "HEAD"]
["git", "tag"]
["git", "tag", "-m", "Version 2.1.2", "v2.1.2"]
Tagged v2.1.2.
git push git push  --tags
^Crake aborted!
Interrupt:
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:198:in `read'
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:198:in `popen'
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:198:in `block in sh_with_status'
/home/deivid/Code/bundler/lib/bundler/shared_helpers.rb:52:in `chdir'
/home/deivid/Code/bundler/lib/bundler/shared_helpers.rb:52:in `block in chdir'
/home/deivid/Code/bundler/lib/bundler/shared_helpers.rb:51:in `chdir'
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:197:in `sh_with_status'
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:133:in `perform_git_push'
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:115:in `git_push'
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:64:in `block (2 levels) in install'
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:160:in `tag_version'
/home/deivid/Code/bundler/lib/bundler/gem_helper.rb:64:in `block in install'
/home/deivid/Code/bundler/Rakefile:14:in `block in invoke'
/home/deivid/Code/bundler/Rakefile:13:in `invoke'
/home/deivid/Code/bundler/spec/support/rubygems_ext.rb:87:in `load'
/home/deivid/Code/bundler/spec/support/rubygems_ext.rb:87:in `gem_load_and_activate'
/home/deivid/Code/bundler/spec/support/rubygems_ext.rb:45:in `gem_load'
Tasks: TOP => release => release:source_control_push
(See full trace by running task with --trace)
```

The debugging output is very interesting because it also tells us that these commands are the only ones passing Strings to `IO.popen` instead of Arrays. That means these commands are [spawning a new shell](https://ruby-doc.org/core-2.6.5/IO.html#method-c-popen).

That's when I realized that I have [hub](https://github.com/github/hub) installed on my system and `git` aliased to it. So I figure this aliasing was interacting with the subcommand in a bad way.

Indeed, disabling `hub` fixed the issue and let me make the release.

### What is your fix for the problem, implemented in this PR?

I think we can avoid other issues similar to this for people pushing releases by not spawing a shell here, just like we do with all of the other commands.

I think it's a good practice anyways.

### Why did you choose this fix out of the possible options?

I chose this fix because I think it makes the code better. Of course I can disable `hub` every time I release, but I think this is worth doing.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
(cherry picked from commit b1652efe9a561cf930c0351592459bbc2a2b2c98)
---
 lib/bundler/gem_helper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb
index a09d03a448c..204dd240521 100644
--- a/lib/bundler/gem_helper.rb
+++ b/lib/bundler/gem_helper.rb
@@ -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
 

From 078c45e0660cbca8d0e4bbb06bbdb71f0364578c Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Wed, 25 Dec 2019 06:06:07 +0000
Subject: [PATCH 04/11] Merge #7520

7520: Do `require "rubygems"` only when needed r=hsbt a=mame

### What was the end-user problem that led to this PR?

The require causes circular require.  See https://github.com/bundler/bundler/pull/7505#issuecomment-568832933

```
$ touch empty_file

$ RUBYGEMS_GEMDEPS=empty_file ./local/bin/ruby -w -e ''
/home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92: warning: /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92: warning: loading in progress, circular require considered harmful - /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb
	from <internal:gem_prelude>:1:in  `<internal:gem_prelude>'
	from <internal:gem_prelude>:1:in  `require'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1417:in  `<top (required)>'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1203:in  `use_gemdeps'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/user_interaction.rb:47:in  `use_ui'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1204:in  `block in use_gemdeps'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in  `require'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in  `require'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler.rb:11:in  `<top (required)>'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler.rb:11:in  `require_relative'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler/rubygems_integration.rb:3:in  `<top (required)>'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in  `require'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in  `require'
```

### What was your diagnosis of the problem?

Do not `require "rubygems"` blindly.

### What is your fix for the problem, implemented in this PR?

Add `unless defined?(Gem)` to make sure it does `require "rubygems"` only when rubygems is not required.

### Why did you choose this fix out of the possible options?

This is needed to release Ruby 2.7.0 so I chose the simplest fix.

Co-authored-by: Yusuke Endoh <mame@ruby-lang.org>
(cherry picked from commit 415e336035b0d8d49dd64b31d2dad78de84f4da3)
---
 lib/bundler/rubygems_integration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 18da5915a5d..d97621cd92c 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rubygems"
+require "rubygems" unless defined?(Gem)
 
 module Bundler
   class RubygemsIntegration

From 9cf51768dc5479bd274dbf6143ce3252d89a3ecb Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Tue, 31 Dec 2019 09:14:50 +0000
Subject: [PATCH 05/11] Merge #7526

7526: Fix CI failure with mustermann 1.1.0 r=deivid-rodriguez a=kou

### What was the end-user problem that led to this PR?

This PR doesn't fix any end-user problem.

This PR fixes a developer problem. Our CI is failed with mustermann 1.1.0.

### What was your diagnosis of the problem?

This is caused because mustermann 1.1.0 starts depending on ruby2_keyword gem but our test script doesn't add a load path for ruby2_keyword gem yet.

See also:

  * The PR that adds ruby2_keyword gem dependency to mustermann: https://github.com/sinatra/mustermann/pull/97
  * Error message on CI: https://github.com/bundler/bundler/pull/7523#issuecomment-569736683

### What is your fix for the problem, implemented in this PR?

My fix adds a load path for ruby2_keywrod gem installed in `tmp/1/gems/`.

### Why did you choose this fix out of the possible options?

I don't have another option.

Co-authored-by: Sutou Kouhei <kou@clear-code.com>
(cherry picked from commit 984bef1771b63d174db68016fb4e135f0526ec5d)
---
 spec/support/artifice/endpoint.rb     | 2 +-
 spec/support/artifice/endpoint_500.rb | 2 +-
 spec/support/artifice/windows.rb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/support/artifice/endpoint.rb b/spec/support/artifice/endpoint.rb
index 7bca681e700..7f4cafc2396 100644
--- a/spec/support/artifice/endpoint.rb
+++ b/spec/support/artifice/endpoint.rb
@@ -4,7 +4,7 @@
 require Spec::Path.lib_dir.join("bundler/deprecate")
 include Spec::Path
 
-$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s))
+$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
 
 require "artifice"
 require "sinatra/base"
diff --git a/spec/support/artifice/endpoint_500.rb b/spec/support/artifice/endpoint_500.rb
index f98e7e3bc25..7c1c4365bb7 100644
--- a/spec/support/artifice/endpoint_500.rb
+++ b/spec/support/artifice/endpoint_500.rb
@@ -3,7 +3,7 @@
 require_relative "../path"
 include Spec::Path
 
-$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s))
+$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
 
 require "artifice"
 require "sinatra/base"
diff --git a/spec/support/artifice/windows.rb b/spec/support/artifice/windows.rb
index 21170c81d9c..c31c6fff793 100644
--- a/spec/support/artifice/windows.rb
+++ b/spec/support/artifice/windows.rb
@@ -3,7 +3,7 @@
 require_relative "../path"
 include Spec::Path
 
-$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s))
+$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
 
 require "artifice"
 require "sinatra/base"

From 4501092e66146d55208a1bde5d6c9a350d8c9138 Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Tue, 31 Dec 2019 09:54:18 +0000
Subject: [PATCH 06/11] Merge #7523

7523: Fix rspec stuck problem for large stderr external command r=deivid-rodriguez a=kou

### What was the end-user problem that led to this PR?

This PR doesn't fix any end-user problem.

This PR just fixes a developer problem.

Some specs runs external commands by `sys_exec` in `spec/support/helpers.rb`. They may be stuck when they outputs many text to its stderr.

### What was your diagnosis of the problem?

`sys_exec` uses `open3`. It uses pipe to communicate an external command. If `rspec` process doesn't read stderr of the external command, the external command is stuck when the external command writes many text to its stderr. Because the external command can't write to pipe infinitely.

### What is your fix for the problem, implemented in this PR?

The current `sys_exec` tries to fix this situation but it's incomplete:

```ruby
        command_execution.stdout = Thread.new { stdout.read }.value.strip
        command_execution.stderr = Thread.new { stderr.read }.value.strip
```

`Thread.new { stderr.read ` isn't started until `Thread.new { stdout.read }.value` is finished. Normally, it's finished when the external command is finished. It's late. We should read stderr of the external command while the external command is alive.

### Why did you choose this fix out of the possible options?

I don't have another option.

Co-authored-by: Sutou Kouhei <kou@clear-code.com>
(cherry picked from commit 8917d9dc4e9787fb93a73a2ec14fa212568e9f05)
---
 spec/support/helpers.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 7d1bd651854..e9c9e766cf1 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -210,8 +210,10 @@ def sys_exec(cmd, env = {})
         yield stdin, stdout, wait_thr if block_given?
         stdin.close
 
-        command_execution.stdout = Thread.new { stdout.read }.value.strip
-        command_execution.stderr = Thread.new { stderr.read }.value.strip
+        stdout_read_thread = Thread.new { stdout.read }
+        stderr_read_thread = Thread.new { stderr.read }
+        command_execution.stdout = stdout_read_thread.value.strip
+        command_execution.stderr = stderr_read_thread.value.strip
         command_execution.exitstatus = wait_thr && wait_thr.value.exitstatus
       end
 

From 80e919280df0fd984a0ae1bb6eba5e7ea408b97d Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Tue, 31 Dec 2019 11:13:07 +0000
Subject: [PATCH 07/11] Merge #7525

7525: Use raise instead of flunk r=deivid-rodriguez a=kou

### What was the end-user problem that led to this PR?

This PR doesn't fix any end-user problem.

This PR fixes a developer problem.

RSpec doesn't provide `flunk` method. It's a method name in test-unit and minitest.

### What was your diagnosis of the problem?

3edfddbf7ebe4b942e1e2b6d693afd582e9a8147 may use `flunk` accidentally.

### What is your fix for the problem, implemented in this PR?

My fix uses `raise` instead of `flunk`.

### Why did you choose this fix out of the possible options?

I don't have another option.

Co-authored-by: Sutou Kouhei <kou@clear-code.com>
(cherry picked from commit 9b9eeddb05feced8d48fbe15a9064de9a10abd18)
---
 spec/support/indexes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/indexes.rb b/spec/support/indexes.rb
index b76f493d013..dc6e0bd1e91 100644
--- a/spec/support/indexes.rb
+++ b/spec/support/indexes.rb
@@ -45,7 +45,7 @@ def should_resolve_and_include(specs, args = [])
 
     def should_conflict_on(names)
       got = resolve
-      flunk "The resolve succeeded with: #{got.map(&:full_name).sort.inspect}"
+      raise "The resolve succeeded with: #{got.map(&:full_name).sort.inspect}"
     rescue Bundler::VersionConflict => e
       expect(Array(names).sort).to eq(e.conflicts.sort)
     end

From 3c3a9cad7b994d977cf257cd50040d3176f4ceb0 Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Tue, 31 Dec 2019 19:38:11 +0000
Subject: [PATCH 08/11] Merge #7519
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

7519: Make `bundle config deployment true` equivalent to `bundle install --deployment` in regards to configuration r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that while addressing comments for https://github.com/docker-library/official-images/pull/7188, I noticed that the alternative we're recommending for `bundle install --deployment`, i.e., `bundle config set deployment true`, is not equivalent to it.

### What was your diagnosis of the problem?

My diagnosis was that whereas `bundle install --deployment` configures bundler to be frozen AND to install gems to `vendor/bundle`, `bundle config deployment true` only configures bundler to be frozen.

### What is your fix for the problem, implemented in this PR?

My fix is to make `bundle config deployment true`  behave just like `bundle install --deployment` in regards to configuration.

### Why did you choose this fix out of the possible options?

I chose this fix because all the commands we're suggesting as alternatives for deprecations should be actual alternatives that work exactly in the same way.

Also, note that there's a change scheduled for bundler 3 where the `deployment` configuration will only mean `frozen`. But for now, we should focus on making sure that people moves away from CLI flags in favor of configuration, so we might want to delay that change to make things less confusing.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
(cherry picked from commit 9719efcacd4e8aa92e0c280122c13457bd17d907)
---
 lib/bundler/cli/install.rb     |   5 +-
 spec/commands/outdated_spec.rb |   2 +-
 spec/commands/update_spec.rb   |   2 +-
 spec/install/deploy_spec.rb    | 178 ++++++++++++++++++---------------
 4 files changed, 104 insertions(+), 83 deletions(-)

diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index d823fb632ff..ecd474971dc 100644
--- a/lib/bundler/cli/install.rb
+++ b/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
diff --git a/spec/commands/outdated_spec.rb b/spec/commands/outdated_spec.rb
index 6e82d34b056..df911eaffd8 100644
--- a/spec/commands/outdated_spec.rb
+++ b/spec/commands/outdated_spec.rb
@@ -423,7 +423,7 @@ def test_group_option(group = nil, gems_list_size = 1)
       expect(err).to include("You are trying to check outdated gems in deployment mode.")
       expect(err).to include("Run `bundle outdated` elsewhere.")
       expect(err).to include("If this is a development machine, remove the ")
-      expect(err).to include("Gemfile freeze\nby running `bundle install --no-deployment`.")
+      expect(err).to include("Gemfile freeze\nby running `bundle config unset deployment`.")
     end
   end
 
diff --git a/spec/commands/update_spec.rb b/spec/commands/update_spec.rb
index a0c7e33299f..e4449312ebf 100644
--- a/spec/commands/update_spec.rb
+++ b/spec/commands/update_spec.rb
@@ -286,7 +286,7 @@
 
       expect(last_command).to be_failure
       expect(err).to match(/You are trying to install in deployment mode after changing.your Gemfile/m)
-      expect(err).to match(/freeze \nby running `bundle install --no-deployment`./m)
+      expect(err).to match(/freeze \nby running `bundle config unset deployment`./m)
     end
 
     it "should suggest different command when frozen is set globally", :bundler => "< 3" do
diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
index 89da3fc8014..f92a531bf53 100644
--- a/spec/install/deploy_spec.rb
+++ b/spec/install/deploy_spec.rb
@@ -34,7 +34,7 @@
       expect(exitstatus).to eq(15) if exitstatus
     end
 
-    it "works after you try to deploy without a lock" do
+    it "doesn't mess up a subsequent `bundle install` after you try to deploy without a lock" do
       bundle "install --deployment"
       bundle! :install
       expect(the_bundle).to include_gems "rack 1.0"
@@ -42,7 +42,7 @@
   end
 
   it "still works if you are not in the app directory and specify --gemfile" do
-    bundle "install"
+    bundle! "install"
     Dir.chdir tmp do
       simulate_new_machine
       bundle! :install,
@@ -60,12 +60,12 @@
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       end
     G
-    bundle :install
+    bundle! :install
     bundle! :install, forgotten_command_line_options(:deployment => true, :without => "test")
   end
 
   it "works when you bundle exec bundle" do
-    bundle :install
+    bundle! :install
     bundle "install --deployment"
     bundle! "exec bundle check"
   end
@@ -104,9 +104,90 @@
     expect(the_bundle).to include_gems "rack 1.0"
   end
 
+  context "when replacing a host with the same host with credentials" do
+    before do
+      bundle! "install", forgotten_command_line_options(:path => "vendor/bundle")
+      gemfile <<-G
+      source "http://user_name:password@localgemserver.test/"
+      gem "rack"
+      G
+
+      lockfile <<-G
+      GEM
+        remote: http://localgemserver.test/
+        specs:
+          rack (1.0.0)
+
+      PLATFORMS
+        #{local}
+
+      DEPENDENCIES
+        rack
+      G
+
+      bundle! "config set --local deployment true"
+    end
+
+    it "prevents the replace by default" do
+      bundle :install
+
+      expect(err).to match(/The list of sources changed/)
+    end
+
+    context "when allow_deployment_source_credential_changes is true" do
+      before { bundle! "config set allow_deployment_source_credential_changes true" }
+
+      it "allows the replace" do
+        bundle! :install
+
+        expect(out).to match(/Bundle complete!/)
+      end
+    end
+
+    context "when allow_deployment_source_credential_changes is false" do
+      before { bundle! "config set allow_deployment_source_credential_changes false" }
+
+      it "prevents the replace" do
+        bundle :install
+
+        expect(err).to match(/The list of sources changed/)
+      end
+    end
+
+    context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is true" do
+      before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "true" }
+
+      it "allows the replace" do
+        bundle :install
+
+        expect(out).to match(/Bundle complete!/)
+      end
+    end
+
+    context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is false" do
+      before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "false" }
+
+      it "prevents the replace" do
+        bundle :install
+
+        expect(err).to match(/The list of sources changed/)
+      end
+    end
+  end
+
   describe "with an existing lockfile" do
     before do
-      bundle "install"
+      bundle! "install"
+    end
+
+    it "installs gems by default to vendor/bundle", :bundler => "< 3" do
+      bundle! "install --deployment"
+      expect(out).to include("vendor/bundle")
+    end
+
+    it "installs gems to custom path if specified", :bundler => "< 3" do
+      bundle! "install --path vendor/bundle2 --deployment"
+      expect(out).to include("vendor/bundle2")
     end
 
     it "works with the --deployment flag if you didn't change anything", :bundler => "< 3" do
@@ -197,6 +278,19 @@
       expect(err).not_to include("You have changed in the Gemfile")
     end
 
+    it "installs gems by default to vendor/bundle when `--deployment` is set via an environment variable", :bundler => "< 3" do
+      ENV["BUNDLE_DEPLOYMENT"] = "true"
+      bundle "install"
+      expect(out).to include("vendor/bundle")
+    end
+
+    it "installs gems to custom path when deployment mode is set via an environment variable ", :bundler => "< 3" do
+      ENV["BUNDLE_DEPLOYMENT"] = "true"
+      ENV["BUNDLE_PATH"] = "vendor/bundle2"
+      bundle "install"
+      expect(out).to include("vendor/bundle2")
+    end
+
     it "can have --frozen set to false via an environment variable" do
       gemfile <<-G
         source "#{file_uri_for(gem_repo1)}"
@@ -280,80 +374,6 @@
       expect(err).not_to include("You have deleted from the Gemfile")
     end
 
-    context "when replacing a host with the same host with credentials" do
-      let(:success_message) do
-        "Bundle complete!"
-      end
-
-      before do
-        install_gemfile <<-G
-        source "http://user_name:password@localgemserver.test/"
-        gem "rack"
-        G
-
-        lockfile <<-G
-        GEM
-          remote: http://localgemserver.test/
-          specs:
-            rack (1.0.0)
-
-        PLATFORMS
-          #{local}
-
-        DEPENDENCIES
-          rack
-        G
-
-        bundle! "config set --local deployment true"
-      end
-
-      it "prevents the replace by default" do
-        bundle :install
-
-        expect(err).to match(/The list of sources changed/)
-      end
-
-      context "when allow_deployment_source_credential_changes is true" do
-        before { bundle! "config set allow_deployment_source_credential_changes true" }
-
-        it "allows the replace" do
-          bundle :install
-
-          expect(out).to match(/#{success_message}/)
-        end
-      end
-
-      context "when allow_deployment_source_credential_changes is false" do
-        before { bundle! "config set allow_deployment_source_credential_changes false" }
-
-        it "prevents the replace" do
-          bundle :install
-
-          expect(err).to match(/The list of sources changed/)
-        end
-      end
-
-      context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is true" do
-        before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "true" }
-
-        it "allows the replace" do
-          bundle :install
-
-          expect(out).to match(/#{success_message}/)
-        end
-      end
-
-      context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is false" do
-        before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "false" }
-
-        it "prevents the replace" do
-          bundle :install
-
-          expect(err).to match(/The list of sources changed/)
-        end
-      end
-    end
-
     it "remembers that the bundle is frozen at runtime" do
       bundle! :lock
 

From 8bf76b36b67e56bb70fb6534c40d22082aaa653d Mon Sep 17 00:00:00 2001
From: Bundlerbot <bot@bundler.io>
Date: Wed, 1 Jan 2020 21:44:00 +0000
Subject: [PATCH 09/11] Merge #7533
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

7533: Rebuild man pages for January r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was man pages are out of date.

### What is your fix for the problem, implemented in this PR?

My fix is to bring them up to date.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
(cherry picked from commit c93740f7d05468d053f6aab7d6c88cb0319f96ab)
---
 man/bundle-add.1          | 2 +-
 man/bundle-add.1.txt      | 2 +-
 man/bundle-binstubs.1     | 2 +-
 man/bundle-binstubs.1.txt | 2 +-
 man/bundle-cache.1        | 2 +-
 man/bundle-cache.1.txt    | 2 +-
 man/bundle-check.1        | 2 +-
 man/bundle-check.1.txt    | 2 +-
 man/bundle-clean.1        | 2 +-
 man/bundle-clean.1.txt    | 2 +-
 man/bundle-config.1       | 2 +-
 man/bundle-config.1.txt   | 2 +-
 man/bundle-doctor.1       | 2 +-
 man/bundle-doctor.1.txt   | 2 +-
 man/bundle-exec.1         | 2 +-
 man/bundle-exec.1.txt     | 2 +-
 man/bundle-gem.1          | 2 +-
 man/bundle-gem.1.txt      | 2 +-
 man/bundle-info.1         | 2 +-
 man/bundle-info.1.txt     | 2 +-
 man/bundle-init.1         | 2 +-
 man/bundle-init.1.txt     | 2 +-
 man/bundle-inject.1       | 2 +-
 man/bundle-inject.1.txt   | 2 +-
 man/bundle-install.1      | 2 +-
 man/bundle-install.1.txt  | 2 +-
 man/bundle-list.1         | 2 +-
 man/bundle-list.1.txt     | 2 +-
 man/bundle-lock.1         | 2 +-
 man/bundle-lock.1.txt     | 2 +-
 man/bundle-open.1         | 2 +-
 man/bundle-open.1.txt     | 2 +-
 man/bundle-outdated.1     | 2 +-
 man/bundle-outdated.1.txt | 2 +-
 man/bundle-platform.1     | 2 +-
 man/bundle-platform.1.txt | 2 +-
 man/bundle-pristine.1     | 2 +-
 man/bundle-pristine.1.txt | 2 +-
 man/bundle-remove.1       | 2 +-
 man/bundle-remove.1.txt   | 2 +-
 man/bundle-show.1         | 2 +-
 man/bundle-show.1.txt     | 2 +-
 man/bundle-update.1       | 2 +-
 man/bundle-update.1.txt   | 2 +-
 man/bundle-viz.1          | 2 +-
 man/bundle-viz.1.txt      | 2 +-
 man/bundle.1              | 2 +-
 man/bundle.1.txt          | 2 +-
 man/gemfile.5             | 2 +-
 man/gemfile.5.txt         | 2 +-
 50 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/man/bundle-add.1 b/man/bundle-add.1
index 24bfe50f4f0..8b75859104f 100644
--- a/man/bundle-add.1
+++ b/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
diff --git a/man/bundle-add.1.txt b/man/bundle-add.1.txt
index aff9977fb12..dcd76df4ae7 100644
--- a/man/bundle-add.1.txt
+++ b/man/bundle-add.1.txt
@@ -55,4 +55,4 @@ OPTIONS
 
 
 
-				 December 2019			 BUNDLE-ADD(1)
+				 January 2020			 BUNDLE-ADD(1)
diff --git a/man/bundle-binstubs.1 b/man/bundle-binstubs.1
index 4e69bfb7159..4f9e5c0e319 100644
--- a/man/bundle-binstubs.1
+++ b/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
diff --git a/man/bundle-binstubs.1.txt b/man/bundle-binstubs.1.txt
index 564989bd8a6..cbd2b12da0e 100644
--- a/man/bundle-binstubs.1.txt
+++ b/man/bundle-binstubs.1.txt
@@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS
 
 
 
-				 December 2019		    BUNDLE-BINSTUBS(1)
+				 January 2020		    BUNDLE-BINSTUBS(1)
diff --git a/man/bundle-cache.1 b/man/bundle-cache.1
index 23bc757d035..cb376777ffb 100644
--- a/man/bundle-cache.1
+++ b/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
diff --git a/man/bundle-cache.1.txt b/man/bundle-cache.1.txt
index 4dcc7c9cc96..c0b8b5bf078 100644
--- a/man/bundle-cache.1.txt
+++ b/man/bundle-cache.1.txt
@@ -75,4 +75,4 @@ REMOTE FETCHING
 
 
 
-				 December 2019		       BUNDLE-CACHE(1)
+				 January 2020		       BUNDLE-CACHE(1)
diff --git a/man/bundle-check.1 b/man/bundle-check.1
index ac80f697f54..aba5b66348f 100644
--- a/man/bundle-check.1
+++ b/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
diff --git a/man/bundle-check.1.txt b/man/bundle-check.1.txt
index 05d1c7dc5c4..cca5fae9e17 100644
--- a/man/bundle-check.1.txt
+++ b/man/bundle-check.1.txt
@@ -30,4 +30,4 @@ OPTIONS
 
 
 
-				 December 2019		       BUNDLE-CHECK(1)
+				 January 2020		       BUNDLE-CHECK(1)
diff --git a/man/bundle-clean.1 b/man/bundle-clean.1
index 61fcf9d3964..cc5c8e86d7a 100644
--- a/man/bundle-clean.1
+++ b/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
diff --git a/man/bundle-clean.1.txt b/man/bundle-clean.1.txt
index 9438f8adc90..300d0c0b518 100644
--- a/man/bundle-clean.1.txt
+++ b/man/bundle-clean.1.txt
@@ -23,4 +23,4 @@ OPTIONS
 
 
 
-				 December 2019		       BUNDLE-CLEAN(1)
+				 January 2020		       BUNDLE-CLEAN(1)
diff --git a/man/bundle-config.1 b/man/bundle-config.1
index 56ef24791d0..c3464fb2ec4 100644
--- a/man/bundle-config.1
+++ b/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
diff --git a/man/bundle-config.1.txt b/man/bundle-config.1.txt
index bc3fe390699..f5fc0ce12a4 100644
--- a/man/bundle-config.1.txt
+++ b/man/bundle-config.1.txt
@@ -525,4 +525,4 @@ CONFIGURE BUNDLER DIRECTORIES
 
 
 
-				 December 2019		      BUNDLE-CONFIG(1)
+				 January 2020		      BUNDLE-CONFIG(1)
diff --git a/man/bundle-doctor.1 b/man/bundle-doctor.1
index d3e3e73bbe5..344c40066be 100644
--- a/man/bundle-doctor.1
+++ b/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
diff --git a/man/bundle-doctor.1.txt b/man/bundle-doctor.1.txt
index 6b2fdcbdf42..595ba996333 100644
--- a/man/bundle-doctor.1.txt
+++ b/man/bundle-doctor.1.txt
@@ -41,4 +41,4 @@ OPTIONS
 
 
 
-				 December 2019		      BUNDLE-DOCTOR(1)
+				 January 2020		      BUNDLE-DOCTOR(1)
diff --git a/man/bundle-exec.1 b/man/bundle-exec.1
index fa0728a5de1..555819a5b43 100644
--- a/man/bundle-exec.1
+++ b/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
diff --git a/man/bundle-exec.1.txt b/man/bundle-exec.1.txt
index efcb130b48e..ebdc2fda713 100644
--- a/man/bundle-exec.1.txt
+++ b/man/bundle-exec.1.txt
@@ -175,4 +175,4 @@ RUBYGEMS PLUGINS
 
 
 
-				 December 2019			BUNDLE-EXEC(1)
+				 January 2020			BUNDLE-EXEC(1)
diff --git a/man/bundle-gem.1 b/man/bundle-gem.1
index 9971e3528c2..baed185e70a 100644
--- a/man/bundle-gem.1
+++ b/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
diff --git a/man/bundle-gem.1.txt b/man/bundle-gem.1.txt
index c95c409c659..554bb1a41b0 100644
--- a/man/bundle-gem.1.txt
+++ b/man/bundle-gem.1.txt
@@ -88,4 +88,4 @@ SEE ALSO
 
 
 
-				 December 2019			 BUNDLE-GEM(1)
+				 January 2020			 BUNDLE-GEM(1)
diff --git a/man/bundle-info.1 b/man/bundle-info.1
index 9dbef738fa0..d7c73e9bb70 100644
--- a/man/bundle-info.1
+++ b/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
diff --git a/man/bundle-info.1.txt b/man/bundle-info.1.txt
index 102ec48f6ec..67563aa191e 100644
--- a/man/bundle-info.1.txt
+++ b/man/bundle-info.1.txt
@@ -18,4 +18,4 @@ OPTIONS
 
 
 
-				 December 2019			BUNDLE-INFO(1)
+				 January 2020			BUNDLE-INFO(1)
diff --git a/man/bundle-init.1 b/man/bundle-init.1
index 8fe0d024063..803d4b9be80 100644
--- a/man/bundle-init.1
+++ b/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
diff --git a/man/bundle-init.1.txt b/man/bundle-init.1.txt
index 187ed4b3c04..2565edbecef 100644
--- a/man/bundle-init.1.txt
+++ b/man/bundle-init.1.txt
@@ -31,4 +31,4 @@ SEE ALSO
 
 
 
-				 December 2019			BUNDLE-INIT(1)
+				 January 2020			BUNDLE-INIT(1)
diff --git a/man/bundle-inject.1 b/man/bundle-inject.1
index afc328771e0..3370a915730 100644
--- a/man/bundle-inject.1
+++ b/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
diff --git a/man/bundle-inject.1.txt b/man/bundle-inject.1.txt
index a73927cef0c..4707b99e5f4 100644
--- a/man/bundle-inject.1.txt
+++ b/man/bundle-inject.1.txt
@@ -29,4 +29,4 @@ DESCRIPTION
 
 
 
-				 December 2019		      BUNDLE-INJECT(1)
+				 January 2020		      BUNDLE-INJECT(1)
diff --git a/man/bundle-install.1 b/man/bundle-install.1
index 200acfca241..4a289f5c2ed 100644
--- a/man/bundle-install.1
+++ b/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
diff --git a/man/bundle-install.1.txt b/man/bundle-install.1.txt
index 08a0869d6f8..b1a9ad1eb3c 100644
--- a/man/bundle-install.1.txt
+++ b/man/bundle-install.1.txt
@@ -398,4 +398,4 @@ SEE ALSO
 
 
 
-				 December 2019		     BUNDLE-INSTALL(1)
+				 January 2020		     BUNDLE-INSTALL(1)
diff --git a/man/bundle-list.1 b/man/bundle-list.1
index 53427b4504c..72bc391ac20 100644
--- a/man/bundle-list.1
+++ b/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
diff --git a/man/bundle-list.1.txt b/man/bundle-list.1.txt
index f4eab62783d..645e62e4525 100644
--- a/man/bundle-list.1.txt
+++ b/man/bundle-list.1.txt
@@ -40,4 +40,4 @@ OPTIONS
 
 
 
-				 December 2019			BUNDLE-LIST(1)
+				 January 2020			BUNDLE-LIST(1)
diff --git a/man/bundle-lock.1 b/man/bundle-lock.1
index b64a645eb80..89f6e351799 100644
--- a/man/bundle-lock.1
+++ b/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
diff --git a/man/bundle-lock.1.txt b/man/bundle-lock.1.txt
index a50ee25643c..80dcada5b33 100644
--- a/man/bundle-lock.1.txt
+++ b/man/bundle-lock.1.txt
@@ -90,4 +90,4 @@ PATCH LEVEL OPTIONS
 
 
 
-				 December 2019			BUNDLE-LOCK(1)
+				 January 2020			BUNDLE-LOCK(1)
diff --git a/man/bundle-open.1 b/man/bundle-open.1
index 6213aeca655..5a11eeeb644 100644
--- a/man/bundle-open.1
+++ b/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
diff --git a/man/bundle-open.1.txt b/man/bundle-open.1.txt
index 9ecc89c10a9..288bbce0e3c 100644
--- a/man/bundle-open.1.txt
+++ b/man/bundle-open.1.txt
@@ -26,4 +26,4 @@ DESCRIPTION
 
 
 
-				 December 2019			BUNDLE-OPEN(1)
+				 January 2020			BUNDLE-OPEN(1)
diff --git a/man/bundle-outdated.1 b/man/bundle-outdated.1
index 81543bb65b3..408e568034b 100644
--- a/man/bundle-outdated.1
+++ b/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
diff --git a/man/bundle-outdated.1.txt b/man/bundle-outdated.1.txt
index 905a1fd9fc9..c938e0a4abc 100644
--- a/man/bundle-outdated.1.txt
+++ b/man/bundle-outdated.1.txt
@@ -128,4 +128,4 @@ FILTERING OUTPUT
 
 
 
-				 December 2019		    BUNDLE-OUTDATED(1)
+				 January 2020		    BUNDLE-OUTDATED(1)
diff --git a/man/bundle-platform.1 b/man/bundle-platform.1
index f7f65045dc9..c83aa3c5d4e 100644
--- a/man/bundle-platform.1
+++ b/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
diff --git a/man/bundle-platform.1.txt b/man/bundle-platform.1.txt
index d808bed64f7..f9dc8ccc1f7 100644
--- a/man/bundle-platform.1.txt
+++ b/man/bundle-platform.1.txt
@@ -54,4 +54,4 @@ OPTIONS
 
 
 
-				 December 2019		    BUNDLE-PLATFORM(1)
+				 January 2020		    BUNDLE-PLATFORM(1)
diff --git a/man/bundle-pristine.1 b/man/bundle-pristine.1
index 5b3522dd1ae..460e3d4e5a1 100644
--- a/man/bundle-pristine.1
+++ b/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
diff --git a/man/bundle-pristine.1.txt b/man/bundle-pristine.1.txt
index a22bd539273..8d474fe4972 100644
--- a/man/bundle-pristine.1.txt
+++ b/man/bundle-pristine.1.txt
@@ -41,4 +41,4 @@ DESCRIPTION
 
 
 
-				 December 2019		    BUNDLE-PRISTINE(1)
+				 January 2020		    BUNDLE-PRISTINE(1)
diff --git a/man/bundle-remove.1 b/man/bundle-remove.1
index 4a4ed7ac951..cb4ad8d3847 100644
--- a/man/bundle-remove.1
+++ b/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
diff --git a/man/bundle-remove.1.txt b/man/bundle-remove.1.txt
index 7c8945e2c06..7203422f397 100644
--- a/man/bundle-remove.1.txt
+++ b/man/bundle-remove.1.txt
@@ -31,4 +31,4 @@ OPTIONS
 
 
 
-				 December 2019		      BUNDLE-REMOVE(1)
+				 January 2020		      BUNDLE-REMOVE(1)
diff --git a/man/bundle-show.1 b/man/bundle-show.1
index 575619370b9..2922a33467e 100644
--- a/man/bundle-show.1
+++ b/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
diff --git a/man/bundle-show.1.txt b/man/bundle-show.1.txt
index fa800814277..58f16201683 100644
--- a/man/bundle-show.1.txt
+++ b/man/bundle-show.1.txt
@@ -24,4 +24,4 @@ OPTIONS
 
 
 
-				 December 2019			BUNDLE-SHOW(1)
+				 January 2020			BUNDLE-SHOW(1)
diff --git a/man/bundle-update.1 b/man/bundle-update.1
index 6a3fd877e2a..f315532bb94 100644
--- a/man/bundle-update.1
+++ b/man/bundle-update.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-UPDATE" "1" "December 2019" "" ""
+.TH "BUNDLE\-UPDATE" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-update\fR \- Update your gems to the latest available versions
diff --git a/man/bundle-update.1.txt b/man/bundle-update.1.txt
index c54ade97136..b8208c75d37 100644
--- a/man/bundle-update.1.txt
+++ b/man/bundle-update.1.txt
@@ -387,4 +387,4 @@ RECOMMENDED WORKFLOW
 
 
 
-				 December 2019		      BUNDLE-UPDATE(1)
+				 January 2020		      BUNDLE-UPDATE(1)
diff --git a/man/bundle-viz.1 b/man/bundle-viz.1
index f1852e4206b..a2153da28dd 100644
--- a/man/bundle-viz.1
+++ b/man/bundle-viz.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-VIZ" "1" "December 2019" "" ""
+.TH "BUNDLE\-VIZ" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile
diff --git a/man/bundle-viz.1.txt b/man/bundle-viz.1.txt
index 7956cf18ed8..c934b4cf5bc 100644
--- a/man/bundle-viz.1.txt
+++ b/man/bundle-viz.1.txt
@@ -36,4 +36,4 @@ OPTIONS
 
 
 
-				 December 2019			 BUNDLE-VIZ(1)
+				 January 2020			 BUNDLE-VIZ(1)
diff --git a/man/bundle.1 b/man/bundle.1
index 93a43c0c700..4a9a9bec4de 100644
--- a/man/bundle.1
+++ b/man/bundle.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE" "1" "December 2019" "" ""
+.TH "BUNDLE" "1" "January 2020" "" ""
 .
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management
diff --git a/man/bundle.1.txt b/man/bundle.1.txt
index cd0fabadeae..e7eb35aa14a 100644
--- a/man/bundle.1.txt
+++ b/man/bundle.1.txt
@@ -113,4 +113,4 @@ OBSOLETE
 
 
 
-				 December 2019			     BUNDLE(1)
+				 January 2020			     BUNDLE(1)
diff --git a/man/gemfile.5 b/man/gemfile.5
index 536af70a6e2..a9d2cee7c70 100644
--- a/man/gemfile.5
+++ b/man/gemfile.5
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GEMFILE" "5" "December 2019" "" ""
+.TH "GEMFILE" "5" "January 2020" "" ""
 .
 .SH "NAME"
 \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
diff --git a/man/gemfile.5.txt b/man/gemfile.5.txt
index b3da595b17a..71d2513271f 100644
--- a/man/gemfile.5.txt
+++ b/man/gemfile.5.txt
@@ -646,4 +646,4 @@ SOURCE PRIORITY
 
 
 
-				 December 2019			    GEMFILE(5)
+				 January 2020			    GEMFILE(5)

From 7fdb7faeaebaa349cf5c6c14b5c14166289bfd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Wed, 1 Jan 2020 20:52:54 +0100
Subject: [PATCH 10/11] Version 2.1.3

---
 lib/bundler/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index b63e39b8d20..65914b58310 100644
--- a/lib/bundler/version.rb
+++ b/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

From 784c368617cb8a6f4b5a10460b3783cd26222c93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Wed, 1 Jan 2020 20:58:00 +0100
Subject: [PATCH 11/11] Changelog for 2.1.3

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 612b0e36bb9..7d66fbc58a1 100644
--- a/CHANGELOG.md
+++ b/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: