Commit e436a683
Changed files (2)
config
config/deploy.rb
@@ -15,9 +15,16 @@ set :use_sudo, false
$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
require "rvm/capistrano"
require 'bundler/capistrano'
-set :rvm_ruby_string, '1.9.2@cakeside'
+set :rvm_ruby_string, '1.9.2-p290@cakeside'
# set :rvm_type, :user
set :rvm_type, :system
+# set :default_environment, {
+# 'PATH' => "/usr/local/rvm/bin:/usr/local/rvm/gems/ruby-1.9.2-p290@cakeside/bin:/usr/local/rvm/rubies/ruby-1.9.2-p290/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games",
+# 'RUBY_VERSION' => 'ruby-1.9.2-p290',
+# 'GEM_HOME' => '/usr/local/rvm/gems/ruby-1.9.2-p290@cakeside',
+# 'GEM_PATH' => '/usr/local/rvm/gems/ruby-1.9.2-p290@cakeside',
+# 'BUNDLE_PATH' => '/usr/local/rvm/gems/ruby-1.9.2-p290@cakeside' # If you are using bundler.
+# }
ssh_options[:keys] = [File.join(ENV["HOME"], ".ssh", "amazon-cakeside", "cakeside.pem")]
# if you're still using the script/reaper helper you will need
Gemfile.lock
@@ -32,6 +32,7 @@ GEM
activesupport (3.1.0)
multi_json (~> 1.0)
addressable (2.2.4)
+ ansi (1.3.0)
arel (2.2.1)
bcrypt-ruby (3.0.1)
builder (3.0.0)
@@ -52,6 +53,13 @@ GEM
activesupport (~> 3.0)
childprocess (0.2.2)
ffi (~> 1.0.6)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.1.2)
devise (1.4.5)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
@@ -63,6 +71,8 @@ GEM
erubis (2.7.0)
eventmachine (0.12.10)
excon (0.6.6)
+ execjs (1.2.6)
+ multi_json (~> 1.0)
factory_girl (2.1.0)
factory_girl_rails (1.2.0)
factory_girl (~> 2.1.0)
@@ -222,6 +232,13 @@ GEM
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
rubyzip (0.9.4)
+ sass (3.1.7)
+ sass-rails (3.1.2)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (>= 3.1.4)
+ sprockets (~> 2.0.0)
+ tilt (~> 1.3.2)
selenium-webdriver (2.6.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
@@ -242,7 +259,12 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
+ turn (0.8.2)
+ ansi (>= 1.2.2)
tzinfo (0.3.29)
+ uglifier (1.0.3)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
warden (1.0.5)
rack (>= 1.0)
webrat (0.7.3)
@@ -261,6 +283,7 @@ DEPENDENCIES
capistrano
capybara
carrierwave
+ coffee-rails (~> 3.1.0)
devise
factory_girl_rails
fog
@@ -279,6 +302,9 @@ DEPENDENCIES
rb-fsevent
rmagick
rspec-rails
+ sass-rails (~> 3.1.0)
sqlite3-ruby
thinking-sphinx
+ turn
+ uglifier
webrat