drush-deploy 1.0.0.alpha1 → 1.0.0.alpha2

data/README.md

@@ -1,4 +1,4 @@
-version 1.0.0.alpha1
+version 1.0.0.alpha2
 
 ## DESCRIPTION
 
@@ -12,4 +12,4 @@ Provides capistrano deployment strategy for Drupal.
 
 ## USAGE
 
-        # gem install drush-deploy
+        # gem install --pre drush-deploy

data/drush-deploy.gemspec

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

@@ -42,14 +42,16 @@ module DrushDeploy
 
             servername = site["remote-user"]+'@'+servername if site["remote-user"]
 
-            ssh_opts = site["ssh-options"].dup
-            if ssh_opts && ssh_opts[:port]
-              servername += ':'+ssh_opts[:port].to_s
-              ssh_opts.delete :port
+            if site["ssh-options"]
+              ssh_opts = site["ssh-options"].dup
+              if  ssh_opts[:port]
+                servername += ':'+ssh_opts[:port].to_s
+                ssh_opts.delete :port
+              end
+              (attributes[:ssh_options] ||= {}).merge! ssh_opts
             end
 
             attributes = site["attributes"] || {}
-            (attributes[:ssh_options] ||= {}).merge! ssh_opts
             roles = site["roles"]
             unless roles
               roles = DEFAULT_ROLES

data/lib/drush_deploy/database.rb

@@ -166,7 +166,7 @@ module DrushDeploy
       logger.info "Getting list of databases versions"
       sql = %q{SELECT SCHEMA_NAME FROM information_schema.SCHEMATA
                WHERE SCHEMA_NAME REGEXP '%{database}_[0-9]+';} % conf
-      remote_sql(sql, :config => conf, :capture => true).split(/\n/)[1..-1].sort.reverse
+      (remote_sql(sql, :config => conf, :capture => true).split(/\n/)[1..-1] || []).sort.reverse
     end
 
     def db_exists?(db = nil)

data/lib/drush_deploy/recipes/drupal.rb

@@ -1,14 +1,15 @@
 require 'drush_deploy/database'
 
 before "deploy", "drupal:setup_build"
-before "deploy", "drupal:check_permissions"
-after "deploy:symlink", "drupal:symlink"
+before "deploy:symlink", "drupal:symlink"
+after "drupal:symlink", "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
  

data/lib/drush_deploy/recipes/setup.rb

@@ -3,6 +3,7 @@ require 'drush_deploy/capistrano'
 set :deploy_via, :copy
 set :scm, :none
 set :repository, "."
+set :use_sudo, false
 set :drush_bin, "drush"
 set :make, nil
 set :makefile, 'distro.make'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drush-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &24649140 !ruby/object:Gem::Requirement
+  requirement: &20016380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *24649140
+  version_requirements: *20016380
 - !ruby/object:Gem::Dependency
   name: railsless-deploy
-  requirement: &24648400 !ruby/object:Gem::Requirement
+  requirement: &20015720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *24648400
+  version_requirements: *20015720
 - !ruby/object:Gem::Dependency
   name: php_serialize
-  requirement: &24647760 !ruby/object:Gem::Requirement
+  requirement: &20015000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *24647760
+  version_requirements: *20015000
 description: Utilizes capistrano to allow for doing intellegent deployments of drupal
   projects.
 email: matt@xforty.com