add rvm capistrano gem and configuration

3 files changed, 14 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index 63d8471..0b62624 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,6 +34,11 @@ group :doc do
   gem 'sdoc', require: false
 end
 
+group :development do
+  gem 'capistrano'
+  gem 'rvm-capistrano'
+end
+
 group :development, :test do
   gem 'rspec-rails'
   gem 'rspec-fakes'
@@ -52,8 +57,5 @@ end
 # Use unicorn as the app server
 gem 'unicorn'
 
-# Use Capistrano for deployment
-gem 'capistrano', group: :development
-
 # Use debugger
 # gem 'debugger', group: [:development, :test]
diff --git a/Gemfile.lock b/Gemfile.lock
index f0e582b..d093fa3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,6 +154,8 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rubyzip (0.9.9)
+    rvm-capistrano (1.4.1)
+      capistrano (>= 2.0.0)
     sass (3.2.9)
     sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
@@ -223,6 +225,7 @@ DEPENDENCIES
   rails (= 4.0.0)
   rspec-fakes
   rspec-rails
+  rvm-capistrano
   sass-rails (~> 4.0.0)
   sdoc
   selenium-webdriver
diff --git a/config/deploy.rb b/config/deploy.rb
index 2ccadc2..3e07894 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,4 +1,5 @@
 require "bundler/capistrano"
+require "rvm/capistrano"
 
 load "config/recipes/base"
 load "config/recipes/nginx"
@@ -26,9 +27,14 @@ set :scm, "git"
 set :branch, "master"
 set :repository,  "git@github.com:madebyuppercut/parley.git"
 
+set :rvm_ruby_string, :local # use the same ruby as used locally for deployment
+
 default_run_options[:pty] = true # password prompt
 ssh_options[:forward_agent] = true # no deploy key for github
 
+before 'deploy', 'rvm:install_rvm'  # update RVM
+before 'deploy', 'rvm:install_ruby' # install Ruby and create gemset (both if missing)
+
 after "deploy", "deploy:cleanup" # keep only the last 5 releases
 
 # Instructions