capistrano-ash 1.4.0 → 1.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzFiZmRjNzA1NjRmYzNhN2E5MDczMTA1YzJmNDIwMzhkOGI0YjA5Yg==
+    Y2JmNTc0MjY3YmNiYzM3NWI2NzA5N2RiNjE3OThkYjZhMDk3YjUyYg==
   data.tar.gz: !binary |-
-    NjE3NjU3Zjc0MGNjMDhjNTIxZGM4Njk3ZGY4NTBkOTIzODM0YmI1NQ==
-!binary "U0hBNTEy":
+    YzgyZDIyOWQ5ZmVhYTJiMThmNDI1Njc2MmVkOWYzNzFiMDc4NWNmYg==
+SHA512:
   metadata.gz: !binary |-
-    MmU5MmQ5Y2QyZGEzYzBhYTMyNDE3ZmU1OWYwYzgxNGUyMjExZjUxODExMGFl
-    ODk5ODRjMzA3NGUxNWQ4MjlkZTE4NDZmMzc2MGM2ZTQxMWRmYWE0MWFiZjZk
-    OTc4YzY3YzY1MzIyZDI1YTZmY2Q2MTRjN2QxN2FkZmQ0MzkxODM=
+    Y2JjNDc2ODhlMWYwNzFlYmM0ZjZkMmRiYmNhODY0NzAxZjQxMzJmMTc1MWU5
+    NDhmZTcxNzY5MGM5MTlmYmQxYzY3MjlkYTc5OWU4YWVhZDNkMmNmNGVhNWJm
+    NDliZDczNTA0ZDRhNjM4NzkxNTM1MmU1MDE0NDBmOWU1NDE1MWQ=
   data.tar.gz: !binary |-
-    ZTM4MGEyNDQ0NWY2MjRlNjIzMGM3MzE5MjdkNjBiNGE1NWFmZDhkNWU1ODVj
-    MzY2NGM3ZGIyM2I5MTcwMTY1YTYzNGVmZTFmMzkwYjBmY2Q2NmE0YTE5MWU1
-    YjM2YTZlY2U1ODg4ZmFmYjQ2YjBlNWE0ZTBhYTQwNjFhYzc5NDU=
+    MWFmZGZkZWU5NjY3YTMzNmM0MzE3MGQxMGNiYmZiYjFlZTI3MDhhYTk2NDdl
+    NDA5NjZjMzU5YjcyMWQ2YjkxZGUxOWQ1ZDcyMWZmZmY5MTU2NDU3YWZmMzdh
+    MzBlMmVkMDczMzY3MDRjMzdhZTc5M2M4NDQxMmYzOTc3OWQxZDM=

data/Rakefile

@@ -11,10 +11,14 @@ begin
     gemspec.homepage    = "https://github.com/augustash/capistrano-ash"
     gemspec.authors     = ["August Ash"]
     # Gem dependencies
-    gemspec.add_dependency('capistrano', '~> 2.15.0')
-    gemspec.add_dependency('capistrano-ext')
-    gemspec.add_dependency('railsless-deploy')
-    gemspec.add_dependency('capistrano_colors')
+    gemspec.add_dependency('capistrano', '~> 2.15.5')
+    gemspec.add_dependency('capistrano-ext', '~> 1.2')
+    gemspec.add_dependency('railsless-deploy', '~> 1.1')
+    gemspec.add_dependency('capistrano_colors', '~> 0.5')
+
+    # Net-SSH issues
+    # see https://github.com/capistrano/capistrano/issues/927
+    gemspec.add_dependency('net-ssh', '2.7.0')
 
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/capistrano-ash.gemspec

@@ -2,19 +2,25 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: capistrano-ash 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name                      = "capistrano-ash"
-  s.version                   = "1.3.2"
+  s.name = "capistrano-ash"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors                   = ["August Ash"]
-  s.date                      = "2013-07-18"
-  s.description               = "August Ash recipes for Capistrano"
-  s.email                     = "code@augustash.com"
-  s.extra_rdoc_files          = ["README.textile"]
-  s.files                     = [
+  s.require_paths = ["lib"]
+  s.authors = ["August Ash"]
+  s.date = "2014-03-27"
+  s.description = "August Ash recipes for Capistrano"
+  s.email = "code@augustash.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.textile"
+  ]
+  s.files = [
     "CHANGELOG.rdoc",
+    "LICENSE.txt",
     "README.textile",
     "Rakefile",
     "VERSION",
@@ -26,14 +32,14 @@ Gem::Specification.new do |s|
     "lib/ash/hosted_magento.rb",
     "lib/ash/magento.rb",
     "lib/ash/wordpress.rb",
+    "lib/ash/wordpress_nested.rb",
     "lib/ash/wordpress_shared_hosting.rb",
     "lib/ash/zend_doctrine.rb",
     "lib/ash/zend_doctrine_shared_hosting.rb"
   ]
