Better Capistrano multistage support (database.yml)

mbailey · Aug 26, 2009 · effc3a8 · effc3a8
1 parent 3ca5169
commit effc3a8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,14 @@
 # deprec changelog
 
+= 2.1.2 (Aug 26, 2009)
+
+* Better support for Capistrano multistage
+  Look for database.yml in config/#{stage}/database.yml
+
+= 2.1.1 (Aug 25, 2009)
+
+* Added haproxy
+
 = 2.1.0 (Aug 24, 2009)
 
 * Added Collectd

diff --git a/TODO.txt b/TODO.txt
@@ -2,7 +2,6 @@ deprec/TODO.txt
 
 # collectd
 + start on boot (init.d)
-+ copy config from mon.failmode to deprec templates
 + install php_collection
   - auth
   - update config.php 

diff --git a/deprec.gemspec b/deprec.gemspec
@@ -2,7 +2,7 @@ require 'rubygems'
 
 SPEC = Gem::Specification.new do |s|
   s.name = 'deprec'
-  s.version = '2.1.0'
+  s.version = '2.1.2'
 
   s.authors = ['Mike Bailey']
   s.description = <<-EOF

diff --git a/lib/deprec/recipes/rails.rb b/lib/deprec/recipes/rails.rb
@@ -286,13 +286,15 @@
 
       desc "Link in the production database.yml" 
       task :symlink_database_yml, :roles => :app do
-        run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
+        run "ln -nfs #{shared_path}/config/database.yml #{current_path}/config/database.yml" 
       end
 
       desc "Copy database.yml to shared/config/database.yml. Useful if not kept in scm"
       task :push_database_yml, :roles => :app do
-        if File.exists?('config/database.yml')
-          put(File.read('config/database.yml'), "#{shared_path}/config/database.yml")
+        stage = exists?(:stage) ? fetch(:stage).to_s : ''
+        full_local_path = File.join('config', stage, 'database.yml')
+        if File.exists?(full_local_path)
+          put(File.read(full_local_path), "#{shared_path}/config/database.yml")
         end
       end