capistrano-ash 1.3.1 → 1.3.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDU5ZDEzMTJhYjMzNGFiMzkwYWIzOTc0Y2ZiZjg1MmJjYjViNDFkZQ==
+  data.tar.gz: !binary |-
+    ZWU1ZGMzOTRhMGYxMzZiZjY5YzU1MjRkOGIyNzQzMDJkNTdmMTUyZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Njg3OTdmZTU2OTgyMDZmNzY3ZGIzZmYzM2ViMmY3NmY0ZWQ2ZGE4ZWJiYjJl
+    ZTE2NjA4MDlmOTlmZWUzY2RiNWQ3MmViNmRiYTlmNzU2Y2Y4ZTE1YjAwNzA0
+    NDQ3NmZhMDY5Mzg3Y2Y4OGQyODFjYjM3YzQxZjIyYTg0NmRjOTE=
+  data.tar.gz: !binary |-
+    OWY3Y2YwODJjNDljZGNiNTk3MjkxYWU5NTIxNTY0ODg0MmNkMTVjNDk5Y2Nk
+    Njc3ZjNhNDlhYzkxZGYzOTU2OTdlZmZlMzJlMGIyNWI4YTEyOTdjYjIzZTM5
+    YjNkNjdkZTExYWNhODdlOWUwZTQyNzhkZTZkYWJhOGE0ODk3ZWY=

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+== 1.3.3
+* FIXED: Issue #42 - chown backups path was failing miserably in the deploy:setup_backup task
+
+== 1.3.2
+* FIXED: Issue #28 - use try_sudo where appropriate
+* FEATURE: Issue #33 - Enable git submodules by default if using git
+* FIXED: Issue #34 - scp fails because of missing port option
+* FIXED: Issue #37 - Rescue from errors during backup:cleanup
+* MERGED PULL REQUEST: Issue #38 - improve set_perms_dirs and set_perms_files performance
+* FIXED: Issue #39 - zend:symlink is run multiple times
+* FEATURE: Issue #40 - check remote servers to see if drush is installed and available to the user
+
 == 1.3.1
 * Added additional variable (:skip_compass_compile) to skip the compilation and just upload stylesheets (useful for our upcoming Wraith theme)
 * Namespaced the commands within `compass:defualt` to avoid any future conflicts

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.3

data/capistrano-ash.gemspec

@@ -0,0 +1,61 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "capistrano-ash"
+  s.version = "1.3.3"
+
+  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 = [
+    "CHANGELOG.rdoc",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "capistrano-ash.gemspec",
+    "lib/ash/base.rb",
+    "lib/ash/common.rb",
+    "lib/ash/drupal.rb",
+    "lib/ash/drupal_shared_hosting.rb",
+    "lib/ash/hosted_magento.rb",
+    "lib/ash/magento.rb",
+    "lib/ash/wordpress.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"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<capistrano>, [">= 2.12.0"])
+      s.add_runtime_dependency(%q<capistrano-ext>, [">= 0"])
+      s.add_runtime_dependency(%q<railsless-deploy>, [">= 0"])
+      s.add_runtime_dependency(%q<capistrano_colors>, [">= 0"])
+    else
+      s.add_dependency(%q<capistrano>, [">= 2.12.0"])
+      s.add_dependency(%q<capistrano-ext>, [">= 0"])
+      s.add_dependency(%q<railsless-deploy>, [">= 0"])
+      s.add_dependency(%q<capistrano_colors>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<capistrano>, [">= 2.12.0"])
+    s.add_dependency(%q<capistrano-ext>, [">= 0"])
+    s.add_dependency(%q<railsless-deploy>, [">= 0"])
+    s.add_dependency(%q<capistrano_colors>, [">= 0"])
+  end
+end
+

data/lib/ash/base.rb

@@ -43,7 +43,8 @@ configuration.load do
   # Source Control
   set :group_writable,    false
   set :use_sudo,          false
