From cd3307a8c8577767a0299d8b5abc62e275b726fe Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Tue, 19 Aug 2014 10:16:11 +0200
Subject: [PATCH] deploy files

---
 Gemfile               |  4 +++-
 Gemfile.lock          | 34 +++++++++++++++++-----------------
 config/deploy.rb      |  2 +-
 config/unicorn_init_d |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index edd8008..df81b28 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,8 +35,10 @@ gem 'haml-rails'
  gem 'unicorn'
 
 # Use Capistrano for deployment
- gem 'capistrano-rails', group: :development
 
+gem "capistrano", '2.15.5', group: :development
+gem "rvm-capistrano",'1.4.1', group: :development
+gem 'net-ssh', '~>2.7.0'
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 768c04a..14c7767 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,16 +29,12 @@ GEM
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
-    capistrano (3.2.1)
-      i18n
-      rake (>= 10.0.0)
-      sshkit (~> 1.3)
-    capistrano-bundler (1.1.3)
-      capistrano (~> 3.1)
-      sshkit (~> 1.2)
-    capistrano-rails (1.1.1)
-      capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
+    capistrano (2.15.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -46,7 +42,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.1)
-    colorize (0.7.3)
     erubis (2.7.0)
     execjs (2.2.1)
     haml (4.0.5)
@@ -56,6 +51,7 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
+    highline (1.6.21)
     hike (1.2.3)
     i18n (0.6.11)
     jbuilder (2.1.3)
@@ -74,7 +70,11 @@ GEM
     multi_json (1.10.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -98,6 +98,8 @@ GEM
     rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
+    rvm-capistrano (1.4.1)
+      capistrano (>= 2.0.0)
     sass (3.2.19)
     sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
@@ -118,10 +120,6 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.9)
-    sshkit (1.5.1)
-      colorize
-      net-scp (>= 1.1.2)
-      net-ssh (>= 2.8.0)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -144,12 +142,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano-rails
+  capistrano (= 2.15.5)
   coffee-rails (~> 4.0.0)
   haml-rails
   jbuilder (~> 2.0)
   jquery-rails
+  net-ssh (~> 2.7.0)
   rails (= 4.1.4)
+  rvm-capistrano (= 1.4.1)
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   spring
diff --git a/config/deploy.rb b/config/deploy.rb
index 36d7e42..9abf3f6 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -9,7 +9,7 @@ set :scm_host, "gitlab.bally.me"
 
 
 
-set :rvm_ruby_string, 'ruby-2.1.2@ads'           
+set :rvm_ruby_string, 'ruby-2.1.2'           
 set :rvm_autolibs_flag, "read-only"      
 
 set :bundle_cmd, "/home/#{user}/.rvm/gems/#{rvm_ruby_string}@global/bin/bundle"
diff --git a/config/unicorn_init_d b/config/unicorn_init_d
index b84b3e0..d5f42e6 100644
--- a/config/unicorn_init_d
+++ b/config/unicorn_init_d
@@ -6,7 +6,7 @@ set -e
 
 # Change these to match your app:
 APP_NAME=ads_app
-APP_RUBY=2.1.2@ads
+APP_RUBY=2.1.2
 APP_ROOT="/home/web/ads_app/current"
 PID="/home/web/ads_app/shared/unicorn.pid"
 ENV=production