lib/recipes/rails.rb in capitate-0.2.8 vs lib/recipes/rails.rb in capitate-0.2.11

@@ -1,29 +1,32 @@
 # Rails recipes
 namespace :rails do
   
   desc <<-DESC
-  Create database yaml in shared path.
+  Create database yaml in shared path. Note: If both <tt>:db_host</tt> and <tt>:db_socket</tt> are used,
+  db_socket wins.
   
   *db_name*: Database name (rails).\n    
   @set :db_name, "app_db_name"@\n  
   *db_user*: Database user (rails).\n  
   @set :db_user, "app_db_user"@\n    
   *db_pass*: Database password (rails).\n  
   @set :db_pass, "the_password"@\n    
   *db_host*: Database host (can be nil, if you are using socket). _Defaults to nil_\n
-  *db_socket*: Database socket (can be nil, if you are using host). _Defaults to nil_\n
+  *db_socket*: Database socket (can be nil, if you are using host). _Defaults to nil_\n    
   @set :db_socket, "/var/lib/mysql/mysql.sock"@\n
+  *database_yml_template*: Path to database yml erb template. _Defaults to <tt>rails/database.yml.erb</tt>_ (in this GEM)\n
   DESC
-  task :setup do    
+  task :setup, :roles => :app do    
     
     # Settings
     fetch(:db_name)
     fetch(:db_user)
     fetch(:db_pass)
     fetch_or_default(:db_host, nil)
     fetch_or_default(:db_socket, nil)
+    fetch_or_default(:database_yml_template, "rails/database.yml.erb")
     
     unless db_host.blank?
       set :db_connect_type, "host"
       set :db_connect, db_host
     end
@@ -32,54 +35,61 @@
       set :db_connect_type, "socket"
       set :db_connect, db_socket
     end
     
     run "mkdir -p #{shared_path}/config"
-    put template.load("rails/database.yml.erb"), "#{shared_path}/config/database.yml"
+    put template.load(database_yml_template), "#{shared_path}/config/database.yml"
   end
 
   desc "Make symlink for database yaml" 
   task :update_code do
     run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
   end
   
-  desc <<-DESC
-  Tail production log files. (http://errtheblog.com/posts/19-streaming-capistrano)
-  DESC
-  task :tail_logs, :roles => :web do
-    run "tail -f #{shared_path}/log/production.log" do |channel, stream, data|
-      puts  # for an extra line break before the host name
-      puts "#{channel[:host]}: #{data}" 
-      break if stream == :err    
+  # Log tasks
+  namespace :logs do 
+    
+    desc <<-DESC
+    Tail production log files.\n
+    http://errtheblog.com/posts/19-streaming-capistrano
+    DESC
+    task :tail, :roles => :web do
+      run "tail -f #{shared_path}/log/production.log" do |channel, stream, data|
+        puts  # for an extra line break before the host name
+        puts "#{channel[:host]}: #{data}" 
+        break if stream == :err    
+      end
     end
-  end
 
 
-  desc <<-DESC
-  Check production log files in TextMate.  (http://errtheblog.com/posts/19-streaming-capistrano)
-  DESC
-  task :mate_logs, :roles => :app do
+    desc <<-DESC
+    Check production log files in TextMate.\n
+    See http://errtheblog.com/posts/19-streaming-capistrano
+    DESC
+    task :mate, :roles => :app do
 
-    require 'tempfile'
-    tmp = Tempfile.open('w')
-    logs = Hash.new { |h,k| h[k] = '' }
+      require 'tempfile'
+      tmp = Tempfile.open('w')
+      logs = Hash.new { |h,k| h[k] = '' }
 
-    run "tail -n500 #{shared_path}/log/production.log" do |channel, stream, data|
-      logs[channel[:host]] << data
-      break if stream == :err
-    end
+      run "tail -n500 #{shared_path}/log/production.log" do |channel, stream, data|
+        logs[channel[:host]] << data
+        break if stream == :err
+      end
 
-    logs.each do |host, log|
-      tmp.write("--- #{host} ---\n\n")
-      tmp.write(log + "\n")
-    end
+      logs.each do |host, log|
+        tmp.write("--- #{host} ---\n\n")
+        tmp.write(log + "\n")
+      end
 
-    exec "mate -w #{tmp.path}" 
-    tmp.close
+      exec "mate -w #{tmp.path}" 
+      tmp.close
+    end
   end
 
   desc <<-DESC
-  Remotely console. (http://errtheblog.com/posts/19-streaming-capistrano)
+  Remotely console.\n
+  See http://errtheblog.com/posts/19-streaming-capistrano
   DESC
   task :console, :roles => :app do
     input = ''
     run "cd #{current_path} && ./script/console #{ENV['RAILS_ENV']}" do |channel, stream, data|
       next if data.chomp == input.chomp || data.chomp == ''