capistrano-ash 1.1.4 → 1.1.5

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.1.5
+* Added a common method and test tasks to check if a file exists on the remote server
+* Added drupal:symlink_config_file as a utility task to check if the settings.php file exists in one of two formats (settings.ENV.php or settings.php.ENV)
+* The 'default' directory in `sites` is no longer the default application directory to be replaced. Instead the `:multisites` variable now expects the `:application` variable will also represent a folder within the `sites` directory that will be used as the default site when running drush commands. (i.e., `set :multisites, { "#{application}" => "#{application}" }`)
+
 == 1.0.0
 * Added the drupal:htaccess task for copying distributed .htaccess files
 * Added example Drupal Capfile and staging/production deployment files

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gemspec.name = "capistrano-ash"
     gemspec.summary = "Useful task libraries for August Ash recipes for Capistrano"
     gemspec.description = "August Ash recipes for Capistrano"
-    gemspec.email = "jake@augustash.com"
+    gemspec.email = "code@augustash.com"
     gemspec.homepage = "https://github.com/augustash/capistrano-ash"
     gemspec.authors = ["August Ash"]
   end

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/capistrano-ash.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-ash}
-  s.version = "1.1.3"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["August Ash"]
-  s.date = %q{2011-05-19}
+  s.date = %q{2011-06-22}
   s.description = %q{August Ash recipes for Capistrano}
-  s.email = %q{jake@augustash.com}
+  s.email = %q{code@augustash.com}
   s.extra_rdoc_files = [
     "README.textile"
   ]

data/lib/ash/base.rb

@@ -105,7 +105,7 @@ configuration.load do
       run "echo $PATH"
     end
   end
-
+  
   # --------------------------------------------
   # PHP tasks
   # --------------------------------------------
@@ -235,4 +235,29 @@ configuration.load do
     end
   end
 
+  # --------------------------------------------
+  # Remote File/Directory test tasks
+  # --------------------------------------------
+  namespace :remote do
+    namespace :file do
+      desc "Test: Task to test existence of missing file"
+      task :missing do
+        if remote_file_exists?('/dev/mull')
+          logger.info "FAIL - Why does the '/dev/mull' path exist???"
+        else
+          logger.info "GOOD - Verified the '/dev/mull' path does not exist!"
+        end
+      end
+
+      desc "Test: Task used to test existence of a present file"
+      task :exists do
+        if remote_file_exists?('/dev/null')
+          logger.info "GOOD - Verified the '/dev/null' path exists!"
+        else
+          logger.info "FAIL - WHAT happened to the '/dev/null' path???"
+        end
+      end
+    end
+  end
+
 end

data/lib/ash/common.rb

@@ -14,4 +14,10 @@ end
 # +prompt+
 def text_prompt(prompt="Value: ")
   Capistrano::CLI.ui.ask(prompt) { |q| q.echo = true }
+end
+
+# Test to see if a file exists by providing 
+# the full path to the expected file location
+def remote_file_exists?(full_path)
+  'true' ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
 end

data/lib/ash/drupal.rb

@@ -11,7 +11,7 @@ configuration.load do
   # --------------------------------------------
   # Setting defaults
   # --------------------------------------------
-  proc{_cset( :multisites, {"default" => "#{application}"} )}
+  proc{_cset( :multisites, {"#{application}" => "#{application}"} )}
   set :drush_bin, "drush"
 
   # --------------------------------------------
@@ -19,10 +19,9 @@ configuration.load do
   # --------------------------------------------
   after "deploy:setup", "deploy:setup_shared"
   after "deploy:finalize_update", "ash:fixperms"
-  after "ash:fixperms", "drupal:protect"
   after "deploy:symlink", "drupal:symlink"
+  after "drupal:symlink","drupal:protect"
   after "deploy", "drupal:clearcache"
-  after "deploy", "drupal:htaccess"
   after "deploy", "deploy:cleanup"
 
   # --------------------------------------------
@@ -95,11 +94,35 @@ configuration.load do
    desc "Symlink shared directories"
    task :symlink, :except => { :no_release => true } do
       multisites.each_pair do |folder, url|
+        # symlinks the appropriate environment's settings.php file
+        symlink_config_file
+        
         run "ln -nfs #{shared_path}/#{url}/files #{latest_release}/sites/#{url}/files"
-        run "ln -nfs #{latest_release}/sites/#{url}/settings.php.#{stage} #{latest_release}/sites/#{url}/settings.php"
         run "#{drush_bin} -l #{url} -r #{current_path} vset --yes file_directory_path sites/#{url}/files"
       end
    end
+   
+   desc <<-DESC
+    Symlinks the appropriate environment's settings file within the proper sites directory
+    
+    Assumes the environment's settings file will be in one of two formats:
+        settings.<environment>.php    => new default
+        settings.php.<environment>    => deprecated
+   DESC
+   task :symlink_config_file, :except => { :no_release => true} do
+     multisites.each_pair do |folder, url|
+       drupal_app_site_dir = " #{latest_release}/sites/#{url}"
+       
+       case true
+         when remote_file_exists?("#{drupal_app_site_dir}/settings.#{stage}.php")
+           run "ln -nfs #{drupal_app_site_dir}/settings.#{stage}.php #{drupal_app_site_dir}/settings.php"
+         when remote_file_exists?("#{drupal_app_site_dir}/settings.php.#{stage}")
+           run "ln -nfs #{drupal_app_site_dir}/settings.php.#{stage} #{drupal_app_site_dir}/settings.php"
+         else
+           logger.important "Failed to symlink the settings.php file in #{drupal_app_site_dir} because an unknown pattern was used"
+       end
+     end
+   end
 
    desc "Replace local database paths with remote paths"
    task :updatedb, :except => { :no_release => true } do

metadata

@@ -2,7 +2,7 @@
 name: capistrano-ash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - August Ash
@@ -10,12 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -05:00
+date: 2011-06-22 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
 description: August Ash recipes for Capistrano
-email: jake@augustash.com
+email: code@augustash.com
 executables: []
 
 extensions: []