capistrano-drupal 0.1.8 → 0.1.9

data/README.markdown

@@ -14,9 +14,16 @@ Open your application's `Capfile` and make it begin like this:
 
     require 'rubygems'
     require 'railsless-deploy'
-    require 'capistrano-drupal
+    require 'capistrano-drupal'
     load    'config/deploy'
 
 You should then be able to proceed as you would usually, you may want to familiarise yourself with the truncated list of tasks, you can get a full list with:
 
-    $ cap -T
+    $ cap -T
+
+## Roadmap
+
+- Split out the tasks into indivual files/modules
+- Use drush aliases
+- Support install profiles
+- Support composer

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/capistrano-drupal.rb

@@ -12,20 +12,17 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :deploy_via, :remote_cache
   _cset :branch, "master"
   set :git_enable_submodules, true
+  
+  set :drush_cmd, "drush"
+  
   set :runner_group, "www-data"
   set :group_writable, false
   
   set(:deploy_to) { "/var/www/#{application}" }
   set :shared_children, ['files', 'private']
-  
-  after "deploy:setup", "drush:createdb"
-  after "deploy:setup", "drush:init_settings"
-  after "drupal:symlink_shared", "drush:site_offline"
-  after "deploy:symlink", "drupal:symlink_shared"
-  after "deploy:symlink", "drush:updatedb"
-  after "deploy:symlink", "drush:cache_clear"
-  after "deploy:symlink", "drush:site_online"
-  after "deploy:symlink", "git:push_deploy_tag"
+    
+  after "deploy:update_code", "drupal:symlink_shared", "drush:site_offline", "drush:updatedb", "drush:cache_clear", "drush:site_online"
+  after "deploy", "git:push_deploy_tag"
   
   namespace :deploy do
     desc <<-DESC
@@ -42,10 +39,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     DESC
     task :setup, :except => { :no_release => true } do
       dirs = [deploy_to, releases_path, shared_path].join(' ')
-      run "#{try_sudo} mkdir -p #{dirs}"
-      run "#{try_sudo} chown -R #{runner}:#{runner_group} #{dirs}"
+      run "#{try_sudo} mkdir -p #{releases_path} #{shared_path}"
+      run "#{try_sudo} chown -R #{user}:#{runner_group} #{deploy_to}"
       sub_dirs = shared_children.map { |d| File.join(shared_path, d) }
-      run "#{try_sudo} chmod -R g+w #{sub_dirs.join(' ')}"
+      run "#{try_sudo} chmod 2775 #{sub_dirs.join(' ')}"
     end
   end
   
@@ -79,30 +76,29 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Backup the database"
     task :backupdb, :on_error => :continue do
-      t = Time.now.utc.strftime("%Y-%m-%dT%H-%M-%S")
-      run "drush -r #{app_path} bam-backup"
+      run "#{drush_cmd} -r #{app_path} bam-backup"
     end
 
     desc "Run Drupal database migrations if required"
     task :updatedb, :on_error => :continue do
-      run "drush -r #{app_path} updatedb -y"
+      run "#{drush_cmd} -r #{app_path} updatedb -y"
     end
 
     desc "Clear the drupal cache"
     task :cache_clear, :on_error => :continue do
-      run "drush -r #{app_path}  cc all"
+      run "#{drush_cmd} -r #{app_path} cc all"
     end
     
     desc "Set the site offline"
     task :site_offline, :on_error => :continue do
-      run "drush -r #{app_path} vset site_offline 1 -y"
-      run "drush -r #{app_path} vset maintenance_mode 1 -y"
+      run "#{drush_cmd} -r #{app_path} vset site_offline 1 -y"
+      run "#{drush_cmd} -r #{app_path} vset maintenance_mode 1 -y"
     end
 
     desc "Set the site online"
     task :site_online, :on_error => :continue do
-      run "drush -r #{app_path} vset site_offline 0 -y"
-      run "drush -r #{app_path} vset maintenance_mode 0 -y"
+      run "#{drush_cmd} -r #{app_path} vset site_offline 0 -y"
+      run "#{drush_cmd} -r #{app_path} vset maintenance_mode 0 -y"
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Kim Pepper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 +10:00
+date: 2012-09-03 00:00:00 +10:00
 default_executable: 
 dependencies: []