drush-deploy 1.0.1 → 1.0.2

data/README.md

@@ -1,4 +1,4 @@
-version 1.0.1
+version 1.0.2
 
 ## DESCRIPTION
 

data/drush-deploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'drush-deploy'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.summary     = "Deployment strategy for Drupal using Drush"
   s.description = "Utilizes capistrano to allow for doing intellegent deployments of drupal projects."
   s.authors     = ["Matt Edlefsen"]

data/lib/drush_deploy/capistrano.rb

@@ -78,6 +78,9 @@ module DrushDeploy
               dbs = DrushDeploy::Configuration.normalize_value site["databases"]
               set :databases, DrushDeploy::Database.deep_merge(dbs,databases)
             end
+            if site["version_database"]
+              set :version_database, (site["version_database"] == 1)
+            end
           end
         end
       end

data/lib/drush_deploy/recipes/db.rb

@@ -5,9 +5,11 @@ after "deploy:update_code", "db:drupal:update_settings"
 after "deploy:update_code", "db:version:create"
 before "deploy:rollback", "db:version:rollback"
 
-before "db:version:create", "db:drupal:configure"
-before "db:version:rollback", "db:drupal:configure"
-before "db:version:cleanup", "db:drupal:configure"
+if version_database
+  before "db:version:create", "db:drupal:configure"
+  before "db:version:rollback", "db:drupal:configure"
+  before "db:version:cleanup", "db:drupal:configure"
+end
 
 if update_modules
   after "deploy:update_code", "db:drupal:update"

data/lib/drush_deploy/recipes/drupal.rb

@@ -2,16 +2,21 @@ require 'drush_deploy/database'
 
 before "deploy", "drupal:setup_build"
 before "deploy:symlink", "drupal:symlink"
-after "drupal:symlink", "drupal:check_permissions"
+before "deploy:setup", "drupal:setup"
+after "drupal:setup", "drupal:check_permissions"
 after "deploy", "drupal:clearcache"
 before "drupal:install_profile", "db:drupal:configure"
 
 namespace :drupal do
   desc "Symlink shared directories"
   task :symlink, :roles => :web do
-    run "mkdir -p #{shared_path}/default/files || true"
     run "ln -nfs #{shared_path}/default/files #{latest_release}/sites/default/files"
   end
+
+  desc "Setup drupal specific configuration"
+  task :setup, :roles => :web do
+    run "mkdir -p #{shared_path}/default/files || true"
+  end
  
   desc "Clear all Drupal cache"
   task :clearcache, :roles => :web do
@@ -78,7 +83,7 @@ namespace :drupal do
       end
     end
     if ! defined? www_user or www_user.nil?
-      run "setfacl -Rdm u:#{www_user}:rwx #{shared_path}/default/files && setfacl -Rm u:#{www_user}:rwx #{shared_path}/default/files"
+      run "! which setfacl &>/dev/null || { setfacl -Rdm u:#{www_user}:rwx #{shared_path}/default/files && setfacl -Rm u:#{www_user}:rwx #{shared_path}/default/files; }"
     end
   end
 

data/lib/drush_deploy/recipes/setup.rb

@@ -9,6 +9,7 @@ set :makefile, 'distro.make'
 set :make_args, ''
 set :databases, {}
 set :update_modules, true
+set :version_database, nil
 
 set :scm, ENV['SCM'].to_sym if ENV['SCM']
 set :repository, ENV['REPO'] if ENV['REPO']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drush-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &8968000 !ruby/object:Gem::Requirement
+  requirement: &14139580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *8968000
+  version_requirements: *14139580
 - !ruby/object:Gem::Dependency
   name: railsless-deploy
-  requirement: &8967460 !ruby/object:Gem::Requirement
+  requirement: &14138800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *8967460
+  version_requirements: *14138800
 - !ruby/object:Gem::Dependency
   name: php_serialize
-  requirement: &8966960 !ruby/object:Gem::Requirement
+  requirement: &14137980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *8966960
+  version_requirements: *14137980
 description: Utilizes capistrano to allow for doing intellegent deployments of drupal
   projects.
 email: matt@xforty.com