-  s.homepage                  = "https://github.com/augustash/capistrano-ash"
-  s.require_paths             = ["lib"]
-  s.rubygems_version          = "2.0.3"
-  s.summary                   = "Useful task libraries for August Ash recipes for Capistrano"
+  s.homepage = "https://github.com/augustash/capistrano-ash"
+  s.rubygems_version = "2.2.2"
+  s.summary = "Useful task libraries for August Ash recipes for Capistrano"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/lib/ash/base.rb

@@ -39,10 +39,11 @@ configuration.load do
   set :dbpass,            proc{Capistrano::CLI.password_prompt("Database password for '#{dbuser}':")}
   set :dbname,            proc{text_prompt("Database name: ")}
   _cset :mysqldump,       "mysqldump"
-  _cset :dump_options,    "--single-transaction --create-options --quick --triggers --routines"
+  _cset :dump_options,    "--single-transaction --create-options --quick --triggers --routines --force --opt --skip-lock-tables"
+  _cset :ignore_tables,   []
 
   # Source Control
-  set :group_writable,    false
+  # set :group_writable,    false
   set :use_sudo,          false
   set :scm,               :git
   set :git_enable_submodules, 1 if fetch(:scm, :git)
@@ -59,6 +60,13 @@ configuration.load do
   # phpMyAdmin version
   set :pma_version,       "3.4.5"
 
+  # FIX capistrano 2.15.4+ use of `try_sudo` with capture commands (shouldn't need sudo for `ls` and `cat` commands)
+  set(:releases) { capture("ls -x #{releases_path}", :except => { :no_release => true }).split.sort }
+  set(:current_revision) { capture("cat #{current_path}/REVISION", :except => { :no_release => true }).chomp }
+  set(:latest_revision) { capture("cat #{current_release}/REVISION", :except => { :no_release => true }).chomp }
+  set(:previous_revision) { capture("cat #{previous_release}/REVISION", :except => { :no_release => true }).chomp if previous_release }
+
+
   # Backups Path
   _cset(:backups_path)      { File.join(deploy_to, "backups") }
   _cset(:tmp_backups_path)  { File.join("#{backups_path}", "tmp") }
@@ -110,7 +118,8 @@ configuration.load do
       dirs = [deploy_to, releases_path, shared_path]
       dirs += shared_children.map { |d| File.join(shared_path, d.split('/').last) }
       run "mkdir -p #{dirs.join(' ')}"
-      run "chmod 755 #{dirs.join(' ')}" if fetch(:group_writable, true)
+      run "#{try_sudo} chmod g+w #{dirs.join(' ')}" if fetch(:group_writable, true)
+      # run "chmod 755 #{dirs.join(' ')}" if fetch(:group_writable, true)
     end
 
     desc "Setup shared application directories and permissions after initial setup"
@@ -131,6 +140,33 @@ configuration.load do
       create_symlink
     end
 
+    desc <<-DESC
+      Updates the symlink to the most recently deployed version. Capistrano works \
+      by putting each new release of your application in its own directory. When \
+      you deploy a new version, this task's job is to update the `current' symlink \
+      to point at the new version. You will rarely need to call this task \
+      directly; instead, use the `deploy' task (which performs a complete \
+      deploy, including `restart') or the 'update' task (which does everything \
+      except `restart').
+
+      AAI OVERRIDES:
+      removes use of try_sudo with symlink command because we use try_sudo \
+      (set :use_sudo, true) for several common deploy-related tasks, but symlinks \
+      are not part of the tasks that truly require sudo privileges
+
+    DESC
+    task :create_symlink, :except => { :no_release => true } do
+      on_rollback do
+        if previous_release
+          run "#{try_sudo} rm -f #{current_path}; ln -s #{previous_release} #{current_path}; true"
+        else
+          logger.important "no previous release to rollback to, rollback of symlink skipped"
+        end
+      end
+
+      run "#{try_sudo} rm -f #{current_path} && ln -s #{latest_release} #{current_path}"
+    end
+
     desc <<-DESC
       Clean up old releases. By default, the last 5 releases are kept on each \
       server (though you can change this with the keep_releases variable). All \
