Updated capistrano and made some adjustments to fix errors in the deploy.

Author: daronco

.gitignore

@@ -26,3 +26,4 @@ pids/*
 doc/app/*
 .sass-cache/
 config/analytics_conf.yml
+public/assets/*

Gemfile

@@ -52,7 +52,7 @@ gem 'table_helper', :git => 'git://github.com/eeng/table_helper.git'
 
 group :development do
   #gem 'ruby-debug19', :require => 'ruby-debug'
-  gem 'capistrano', '~> 2.5'
+  gem 'capistrano', '~> 2.11'
   gem 'capistrano-ext'
   gem 'translate-rails3', :require => 'translate', :git => 'git://github.com/mconf/translate.git'
   gem 'rails-dev-tweaks', '~> 0.5.2' # speed up rails 3.1 development server

Gemfile.lock

@@ -84,7 +84,7 @@ GEM
       mime-types
       xml-simple
     builder (3.0.0)
-    capistrano (2.6.0)
+    capistrano (2.11.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -141,7 +141,7 @@ GEM
       crack (>= 0.1.6)
     god (0.12.1)
     haml (3.1.4)
-    highline (1.6.2)
+    highline (1.6.11)
     hike (1.2.1)
     hoe (2.9.4)
       rake (>= 0.8.7)
@@ -166,7 +166,7 @@ GEM
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.4)
+    net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.4.1)
@@ -283,7 +283,7 @@ DEPENDENCIES
   attachment_fu!
   bigbluebutton-api-ruby!
   bigbluebutton_rails!
-  capistrano (~> 2.5)
+  capistrano (~> 2.11)
   capistrano-ext
   chronic
   ci_reporter

Rakefile

@@ -2,11 +2,16 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 require 'rubygems'
 require 'bundler/setup'
-require 'rspec/core/rake_task'
 require 'rake'
 require File.expand_path('../config/application', __FILE__)
 
 desc 'Default: run specs.'
 task :default => ["db:test:prepare", "db:seed", :spec]
 
 Mconf::Application.load_tasks
+
+# conditional load so it doesn't fail when in production
+begin
+  require 'rspec/core/rake_task'
+rescue LoadError
+end

config/deploy.rb

@@ -178,10 +178,8 @@
 end
 
 # From: http://stackoverflow.com/questions/312214/how-do-i-run-a-rake-task-from-capistrano
-namespace :rake do
-  desc "Run a task on a remote server."
-  # example: cap staging rake:invoke task=jobs:queued
-  task :invoke do
-    run("cd #{deploy_to}/current; bundle exec rake #{ENV['TASK']} RAILS_ENV=production")
-  end
+# example: cap staging invoke task=jobs:queued
+desc "Run a task on a remote server."
+task :invoke do
+  run("cd #{deploy_to}/current; bundle exec rake #{ENV['TASK']} RAILS_ENV=production")
 end