From 6b23e523c337d966457e4c034a5e86b902ebcc4c Mon Sep 17 00:00:00 2001
From: Kir Shatrov <shatrov@me.com>
Date: Wed, 24 Jun 2015 09:56:05 +0300
Subject: [PATCH] Revert "use default bundle_path in deployment"

Thanks to @pjungwir
Close #71

This reverts commit 9414388930717f557927ab2e73a51ec8077f4bdb.

Conflicts:
	CHANGELOG.md
	lib/capistrano/tasks/bundler.cap
---
 CHANGELOG.md                     | 5 -----
 README.md                        | 7 +------
 lib/capistrano/tasks/bundler.cap | 6 +++---
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bffb837..1945acfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,6 @@
 (master)
 
 * Use `bundle check` to check if we can skip `bundle install`
-* Add `vendor/bundle/` to `linked_dirs`.
-* Set default for `bundle_path` to `nil`, which means Bundler chooses `vendor/bundle/`.
-    * If you did not change the default `bundle_path` make sure to cleanup the
-      old bundle path `shared/bundle/` which is now unused. The new default is
-      `shared/vendor/bundle/`.
 
 # 1.1.4 (22 Jan 2014)
 
diff --git a/README.md b/README.md
index 4edf9240..7426d4a7 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ set :bundle_roles, :all                                         # this is defaul
 set :bundle_servers, -> { release_roles(fetch(:bundle_roles)) } # this is default
 set :bundle_binstubs, -> { shared_path.join('bin') }            # default: nil
 set :bundle_gemfile, -> { release_path.join('MyGemfile') }      # default: nil
-set :bundle_path, -> { shared_path.join('my_special_bundle') }  # default: nil
+set :bundle_path, -> { shared_path.join('bundle') }             # this is default
 set :bundle_without, %w{development test}.join(' ')             # this is default
 set :bundle_flags, '--deployment --quiet'                       # this is default
 set :bundle_env_variables, {}                                   # this is default
@@ -72,11 +72,6 @@ To generate binstubs on each deploy, set `:bundle_binstubs` path:
 set :bundle_binstubs, -> { shared_path.join('bin') }
 ```
 
-Bundler uses `vendor/bundle/` as path for gems if called with `--deployment`.
-Therefore this gem adds that path to `linked_dirs`. See the [Bundler
-documentation](http://bundler.io/v1.7/man/bundle-install.1.html#DEPLOYMENT-MODE)
-for details.
-
 In the result this would execute the following bundle command on all servers
 (actual paths depend on the real deploy directory):
 
diff --git a/lib/capistrano/tasks/bundler.cap b/lib/capistrano/tasks/bundler.cap
index 55a8f7b0..4d379be6 100644
--- a/lib/capistrano/tasks/bundler.cap
+++ b/lib/capistrano/tasks/bundler.cap
@@ -14,7 +14,7 @@ namespace :bundler do
           set :bundle_servers, -> { release_roles(fetch(:bundle_roles)) }
           set :bundle_binstubs, -> { shared_path.join('bin') }
           set :bundle_gemfile, -> { release_path.join('Gemfile') }
-          set :bundle_path, -> { shared_path.join('my_special_bundle') }
+          set :bundle_path, -> { shared_path.join('bundle') }
           set :bundle_without, %w{development test}.join(' ')
           set :bundle_flags, '--deployment --quiet'
           set :bundle_jobs, nil
@@ -65,10 +65,10 @@ namespace :load do
 
     set :bundle_roles, :all
     set :bundle_servers, -> { release_roles(fetch(:bundle_roles)) }
-    set :bundle_path, nil
+    set :bundle_path, -> { shared_path.join('vendor/bundle') }
     set :bundle_without, %w{development test}.join(' ')
     set :bundle_flags, '--deployment --quiet'
 
-    set :linked_dirs, fetch(:linked_dirs, []) + %w(vendor/bundle .bundle)
+    set :linked_dirs, fetch(:linked_dirs, []) << '.bundle'
   end
 end