Tweaked the Gemfile again

diff --git a/Gemfile b/Gemfile
index 3ab848c754b0e63285e82b0f5e8934a7ecb76782..5e8cc3fbb3d0edfbe20c4af90584b6e1ee390a80 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -43,8 +43,9 @@ group :development do
   gem 'capistrano', '~> 3.0'
   gem 'capistrano-rails', '~> 1.1'
   gem 'capistrano-bundler','>= 1.1.0'
-  gem 'capistrano-rvm'
+  gem 'capistrano-rvm', '~> 0.1.0'
 end
+
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 

diff --git a/Gemfile.lock b/Gemfile.lock
index d589268e238c9c04ec671279442b588d6026cbcb..947bac66168f54717da9a6b7254afff4cf9e023c 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,8 +38,9 @@ GEM
     capistrano-rails (1.1.0)
       capistrano (>= 3.0.0)
       capistrano-bundler (>= 1.0.0)
-    capistrano-rvm (0.0.3)
-      capistrano
+    capistrano-rvm (0.1.0)
+      capistrano (~> 3.0)
+      sshkit (~> 1.2.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -69,7 +70,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.7.0)
@@ -92,7 +93,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    rdoc (3.12.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
@@ -111,9 +112,9 @@ GEM
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
+    sdoc (0.4.0)
+      json (~> 1.8)
+      rdoc (~> 4.0, < 5.0)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -123,7 +124,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sshkit (1.3.0)
+    sshkit (1.2.0)
       net-scp (>= 1.1.2)
       net-ssh
       term-ansicolor
@@ -137,7 +138,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.1.0)
+    turbolinks (2.2.0)
       coffee-rails
     tzinfo (0.3.38)
     uglifier (2.4.0)
@@ -151,7 +152,7 @@ DEPENDENCIES
   capistrano (~> 3.0)
   capistrano-bundler (>= 1.1.0)
   capistrano-rails (~> 1.1)
-  capistrano-rvm
+  capistrano-rvm (~> 0.1.0)
   coffee-rails (~> 4.0.0)
   factory_girl_rails
   jbuilder (~> 1.2)

diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 97ad782ff1a4fd185994f95a7e04f712506ef955..6d371965b772515fee06fe6e28906bf186369ad5 100644 (file)
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -7,7 +7,7 @@ set :stage, :production
 # unless any hosts have the primary property set.
 role :app, %w{deploy@feedcatcher.njae.me.uk}
 role :web, %w{deploy@feedcatcher.njae.me.uk}
-role :db,  %w{deploy@feedcatcher.njae.me.uk}
+role :db,  %w{deploy@feedcatcher.njae.me.uk}, primary: true
 
 # Extended Server Syntax
 # ======================

diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
deleted file mode 100644 (file)
index a3e50ce..0000000
--- a/config/deploy/staging.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-set :stage, :staging
-
-# Simple Role Syntax
-# ==================
-# 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}
-
-# Extended Server Syntax
-# ======================
-# This can be used to drop a more detailed server
-# 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
-
-# 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
-# you can see them in [net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start)
-# set it globally
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-# and/or per server
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }
-# setting per server overrides global ssh_options
-
-# fetch(:default_env).merge!(rails_env: :staging)