capistrano-exts 1.1.5 → 1.2.0

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

@@ -64,11 +64,11 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   # Helper for some mysql tasks
-  def mysql_credentials
+  def mysql_credentials_formatted(mysql_credentials)
     return <<-EOS
-      hostname: localhost
-      username: #{mysql_db_user}
-      password: #{fetch :mysql_db_pass}
+      hostname: #{mysql_credentials[:host]}
+      username: #{mysql_credentials[:user]}
+      password: #{mysql_credentials[:pass]}
     EOS
   end
 end

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

@@ -55,7 +55,24 @@ Capistrano::Configuration.instance(:must_exist).load do
               '#{mysql_db_name}'
           CMD
         rescue
-          puts "WARNING: The database doesn't exist."
+          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
+              mysqldump \
+                --host='#{mysql_credentials[:host]}' \
+                --user='#{mysql_credentials[:user]}' \
+                --password='#{mysql_credentials[:pass]}' \
+                --add-drop-table --no-data '#{mysql_db_name}' |\
+                grep '^DROP' | \
+                mysql \
+                --host='#{mysql_credentials[:host]}' \
+                --user='#{mysql_credentials[:user]}' \
+                --password='#{mysql_credentials[:pass]}' \
+                '#{mysql_db_name}'
+            CMD
+          rescue
+            puts "WARNING: The database doesn't exist or you do not have permissions to drop it."
+          end
         end
       end
     end
@@ -94,31 +111,22 @@ Capistrano::Configuration.instance(:must_exist).load do
             rm -f #{random_file}
           CMD
 
-          find_and_execute_task("mysql:write_db_credentials")
+          set :mysql_credentials, {
+            # TODO: The host is not always localhost, it should be the primary
+            #       database server
+            host: 'localhost',
+            user: mysql_db_user,
+            pass: fetch(:mysql_db_pass),
+          }
+
+          find_and_execute_task("mysql:write_credentials")
         rescue
-          puts "WARNING: The user #{application} already exists."
-          find_and_execute_task("mysql:print_db_credentials")
+          puts "WARNING: The user #{application} already exists or you do not have permissions to create it."
+          find_and_execute_task("mysql:print_credentials")
         end
       end
     end
 
-    desc "write database credentials"
-    task :write_db_credentials do
-      mysql_credentials_file = fetch :mysql_credentials_file
-      unless exists?(:mysql_credentials_file) and remote_file_exists?(mysql_credentials_file)
-          put mysql_credentials, mysql_credentials_file
-      end
-    end
-
-    desc "print database credentials"
-    task :print_db_credentials do
-      mysql_credentials_file = fetch :mysql_credentials_file
-      unless exists?(:mysql_credentials_file) and remote_file_exists?(mysql_credentials_file)
-        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"
-        puts mysql_credentials
-      end
-    end
-
     desc "create database"
     task :create_db, :roles => :db, :except => { :no_release => true } do
       mysql_credentials = fetch :mysql_credentials
@@ -134,7 +142,7 @@ Capistrano::Configuration.instance(:must_exist).load do
               create '#{mysql_db_name}'
           CMD
         rescue
-          puts "WARNING: The database already exists, it hasn't been modified, drop it manually if necessary."
+          puts "WARNING: The database already exists or you do not have permissions to create it."
         end
       end
     end
@@ -208,6 +216,25 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
+    # TODO: credentials and root_credentials are exactly the same code with
+    #       one variable changing, we need some meta-programming for them!!
+
+    desc "print database credentials"
+    task :print_credentials do
+      puts mysql_credentials_formatted(fetch :mysql_credentials)
+    end
+
+    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
+      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")
+      end
+    end
+
     desc "Get Mysql credentials"
     task :credentials, :roles => :app, :except => { :no_release => true } do
       mysql_credentials_file = fetch :mysql_credentials_file
@@ -230,31 +257,58 @@ Capistrano::Configuration.instance(:must_exist).load do
                 user: mysql_credentials_file_contents.match(mysql_credentials_user_regex).try(:[], mysql_credentials_user_regex_match).try(:chomp),
                 pass: mysql_credentials_file_contents.match(mysql_credentials_pass_regex).try(:[], mysql_credentials_pass_regex_match).try(:chomp),
               }
-
-              if mysql_credentials[:user].present? and mysql_credentials[:pass].present?
-                set :mysql_credentials, mysql_credentials
-              end
             end
           end
         end
 
         # Verify that we got them!
