drush-deploy 1.0.10 → 1.0.11

data/README.md

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

data/drush-deploy.gemspec

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

@@ -158,12 +158,12 @@ module DrushDeploy
 
     def config(*args)
       options = (args.size>0 && args.last.is_a?(Hash)) ? args.pop : {}
-      site_name = args[0] || :default
-      db_name = args[1] || :default
-      if databases[site_name] && databases[site_name][db_name]
-        conf = databases[site_name][db_name].dup
+      db_name = args[0] || :default
+      instance_name = args[1] || :default
+      if databases[db_name] && databases[db_name][instance_name]
+        conf = databases[db_name][instance_name].dup
       else
-        throw ConfigNotFound.new site_name,db_name
+        throw ConfigNotFound.new db_name,instance_name
       end
       if options[:admin] && conf[:admin_username]
         conf[:username] = conf[:admin_username]
@@ -184,8 +184,8 @@ module DrushDeploy
       end
     end
 
-    def db_empty?(db = nil)
-      conf = config
+    def db_empty?(db = nil, conf_name = nil)
+      conf = config(conf_name)
       conf[:database] = db if db
       db = conf[:database]
       if @db_status[db].nil?
@@ -200,8 +200,9 @@ module DrushDeploy
       @db_status[db]
     end
 
-    def db_versions
-      conf = config(:admin => true)
+    def db_versions(db = nil, conf_name = nil)
+      conf = config(conf_name,:admin => true)
+      conf[:database] = db if db
       throw FieldNotFound.new 'database' unless conf[:database]
       logger.info "Getting list of databases versions"
       sql = %q{SELECT SCHEMA_NAME FROM information_schema.SCHEMATA
@@ -209,8 +210,8 @@ module DrushDeploy
       (remote_sql(sql, :config => conf, :capture => true).split(/\n/)[1..-1] || []).sort.reverse
     end
 
-    def db_exists?(db = nil)
-      conf = config(:admin => true)
+    def db_exists?(db = nil, conf_name = nil)
+      conf = config(conf_name,:admin => true)
       conf[:database] = db if db
       throw FieldNotFound.new 'database' unless conf[:database]
       logger.info "Checking existence of #{conf[:database]}"
@@ -219,8 +220,8 @@ module DrushDeploy
       remote_sql(sql, :config => conf, :capture => true).split(/\n/)[1].to_i != 0
     end
 
-    def db_tables(db = nil)
-      conf = config(:admin => true)
+    def db_tables(db = nil, conf_name = nil)
+      conf = config(conf_name,:admin => true)
       conf[:database] = db if db
       db = conf[:database]
       throw FieldNotFound.new 'database' unless conf[:database]
@@ -235,10 +236,10 @@ module DrushDeploy
       tables
     end
 
-    def copy_database(from,to)
+    def copy_database(from,to,conf_name = nil)
       logger.info "Copying database #{from} to #{to}"
-      tables = db_tables
-      conf = config(:database => from, :admin => true)
+      tables = db_tables(nil,conf_name)
+      conf = config(conf_name,:database => from, :admin => true)
 
       remote_sql("CREATE DATABASE #{to};", :config => conf)
       sql = ''
@@ -252,13 +253,13 @@ module DrushDeploy
       @db_status.delete(to)
     end
 
-    def rename_database(from,to)
+    def rename_database(from,to,conf_name = nil)
       logger.info "Renaming database #{from} to #{to}"
-      conf = config(:database => from, :admin => true)
+      conf = config(conf_name,:database => from, :admin => true)
       sql = ''
       if conf[:driver] == :mysql
         sql += "CREATE DATABASE `#{to}`;"
-        db_tables(from).each do |table|
+        db_tables(from,conf_name).each do |table|
           sql += "RENAME TABLE `#{from}`.`#{table}` TO `#{to}`.`#{table}`;"
         end
         sql += "DROP DATABASE `#{from}`;"
@@ -269,9 +270,9 @@ module DrushDeploy
       @db_status.delete(to)
     end
 
-    def drop_database(db)
+    def drop_database(db,conf_name = nil)
       logger.info "Dropping database #{db}"
-      conf = config(:database => db, :admin => true)
+      conf = config(conf_name,:database => db, :admin => true)
       remote_sql("DROP DATABASE #{db};", :config => conf)
       @db_status[db] = false
     end

data/lib/drush_deploy/recipes/db.rb

@@ -71,13 +71,16 @@ namespace :db do
     desc "Create a versioned backup of the database"
     task :create, :roles => :web do
       if releases.size > 1
-        current = drupal_db.config[:database]
-        backup = "#{current}_#{releases[-2]}"
-        unless drupal_db.db_empty? or drupal_db.db_exists? backup
-          on_rollback do
-            drupal_db.drop_database backup
+        versioned_databases.each do |conf_name|
+          current = drupal_db.config(conf_name)[:database]
+          backup = "#{current}_#{releases[-2]}"
+          unless drupal_db.db_empty?(current,conf_name) or drupal_db.db_exists? backup,conf_name
+            on_rollback do
+              drupal_db.drop_database backup, conf_name
+            end
+            logger.info "Creating backup version of #{conf_name} database as #{backup}"
+            drupal_db.copy_database(current,backup,conf_name)
           end
-          drupal_db.copy_database(current,backup)
         end
       end
     end
@@ -87,14 +90,17 @@ namespace :db do
       unless releases.size > 1
         throw DrushDeploy::Error.new "No previous versions to rollback to"
       end
-      current = drupal_db.config[:database]
-      release = releases.last
-      source = "#{current}_#{releases[-2]}"
-      backup = "#{current}_backup"
-      if drupal_db.db_exists? source
-        drupal_db.rename_database(current,backup)
-        drupal_db.rename_database(source,current)
-        drupal_db.drop_database(backup)
+      versioned_databases.each do |conf_name|
+        current = drupal_db.config(conf_name)[:database]
+        release = releases.last
+        source = "#{current}_#{releases[-2]}"
+        backup = "#{current}_backup"
+        if drupal_db.db_exists? source,conf_name
+          logger.info "Rolling back #{conf_name} database to #{source}"
+          drupal_db.rename_database(current,backup,conf_name)
+          drupal_db.rename_database(source,current,conf_name)
+          drupal_db.drop_database(backup,conf_name)
+        end
       end
     end
 
@@ -102,8 +108,11 @@ namespace :db do
     task :cleanup, :roles => :web do
       # Subtract one because the latest release won't be counted
       count = fetch(:keep_releases, 5).to_i - 1
-      drupal_db.db_versions.drop(count).each do |db|
-        drupal_db.drop_database(db)
+      versioned_databases.each do |conf_name|
+        logger.info "Cleaning up #{conf_name} database"
+        drupal_db.db_versions(nil,conf_name).drop(count).each do |db|
+          drupal_db.drop_database(db,conf_name)
+        end
       end
     end
   end

data/lib/drush_deploy/recipes/drupal.rb

@@ -2,14 +2,10 @@ require 'drush_deploy/database'
 
 on :start, "drupal:load_targets"
 before "deploy", "drupal:setup_build"
-before "deploy:symlink", "drupal:symlink"
+after "deploy:update_code", "drupal:symlink"
 before "deploy:setup", "drupal:setup"
 after "drupal:setup", "drupal:check_permissions"
-if version_database
-  after "db:version:create", "drupal:clearcache"
-else
-  after "deploy:update_code", "drupal:clearcache"
-end
+before "deploy:symlink", "drupal:clearcache"
 before "drupal:install_profile", "db:drupal:configure"
 
 namespace :drupal do

data/lib/drush_deploy/recipes/setup.rb

@@ -42,3 +42,5 @@ set :configured, false
 
 set(:drush_cap) { DrushDeploy::Capistrano.new(self)}
 set(:drupal_db) { DrushDeploy::Database.new(self)}
+set :versioned_databases, [:default]
+set(:targets) { drush_cap.targets }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drush-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano