capistrano-ash 1.1.7 → 1.1.8

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 1.1.7
+* Updated naming convention for Magento configuration files
+
 == 1.1.6
 * Bug Fix: removed "config" from ignore statement to prevent legit Magento files from being ignored
 

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/ash/base.rb

@@ -23,6 +23,7 @@ configuration.load do
   # --------------------------------------------
   after "deploy:setup", "deploy:setup_shared"
   after "deploy:setup_shared", "deploy:setup_backup"
+  after "deploy:finalize_update", "ash:htaccess"
   after "deploy", "deploy:cleanup"
 
   # --------------------------------------------
@@ -104,6 +105,12 @@ configuration.load do
     task :getpath do
       run "echo $PATH"
     end
+    
+    desc 'Copy distribution htaccess file'
+    task :htaccess do
+      run "mv #{latest_release}/htaccess.dist #{latest_release}/.htaccess" if 
+        remote_file_exists?("#{latest_release}/htaccess.dist")
+    end
   end
   
   # --------------------------------------------

data/lib/ash/drupal.rb

@@ -17,7 +17,7 @@ configuration.load do
   # --------------------------------------------
   # Calling our Methods
   # --------------------------------------------
-  after "deploy:setup", "deploy:setup_shared"
+  after "deploy:setup", "deploy:setup_local"
   after "deploy:finalize_update", "ash:fixperms"
   after "deploy:symlink", "drupal:symlink"
   after "drupal:symlink","drupal:protect"
@@ -28,6 +28,12 @@ configuration.load do
   # Overloaded Methods
   # --------------------------------------------
   namespace :deploy do
+    desc "Setup local files necessary for deployment"
+    task :setup_local do
+      # attempt to create files needed for proper deployment
+      system("cp .htaccess htaccess.dist")
+    end
+    
     desc "Setup shared application directories and permissions after initial setup"
     task :setup_shared, :roles => :web do
       # remove Capistrano specific directories
@@ -144,10 +150,5 @@ configuration.load do
         run "chmod 644 #{latest_release}/sites/#{url}/settings.php*"
       end
     end
-  
-    desc 'Copy over htaccess file'
-    task :htaccess do
-      run "cp #{latest_release}/htaccess.dist #{latest_release}/.htaccess"
-    end
   end
 end

data/lib/ash/hosted_magento.rb

@@ -1,6 +1,5 @@
 # Required base libraries
-require 'ash/base'
-require 'railsless-deploy'
+require 'ash/magento'
 
 # Bootstrap Capistrano instance
 configuration = Capistrano::Configuration.respond_to?(:instance) ?
@@ -16,21 +15,11 @@ configuration.load do
   # --------------------------------------------
   # Task chains
   # --------------------------------------------
-  after "deploy:setup", "deploy:setup_local"
-  after "deploy:finalize_update", "magento:activate_config"
-  after "deploy:symlink", "magento:symlink"
-  after "deploy", "magento:purge_cache"
 
   # --------------------------------------------
   # Overloaded tasks
   # --------------------------------------------
-  namespace :deploy do
-    desc "Setup local files necessary for deployment"
-    task :setup_local do
-      # attempt to create files needed for proper deployment
-      system("touch htaccess.dist app/etc/local.xml.staging app/etc/local.xml.production")
-    end
-    
+  namespace :deploy do    
     desc "Setup shared application directories and permissions after initial setup"
     task :setup_shared do
       # remove Capistrano specific directories
@@ -65,18 +54,6 @@ configuration.load do
       # set the file and directory permissions
       ash.fixperms
     end
-
-    namespace :web do
-      desc "Disable the application and show a message screen"
-      task :disable, :except => { :no_release => true } do
-        run "touch #{current_path}/maintenance.flag"
-      end
-
-      desc "Enable the application and remove the message screen"
-      task :enable, :except => { :no_release => true } do
-        run "rm #{current_path}/maintenance.flag"
-      end
-    end
   end
   
   # --------------------------------------------
@@ -90,51 +67,4 @@ configuration.load do
       run "find #{latest_release} -type f -exec chmod 644 {} \\;"
     end
   end
-
-  # --------------------------------------------
-  # Magento specific tasks
-  # --------------------------------------------
-  namespace :magento do
-    desc "Set appropriate configuration values for the stage"
-    task :activate_config, :except => { :no_release => true } do
-      run "cp -f #{latest_release}/app/etc/local.xml.#{stage} #{latest_release}/app/etc/local.xml"
-    end
-
-    desc "Symlink shared directories"
-    task :symlink, :except => { :no_release => true } do
-      run "ln -nfs #{shared_path}/includes #{current_release}/includes"
-      run "ln -nfs #{shared_path}/media #{current_release}/media"
-      run "ln -nfs #{shared_path}/sitemap #{current_release}/sitemap"
-      run "ln -nfs #{shared_path}/var #{current_release}/var"
-    end
-
-    desc "Purge Magento cache directory"
-    task :purge_cache, :except => { :no_release => true } do
-      run "rm -Rf #{shared_path}/var/cache/*"
-    end
-
-    desc "Watch Magento system log"
-    task :watch_logs, :except => { :no_release => true } do      
-      run "tail -f #{shared_path}/var/log/system.log" do |channel, stream, data|
-        puts  # for an extra line break before the host name
-        puts "#{channel[:host]}: #{data}" 
-        break if stream == :err    
-      end
-    end
-
-    desc "Watch Magento exception log"
-    task :watch_exceptions, :except => { :no_release => true } do
-      run "tail -f #{shared_path}/var/log/exception.log" do |channel, stream, data|
-        puts  # for an extra line break before the host name
-        puts "#{channel[:host]}: #{data}" 
-        break if stream == :err    
-      end
-    end
-  end
-
-  # --------------------------------------------
-  # Custom tasks
-  # --------------------------------------------
-
-  # update core_config_data; set value = "domain" where scope_id = 0 and path = "web/unsecure/base_url"
 end

data/lib/ash/magento.rb

@@ -24,7 +24,8 @@ configuration.load do
     desc "Setup local files necessary for deployment"
     task :setup_local do
       # attempt to create files needed for proper deployment
-      system("touch app/etc/local.xml.staging app/etc/local.xml.production")
+      system("cp .htaccess htaccess.dist")
+      system("touch app/etc/local.staging.xml app/etc/local.production.xml")
     end
     
     desc "Setup shared application directories and permissions after initial setup"
@@ -58,8 +59,8 @@ configuration.load do
 
       # set the file and directory permissions
       ash.fixperms
-      run "chmod 400 #{latest_release}/pear"
-      run "chmod 400 #{latest_release}/mage"
+      run "chmod 400 #{latest_release}/pear" if remote_file_exists?("#{latest_release}/pear")
+      run "chmod 400 #{latest_release}/mage" if remote_file_exists?("#{latest_release}/mage")
       run "chmod o+w #{latest_release}/app/etc"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ash
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-06 00:00:00.000000000 -05:00
+date: 2011-07-07 00:00:00.000000000 -05:00
 default_executable: 
 dependencies: []
 description: August Ash recipes for Capistrano