From: Neil Smith <neil.git@njae.me.uk>
Date: Wed, 8 Jan 2014 23:06:19 +0000 (+0000)
Subject: Tinkered with Capistrano config
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=26980e31177ce8915054c8661e0d084852723645;p=feedcatcher.git

Tinkered with Capistrano config
---

diff --git a/Capfile b/Capfile
index 331c5a3..3a9dac7 100644
--- a/Capfile
+++ b/Capfile
@@ -15,12 +15,12 @@ require 'capistrano/deploy'
 #   https://github.com/capistrano/rails/tree/master/assets
 #   https://github.com/capistrano/rails/tree/master/migrations
 #
-# require 'capistrano/rvm'
+require 'capistrano/rvm'
 # require 'capistrano/rbenv'
 # require 'capistrano/chruby'
-# require 'capistrano/bundler'
-# require 'capistrano/rails/assets'
-# require 'capistrano/rails/migrations'
+require 'capistrano/bundler'
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
diff --git a/Gemfile b/Gemfile
index ae94bb6..3ab848c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,8 +39,12 @@ end
 # gem 'unicorn'
 
 # Use Capistrano for deployment
-gem 'capistrano', group: :development
-
+group :development do
+  gem 'capistrano', '~> 3.0'
+  gem 'capistrano-rails', '~> 1.1'
+  gem 'capistrano-bundler','>= 1.1.0'
+  gem 'capistrano-rvm'
+end
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4acc3e4..d589268 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,6 +32,14 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (>= 0.0.23)
+    capistrano-bundler (1.1.1)
+      capistrano (~> 3.0)
+      sshkit (>= 1.2.0)
+    capistrano-rails (1.1.0)
+      capistrano (>= 3.0.0)
+      capistrano-bundler (>= 1.0.0)
+    capistrano-rvm (0.0.3)
+      capistrano
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -140,7 +148,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano
+  capistrano (~> 3.0)
+  capistrano-bundler (>= 1.1.0)
+  capistrano-rails (~> 1.1)
+  capistrano-rvm
   coffee-rails (~> 4.0.0)
   factory_girl_rails
   jbuilder (~> 1.2)
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 9632098..97ad782 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -5,9 +5,9 @@ set :stage, :production
 # Supports bulk-adding hosts to roles, the primary
 # server in each group is considered to be the first
 # unless any hosts have the primary property set.
-role :app, %w{deploy@example.com}
-role :web, %w{deploy@example.com}
-role :db,  %w{deploy@example.com}
+role :app, %w{deploy@feedcatcher.njae.me.uk}
+role :web, %w{deploy@feedcatcher.njae.me.uk}
+role :db,  %w{deploy@feedcatcher.njae.me.uk}
 
 # Extended Server Syntax
 # ======================
@@ -15,7 +15,7 @@ role :db,  %w{deploy@example.com}
 # definition into the server list. The second argument
 # something that quacks like a hash can be used to set
 # extended properties on the server.
-server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
+# server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
 
 # you can set custom ssh options
 # it's possible to pass any option but you need to keep in mind that net/ssh understand limited list of options