drush-deploy 1.0.11 → 1.0.12.pre1

data/README.md

@@ -1,4 +1,4 @@
-version 1.0.11
+version 1.0.12
 
 ## DESCRIPTION
 

data/drush-deploy.gemspec

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

@@ -129,8 +129,21 @@ module DrushDeploy
         $backup = '/tmp/default_settings_backup.php';
 
         $databases = unserialize('#{PHP.serialize(settings)}');
-        $settings["databases"] = array( 'comment' => 'Generated by drush-deploy',
-                                        'value' => $databases );
+        $comment = 'Generated by drush-deploy';
+        $version = explode('.',drush_drupal_version());
+        if($version[0] < 7) {
+          $vals = $databases['default']['default'];
+          $db_url = sprintf('%s://%s:%s@%s:%s/%s',
+            $vals['driver'],$vals['username'],$vals['password'],
+            $vals['host'], $vals['port'], $vals['database']);
+          $settings["db_url"] = array( 'comment' => $comment,
+                                          'value' =>  $db_url);
+          $settings["db_prefix"] = array( 'comment' => $comment,
+                                          'value' =>  $vals['prefix']);
+        } else {
+          $settings["databases"] = array( 'comment' => $comment,
+                                          'value' => $databases );
+        }
 
         require_once(DRUPAL_ROOT.'/includes/bootstrap.inc');
         require_once(DRUPAL_ROOT.'/includes/install.inc');

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: drush-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.11
-  prerelease: 
+  version: 1.0.12.pre1
+  prerelease: 7
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -103,12 +103,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Deployment strategy for Drupal using Drush