From f184a231e15ca354ae5df3814258d9737c23cd82 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Fri, 14 Sep 2012 12:11:05 +0200
Subject: [PATCH] rvm capistrano

---
 Gemfile          |  3 ++-
 Gemfile.lock     | 18 ++++++++++++++++++
 config/deploy.rb |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d5386ea..eea331f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,8 @@ gem 'jquery-rails'
 # gem 'unicorn'
 
 # Deploy with Capistrano
-# gem 'capistrano'
+gem 'capistrano'
+gem 'rvm-capistrano'
 
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d7dc30..a9a35fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,6 +37,12 @@ GEM
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
     cancan (1.6.7)
+    capistrano (2.13.3)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
     carrierwave (0.5.8)
       activesupport (~> 3.0)
     coffee-script (2.2.0)
@@ -54,6 +60,7 @@ GEM
     formtastic (2.0.2)
       rails (~> 3.0)
     haml (3.1.4)
+    highline (1.6.13)
     hike (1.2.1)
     i18n (0.6.0)
     jquery-rails (1.0.19)
@@ -79,6 +86,13 @@ GEM
     mimetype-fu (0.1.2)
     multi_json (1.0.4)
     mysql2 (0.3.11)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.5.2)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
     orm_adapter (0.0.6)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
@@ -112,6 +126,8 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     rmagick (2.13.1)
+    rvm-capistrano (1.2.5)
+      capistrano (>= 2.0.0)
     sass (3.1.14)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
@@ -153,6 +169,7 @@ DEPENDENCIES
   acts_as_list
   acts_as_tree
   cancan
+  capistrano
   carrierwave
   coffee-script
   devise
@@ -165,6 +182,7 @@ DEPENDENCIES
   mysql2
   rails (= 3.1.0)
   rmagick
+  rvm-capistrano
   sass-rails (~> 3.1.0.rc)
   simple-navigation
   sqlite3
diff --git a/config/deploy.rb b/config/deploy.rb
index 2ebd39d..53525fe 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -2,7 +2,7 @@ set :application, 'boissier_app'
 	set :domain, 'www.pharmacieboissier.com'
 
 
-	$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
+
 
 	require "rvm/capistrano"