erCapistranoDrupal 0.1.1 → 0.1.2

data/README.md

@@ -10,7 +10,7 @@ erCapistranoDrupal is a drupal deploy file for Capistrano. Includes site install
 
 ## Versions
 * Drupal 7
-* Drupal 6 will be support on next version
+* Drupal 6
 
 ## Installation
 
@@ -52,7 +52,7 @@ You should then be able to proceed as you would usually, you may want to familia
 
 #### Drush File
     # create new user 'everright'
-    user-create everright --mail="everright@example.com" --password="123456"
+    user-create everright --mail=everright@example.com --password=123456
     # enable token module
     en token
 
@@ -79,6 +79,9 @@ You should then be able to proceed as you would usually, you may want to familia
 ### Drush tool
 * :drush, '/usr/bin/drush'
 
+### Drupal version, 6 or 7
+* :dp_version, 7
+
 ### Drush site install info
 If you want to install the drupal when first deploy, then you need to change these variables.
 * :dp_site_install, false 
@@ -174,6 +177,11 @@ System will be auto set the maintainance key to "site_readonly" when "Read Only
 
 ## Changelog:
 
+### Version 0.1.2 - June 28 2013
+* Add drupal 6 support
+* Fix release files backup bug
+* Fix database migration bug on migration was not exist
+
 ### Version 0.1.1 - June 19 2013
 * Fix muiltiple servers deploy bug
 * Fix rollback permissions bug

data/lib/erCapistranoDrupal/version.rb

@@ -1,3 +1,3 @@
 module ErCapistranoDrupal
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/erCapistranoDrupal.rb

@@ -89,11 +89,14 @@ Capistrano::Configuration.instance(:must_exist).load do
   # Drush tool
   _cset :drush, '/usr/bin/drush'
 
+  # Drupal version, 6 or 7
+  _cset :dp_version, 7
+
   # Drush site install info
   _cset :dp_site_install, false 
   _cset :dp_site_db_url, nil
-  _cset :dp_site_profile, 'standard'
-  _cset :dp_site_name, 'Drupal 7 Demo'
+  _cset(:dp_site_profile) { dp_version == 6 ? 'default' : 'standard' }
+  _cset(:dp_site_name) { dp_version == 6 ? 'Drupal 6 Demo' : 'Drupal 7 Demo' }
   _cset :dp_site_admin_user, 'admin'
   _cset :dp_site_admin_pass, 'admin'
 
@@ -101,7 +104,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   # If "Read Only Mode" enabled, then set maintainance key to 'site_readonly'
   # else set maintainance key to 'maintenance_mode'
   # =========================================================================
-  _cset :dp_maintainance_keys, {'default' => 'maintenance_mode'}
+  _cset(:dp_maintainance_keys) { dp_version == 6 ? {'default' => 'site_offline'} : {'default' => 'maintenance_mode'}}
 
   # =========================================================================
   # These are helper methods that will be available to your recipes.
@@ -647,17 +650,19 @@ Capistrano::Configuration.instance(:must_exist).load do
           # Append hook_update migration
           commands << "#{drush} updb --root=#{current_path} --uri=#{domain} -y"
 
+          migration_commands = []
           # Append drush migration
-          commands << "#{try_sudo} touch #{drush_history}"
-          commands << "find #{current_path}/#{dp_migration}/#{domain} -type f -name *.drush | xargs ls -1v 2>/dev/null > #{drush_available}"
-          commands << "diff #{drush_available} #{drush_history} | awk \"/^</ {print \\$2}\" | while read f; do echo \"Migrating: $(basename $f)\"; egrep -v \"^$|^#|^[[:space:]]+$\" $f | while read line; do echo \"Running: drush $line\"; #{drush} $line --root=#{current_path} --uri=#{domain} -y; done; echo $f >> #{drush_history}; done"
-          commands << "#{try_sudo} rm -f #{drush_available}"
+          migration_commands << "#{try_sudo} touch #{drush_history}"
+          migration_commands << "find #{current_path}/#{dp_migration}/#{domain} -type f -name *.drush | xargs ls -1v 2>/dev/null > #{drush_available}"
+          migration_commands << "diff #{drush_available} #{drush_history} | awk \"/^</ {print \\$2}\" | while read f; do echo \"Migrating: $(basename $f)\"; egrep -v \"^$|^#|^[[:space:]]+$\" $f | while read line; do echo \"Running: drush $line\"; #{drush} $line --root=#{current_path} --uri=#{domain} -y; done; echo $f >> #{drush_history}; done"
+          migration_commands << "#{try_sudo} rm -f #{drush_available}"
 
           # Append sql migration
-          commands << "#{try_sudo} touch #{sql_history}"
-          commands << "find #{current_path}/#{dp_migration}/#{domain} -type f -name *.sql | xargs ls -1v 2>/dev/null > #{sql_available}"
-          commands << "diff #{sql_available} #{sql_history} | awk \"/^</ {print \\$2}\" | while read f; do echo \"Migrating $(basename $f)\"; #{drush} -r #{current_path} --uri=#{domain} sqlq --file=$f -y && echo $f >> #{sql_history}; done"
-          commands << "#{try_sudo} rm -f #{sql_available}"
+          migration_commands << "#{try_sudo} touch #{sql_history}"
+          migration_commands << "find #{current_path}/#{dp_migration}/#{domain} -type f -name *.sql | xargs ls -1v 2>/dev/null > #{sql_available}"
+          migration_commands << "diff #{sql_available} #{sql_history} | awk \"/^</ {print \\$2}\" | while read f; do echo \"Migrating $(basename $f)\"; #{drush} -r #{current_path} --uri=#{domain} sqlq --file=$f -y && echo $f >> #{sql_history}; done"
+          migration_commands << "#{try_sudo} rm -f #{sql_available}"
+          commands << "if [ -d #{current_path}/#{dp_migration}/#{domain} ]; then #{migration_commands.join('; ')}; fi"
         end
 
         run commands.join('; ') if commands.any?
@@ -690,9 +695,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           commands = []
 
           dp_domains.each do |domain|
-            commands << "cd #{shared_path}/#{dp_sites}/#{domain}"
-            commands << "#{try_sudo} tar cjf #{shared_path}/#{dp_released_files}/#{domain}/#{domain}_files_#{release_name}.tar.bz2 files"
-            commands << "cd -"
+            commands << "cd #{shared_path}/#{dp_sites}/#{domain} && #{try_sudo} tar cjf #{shared_path}/#{dp_released_files}/#{domain}/#{domain}_files_#{release_name}.tar.bz2 files && cd -"
           end
 
           run commands.join('; ') if commands.any?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erCapistranoDrupal
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - everright.chen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-19 00:00:00 Z
+date: 2013-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano