Updated Capfile for Capistrano 3; moving mapMarkers in attempt to fix…

… asset problem

.gitignore

@@ -1,4 +1,5 @@
 .bundle
+.capistrano
 db/*.sqlite3
 log/*
 tmp/
@@ -27,6 +28,7 @@ config/deploy
 *.DS_Store
 config/*.mapnik.xml
 config/*.ogr.vrt
+public/assets
 public/lists
 public/observations
 public/places

Capfile

@@ -1,2 +1,16 @@
-load "deploy" if respond_to?(:namespace) # cap2 differentiator
-load "config/deploy"
+# Load DSL and set up stages
+require 'capistrano/setup'
+
+# Deployment tasks
+require 'capistrano/deploy'
+require 'capistrano/rvm'
+require 'capistrano/bundler'
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
+require 'capistrano/passenger'
+require 'whenever/capistrano'
+require 'thinking_sphinx/capistrano'
+require 'capistrano/delayed-job'
+
+# Load custom tasks from `lib/capistrano/tasks' if you have any defined
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Gemfile

@@ -12,7 +12,11 @@ gem 'airbrake'
 gem 'ancestry'
 gem 'aws-sdk'
 gem 'bluecloth'
-gem 'capistrano', '~> 2.15', :require => false
+gem 'capistrano3-delayed-job', '~> 1.0'
+gem 'capistrano', '~> 3.3'
+gem 'capistrano-rvm', '~> 0.1'
+gem 'capistrano-rails', '~> 1.1'
+gem 'capistrano-passenger', '~> 0.0'
 gem 'chronic'
 gem 'cocoon' # JY: Added to support nested attributes for assessment_sections on assessments
 gem 'daemons'
@@ -66,7 +70,6 @@ gem 'right_aws', :git => 'git://github.com/rightscale/right_aws.git'
 gem 'right_http_connection'
 gem 'rinku', :require => 'rails_rinku'
 gem 'riparian', :git => 'git://github.com/kueda/riparian.git'
-gem 'rvm-capistrano', '~> 1.3'
 gem 'savon'   #allow to consume soap services with WSDL
 gem 'sass', '= 3.2.5'
 gem 'sass-rails'