drush-deploy 1.0.12 → 1.0.13.pre20130123003441

data/bin/drush-deploy

@@ -2,15 +2,15 @@
 
 require 'capistrano/cli'
 require 'drush_deploy/paths'
-module Capistrano
-  class CLI
-    alias_method :execute_without_drush, :execute!
-    def execute_with_drush
-      options[:recipes] << DrushDeploy::Paths.recipe('bootstrap')
-      options[:actions] << 'deploy' if options[:actions].empty?
-      execute_without_drush
-    end
-    alias_method :execute!, :execute_with_drush
-  end
+
+aliases,args = ARGV.partition {|a| a =~ /^@./}
+
+args = ['--set-before', 'cmdline_target='+aliases.map {|a| a[1..-1] }.join(','),
+        '--file', DrushDeploy::Paths.recipe('bootstrap')] + args
+
+cli = Capistrano::CLI.parse(args)
+if cli.options[:actions].empty?
+  args << 'deploy'
+  cli = Capistrano::CLI.parse(args)
 end
-Capistrano::CLI.execute
+cli.execute!

data/drush-deploy.gemspec

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

@@ -75,6 +75,9 @@ module DrushDeploy
             if site["version_database"]
               set :version_database, (site["version_database"] == 1)
             end
+            if site["versioned_databases"]
+              set :versioned_databases, site["versioned_databases"]
+            end
           end
         end
       end

data/lib/drush_deploy/recipes/db.rb

@@ -3,10 +3,7 @@ require 'drush_deploy/database'
 
 after "deploy:update_code", "db:drupal:update_settings"
 
-if version_database
-  after "deploy:update_code", "db:version:create"
-  before "deploy:rollback", "db:version:rollback"
-end
+after "drupal:load_targets", "db:version:init"
 
 before "db:version:create", "db:drupal:configure"
 before "db:version:rollback", "db:drupal:configure"
@@ -68,6 +65,14 @@ namespace :db do
   end
 
   namespace :version do
+    task :init do
+      if version_database
+        after "deploy:update_code", "db:version:create"
+        before "deploy:rollback", "db:version:rollback"
+      else
+        logger.info "Skipping database versioning"
+      end
+    end
     desc "Create a versioned backup of the database"
     task :create, :roles => :web do
       if releases.size > 1

data/lib/drush_deploy/recipes/setup.rb

@@ -22,6 +22,8 @@ set :make_args, ENV['MAKE_ARGS'] if ENV['MAKE_ARGS']
 set :update_modules, (ENV['UPDATE_MODULES'] =~ true_values) if ENV['UPDATE_MODULES']
 
 set :target, ENV['TARGET'] if ENV['TARGET']
+set :target, cmdline_target if exists? :cmdline_target
+
 set :source, ENV['SOURCE'] if ENV['SOURCE']
 
 set :application, 'Drupal'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: drush-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.12
-  prerelease: 
+  version: 1.0.13.pre20130123003441
+  prerelease: 7
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2013-01-23 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.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Deployment strategy for Drupal using Drush