capistrano-ash 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/capistrano-ash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-ash}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["August Ash"]
-  s.date = %q{2011-05-17}
+  s.date = %q{2011-05-19}
   s.description = %q{August Ash recipes for Capistrano}
   s.email = %q{jake@augustash.com}
   s.extra_rdoc_files = [
@@ -24,10 +24,13 @@ Gem::Specification.new do |s|
     "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/zend_doctrine.rb"
+    "lib/ash/wordpress_shared_hosting.rb",
+    "lib/ash/zend_doctrine.rb",
+    "lib/ash/zend_doctrine_shared_hosting.rb"
   ]
   s.homepage = %q{https://github.com/augustash/capistrano-ash}
   s.require_paths = ["lib"]

data/lib/ash/drupal.rb

@@ -32,11 +32,9 @@ configuration.load do
     desc "Setup shared application directories and permissions after initial setup"
     task :setup_shared, :roles => :web do
       # remove Capistrano specific directories
-      run<<-CMD
-        rm -Rf #{shared_path}/log &&
-        rm -Rf #{shared_path}/pids &&
-        rm -Rf #{shared_path}/system
-      CMD
+      run "rm -Rf #{shared_path}/log"
+      run "rm -Rf #{shared_path}/pids"
+      run "rm -Rf #{shared_path}/system"
 
       # create shared directories
       multisites.each_pair do |folder, url|

data/lib/ash/drupal_shared_hosting.rb

@@ -13,11 +13,9 @@ configuration.load do
     desc "Setup shared application directories and permissions after initial setup"
     task :setup_shared, :roles => :web do
       # remove Capistrano specific directories
-      run<<-CMD
-        rm -Rf #{shared_path}/log &&
-        rm -Rf #{shared_path}/pids &&
-        rm -Rf #{shared_path}/system
-      CMD
+      run "rm -Rf #{shared_path}/log"
+      run "rm -Rf #{shared_path}/pids"
+      run "rm -Rf #{shared_path}/system"
 
       # create shared directories
       multisites.each_pair do |folder, url|

data/lib/ash/wordpress.rb

@@ -27,17 +27,14 @@ namespace :deploy do
   desc "Setup shared application directories and permissions after initial setup"
   task :setup_shared, :roles => :web do
     # remove Capistrano specific directories
-    run<<-CMD
-      rm -Rf #{shared_path}/log &&
-      rm -Rf #{shared_path}/pids &&
-      rm -Rf #{shared_path}/system
-    CMD
+    run "rm -Rf #{shared_path}/log"
+    run "rm -Rf #{shared_path}/pids"
+    run "rm -Rf #{shared_path}/system"
     
     # create shared directories
-    run<<-CMD
-      mkdir -p #{shared_path}/uploads &&
-      mkdir -p #{shared_path}/cache
-    CMD
+    run "mkdir -p #{shared_path}/uploads"
+    run "mkdir -p #{shared_path}/cache"
+
     # set correct permissions
     run "chmod -R 777 #{shared_path}/*"
   end
@@ -45,16 +42,12 @@ namespace :deploy do
   desc "[internal] Touches up the released code. This is called by update_code after the basic deploy finishes."
   task :finalize_update, :except => { :no_release => true } do
     # remove shared directories
-    run<<-CMD
-      rm -Rf #{latest_release}/#{uploads_path} &&
-      rm -Rf #{latest_release}/wp-content/cache
-    CMD
+    run "rm -Rf #{latest_release}/#{uploads_path}"
+    run "rm -Rf #{latest_release}/wp-content/cache"
     
     # Removing cruft files.
-    run<<-CMD
-      rm -Rf #{latest_release}/license.txt &&
-      rm -Rf #{latest_release}/readme.html
-    CMD
+    run "rm -Rf #{latest_release}/license.txt"
+    run "rm -Rf #{latest_release}/readme.html"
   end
 end
 
@@ -64,10 +57,9 @@ end
 namespace :wordpress do
   desc "Links the correct settings file"
   task :symlink do
-    run<<-CMD
-      ln -nfs #{shared_path}/uploads #{current_release}/#{uploads_path} &&
-      ln -nfs #{shared_path}/cache #{current_release}/wp-content/cache &&
-      ln -nfs #{latest_release}/wp-config.php.#{stage} #{latest_release}/wp-config.php
+    run "ln -nfs #{shared_path}/uploads #{current_release}/#{uploads_path}"
+    run "ln -nfs #{shared_path}/cache #{current_release}/wp-content/cache"
+    run "ln -nfs #{latest_release}/wp-config.php.#{stage} #{latest_release}/wp-config.php"
     CMD
   end
   

data/lib/ash/wordpress_shared_hosting.rb

@@ -13,17 +13,13 @@ configuration.load do
     desc "Setup shared application directories and permissions after initial setup"
     task :setup_shared, :roles => :web do
       # remove Capistrano specific directories
-      run<<-CMD
-        rm -Rf #{shared_path}/log &&
-        rm -Rf #{shared_path}/pids &&
-        rm -Rf #{shared_path}/system
-      CMD
+      run "rm -Rf #{shared_path}/log"
+      run "rm -Rf #{shared_path}/pids"
+      run "rm -Rf #{shared_path}/system"
       
       # create shared directories
-      run<<-CMD
-        mkdir -p #{shared_path}/uploads &&
-        mkdir -p #{shared_path}/cache
-      CMD
+      run "mkdir -p #{shared_path}/uploads"
+      run "mkdir -p #{shared_path}/cache"
 
       # set correct permissions
       run "chmod -R 755 #{shared_path}/*"

data/lib/ash/zend_doctrine.rb

@@ -22,13 +22,11 @@ configuration.load do
   namespace :deploy do
     desc "Setup shared directories and permissions after initial setup"
     task :setup_shared, :roles => :web, :except => { :no_release => true } do
-      run<<-CMD 
-        mkdir -p #{shared_path}/var &&
-        mkdir -p #{shared_path}/var/logs &&
-        mkdir -p #{shared_path}/var/cache && 
-        mkdir -p #{shared_path}/var/sessions &&
-        mkdir -p #{shared_path}/system
-      CMD
+      run "mkdir -p #{shared_path}/var"
+      run "mkdir -p #{shared_path}/var/logs"
+      run "mkdir -p #{shared_path}/var/cache"
+      run "mkdir -p #{shared_path}/var/sessions"
+      run "mkdir -p #{shared_path}/system"
       try_sudo "chmod -R 777 #{shared_path}/*"
     end
     
@@ -43,24 +41,21 @@ configuration.load do
   namespace :zend do
     desc "Symlink shared directories"
     task :symlink, :except => { :no_release => true } do
-      run<<-CMD
-        ln -nfs #{shared_path}/var #{current_release}/var &&
-        ln -nfs #{shared_path}/system #{current_release}/public/system &&
-        mv #{current_release}/application/configs/application.ini.dist #{current_release}/application/configs/application.ini &&
-        ln -nfs #{current_release}/application/Application.#{stage}.php #{current_release}/application/Application.php &&
-        mv #{current_release}/public/htaccess.#{stage} #{current_release}/public/.htaccess &&
-        cp #{current_release}/scripts/doctrine-cli.#{stage} #{current_release}/scripts/doctrine-cli
-      CMD
+      run "ln -nfs #{shared_path}/var #{current_release}/var"
+      run "ln -nfs #{shared_path}/system #{current_release}/public/system"
+      run "mv #{current_release}/application/configs/application.ini.dist #{current_release}/application/configs/application.ini"
+      run "ln -nfs #{current_release}/application/Application.#{stage}.php #{current_release}/application/Application.php"
+      run "mv #{current_release}/public/htaccess.#{stage} #{current_release}/public/.htaccess"
+      run "cp #{current_release}/scripts/doctrine-cli.#{stage} #{current_release}/scripts/doctrine-cli"
+      
       
       try_sudo "chmod +x #{current_release}/scripts/doctrine-cli"
       
       # remove the example or other environment example files
-      run<<-CMD
-        rm -f #{current_release}/scripts/doctrine-cli.dist &&
-        rm -f #{current_release}/scripts/doctrine-cli.staging &&
-        rm -f #{current_release}/scripts/doctrine-cli.production &&
-        rm -f #{current_release}/application/Application.example.php
-      CMD
+      run "rm -f #{current_release}/scripts/doctrine-cli.dist"
+      run "rm -f #{current_release}/scripts/doctrine-cli.staging"
+      run "rm -f #{current_release}/scripts/doctrine-cli.production"
+      run "rm -f #{current_release}/application/Application.example.php"
     end
   end
   

data/lib/ash/zend_doctrine_shared_hosting.rb

@@ -15,13 +15,11 @@ configuration.load do
       for a shared hosting enviroment
     DESC
     task :setup_shared, :roles => :web, :except => { :no_release => true } do
-      run<<-CMD 
-        mkdir -p #{shared_path}/var &&
-        mkdir -p #{shared_path}/var/logs &&
-        mkdir -p #{shared_path}/var/cache && 
-        mkdir -p #{shared_path}/var/sessions &&
-        mkdir -p #{shared_path}/system
-      CMD
+      run "mkdir -p #{shared_path}/var"
+      run "mkdir -p #{shared_path}/var/logs"
+      run "mkdir -p #{shared_path}/var/cache"
+      run "mkdir -p #{shared_path}/var/sessions"
+      run "mkdir -p #{shared_path}/system"
       try_sudo "chmod -R 755 #{shared_path}/*"
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: capistrano-ash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - August Ash