capistrano-exts 1.2.0 → 1.3.0

data/lib/capistrano-exts/receipts/contao.rb

@@ -1,4 +1,5 @@
 require 'capistrano'
+require 'capistrano/errors'
 require 'capistrano-exts/receipts/deploy'
 require 'capistrano-exts/receipts/mysql'
 
@@ -62,7 +63,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           run <<-CMD
             #{try_sudo} cp #{fetch :latest_release}/public/.htaccess.default #{fetch :shared_path}/config/htaccess.txt
           CMD
-        rescue
+        rescue Capistrano::CommandError
           run <<-CMD
             #{try_sudo} touch #{fetch :shared_path}/config/htaccess.txt
           CMD

data/lib/capistrano-exts/receipts/mysql.rb

@@ -1,4 +1,5 @@
 require 'capistrano'
+require 'capistrano/errors'
 require 'capistrano-exts/receipts/deploy'
 
 # Verify that Capistrano is version 2
@@ -31,7 +32,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           run <<-CMD
             #{try_sudo} bzip2 -9 '#{MYSQL_DB_BACKUP_PATH}'
           CMD
-        rescue
+        rescue Capistrano::CommandError
           puts "WARNING: The database doesn't exist."
         end
       else
@@ -54,7 +55,7 @@ Capistrano::Configuration.instance(:must_exist).load do
               drop --force \
               '#{mysql_db_name}'
           CMD
-        rescue
+        rescue Capistrano::CommandError
           puts "WARNING: The database doesn't exist or you do not have permissions to drop it, trying to drop all tables inside of it."
           begin
             run <<-CMD
@@ -70,7 +71,7 @@ Capistrano::Configuration.instance(:must_exist).load do
                 --password='#{mysql_credentials[:pass]}' \
                 '#{mysql_db_name}'
             CMD
-          rescue
+          rescue Capistrano::CommandError
             puts "WARNING: The database doesn't exist or you do not have permissions to drop it."
           end
         end
@@ -112,15 +113,13 @@ Capistrano::Configuration.instance(:must_exist).load do
           CMD
 
           set :mysql_credentials, {
-            # TODO: The host is not always localhost, it should be the primary
-            #       database server
-            host: 'localhost',
+            host: find_servers(:roles => :db, primary: true).first.to_s.gsub(/^(.*@)?([^:]*)(:.*)?$/, '\2'),
             user: mysql_db_user,
             pass: fetch(:mysql_db_pass),
           }
 
           find_and_execute_task("mysql:write_credentials")
-        rescue
+        rescue Capistrano::CommandError
           puts "WARNING: The user #{application} already exists or you do not have permissions to create it."
           find_and_execute_task("mysql:print_credentials")
         end
@@ -141,7 +140,7 @@ Capistrano::Configuration.instance(:must_exist).load do
               --password='#{mysql_credentials[:pass]}' \
               create '#{mysql_db_name}'
           CMD
-        rescue
+        rescue Capistrano::CommandError
           puts "WARNING: The database already exists or you do not have permissions to create it."
         end
       end
@@ -226,9 +225,20 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "[internal] write database credentials"
     task :write_credentials do
-      mysql_credentials_file = fetch :mysql_credentials_file
-      unless exists?(:mysql_credentials_file) and remote_file_exists?(mysql_credentials_file)
-          put mysql_credentials_formatted(fetch :mysql_credentials), mysql_credentials_file
+      unless exists?(:mysql_credentials_file) and remote_file_exists?(fetch :mysql_credentials_file)
+        mysql_credentials_file = fetch :mysql_credentials_file
+        random_file = random_tmp_file(mysql_credentials_formatted(fetch :mysql_credentials))
+        put mysql_credentials_formatted(fetch :mysql_credentials), random_file
+
+        begin
+          run <<-CMD
+            #{try_sudo} cp #{random_file} #{mysql_credentials_file}; \
+            #{try_sudo} rm -f #{random_file}
+          CMD
+        rescue Capistrano::CommandError
+          puts "WARNING: Apparently you do not have permissions to write to #{mysql_credentials_file}."
+          find_and_execute_task("mysql:print_credentials")
+        end
       else
         puts "WARNING: mysql_credentials_file is not defined in config.rb you have to manually copy the following info into a credential file and define it"
         find_and_execute_task("mysql:print_credentials")
@@ -237,14 +247,14 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Get Mysql credentials"
     task :credentials, :roles => :app, :except => { :no_release => true } do
-      mysql_credentials_file = fetch :mysql_credentials_file
-
       unless exists?(:mysql_credentials)
         # We haven't got the credentials yet, look for them
-        if exists?(:mysql_credentials_file) and remote_file_exists?(mysql_credentials_file)
+        if exists?(:mysql_credentials_file) and remote_file_exists?(fetch :mysql_credentials_file)
+          mysql_credentials_file = fetch :mysql_credentials_file
+
           begin
             set :mysql_credentials_file_contents, capture("cat #{mysql_credentials_file}")
-          rescue
+          rescue Capistrano::CommandError
             set :mysql_credentials, false
           end
 
@@ -293,10 +303,20 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "[internal] write database root credentials"
     task :write_root_credentials do