@@ -164,7 +200,7 @@ configuration.load do
               # adding a chown -R method to fix permissions on the directory
               # this should help with issues related to permission denied
               # as in issues #28 and #30
-              run "#{try_sudo} chown -R #{user}:#{user} #{dir}" if remote_dir_exists?(dir)
+              run "chown -R #{user}:#{user} #{dir}" if remote_dir_exists?(dir)
 
               set_perms_dirs(dir)
               set_perms_files(dir)
@@ -178,6 +214,26 @@ configuration.load do
         end
       end
     end
+
+    namespace :rollback do
+      desc <<-DESC
+        [internal] Points the current symlink at the previous revision.
+        This is called by the rollback sequence, and should rarely (if
+        ever) need to be called directly.
+
+        AAI OVERRIDES:
+        removes use of try_sudo with symlink command because we use try_sudo \
+        (set :use_sudo, true) for several common deploy-related tasks, but symlinks \
+        are not part of the tasks that truly require sudo privileges
+      DESC
+      task :revision, :except => { :no_release => true } do
+        if previous_release
+          run "#{try_sudo} rm #{current_path}; ln -s #{previous_release} #{current_path}"
+        else
+          abort "could not rollback the code because there is no prior release"
+        end
+      end
+    end
   end
 
   # --------------------------------------------
@@ -270,12 +326,12 @@ EOF
   # NGINX tasks
   # --------------------------------------------
   namespace :nginx do
-    %w(start stop restart status).each do |cmd|
+    %w(start stop restart reload status).each do |cmd|
       desc "[internal] - #{cmd.upcase} nginx and php-fpm"
       task cmd.to_sym, :roles => :web do
 
-        nginx_cmd   = fetch(:nginx_init_command, "/etc/init.d/nginx")
-        phpfpm_cmd  = fetch(:phpfpm_init_command, "/etc/init.d/php-fpm")
+        nginx_cmd   = fetch(:nginx_init_command, "service nginx")
+        phpfpm_cmd  = fetch(:phpfpm_init_command, "service php5-fpm")
 
         run "#{try_sudo} #{nginx_cmd} #{cmd}"
         run "#{try_sudo} #{phpfpm_cmd} #{cmd}"
@@ -400,9 +456,9 @@ EOF
     desc "Perform a backup of web and database files"
     task :default do
       deploy.setup_backup
-      db
-      web
-      cleanup
+      backup.db
+      backup.web
+      backup.cleanup
     end
 
     desc <<-DESC
@@ -458,10 +514,11 @@ EOF
     end
 
     desc "Perform a backup of database files"
-    task :db, :roles => :db do
+    task :db, :roles => :web do
       if previous_release
         mysqldump     = fetch(:mysqldump, "mysqldump")
         dump_options  = fetch(:dump_options, "--single-transaction --create-options --quick")
+        dbhost        = fetch(:db_remote_host, 'localhost')
 
         puts "Backing up the database now and putting dump file in the previous release directory"
 
@@ -469,11 +526,34 @@ EOF
         # which we'll tarball in the backup:web task
         run "mkdir -p #{tmp_backups_path}/#{release_name}"
 
-        # define the filename (include the current_path so the dump file will be within the directory)
-        filename = "#{tmp_backups_path}/#{release_name}/#{dbname}_dump-#{Time.now.to_s.gsub(/ /, "_")}.sql.gz"
-        # dump the database for the proper environment
-        run "#{mysqldump} #{dump_options} -u #{dbuser} -p #{dbname} | gzip -c --best > #{filename}" do |ch, stream, out|
-            ch.send_data "#{dbpass}\n" if out =~ /^Enter password:/
+        now = Time.now.to_s.gsub(/ /, "_")
+        # ignored db tables
+        ignore_tables = fetch(:ignore_tables, [])
+        if !ignore_tables.empty?
+          ignore_tables_str = ''
+          ignore_tables.each{ |t| ignore_tables_str << "--ignore-table='#{dbname}'.'" + t + "' " }
+
+          # define the filenames (include the current_path so the dump file will be within the directory)
+          data_filename       = "#{tmp_backups_path}/#{release_name}/#{dbname}_data_dump-#{now}.sql.gz"
+          structure_filename  = "#{tmp_backups_path}/#{release_name}/#{dbname}_structure_dump-#{now}.sql.gz"
+
+          # dump the database structure for the proper environment
+          run "#{mysqldump} --single-transaction --create-options --quick --triggers --routines --no-data -h #{dbhost} -u #{dbuser} -p #{dbname} | gzip -c --best > #{structure_filename}" do |ch, stream, out|
+              ch.send_data "#{dbpass}\n" if out =~ /^Enter password:/
+          end
+
+          # dump the database data for the proper environment
+          run "#{mysqldump} #{dump_options} -h #{dbhost} -u #{dbuser} -p #{dbname} #{ignore_tables_str} | gzip -c --best > #{data_filename}" do |ch, stream, out|
+              ch.send_data "#{dbpass}\n" if out =~ /^Enter password:/
+          end
+        else
+          # define the filename (include the current_path so the dump file will be within the directory)
+          filename = "#{tmp_backups_path}/#{release_name}/#{dbname}_dump-#{now}.sql.gz"
+
+          # dump the database for the proper environment
+          run "#{mysqldump} #{dump_options} -h #{dbhost} -u #{dbuser} -p #{dbname} | gzip -c --best > #{filename}" do |ch, stream, out|
+              ch.send_data "#{dbpass}\n" if out =~ /^Enter password:/
+          end
         end
       else
         logger.important "no previous release to backup to; backup of database skipped"

