drush-deploy 1.0.1.beta2 → 1.0.1.beta4

data/README.md

@@ -1,4 +1,4 @@
-version 1.0.1.beta2
+version 1.0.1.beta4
 
 ## DESCRIPTION
 

data/drush-deploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'drush-deploy'
-  s.version     = '1.0.1.beta2'
+  s.version     = '1.0.1.beta4'
   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/recipes/db.rb

@@ -2,8 +2,8 @@ require 'drush_deploy/database'
 
 drupal_db = DrushDeploy::Database.new(self)
 
-after "deploy", "db:drupal:update_settings"
-after "deploy", "db:version:create"
+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"
@@ -11,7 +11,7 @@ before "db:version:rollback", "db:drupal:configure"
 before "db:version:cleanup", "db:drupal:configure"
 
 if update_modules
-  after "deploy", "db:drupal:update"
+  after "deploy:update_code", "db:drupal:update"
 end
 after "deploy:cleanup", "db:version:cleanup"
 

data/lib/drush_deploy/recipes/drupal.rb

@@ -54,7 +54,7 @@ namespace :drupal do
   end
 
   task :setup_build, :roles => :web do
-    build_cmd = "drush make '#{makefile}' ."
+    build_cmd = "drush make #{make_args} '#{makefile}' ."
 
     if make == :auto
       build_cmd = "[ -f index.php ] || { [ -f '#{makefile}' ] && #{build_cmd}; }"

data/lib/drush_deploy/recipes/setup.rb

@@ -6,6 +6,7 @@ set :scm, :none
 set :repository, "."
 set :make, :auto
 set :makefile, 'distro.make'
+set :make_args, ''
 set :databases, {}
 set :update_modules, true
 
@@ -15,6 +16,7 @@ if ENV['MAKE']
   set :make, (ENV['MAKE'] == 'auto' ? :auto : (ENV['MAKE'] =~ true_values))
 end
 set :makefile, ENV['MAKEFILE'] if ENV['MAKEFILE']
+set :make_args, ENV['MAKE_ARGS'] if ENV['MAKE_ARGS']
 set :update_modules, (ENV['UPDATE_MODULES'] =~ true_values) if ENV['UPDATE_MODULES']
 
 set :target, ENV['TARGET'] if ENV['TARGET']
@@ -25,9 +27,9 @@ set :deploy_via, :copy
 set :use_sudo, false
 set :drush_bin, "drush"
 
-set :databases_path, [ '~/.drush/database.php', '~/.drush/database.yml', 
-                       '/etc/drush/database.php','/etc/drush/database.yml',
-                       'sites/default/default.settings.php']
+set(:databases_path) { [ "#{deploy_to}/database.php", "#{deploy_to}/database.yml",
+                       '~/.drush/database.php', '~/.drush/database.yml', 
+                       '/etc/drush/database.php','/etc/drush/database.yml' ] }
 
 set :database_ports, { :pgsql => 5432, :mysql => 3306 }
 

metadata

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