-        if !exists?(:mysql_credentials)
-          set :mysql_credentials, {
-            host: ask("What is the hostname used to access the database", default: 'localhost', validate: /.+/),
-            user: ask("What is the username used to access the database", default: nil, validate: /.+/),
-            pass: ask("What is the password used to access the database", default: nil, validate: /.+/, echo: false),
+        if mysql_credentials.blank? or mysql_credentials[:user].blank? or mysql_credentials[:pass].blank?
+          mysql_credentials = {
+            host: ask("What is the hostname used to access the database",
+                      default: mysql_credentials.try(:[], :host) || 'localhost',
+                      validate: /.+/),
+            user: ask("What is the username used to access the database",
+                      default: mysql_credentials.try(:[], :user),
+                      validate: /.+/),
+            pass: ask("What is the password used to access the database",
+                      default: mysql_credentials.try(:[], :pass),
+                      validate: /.+/,
+                      echo: false),
           }
         end
+
+        # Finally set it so it's available and write it to the server.
+        if mysql_credentials[:user].present? and mysql_credentials[:pass].present?
+          set :mysql_credentials, mysql_credentials
+          find_and_execute_task("mysql:write_credentials")
+        end
+      end
+    end
+
+    # REFACTOR!!
+    desc "print database root credentials"
+    task :print_root_credentials do
+      puts mysql_credentials_formatted(fetch :mysql_root_credentials)
+    end
+
+    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
+      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")
       end
     end
 
-    desc "Get Mysql root credentials"
+    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 credentials yet, look for them
+        # 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)
           begin
             set :mysql_root_credentials_file_contents, capture("cat #{mysql_root_credentials_file}")
@@ -264,30 +318,42 @@ Capistrano::Configuration.instance(:must_exist).load do
 
           if exists?(:mysql_root_credentials_file_contents)
             mysql_root_credentials_file_contents = fetch :mysql_root_credentials_file_contents
+
             unless mysql_root_credentials_file_contents.blank?
               mysql_root_credentials = {
                 host: mysql_root_credentials_file_contents.match(mysql_root_credentials_host_regex).try(:[], mysql_root_credentials_host_regex_match).try(:chomp),
                 user: mysql_root_credentials_file_contents.match(mysql_root_credentials_user_regex).try(:[], mysql_root_credentials_user_regex_match).try(:chomp),
                 pass: mysql_root_credentials_file_contents.match(mysql_root_credentials_pass_regex).try(:[], mysql_root_credentials_pass_regex_match).try(:chomp),
               }
-
-              if mysql_root_credentials[:user].present? and mysql_root_credentials[:pass].present?
-                set :mysql_root_credentials, mysql_root_credentials
-              end
             end
           end
         end
 
         # Verify that we got them!
-        if !exists?(:mysql_root_credentials)
-          set :mysql_root_credentials, {
-            host: ask("What is the hostname used to access the database", default: 'localhost', validate: /.+/),
-            user: ask("What is the username used to access the database", default: nil, validate: /.+/),
-            pass: ask("What is the password used to access the database", default: nil, validate: /.+/, echo: false),
+        if mysql_root_credentials.blank? or mysql_root_credentials[:user].blank? or mysql_root_credentials[:pass].blank?
+          mysql_root_credentials = {
+            host: ask("What is the hostname used to access the database",
+                      default: mysql_root_credentials.try(:[], :host) || 'localhost',
+                      validate: /.+/),
+            user: ask("What is the username used to access the database",
+                      default: mysql_root_credentials.try(:[], :user),
+                      validate: /.+/),
+            pass: ask("What is the password used to access the database",
+                      default: mysql_root_credentials.try(:[], :pass),
+                      validate: /.+/,
+                      echo: false),
           }
         end
+
+        # Finally set it so it's available and write it to the server.
+        if mysql_root_credentials[:user].present? and mysql_root_credentials[:pass].present?
+          set :mysql_root_credentials, mysql_root_credentials
+          find_and_execute_task("mysql:write_root_credentials")
+        end
       end
     end
+    # REFACTOR!!
+
   end
 
   before "mysql:backup_db", "mysql:credentials"
@@ -297,4 +363,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   before "mysql:export_db_dump", "mysql:backup_db"
   before "mysql:create_db_user", "mysql:root_credentials"
   after  "mysql:create_db_user", "mysql:create_db"
+
+  before "mysql:print_credentials", "mysql:credentials"
+  before "mysql:print_root_credentials", "mysql:root_credentials"
 end

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

@@ -94,6 +94,11 @@ Capistrano::Configuration.instance(:must_exist).load do
           end
         end
 
+        desc "print authentification file"
+        task :print_web_server_auth_file do
+          puts capture("cat #{fetch :deploy_to}/.http_basic_auth")
+        end
+
         desc "[internal] Write web configuration file"
         task :write_web_conf_file do
           if exists?(:web_conf_file)

data/lib/capistrano-exts/version.rb

@@ -2,8 +2,8 @@ module Capistrano
   module Extensions
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 1
-      TINY = 5
+      MINOR = 2
+      TINY = 0
 
       ARRAY  = [MAJOR, MINOR, TINY]
       STRING = ARRAY.join(".")

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ RSpec.configure do |config|
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
   #
-  config.mock_with :mocha
+  # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
   # config.mock_with :rspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000 Z
+date: 2011-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2157484500 !ruby/object:Gem::Requirement
+  requirement: &2160791120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157484500
+  version_requirements: *2160791120
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157484000 !ruby/object:Gem::Requirement
+  requirement: &2160790620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157484000
+  version_requirements: *2160790620
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157483540 !ruby/object:Gem::Requirement
+  requirement: &2160790160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157483540
+  version_requirements: *2160790160
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2157483080 !ruby/object:Gem::Requirement
+  requirement: &2160789700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2157483080
+  version_requirements: *2160789700
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2157482620 !ruby/object:Gem::Requirement
+  requirement: &2160789240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157482620
+  version_requirements: *2160789240
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2157482160 !ruby/object:Gem::Requirement
+  requirement: &2160788780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2157482160
+  version_requirements: *2160788780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157481700 !ruby/object:Gem::Requirement
+  requirement: &2160788320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157481700
+  version_requirements: *2160788320
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com