data/lib/ash/common.rb

@@ -45,7 +45,7 @@ end
 # set the permissions for files recurisvely from the starting directory (dir_path)
 def set_perms_files(dir_path, perm = 644)
   begin
-    run "find #{dir_path} -type f -print0 | xargs -0 #{try_sudo} chmod #{perm}" if remote_dir_exists?(dir_path)
+    run "find #{dir_path} -type f -print0 | xargs -0 -L 500 #{try_sudo} chmod #{perm}" if remote_dir_exists?(dir_path)
   rescue Exception => e
     logger.important "FAILED to set permissions of #{perm} on files within #{dir_path}!"
     logger.important e.message
@@ -62,7 +62,7 @@ end
 # set the permissions for directories recursively from the starting directory (dir_path)
 def set_perms_dirs(dir_path, perm = 755)
   begin
-    run "find #{dir_path} -type d -print0 | xargs -0 #{try_sudo} chmod #{perm}" if remote_dir_exists?(dir_path)
+    run "find #{dir_path} -type d -print0 | xargs -0 -L 500 #{try_sudo} chmod #{perm}" if remote_dir_exists?(dir_path)
   rescue Exception => e
     logger.important "FAILED to set permissions of #{perm} on directories within #{dir_path}!"
     logger.important e.message

data/lib/ash/drupal.rb

@@ -27,7 +27,7 @@ configuration.load do
   # to just using `sudo` due to the concatenation in the sudo method.
   #
   # This assumes that you have set up your SSH user to have passwordless sudo
-  # setup for common commands (e.g., mv, cp, ln, mkdir, chown, chmod, rm, etc.)
+  # setup for common commands (e.g., chmod, rm, rsync, etc.)
   #
   # (see: https://github.com/capistrano/capistrano/blob/legacy-v2/lib/capistrano/configuration/actions/invocation.rb#L229-L237)
   set :sudo_prompt, ''
@@ -62,8 +62,8 @@ configuration.load do
   after "deploy", "drupal:symlink"
   after "drupal:symlink_config_file", "drupal:run_makefiles"
   after "drupal:symlink","drupal:protect"
+  after "drupal:symlink", "compass"
   after "drupal:symlink", "drupal:clearcache"
-  before "drupal:clearcache", "compass"
   after "deploy", "deploy:cleanup"
 
   # --------------------------------------------
@@ -97,7 +97,7 @@ configuration.load do
       # remove shared directories
       multisites.each_pair do |folder, url|
         if folder != url
-          try_sudo "mv #{latest_release}/sites/#{folder} #{latest_release}/sites/#{url}"
+          run "mv #{latest_release}/sites/#{folder} #{latest_release}/sites/#{url}"
         end
         try_sudo "rm -Rf #{latest_release}/sites/#{url}/files"
       end
@@ -143,7 +143,7 @@ configuration.load do
 
   namespace :backup do
     desc "Perform a backup of database files"
-    task :db, :roles => :db do
+    task :db, :roles => :web do
       if previous_release
         puts "Backing up the database now and putting dump file in the previous release directory"
 
@@ -151,11 +151,42 @@ configuration.load do
         # which we'll tarball in the backup:web task
         run "mkdir -p #{tmp_backups_path}/#{release_name}"
 
