capistrano-exts 1.11.2 → 1.11.3

data/README.md

@@ -18,7 +18,7 @@ gem install capistrano-exts
 or add it to your Gemfile
 
 ```ruby
-gem 'capistrano-exts', '>=1.11.2', :require => false
+gem 'capistrano-exts', '>=1.11.3', :require => false
 ```
 
 # Setup

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

@@ -83,7 +83,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       export_filename_argv = ARGV.try(:[], argv_file_index)
 
       # Generate the file name
-      if export_filename_argv and not export_filename_argv =~ /.+:.+/ and not File.exists?(export_filename_argv)
+      if export_filename_argv && !export_filename_argv =~ /.+:.+/ && !File.exists?(export_filename_argv)
         export_filename = export_filename_argv
       else
         export_filename = random_tmp_file + ".tar.gz"
@@ -101,7 +101,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Find out at which index the file is located ?
       argv_file_index = ARGV.index("contents:import") + 1
 
-      unless ARGV.size >= (argv_file_index + 1) and File.exists?(ARGV[argv_file_index])
+      unless ARGV.size >= (argv_file_index + 1) && File.exists?(ARGV[argv_file_index])
         logger.important "ERROR: please run 'cap import <gzipped tar>'"
         exit 1
       else

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

@@ -133,7 +133,7 @@ password: #{credentials[:pass]}
   # This function asks the user for confirmation (confirm running the task)
   # If the user answers no, then the task won't be executed.
   def ask_for_confirmation(what, options = {})
-    unless exists?(:force) and fetch(:force) == true
+    unless exists?(:force) && fetch(:force) == true
       # Ask for a confirmation
       response = ask(what, options)
       if response =~ /(no?)|(a(bort)?|\n)/i

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

@@ -160,7 +160,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Find out at which index the file is located ?
       argv_file_index = ARGV.index("mysql:import_db_dump") + 1
 
-      unless ARGV.size >= (argv_file_index + 1) and File.exists?(ARGV[argv_file_index])
+      unless ARGV.size >= (argv_file_index + 1) && File.exists?(ARGV[argv_file_index])
         logger.important "ERROR: please run 'cap mysql:import_db_dump <sql dump>'"
         exit 1
       else
@@ -181,15 +181,15 @@ Capistrano::Configuration.instance(:must_exist).load do
           # TODO: Try upload(filename, remote_file_name) function instead
           put contents_dump, random_file
 
+          # Backup skiped tables
+          find_and_execute_task "mysql:backup_skiped_tables"
+
           # Drop the database
           find_and_execute_task("mysql:drop_db")
 
           # Create the database
           find_and_execute_task("mysql:create_db")
 
-          # Backup skiped tables
-          find_and_execute_task "mysql:backup_skiped_tables"
-
           run <<-CMD
             mysql \
               --host='#{mysql_credentials[:host]}' \
@@ -229,7 +229,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       export_filename_argv = ARGV.try(:[], argv_file_index)
 
       # Generate the file name
-      if export_filename_argv and not export_filename_argv =~ /.+:.+/ and not File.exists?(export_filename_argv)
+      if export_filename_argv && !export_filename_argv =~ /.+:.+/ && !File.exists?(export_filename_argv)
         export_filename = export_filename_argv
       else
         export_filename = random_tmp_file + ".sql"
@@ -320,7 +320,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       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)
+        unless exists?("mysql_#{var}_file".to_sym) && remote_file_exists?(fetch "mysql_#{var}_file".to_sym)
           mysql_credentials_file = fetch "mysql_#{var}_file".to_sym
           credentials_formatted_content = credentials_formatted(fetch "mysql_#{var}".to_sym)
           random_file = random_tmp_file(credentials_formatted_content)
@@ -355,7 +355,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           mysql_credentials_pass_regex_match = fetch "mysql_#{var}_pass_regex_match".to_sym
 
           # 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)
+          if exists?("mysql_#{var}_file".to_sym) && remote_file_exists?(fetch "mysql_#{var}_file".to_sym)
             mysql_credentials_file = fetch "mysql_#{var}_file".to_sym
 
             begin
@@ -395,7 +395,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           end
 
           # Finally set it so it's available and write it to the server.
-          if mysql_credentials[:user].present? and mysql_credentials[:pass].present?
+          if mysql_credentials[:user].present? && mysql_credentials[:pass].present?
             set "mysql_#{var}".to_sym, mysql_credentials
             find_and_execute_task("mysql:write_#{var}")
           end

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