-  set :scm,               :subversion
+  set :scm,               :git
+  set :git_enable_submodules, 1 if fetch(:scm, :git)
   set :scm_verbose,       true
   set :scm_username,      proc{text_prompt("Subversion username: ")}
   set :scm_password,      proc{Capistrano::CLI.password_prompt("Subversion password for '#{scm_username}': ")}
@@ -107,8 +108,8 @@ configuration.load do
     task :setup, :except => { :no_release => true } do
       dirs = [deploy_to, releases_path, shared_path]
       dirs += shared_children.map { |d| File.join(shared_path, d.split('/').last) }
-      run "#{try_sudo} mkdir -p #{dirs.join(' ')}"
-      run "#{try_sudo} chmod 755 #{dirs.join(' ')}" if fetch(:group_writable, true)
+      try_sudo "mkdir -p #{dirs.join(' ')}"
+      try_sudo "chmod 755 #{dirs.join(' ')}" if fetch(:group_writable, true)
     end
 
     desc "Setup shared application directories and permissions after initial setup"
@@ -118,7 +119,7 @@ configuration.load do
 
     desc "Setup backup directory for database and web files"
     task :setup_backup, :except => { :no_release => true } do
-      run "#{try_sudo} mkdir -p #{backups_path} #{tmp_backups_path} && #{try_sudo} chmod 755 #{backups_path}"
+      try_sudo "mkdir -p #{backups_path} #{tmp_backups_path} && chmod 755 #{backups_path}"
     end
 
     desc <<-DESC
@@ -416,16 +417,20 @@ configuration.load do
       else
         logger.info "keeping #{count} of #{backups.length} backups"
 
-        archives = (backups - backups.last(count)).map { |backup|
-          File.join(backups_path, backup) }.join(" ")
+        begin
+          archives = (backups - backups.last(count)).map { |backup|
+            File.join(backups_path, backup) }.join(" ")
 
-        # fix permissions on the the files and directories before removing them
-        archives.split(" ").each do |backup|
-          set_perms_dirs("#{backup}", 755)
-          set_perms_files("#{backup}", 644)
-        end
+          # fix permissions on the the files and directories before removing them
+          archives.split(" ").each do |backup|
+            set_perms_dirs("#{backup}", 755)
+            set_perms_files("#{backup}", 644)
+          end
 
-        try_sudo "rm -rf #{archives}"
+          try_sudo "rm -rf #{archives}"
+        rescue Exception => e
+          logger.important e.message
+        end
       end
     end
   end
@@ -458,7 +463,7 @@ configuration.load do
           logger.debug "trying to upload stylesheets from ./#{watched_dirs}/#{stylesheets_dir_name} -> #{latest_release}/#{watched_dirs}/#{stylesheets_dir_name}"
 
           servers.each do |web_server|
-            upload_command = "scp -r ./#{watched_dirs}/#{stylesheets_dir_name}/*.css #{user}@#{web_server}:#{latest_release}/#{watched_dirs}/#{stylesheets_dir_name}/"
+            upload_command = "scp -r -P #{port} ./#{watched_dirs}/#{stylesheets_dir_name}/*.css #{user}@#{web_server}:#{latest_release}/#{watched_dirs}/#{stylesheets_dir_name}/"
 
             logger.info "running SCP command:"
             logger.debug upload_command
@@ -470,7 +475,7 @@ configuration.load do
             logger.debug "trying to upload stylesheets from ./#{dir}/#{stylesheets_dir_name}/ -> #{latest_release}/#{dir}/#{stylesheets_dir_name}/"
 
             servers.each do |web_server|
-              upload_command = "scp -r ./#{dir}/#{stylesheets_dir_name}/*.css #{user}@#{web_server}:#{latest_release}/#{dir}/#{stylesheets_dir_name}/"
+              upload_command = "scp -r -P #{port} ./#{dir}/#{stylesheets_dir_name}/*.css #{user}@#{web_server}:#{latest_release}/#{dir}/#{stylesheets_dir_name}/"
 
               logger.info "running SCP command:"
               logger.debug upload_command

