lib/caploy/recipes/setup.rb in caploy-0.1.5 vs lib/caploy/recipes/setup.rb in caploy-0.1.6

@@ -3,11 +3,12 @@
   namespace :deploy do
     namespace :prepare do
       task :create_config_files, :roles => :app do
         run "mkdir -p #{shared_path}/config/"
         config_file_to_setup.each do |config_file|
-          put(File.read(config_file_path(config_file)), "#{shared_path}/config/#{config_file}", :via => :scp)
+          local_path = config_file_path(config_file)
+          put(File.read(local_path), "#{shared_path}/config/#{config_file}", :via => :scp) if local_path
         end
       end
 
       desc "Set up shared directory structure"
       task :create_shared_folders, :roles => :app do
@@ -18,11 +19,11 @@
         try_sudo "chown -R #{user}:#{fetch(:group, user)} #{deploy_to}" if fetch(:use_sudo, false)
       end
 
       task :database, :roles => :db do
         _cset :db_admin_user, 'root'
-        _cset :db_admin_password, Capistrano::CLI.password_prompt("Type your mysql password for user '#{db_admin_user}' (not set if empty): ")
+        _cset :db_admin_password, Capistrano::CLI.password_prompt("\e[0;31mType your mysql password for user '#{db_admin_user}' (not set if empty and ENTER): ")
         _cset :db_name, application.gsub(/\W+/, '')[0..5] + '_' + rails_env.to_s
         _cset :db_user_name, application
         _cset :db_user_password, ''
 
         unless db_admin_password.to_s.empty?
@@ -42,11 +43,15 @@
 
 end
 
 def config_file_path(config_file_name)
   config_file = "#{rails_root}/config/#{config_file_name}"
-  raise "No config file '#{config_file}'" unless File.exists? config_file
-  config_file
+  if File.exists? config_file
+    config_file
+  else
+    puts "\e[0;31mNo config file '#{config_file}'"
+    nil
+  end
 end
 
 def database_exits?
   exists = false