Permalink
Browse files

fix capistrano setup

  • Loading branch information...
1 parent fd70923 commit 212eceb1e40fc41e079c48a0e53513d39fefada6 @gkop committed Apr 8, 2012
Showing with 11 additions and 6 deletions.
  1. +2 −1 Gemfile
  2. +6 −3 Gemfile.lock
  3. +3 −2 config/deploy.rb
View
@@ -47,6 +47,7 @@ gem 'sanitize'
# deployment
gem 'capistrano'
+gem 'rvm-capistrano'
# js runtime
gem 'therubyracer'
@@ -65,7 +66,7 @@ group :test, :development do
gem 'database_cleaner'
gem 'email_spec'
gem 'capybara-webkit'
-
+
# parallelize tests across cpu cores
gem 'parallel_tests'
View
@@ -43,7 +43,7 @@ GEM
bson (= 1.5.2)
builder (3.0.0)
cancan (1.6.7)
- capistrano (2.9.0)
+ capistrano (2.11.2)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -108,7 +108,7 @@ GEM
diff-lcs (~> 1.1)
mime-types (~> 1.15)
haml (3.1.4)
- highline (1.6.9)
+ highline (1.6.11)
hike (1.2.1)
hpricot (0.8.5)
i18n (0.6.0)
@@ -140,7 +140,7 @@ GEM
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.2.2)
+ net-ssh (2.3.0)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.0)
@@ -206,6 +206,8 @@ GEM
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
rubyzip (0.9.5)
+ rvm-capistrano (1.0.2)
+ capistrano (>= 2.0.0)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.1.12)
@@ -282,6 +284,7 @@ DEPENDENCIES
redcarpet (~> 1.17.2)
rspec
rspec-rails
+ rvm-capistrano
sanitize
sass-rails (~> 3.1.0)
therubyracer
View
@@ -1,4 +1,3 @@
-$:.unshift(File.expand_path('./lib', ENV['rvm_path'])) # Add RVM's lib directory to the load path.
require "rvm/capistrano" # Load RVM's capistrano plugin.
require 'bundler/capistrano'
@@ -7,6 +6,8 @@
set :application, "bbase"
set :repository, "git@github.com:gkop/bbase.git"
+set :rvm_type, :system
+
set :scm, :git
role :web, "golahny.org"
@@ -19,7 +20,7 @@
set :deploy_to, "/opt/#{application}"
-set :rvm_ruby_string, 'ree@bbase'
+set :rvm_ruby_string, 'ruby-1.9.3@bbase'
set :rvm_bin_path, "/usr/local/rvm/bin"
# deploy task for Passenger

0 comments on commit 212eceb

Please sign in to comment.