-      mysql_root_credentials = fetch :mysql_root_credentials
-      mysql_root_credentials_file = fetch :mysql_root_credentials_file
-      unless exists?(:mysql_root_credentials_file) and remote_file_exists?(mysql_root_credentials_file)
-          put mysql_credentials_formatted(fetch :mysql_root_credentials), mysql_root_credentials_file
+      unless exists?(:mysql_root_credentials_file) and remote_file_exists?(fetch :mysql_root_credentials_file)
+        mysql_root_credentials_file = fetch :mysql_root_credentials_file
+        random_file = random_tmp_file(mysql_root_credentials_formatted(fetch :mysql_root_credentials))
+        put mysql_root_credentials_formatted(fetch :mysql_root_credentials), random_file
+
+        begin
+          run <<-CMD
+            #{try_sudo} cp #{random_file} #{mysql_root_credentials_file}; \
+            #{try_sudo} rm -f #{random_file}
+          CMD
+        rescue Capistrano::CommandError
+          puts "WARNING: Apparently you do not have permissions to write to #{mysql_root_credentials_file}."
+          find_and_execute_task("mysql:print_root_credentials")
+        end
       else
         puts "WARNING: mysql_root_credentials_file is not defined in config.rb you have to manually copy the following info into a credential file and define it"
         find_and_execute_task("mysql:print_root_credentials")
@@ -305,14 +325,14 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Get Mysql root_credentials"
     task :root_credentials, :roles => :app, :except => { :no_release => true } do
-      mysql_root_credentials_file = fetch :mysql_root_credentials_file
-
       unless exists?(:mysql_root_credentials)
         # We haven't got the root_credentials yet, look for them
-        if exists?(:mysql_root_credentials_file) and remote_file_exists?(mysql_root_credentials_file)
+        if exists?(:mysql_root_credentials_file) and remote_file_exists?(fetch :mysql_root_credentials_file)
+          mysql_root_credentials_file = fetch :mysql_root_credentials_file
+
           begin
             set :mysql_root_credentials_file_contents, capture("cat #{mysql_root_credentials_file}")
-          rescue
+          rescue Capistrano::CommandError
             set :mysql_root_credentials, false
           end
 

data/lib/capistrano-exts/receipts/servers/web_server.rb

@@ -49,7 +49,7 @@ Capistrano::Configuration.instance(:must_exist).load do
             unencrypted_contents = Array.new
 
             web_server_auth_credentials.each do |credentials|
-              if credentials[:password].is_a?(Proc)
+              if credentials[:password].respond_to?(:call)
                 password = credentials[:password].call
               else
                 password = credentials[:password]
@@ -71,7 +71,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         desc "[internal] Write authentification file"
         task :write_web_server_auth_file do
-          if exists?(:web_server_auth_file)
+          if exists?(:web_server_auth_file) and not remote_file_exists?(fetch :web_server_auth_file)
             web_server_auth_file = fetch :web_server_auth_file
             web_server_auth_file_contents = fetch :web_server_auth_file_contents
             web_server_auth_file_unencrypted_contents = fetch :web_server_auth_file_unencrypted_contents
@@ -84,11 +84,18 @@ Capistrano::Configuration.instance(:must_exist).load do
             put web_server_auth_file_contents, random_file
 
             run <<-CMD
-              #{try_sudo} mv #{random_file} #{web_server_auth_file}
+              #{try_sudo} cp #{random_file} #{web_server_auth_file}; \
+              #{try_sudo} rm -f #{random_file}
             CMD
 
             # Store the unencrypted version of the contents
-            put web_server_auth_file_unencrypted_contents, "#{fetch :deploy_to}/.http_basic_auth"
+            put web_server_auth_file_unencrypted_contents, random_file
+
+            run <<-CMD
+              #{try_sudo} cp #{random_file} #{fetch :deploy_to}/.http_basic_auth; \
+              #{try_sudo} rm -f #{random_file}
+            CMD
+
             puts "This site uses http basic auth, the credentials are:"
             puts web_server_auth_file_unencrypted_contents
           end
@@ -112,7 +119,8 @@ Capistrano::Configuration.instance(:must_exist).load do
             put web_conf_contents, random_file
 
             run <<-CMD
-              #{try_sudo} mv #{random_file} #{web_conf_file}
+              #{try_sudo} cp #{random_file} #{web_conf_file}; \
+              #{try_sudo} rm -f #{random_file}
             CMD
           end
         end

data/lib/capistrano-exts/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   module Extensions
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 2
+      MINOR = 3
       TINY = 0
 
       ARRAY  = [MAJOR, MINOR, TINY]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2160791120 !ruby/object:Gem::Requirement
+  requirement: &2157099700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160791120
+  version_requirements: *2157099700
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2160790620 !ruby/object:Gem::Requirement
+  requirement: &2157099200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160790620
+  version_requirements: *2157099200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160790160 !ruby/object:Gem::Requirement
+  requirement: &2157098740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160790160
+  version_requirements: *2157098740
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2160789700 !ruby/object:Gem::Requirement
+  requirement: &2157098280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2160789700
+  version_requirements: *2157098280
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2160789240 !ruby/object:Gem::Requirement
+  requirement: &2157097820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2160789240
+  version_requirements: *2157097820
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2160788780 !ruby/object:Gem::Requirement
+  requirement: &2157097360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2160788780
+  version_requirements: *2157097360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160788320 !ruby/object:Gem::Requirement
+  requirement: &2157096900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2160788320
+  version_requirements: *2157096900
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com