drush-deploy 1.0.0.alpha3 → 1.0.0

data/README.md

@@ -1,4 +1,4 @@
-version 1.0.0.alpha3
+version 1.0.0
 
 ## DESCRIPTION
 
@@ -9,7 +9,13 @@ Provides capistrano deployment strategy for Drupal.
 * Capistrano 
 * railsless-deloy
 * php\_serialize
+* Drush
+
+On remote servers you must have
+
+* Drush
+* File system acls enabled (`setfacl`)
 
 ## USAGE
 
-        # gem install --pre drush-deploy
+        # gem install drush-deploy

data/drush-deploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'drush-deploy'
-  s.version     = '1.0.0.alpha3'
+  s.version     = '1.0.0'
   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/drupal.rb

@@ -54,19 +54,12 @@ namespace :drupal do
   end
 
   task :setup_build, :roles => :web do
-    if ENV['MAKE']
-      set :make, ENV['MAKE'] =~ /^(0|no?)$/i
-    end
-    if ENV['MAKEFILE']
-      set :makefile, ENV['MAKEFILE']
-    end
-
     build_cmd = "drush make '#{makefile}' ."
 
-    if make.nil?
+    if make == :auto
       build_cmd = "[ -f index.php ] || { [ -f '#{makefile}' ] && #{build_cmd}; }"
     end
-    if make != false
+    if make
       set :build_script, build_cmd
     end
   end

data/lib/drush_deploy/recipes/setup.rb

@@ -1,29 +1,37 @@
 require 'drush_deploy/capistrano'
 
-set :deploy_via, :copy
+true_values = /^(1|y(es)?|t(rue)?)$/i
+
 set :scm, :none
 set :repository, "."
-set :use_sudo, false
-set :drush_bin, "drush"
-set :make, nil
+set :make, :auto
 set :makefile, 'distro.make'
+set :databases, {}
+set :update_modules, true
 
-set :drush, ENV['DRUSH'] if ENV['DRUSH']
-set :scm, ENV['SCM'] if ENV['SCM']
+set :scm, ENV['SCM'].to_sym if ENV['SCM']
 set :repository, ENV['REPO'] if ENV['REPO']
+if ENV['MAKE']
+  set :make, (ENV['MAKE'] == 'auto' ? :auto : (ENV['MAKE'] =~ true_values))
+end
+set :makefile, ENV['MAKEFILE'] if ENV['MAKEFILE']
+set :update_modules, (ENV['UPDATE_MODULES'] =~ true_values) if ENV['UPDATE_MODULES']
+
 set :target, ENV['TARGET'] if ENV['TARGET']
 set :source, ENV['SOURCE'] if ENV['SOURCE']
 
+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', 'sites/default/settings.php']
-set :databases, {}
+                       'sites/default/default.settings.php']
 
 set :database_ports, { :pgsql => 5432, :mysql => 3306 }
 
 set :configured, false
 
-set :update_modules, true
 
 set :drush_cap, DrushDeploy::Capistrano.new
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: drush-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha3
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &19149100 !ruby/object:Gem::Requirement
+  requirement: &18923900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19149100
+  version_requirements: *18923900
 - !ruby/object:Gem::Dependency
   name: railsless-deploy
-  requirement: &19148420 !ruby/object:Gem::Requirement
+  requirement: &18922960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *19148420
+  version_requirements: *18922960
 - !ruby/object:Gem::Dependency
   name: php_serialize
-  requirement: &19147660 !ruby/object:Gem::Requirement
+  requirement: &18921860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *19147660
+  version_requirements: *18921860
 description: Utilizes capistrano to allow for doing intellegent deployments of drupal
   projects.
 email: matt@xforty.com
@@ -88,9 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10