drush-deploy 1.0.3 → 1.0.4

data/README.md

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

data/drush-deploy.gemspec

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

@@ -7,6 +7,20 @@ require 'php_serialize'
 module DrushDeploy
   class Database
     class Error < DrushDeploy::Error; end
+    class ConfigNotFound < Error
+      def initialize(site_name,db_name)
+        super "Couldn't locate database configuration #{site_name}/#{db_name}. Please check your database configuration."
+      end
+    end
+    class FieldNotFound < Error
+      def initialize(key,site_name = 'default',db_name = 'default')
+        key = [key] unless key.is_a? Array
+        key = key.map {|k| "'#{k}'"}.join(',')
+
+        super "Couldn't find #{key} field#{key.size == 1 ? '' : 's'} in database configuration #{site_name}/#{db_name}."\
+              " Please check your database configuration."
+      end
+    end
 
 
     STANDARD_KEYS = %w(driver database username password host port prefix collation).map &:to_sym
@@ -146,7 +160,11 @@ module DrushDeploy
       options = (args.size>0 && args.last.is_a?(Hash)) ? args.pop : {}
       site_name = args[0] || :default
       db_name = args[1] || :default
-      conf = databases[site_name][db_name].dup
+      if databases[site_name] && databases[site_name][db_name]
+        conf = databases[site_name][db_name].dup
+      else
+        throw ConfigNotFound.new site_name,db_name
+      end
       if options[:admin] && conf[:admin_username]
         conf[:username] = conf[:admin_username]
         conf[:password] = conf[:admin_password]
@@ -171,6 +189,7 @@ module DrushDeploy
       conf[:database] = db if db
       db = conf[:database]
       if @db_status[db].nil?
+        throw FieldNotFound.new 'database' unless conf[:database]
         logger.info "Fetching status of db #{conf[:database]}"
         sql = %q{SELECT count(*) FROM information_schema.tables 
                  WHERE table_schema = '%{database}' LIMIT 1} % conf
@@ -183,6 +202,7 @@ module DrushDeploy
 
     def db_versions
       conf = config(:admin => true)
+      throw FieldNotFound.new 'database' unless conf[:database]
       logger.info "Getting list of databases versions"
       sql = %q{SELECT SCHEMA_NAME FROM information_schema.SCHEMATA
                WHERE SCHEMA_NAME REGEXP '%{database}_[0-9]+';} % conf
@@ -192,6 +212,7 @@ module DrushDeploy
     def db_exists?(db = nil)
       conf = config(:admin => true)
       conf[:database] = db if db
+      throw FieldNotFound.new 'database' unless conf[:database]
       logger.info "Checking existence of #{conf[:database]}"
       sql = %q{SELECT COUNT(*) FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = '%{database}';} % conf
       conf[:database] = 'information_schema'
@@ -202,6 +223,7 @@ module DrushDeploy
       conf = config(:admin => true)
       conf[:database] = db if db
       db = conf[:database]
+      throw FieldNotFound.new 'database' unless conf[:database]
       logger.info "Fetching table list of #{conf[:database]}"
       db_tables_query = %q{SELECT table_name FROM information_schema.tables
                            WHERE table_schema = '%{database}'
@@ -280,6 +302,9 @@ module DrushDeploy
     end
 
     def self.url(db)
+      missing_keys = %w(driver username password host port database).delete_if {|k| db.key? k.to_sym}
+      throw FieldNotFound.new missing_keys unless missing_keys.empty?
+      
       "#{db[:driver]}://#{db[:username]}:#{db[:password]}@#{db[:host]}:#{db[:port]}/#{db[:database]}"
     end
   end

data/lib/drush_deploy/recipes/db.rb

@@ -2,15 +2,16 @@ require 'drush_deploy/database'
 
 
 after "deploy:update_code", "db:drupal:update_settings"
-after "deploy:update_code", "db:version:create"
-before "deploy:rollback", "db:version:rollback"
 
 if version_database
-  before "db:version:create", "db:drupal:configure"
-  before "db:version:rollback", "db:drupal:configure"
-  before "db:version:cleanup", "db:drupal:configure"
+  after "deploy:update_code", "db:version:create"
+  before "deploy:rollback", "db:version:rollback"
 end
 
+before "db:version:create", "db:drupal:configure"
+before "db:version:rollback", "db:drupal:configure"
+before "db:version:cleanup", "db:drupal:configure"
+
 if update_modules
   after "deploy:update_code", "db:drupal:update"
 end

data/lib/drush_deploy/recipes/setup.rb

@@ -9,7 +9,7 @@ set :makefile, 'distro.make'
 set :make_args, ''
 set :databases, {}
 set :update_modules, true
-set :version_database, nil
+set :version_database, true
 
 set :scm, ENV['SCM'].to_sym if ENV['SCM']
 set :repository, ENV['REPO'] if ENV['REPO']

metadata

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