capistrano-exts 1.7.0 → 1.8.0

data/README.md

@@ -17,7 +17,7 @@ gem install capistrano-exts
 or add it to your Gemfile
 
 ```ruby
-gem 'capistrano-exts', '>=1.7.0'
+gem 'capistrano-exts', '>=1.8.0'
 ```
 
 Setup

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

@@ -74,4 +74,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       password: #{mysql_credentials[:pass]}
     EOS
   end
+
+  # Read a remote file
+  def read(file)
+    capture("cat #{file}")
+  end
 end

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

@@ -21,7 +21,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Check if this revision has already been deployed."
     task :check_revision, :roles => :app, :except => { :no_release => true } do
       if remote_file_exists?("#{deploy_to}/current/REVISION")
-        if `git rev-parse #{branch}`.strip == capture("cat #{deploy_to}/current/REVISION").strip
+        if `git rev-parse #{branch}`.strip == read("#{deploy_to}/current/REVISION").strip
           response = ask("The verison you are trying to deploy is already deployed, should I continue (Yes, [No], Abort)", default: 'No')
           if response =~ /(no?)|(a(bort)?|\n)/i
             abort "Canceled by the user."

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

@@ -250,165 +250,94 @@ 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
-      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 or it already exists on the server."
-        find_and_execute_task("mysql:print_credentials")
+    ['credentials', 'root_credentials'].each do |var|
+      desc "print database #{var.gsub(/_/, ' ')}"
+      task "print_#{var}" do
+        puts mysql_credentials_formatted(fetch "mysql_#{var}".to_sym)
       end
-    end
 
-    desc "Get Mysql credentials"
-    task :credentials, :roles => :app, :except => { :no_release => true } do
-      unless exists?(:mysql_credentials)
-        # We haven't got the credentials yet, look for them
-        if exists?(:mysql_credentials_file) and remote_file_exists?(fetch :mysql_credentials_file)
-          mysql_credentials_file = fetch :mysql_credentials_file
+      desc "[internal] write database #{var.gsub(/_/, ' ')}"
+      task "write_#{var}" do
+        unless exists?("mysql_#{var}_file".to_sym) and remote_file_exists?(fetch "mysql_#{var}_file".to_sym)
+          mysql_credentials_file = fetch "mysql_#{var}_file".to_sym
+          random_file = random_tmp_file(mysql_credentials_formatted(fetch "mysql_#{var}".to_sym))
+          put mysql_credentials_formatted(fetch "mysql_#{var}".to_sym), random_file
 
           begin
-            set :mysql_credentials_file_contents, capture("cat #{mysql_credentials_file}")
+            run <<-CMD
+              #{try_sudo} cp #{random_file} #{mysql_credentials_file}; \
+              #{try_sudo} rm -f #{random_file}
+            CMD
           rescue Capistrano::CommandError
-            set :mysql_credentials, false
+            puts "WARNING: Apparently you do not have permissions to write to #{mysql_credentials_file}."
+            find_and_execute_task("mysql:print_#{var}")
           end
