drush-deploy 1.0.2 → 1.0.3

data/README.md

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

data/drush-deploy.gemspec

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

@@ -67,8 +67,10 @@ module DrushDeploy
           }
         } 
       END
-      put script, '/tmp/load_db_credentials.php', :once => true
-      resp = capture "#{drush_bin} php-script /tmp/load_db_credentials.php"
+
+      tmp = capture('mktemp').strip
+      put script, tmp, :once => true
+      resp = capture "#{drush_bin} php-script '#{tmp}' && rm -f '#{tmp}'"
       
       settings = {}
       unless resp.empty?
@@ -129,9 +131,11 @@ module DrushDeploy
         if ($backed_up) {
           rename($backup,$default);
         }
+        __END__
       END
-      put script, '/tmp/update_settings.php'
-      run "cd '#{latest_release}' && #{drush_bin} php-script /tmp/update_settings.php"
+
+      run %Q{TMP=`mktemp` && sed -n '/^__END__$/ q; p' > $TMP && cd '#{latest_release}' && #{drush_bin} php-script $TMP && rm -f "$TMP"},
+          :data => script
     end
 
     def updatedb
@@ -154,7 +158,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}'}
+      cmd = %Q{cd '#{latest_release}' && #{drush_bin} sql-cli #{url ? "--db-url='#{url}'" : ''} < '#{tmp}' && rm -f '#{tmp}'}
       if options[:capture]
         capture(cmd)
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drush-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &14139580 !ruby/object:Gem::Requirement
+  requirement: &20369920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14139580
+  version_requirements: *20369920
 - !ruby/object:Gem::Dependency
   name: railsless-deploy
-  requirement: &14138800 !ruby/object:Gem::Requirement
+  requirement: &20369400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *14138800
+  version_requirements: *20369400
 - !ruby/object:Gem::Dependency
   name: php_serialize
-  requirement: &14137980 !ruby/object:Gem::Requirement
+  requirement: &20368820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *14137980
+  version_requirements: *20368820
 description: Utilizes capistrano to allow for doing intellegent deployments of drupal
   projects.
 email: matt@xforty.com