drush-deploy 1.0.5 → 1.0.6

data/README.md

@@ -1,4 +1,4 @@
-version 1.0.5
+version 1.0.6
 
 ## DESCRIPTION
 

data/drush-deploy.gemspec

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

@@ -11,15 +11,9 @@ module DrushDeploy
 
     DEFAULT_ROLES = [:web]
 
-    def initialize
-      @cap_config = ::Capistrano::Configuration.instance(:must_exist)
-
-      if @cap_config.exists? :drush
-        @drush_config = DrushDeploy::Configuration.new @cap_config[:drush]
-      else
-        @drush_config = DrushDeploy::Configuration.new
-        @cap_config.set :drush, @drush_config.drush
-      end
+    def initialize(config)
+      @cap_config = config
+      @drush_config = DrushDeploy::Configuration.new @cap_config[:drush]
       @cap_config.logger.info "Using drush at \"#{@drush_config.drush}\""
     end
 

data/lib/drush_deploy/database.rb

@@ -84,7 +84,7 @@ module DrushDeploy
 
       tmp = capture('mktemp').strip
       put script, tmp, :once => true
-      resp = capture "#{drush_bin} php-script '#{tmp}' && rm -f '#{tmp}'"
+      resp = capture "#{remote_drush} php-script '#{tmp}' && rm -f '#{tmp}'"
       
       settings = {}
       unless resp.empty?
@@ -148,12 +148,12 @@ module DrushDeploy
         __END__
       END
 
-      run %Q{TMP=`mktemp` && sed -n '/^__END__$/ q; p' > $TMP && cd '#{latest_release}' && #{drush_bin} php-script $TMP && rm -f "$TMP"},
+      run %Q{TMP=`mktemp` && sed -n '/^__END__$/ q; p' > $TMP && cd '#{latest_release}' && #{remote_drush} php-script $TMP && rm -f "$TMP"},
           :data => script
     end
 
     def updatedb
-      run "cd '#{latest_release}' && #{drush_bin} updatedb --yes", :once => true
+      run "cd '#{latest_release}' && #{remote_drush} updatedb --yes", :once => true
     end
 
     def config(*args)
@@ -176,7 +176,7 @@ module DrushDeploy
       url = options[:config] ? DrushDeploy::Database.url(options[:config]) : nil
       tmp = capture('mktemp').strip
       put(sql,tmp)
-      cmd = %Q{cd '#{latest_release}' && #{drush_bin} sql-cli #{url ? "--db-url='#{url}'" : ''} < '#{tmp}' && rm -f '#{tmp}'}
+      cmd = %Q{cd '#{latest_release}' && #{remote_drush} sql-cli #{url ? "--db-url='#{url}'" : ''} < '#{tmp}' && rm -f '#{tmp}'}
       if options[:capture]
         capture(cmd)
       else

data/lib/drush_deploy/recipes/deploy.rb

@@ -17,12 +17,12 @@ namespace :deploy do
   namespace :web do
     desc "Disable the application and show a message screen"
     task :disable, :roles => :web do
-      run "#{drush_bin} -r #{latest_release} vset --yes site_offline 1"
+      run "#{remote_drush} -r #{latest_release} vset --yes site_offline 1"
     end
 
     desc "Enable the application and remove the message screen"
     task :enable, :roles => :web do
-      run "#{drush_bin} -r #{latest_release} vdel --yes site_offline"
+      run "#{remote_drush} -r #{latest_release} vdel --yes site_offline"
     end
   end
 end

data/lib/drush_deploy/recipes/drupal.rb

@@ -1,5 +1,6 @@
 require 'drush_deploy/database'
 
+on :start, "drupal:load_targets"
 before "deploy", "drupal:setup_build"
 before "deploy:symlink", "drupal:symlink"
 before "deploy:setup", "drupal:setup"
@@ -21,7 +22,7 @@ namespace :drupal do
   desc "Clear all Drupal cache"
   task :clearcache, :roles => :web do
     unless drupal_db.db_empty?
-      run "#{drush_bin} -r #{latest_release} cache-clear all"
+      run "#{remote_drush} -r #{latest_release} cache-clear all"
     end
   end
 
@@ -53,7 +54,7 @@ namespace :drupal do
       dbconf = databases[:default][:default]
       db_url = DrushDeploy::Database.url(dbconf)
 
-      run "cd '#{latest_release}' && #{drush_bin} site-install --yes --db-url='#{db_url}'"\
+      run "cd '#{latest_release}' && #{remote_drush} site-install --yes --db-url='#{db_url}'"\
           " --account-mail='#{admin_email}' --account-name='#{admin_user}' --account-pass='#{admin_password}'"\
           " --site-name='#{site_name}' --site-mail='#{site_email}' "\
           "#{dbconf[:admin_username] ? "--db-su='#{dbconf[:admin_username]}'" : ''} #{dbconf[:admin_password] ? "--db-su-pw='#{dbconf[:admin_password]}'" : ''}"\
@@ -61,7 +62,7 @@ namespace :drupal do
   end
 
   task :setup_build, :roles => :web do
-    build_cmd = "drush make #{make_args} '#{makefile}' ."
+    build_cmd = "#{drush} make #{make_args} '#{makefile}' ."
 
     if make == :auto
       build_cmd = "[ -f index.php ] || { [ -f '#{makefile}' ] && #{build_cmd}; }"
@@ -87,4 +88,9 @@ namespace :drupal do
     end
   end
 
+  task :load_targets do
+    if exists? :target
+      target.split(/ *, */).each {|t| drush_cap.load_target t }
+    end
+  end
 end

data/lib/drush_deploy/recipes/setup.rb

@@ -1,4 +1,5 @@
 require 'drush_deploy/capistrano'
+require 'drush_deploy/database'
 
 true_values = /^(1|y(es)?|t(rue)?)$/i
 
@@ -26,7 +27,8 @@ set :source, ENV['SOURCE'] if ENV['SOURCE']
 set :application, 'Drupal'
 set :deploy_via, :copy
 set :use_sudo, false
-set :drush_bin, "drush"
+set :drush, "drush"
+set :remote_drush, "drush"
 
 set(:databases_path) { [ "#{deploy_to}/database.php", "#{deploy_to}/database.yml",
                        '~/.drush/database.php', '~/.drush/database.yml', 
@@ -38,9 +40,5 @@ set :database_ports, { :pgsql => 5432, :mysql => 3306 }
 set :configured, false
 
 
-set :drush_cap, DrushDeploy::Capistrano.new
-set :drupal_db, DrushDeploy::Database.new(self)
-
-if exists? :target
-  target.split(/ *, */).each {|t| drush_cap.load_target t }
-end
+set(:drush_cap) { DrushDeploy::Capistrano.new(self)}
+set(:drupal_db) { DrushDeploy::Database.new(self)}

metadata

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