-        multisites.each_pair do |folder, url|
-          # define the filename (include the current_path so the dump file will be within the directory)
-          filename = "#{tmp_backups_path}/#{release_name}/#{folder}_dump-#{Time.now.to_s.gsub(/ /, "_")}.sql.gz"
-          # dump the database for the proper environment
-          run "#{drush_bin} -l #{url} -r #{current_path} sql-dump | gzip -c --best > #{filename}"
+        now = Time.now.to_s.gsub(/ /, "_")
+        # ignored db tables
+        ignore_tables         = fetch(:ignore_tables, [])
+        structure_tables_key  = fetch(:structure_tables_key, 'structure-tables')
+
+        if !ignore_tables.empty?
+          if ignore_tables.is_a?(String)
+            ignore_tables_str = ignore_tables
+          else
+            ignore_tables_str = ignore_tables.join(',')
+          end
+
+          # define the filenames (include the current_path so the dump file will be within the directory)
+          data_filename       = "#{tmp_backups_path}/#{release_name}/#{dbname}_data_dump-#{now}.sql.gz"
+          structure_filename  = "#{tmp_backups_path}/#{release_name}/#{dbname}_structure_dump-#{now}.sql.gz"
+
+          if ignore_tables_str == 'common'
+            skip_tables_opt = "--skip-tables-key"
+          else
+            skip_tables_opt = "--skip-tables-list"
+          end
+
+          multisites.each_pair do |folder, url|
+            # dump the database structure for the proper environment (structure dump of common tables)
+            run "#{drush_bin} -l #{url} -r #{current_path} sql-dump --structure-tables-key=#{structure_tables_key} | gzip -c --best > #{structure_filename}"
+
+            # dump the database data for the proper environment
+            run "#{drush_bin} -l #{url} -r #{current_path} sql-dump #{skip_tabls_opt}=#{ignore_tables_str} | gzip -c --best > #{data_filename}"
+          end
+        else
+          multisites.each_pair do |folder, url|
+            # define the filename (include the current_path so the dump file will be within the directory)
+            filename = "#{tmp_backups_path}/#{release_name}/#{folder}_dump-#{now}.sql.gz"
+            # dump the database for the proper environment (skip standard tables)
+            run "#{drush_bin} -l #{url} -r #{current_path} sql-dump --skip-tables-key=common | gzip -c --best > #{filename}"
+          end
         end
       else
         logger.important "no previous release to backup; backup of database skipped"

data/lib/ash/magento.rb

@@ -27,7 +27,7 @@ configuration.load do
   # to just using `sudo` due to the concatenation in the sudo method.
   #
   # This assumes that you have set up your SSH user to have passwordless sudo
-  # setup for common commands (e.g., mv, cp, ln, mkdir, chown, chmod, rm, etc.)
+  # setup for common commands (e.g., chmod, rm, rsync, etc.)
   #
   # (see: https://github.com/capistrano/capistrano/blob/legacy-v2/lib/capistrano/configuration/actions/invocation.rb#L229-L237)
   set :sudo_prompt, ''
@@ -38,11 +38,20 @@ configuration.load do
   set :enable_modules, []
   set :disable_modules, %w(Ash_Bar)
 
+
+  # --------------------------------------------
+  # Database/Backup Variables
+  # --------------------------------------------
+  set :ignore_tables, %w(core_cache core_cache_option core_cache_tag core_session log_customer log_quote log_summary log_summary_type log_url log_url_info log_visitor log_visitor_info log_visitor_online enterprise_logging_event enterprise_logging_event_changes index_event index_process_event report_event report_viewed_product_index dataflow_batch_export dataflow_batch_import)
+
+  # don't backup the media and var directories within the root
+  # of Magento project (these are already in the shared directory)
+  set :backup_exclude, %w(media var)
+
   # --------------------------------------------
   # Task chains
   # --------------------------------------------
   after "deploy:setup", "deploy:setup_local"
-  #  after "deploy:setup_shared", "pma:install"
   after "deploy:finalize_update", "magento:activate_config"
   # after "deploy:create_symlink", "magento:symlink"
 
@@ -118,6 +127,20 @@ configuration.load do
     end
   end
 
+  namespace :compass do
+    desc "Compile SASS stylesheets and upload to remote server"
+    task :default do
+      # optional way to skip compiling of stylesheets and just upload them to the servers
+      skip_compass_compile = fetch(:skip_compass_compile, false)
+
+      compass.compile unless skip_compass_compile
+      compass.upload_stylesheets
+      # fixperms for skin directory instead of the whole application (faster deploys)
+      set_perms_dirs("#{latest_release}/skin")
+      set_perms_files("#{latest_release}/skin")
+    end
+  end
+
   # --------------------------------------------
   # Magento specific tasks
   # --------------------------------------------