data/lib/ash/common.rb

@@ -44,10 +44,10 @@ end
 
 # set the permissions for files recurisvely from the starting directory (dir_path) 
 def set_perms_files(dir_path, perm = 644)
-  try_sudo "find #{dir_path} -type f -exec chmod #{perm} {} \\;"
+  try_sudo "find #{dir_path} -type f -print0 | xargs -0 chmod #{perm}"
 end
 
 # set the permissions for directories recurisvely from the starting directory (dir_path) 
 def set_perms_dirs(dir_path, perm = 755)
-  try_sudo "find #{dir_path} -type d -exec chmod #{perm} {} \\;"
+  try_sudo "find #{dir_path} -type d -print0 | xargs -0 chmod #{perm}"
 end

data/lib/ash/drupal.rb

@@ -8,6 +8,14 @@ configuration = Capistrano::Configuration.respond_to?(:instance) ?
 
 configuration.load do
 
+  # --------------------------------------------
+  # Deployment dependencies
+  #
+  #     $ cap <stage> deploy:check
+  #
+  # --------------------------------------------
+  depend :remote, :command, 'drush'
+
   # --------------------------------------------
   # Setting defaults
   # --------------------------------------------
@@ -55,17 +63,17 @@ configuration.load do
     desc "Setup shared application directories and permissions after initial setup"
     task :setup_shared do
       # remove Capistrano specific directories
-      run "rm -Rf #{shared_path}/log"
-      run "rm -Rf #{shared_path}/pids"
-      run "rm -Rf #{shared_path}/system"
+      try_sudo "rm -Rf #{shared_path}/log"
+      try_sudo "rm -Rf #{shared_path}/pids"
+      try_sudo "rm -Rf #{shared_path}/system"
 
       # create shared directories
       multisites.each_pair do |folder, url|
-        run "mkdir -p #{shared_path}/#{url}/files"
+        try_sudo "mkdir -p #{shared_path}/#{url}/files"
       end
 
       # set correct permissions
-      run "chmod -R 777 #{shared_path}/*"
+      try_sudo "chmod -R 777 #{shared_path}/*"
     end
 
     desc "[internal] Touches up the released code. This is called by update_code after the basic deploy finishes."
@@ -73,9 +81,9 @@ configuration.load do
       # remove shared directories
       multisites.each_pair do |folder, url|
         if folder != url
-          run "mv #{latest_release}/sites/#{folder} #{latest_release}/sites/#{url}"
+          try_sudo "mv #{latest_release}/sites/#{folder} #{latest_release}/sites/#{url}"
         end
-        run "rm -Rf #{latest_release}/sites/#{url}/files"
+        try_sudo "rm -Rf #{latest_release}/sites/#{url}/files"
       end
     end
 
@@ -144,7 +152,7 @@ configuration.load do
         # symlinks the appropriate environment's settings.php file
         symlink_config_file
 
-        run "ln -nfs #{shared_path}/#{url}/files #{latest_release}/sites/#{url}/files"
+        try_sudo "ln -nfs #{shared_path}/#{url}/files #{latest_release}/sites/#{url}/files"
         run "#{drush_bin} -l #{url} -r #{current_path} vset --yes file_directory_path sites/#{url}/files"
       end
     end
@@ -188,7 +196,7 @@ configuration.load do
     desc "Protect system files"
     task :protect, :roles => :web, :except => { :no_release => true } do
       multisites.each_pair do |folder, url|
-        run "chmod 644 #{latest_release}/sites/#{url}/settings.php*"
+        try_sudo "chmod 644 #{latest_release}/sites/#{url}/settings.php*"
       end
     end
 
