Permalink
Browse files

upgrade to rvm-capistrano gem

  • Loading branch information...
1 parent c678367 commit 6598314b0f80fd666d692210f413f6f6fc4ba339 @mpapis committed Mar 26, 2012
Showing with 6 additions and 5 deletions.
  1. +1 −0 Gemfile
  2. +3 −0 Gemfile.lock
  3. +2 −5 config/deploy.rb
View
1 Gemfile
@@ -27,4 +27,5 @@ group :development do
gem 'capistrano'
gem 'capistrano-unicorn'
gem 'capistrano-file_db'
+ gem 'rvm-capistrano'
end
View
3 Gemfile.lock
@@ -101,6 +101,8 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
+ rvm-capistrano (1.0.1)
+ capistrano (>= 2.0.0)
sass (3.1.15)
sass-rails (3.2.4)
railties (~> 3.2.0)
@@ -138,6 +140,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
jquery-rails
rails (= 3.2.2)
+ rvm-capistrano
sass-rails (~> 3.2.3)
sqlite3
therubyracer
View
7 config/deploy.rb
@@ -7,9 +7,7 @@
set :repository, "git://github.com/mpapis/ad.git"
set :keep_releases, 5
-set :rvm_ruby_string, `rvm current`
-set :rvm_type, :user
-set :rvm_install_type, :head # before rvm 1.11.0 gets released
+set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"")
set :bundle_without, [:development]
set :unicorn_pid, "#{shared_path}/pids/unicorn.pid"
@@ -20,8 +18,7 @@
before 'deploy:setup', 'rvm:install_ruby'
after 'deploy', 'deploy:cleanup'
-$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
-require "rvm/capistrano"
+require "rvm-capistrano"
require "bundler/capistrano"
require "capistrano-unicorn"
require "capistrano-file_db"

0 comments on commit 6598314

Please sign in to comment.