@@ -166,7 +189,7 @@ configuration.load do
 
     desc "Clear the Magento Cache"
     task :cc, :roles => [:web, :app], :except => { :no_release => true } do
-      try_sudo "chown -R #{user}:#{user} #{shared_path}/var/*"
+      run "chown -R #{user}:#{user} #{shared_path}/var/*"
       magento.purge_cache
     end
 
@@ -201,33 +224,4 @@ configuration.load do
     end
   end
 
-  # --------------------------------------------
-  # Override the base.rb backup tasks
-  # --------------------------------------------
-  namespace :backup do
-    desc "Perform a backup of ONLY database SQL files"
-    task :default do
-      deploy.setup_backup
-      db
-      cleanup
-    end
-
-    desc "Perform a backup of database files"
-    task :db, :roles => :db do
-      if previous_release
-        puts "Backing up the database now and putting dump file in the #{stage}/backups directory"
-
-        # define the filename (dump the SQL file directly to the backups directory)
-        filename = "#{backups_path}/#{dbname}_dump-#{Time.now.to_s.gsub(/ /, "_")}.sql.gz"
-
-        # dump the database for the proper environment
-        run "#{mysqldump} #{dump_options} -u #{dbuser} -p #{dbname} | gzip -c --best > #{filename}" do |ch, stream, out|
-          ch.send_data "#{dbpass}\n" if out =~ /^Enter password:/
-        end
-      else
-        logger.important "no previous release to backup to; backup of database skipped"
-      end
-    end
-  end
-
 end

data/lib/ash/performance.rb

@@ -0,0 +1,41 @@
+Capistrano::Configuration.instance(:must_exist).load do |config|
+  start_times = {}
+  end_times   = {}
+  order       = []
+
+  on :before do
+    order << [:start, current_task]
+    start_times[current_task] = Time.now
+  end
+
+  on :after do
+    order << [:end, current_task]
+    end_times[current_task] = Time.now
+  end
+
+  config.on :exit do
+    print_report(start_times, end_times, order)
+  end
+
+  def print_report(start_times, end_times, order)
+    def l(s)
+      logger.info s
+    end
+
+    l " Performance Report"
+    l "=========================================================="
+
+    indent = 0
+    (order + [nil]).each_cons(2) do |payload1, payload2|
+      action, task = payload1
+      if action == :start
+        l "#{".." * indent}#{task.fully_qualified_name}" unless task == payload2.last
+        indent += 1
+      else
+        indent -= 1
+        l "#{".." * indent}#{task.fully_qualified_name} #{(end_times[task] - start_times[task]).to_i}s"
+      end
+    end
+    l "=========================================================="
+  end
+end

data/lib/ash/zend_doctrine.rb

@@ -8,6 +8,21 @@ configuration = Capistrano::Configuration.respond_to?(:instance) ?
   Capistrano.configuration(:must_exist)
 
 configuration.load do
+  # --------------------------------------------
+  # try_sudo configuration
+  # --------------------------------------------
+  set :use_sudo, true                 # allow try_sudo methods to actually run via sudo
+  # set(:admin_runner) {"#{user}"}    # specify the :admin_runner if you need to run it as another user other than root
+
+  # Clear out the default prompt (i.e., `sudo -p 'sudo password: '`) to fall back
+  # to just using `sudo` due to the concatenation in the sudo method.
+  #
+  # This assumes that you have set up your SSH user to have passwordless sudo
+  # setup for common commands (e.g., chmod, rm, rsync, etc.)
+  #
+  # (see: https://github.com/capistrano/capistrano/blob/legacy-v2/lib/capistrano/configuration/actions/invocation.rb#L229-L237)
+  set :sudo_prompt, ''
+
   # --------------------------------------------
   # Calling our Methods
   # --------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ash
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - August Ash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.15.5
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: railsless-deploy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
 description: August Ash recipes for Capistrano
 email: code@augustash.com
 executables: []
@@ -86,6 +100,7 @@ files:
 - lib/ash/drupal_shared_hosting.rb
 - lib/ash/hosted_magento.rb
 - lib/ash/magento.rb
+- lib/ash/performance.rb
 - lib/ash/wordpress.rb
 - lib/ash/wordpress_nested.rb
 - lib/ash/wordpress_shared_hosting.rb
@@ -110,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Useful task libraries for August Ash recipes for Capistrano