@@ -220,7 +228,7 @@ configuration.load do
       DESC
       task :setup_ubercart_shared, :roles => :web, :except => { :no_release => true } do
         multisites.each_pair do |folder, url|
-          run "mkdir -p #{shared_path}/#{url}/#{uc_root}"
+          try_sudo "mkdir -p #{shared_path}/#{url}/#{uc_root}"
         end
       end
 
@@ -239,13 +247,13 @@ configuration.load do
       task :secure_downloadable_files, :except => { :no_release => true } do
         # loop through the multisites and move files
         multisites.each_pair do |folder, url|
-          run "mkdir -p #{shared_path}/#{url}/#{uc_root}/#{uc_downloadable_products_root}"
+          try_sudo "mkdir -p #{shared_path}/#{url}/#{uc_root}/#{uc_downloadable_products_root}"
 
           ubercart_dir = "#{latest_release}/sites/#{url}/files/#{uc_root}/#{uc_downloadable_products_root}"
 
           case true
             when remote_dir_exists?("#{ubercart_dir}")
-              run "rsync -rltDvzog #{ubercart_dir} #{shared_path}/#{url}/#{uc_root}/#{uc_downloadable_products_root}"
+              try_sudo "rsync -rltDvzog #{ubercart_dir} #{shared_path}/#{url}/#{uc_root}/#{uc_downloadable_products_root}"
             else
               logger.important "Failed to rsync the ubercart downloadable products in #{ubercart_dir} because the directory doesn't exist"
           end
@@ -273,7 +281,7 @@ configuration.load do
       task :secure_encryption_key, :roles => :web, :except => { :no_release => true } do
         # loop through the multisites and move keys
         multisites.each_pair do |folder, url|
-          run "mkdir -p #{shared_path}/#{url}/#{uc_root}/#{uc_encryption_keys_root}"
+          try_sudo "mkdir -p #{shared_path}/#{url}/#{uc_root}/#{uc_encryption_keys_root}"
 
           # update the ubercart's database tracking of where the
           # root file path is for encryption keys. This should

data/lib/ash/drupal_shared_hosting.rb

@@ -6,6 +6,11 @@ configuration = Capistrano::Configuration.respond_to?(:instance) ?
   Capistrano.configuration(:must_exist)
 
 configuration.load do
+
+  # shared servers typically don't allow `sudo`,
+  # so this will tell `try_sudo` to run as the `:user` instead
+  set :use_sudo, false
+
   # --------------------------------------------
   # Overloaded Methods
   # --------------------------------------------
@@ -26,4 +31,4 @@ configuration.load do
       set_perms_dirs("#{shared_path}")
     end
   end
-end
+end

data/lib/ash/zend_doctrine.rb

@@ -13,12 +13,11 @@ configuration.load do
   # --------------------------------------------
   after "deploy:setup", "deploy:setup_shared"
   after "deploy:finalize_update", "ash:fixperms"
-  # after "deploy:create_symlink", "zend:symlink"
 
   # workaround for issues with capistrano v2.13.3 and
   # before/after callbacks not firing for 'deploy:symlink'
   # or 'deploy:create_symlink'
-  after "deploy", "zend:symlink"
+  after "deploy:create_symlink", "zend:symlink"
   after "zend:symlink", "compass"
   after "deploy", "deploy:cleanup"
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ash
 version: !ruby/object:Gem::Version
-  version: 1.3.1
-  prerelease: 
+  version: 1.3.3
 platform: ruby
 authors:
 - August Ash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: railsless-deploy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,6 +77,7 @@ files:
 - README.textile
 - Rakefile
 - VERSION
+- capistrano-ash.gemspec
 - lib/ash/base.rb
 - lib/ash/common.rb
 - lib/ash/drupal.rb
@@ -98,26 +90,25 @@ files:
 - lib/ash/zend_doctrine_shared_hosting.rb
 homepage: https://github.com/augustash/capistrano-ash
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Useful task libraries for August Ash recipes for Capistrano
 test_files: []