@@ -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) and not remote_file_exists?(fetch :web_server_auth_file)
+          if exists?(:web_server_auth_file) && !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

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

@@ -25,7 +25,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         idrsa_filename_argv = ARGV.try(:[], argv_file_index)
 
         # Generate the file name
-        if idrsa_filename_argv and not idrsa_filename_argv =~ /.+:.+/ and not File.exists?(idrsa_filename_argv)
+        if idrsa_filename_argv && !idrsa_filename_argv =~ /.+:.+/ && !File.exists?(idrsa_filename_argv)
           idrsa_filename = idrsa_filename_argv
         else
           idrsa_filename = "#{ENV['HOME']}/.ssh/id_rsa.pub"

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

@@ -40,7 +40,7 @@ module Capistrano
 
           def php_build_with_force_cgi_redirect?
             # required if PHP was built with --enable-force-cgi-redirect
-            @php_build_with_force_cgi_redirect.present? and @php_build_with_force_cgi_redirect == true
+            @php_build_with_force_cgi_redirect.present? && @php_build_with_force_cgi_redirect == true
           end
 
           def sanity_check
@@ -59,19 +59,19 @@ module Capistrano
             end
 
             if reverse_proxy?
-              if @reverse_proxy_server_address.blank? and @reverse_proxy_server_port.blank? and @reverse_proxy_socket.blank?
+              if @reverse_proxy_server_address.blank? && @reverse_proxy_server_port.blank? && @reverse_proxy_socket.blank?
                 raise ArgumentError, "None of the address, port or socket has been defined."
               end
 
-              if @reverse_proxy_server_address.present? and @reverse_proxy_server_port.blank?
+              if @reverse_proxy_server_address.present? && @reverse_proxy_server_port.blank?
                 raise ArgumentError, "reverse_proxy_server_address is defined but reverse_proxy_server_port is not please define it."
               end
 
-              if @reverse_proxy_server_port.present? and @reverse_proxy_server_address.blank?
+              if @reverse_proxy_server_port.present? && @reverse_proxy_server_address.blank?
                 raise ArgumentError, "reverse_proxy_server_port is defined but reverse_proxy_server_address is not please define it."
               end
 
-              if @reverse_proxy_server_address.present? and @reverse_proxy_server_port.present? and @reverse_proxy_socket.present?
+              if @reverse_proxy_server_address.present? && @reverse_proxy_server_port.present? && @reverse_proxy_socket.present?
                 raise ArgumentError, "you should not define reverse_proxy_server_address, reverse_proxy_server_port and reverse_proxy_socket."
               end
             end

data/lib/capistrano-exts/version.rb

@@ -3,7 +3,7 @@ module Capistrano
     module Version #:nodoc:
       MAJOR = 1
       MINOR = 11
-      TINY = 2
+      TINY = 3
 
       ARRAY  = [MAJOR, MINOR, TINY]
       STRING = ARRAY.join(".")

data/lib/capistrano-exts.rb

@@ -2,7 +2,7 @@
 
 # Add it to PATH
 ROOT_PATH = File.expand_path(File.dirname(__FILE__))
-$: << ROOT_PATH if File.directory?(ROOT_PATH) and not $:.include?(ROOT_PATH)
+$: << ROOT_PATH if File.directory?(ROOT_PATH) && !$:.include?(ROOT_PATH)
 
 # Require our core extensions
 require 'capistrano-exts/core_ext'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2156995460 !ruby/object:Gem::Requirement
+  requirement: &2161270460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156995460
+  version_requirements: *2161270460
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &2156994900 !ruby/object:Gem::Requirement
+  requirement: &2161270000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2156994900
+  version_requirements: *2161270000
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156994320 !ruby/object:Gem::Requirement
+  requirement: &2161269500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156994320
+  version_requirements: *2161269500
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156993520 !ruby/object:Gem::Requirement
+  requirement: &2161268920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156993520
+  version_requirements: *2161268920
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2156992300 !ruby/object:Gem::Requirement
+  requirement: &2161268360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2156992300
+  version_requirements: *2161268360
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2156991500 !ruby/object:Gem::Requirement
+  requirement: &2161267700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2156991500
+  version_requirements: *2161267700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156990900 !ruby/object:Gem::Requirement
+  requirement: &2161266800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2156990900
+  version_requirements: *2161266800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156990240 !ruby/object:Gem::Requirement
+  requirement: &2161264920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156990240
+  version_requirements: *2161264920
 description: ! 'Capistrano exts is a set of helper tasks to help with the initial
   server