-
-          if exists?(:mysql_credentials_file_contents)
-            mysql_credentials_file_contents = fetch :mysql_credentials_file_contents
-
-            unless mysql_credentials_file_contents.blank?
-              mysql_credentials = {
-                host: mysql_credentials_file_contents.match(mysql_credentials_host_regex).try(:[], mysql_credentials_host_regex_match).try(:chomp),
-                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),
-              }
-            end
-          end
-        end
-
-        # Verify that we got them!
-        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) || fetch(:mysql_db_server, 'localhost'),
-                      validate: /.+/),
-            user: ask("What is the username used to access the database",
-                      default: mysql_credentials.try(:[], :user) || fetch(:mysql_db_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")
+        else
+          puts "WARNING: mysql_#{var}_file is not defined or it already exists on the server."
+          find_and_execute_task("mysql:print_#{var}") unless ARGV.include?("mysql:print_#{var}")
         end
       end
-    end
 
-    # REFACTOR!!
-    desc "print database root credentials"
-    task :print_root_credentials do
-      puts mysql_credentials_formatted(fetch :mysql_root_credentials)
-    end
+      desc "Get Mysql #{var.gsub(/_/, ' ')}"
+      task "#{var}", :roles => :app, :except => { :no_release => true } do
+        unless exists?("mysql_#{var}".to_sym)
+          # Fetch configs
+          mysql_credentials_host_regex = fetch "mysql_#{var}_host_regex".to_sym
+          mysql_credentials_host_regex_match = fetch "mysql_#{var}_host_regex_match".to_sym
 
-    desc "[internal] write database root credentials"
-    task :write_root_credentials do
-      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_credentials_formatted(fetch :mysql_root_credentials))
-        put mysql_credentials_formatted(fetch :mysql_root_credentials), random_file
+          mysql_credentials_user_regex = fetch "mysql_#{var}_user_regex".to_sym
+          mysql_credentials_user_regex_match = fetch "mysql_#{var}_user_regex_match".to_sym
 
-        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 or it already exists on the server."
-        find_and_execute_task("mysql:print_root_credentials")
-      end
-    end
+          mysql_credentials_pass_regex = fetch "mysql_#{var}_pass_regex".to_sym
+          mysql_credentials_pass_regex_match = fetch "mysql_#{var}_pass_regex_match".to_sym
 
-    desc "Get Mysql root_credentials"
-    task :root_credentials, :roles => :app, :except => { :no_release => true } do
-      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?(fetch :mysql_root_credentials_file)
-          mysql_root_credentials_file = fetch :mysql_root_credentials_file
+          # We haven't got the credentials yet, look for them
+          if exists?("mysql_#{var}_file".to_sym) and remote_file_exists?(fetch "mysql_#{var}_file".to_sym)
+            mysql_credentials_file = fetch "mysql_#{var}_file".to_sym
 
-          begin
-            set :mysql_root_credentials_file_contents, capture("cat #{mysql_root_credentials_file}")
-          rescue Capistrano::CommandError
-            set :mysql_root_credentials, false
-          end
+            begin
+              set "mysql_#{var}_file_contents".to_sym, read(mysql_credentials_file)
+            rescue Capistrano::CommandError
+              set "mysql_#{var}".to_sym, false
+            end
 
-          if exists?(:mysql_root_credentials_file_contents)
-            mysql_root_credentials_file_contents = fetch :mysql_root_credentials_file_contents
+            if exists?("mysql_#{var}_file_contents".to_sym)
+              mysql_credentials_file_contents = fetch "mysql_#{var}_file_contents".to_sym
 
-            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),
-              }
+              unless mysql_credentials_file_contents.blank?
+                mysql_credentials = {
+                  host: mysql_credentials_file_contents.match(mysql_credentials_host_regex).try(:[], mysql_credentials_host_regex_match).try(:chomp),
+                  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),
+                }
+              end
             end
           end
-        end
 
-        # Verify that we got them!
-        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) || fetch(:mysql_db_server, '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
+          # Verify that we got them!
+          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) || fetch(:mysql_db_server, 'localhost'),
+                        validate: /.+/),
+              user: ask("What is the username used to access the database",
+                        default: mysql_credentials.try(:[], :user) || ((var == 'credentials') ? fetch(:mysql_db_user) : nil),
+                        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_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")
+          # 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_#{var}".to_sym, mysql_credentials
+            find_and_execute_task("mysql:write_#{var}")
+          end
         end
       end
     end
-    # REFACTOR!!
-
   end
 
   before "mysql:backup_db", "mysql:credentials"

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

@@ -103,7 +103,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         desc "print authentification file"
         task :print_http_auth do
-          puts capture("cat #{fetch :deploy_to}/.http_basic_auth")
+          puts read("#{fetch :deploy_to}/.http_basic_auth")
         end
 
         desc "[internal] Write web configuration file"

data/lib/capistrano-exts/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   module Extensions
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 7
+      MINOR = 8
       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.7.0
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000 Z
+date: 2011-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2152478500 !ruby/object:Gem::Requirement
+  requirement: &2156681780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152478500
+  version_requirements: *2156681780
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152477960 !ruby/object:Gem::Requirement
+  requirement: &2156681280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152477960
+  version_requirements: *2156681280
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152477500 !ruby/object:Gem::Requirement
+  requirement: &2156680820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152477500
+  version_requirements: *2156680820
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152476860 !ruby/object:Gem::Requirement
+  requirement: &2156680360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2152476860
+  version_requirements: *2156680360
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2152476180 !ruby/object:Gem::Requirement
+  requirement: &2156679900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2152476180
+  version_requirements: *2156679900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152475460 !ruby/object:Gem::Requirement
+  requirement: &2156679440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2152475460
+  version_requirements: *2156679440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152474740 !ruby/object:Gem::Requirement
+  requirement: &2156678980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152474740
+  version_requirements: *2156678980
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com