drush-deploy 1.0.0 → 1.0.1.beta1

data/README.md

@@ -1,4 +1,4 @@
-version 1.0.0
+version 1.0.1.beta1
 
 ## DESCRIPTION
 

data/drush-deploy.gemspec

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

@@ -36,6 +36,7 @@ module DrushDeploy
         @cap_config.load do
           # Verify existence of required setting
           if this.valid_target(site)
+            logger.info "Loading target #{sitename}"
             # Setup servername. Use <username>@ and :<port> syntax in servername instead of
             # :user and ssh_option[:port] to allow for different values per host.
             servername = site["remote-host"]

data/lib/drush_deploy/configuration.rb

@@ -32,33 +32,25 @@ module DrushDeploy
     end
 
     def load_configuration
-      @aliases = site_aliases
-      @aliases.each do |name,conf|
-        if conf['ssh-options']
-          conf['ssh-options'] = Net::SSH::Config.translate translate_ssh_options(conf['ssh-options'])
-        end
-        if conf['roles']
-          if conf['roles'].is_a? String
-            conf['roles'] = conf['roles'].split(/ *, */)
-          end
-          conf['roles'] = conf['roles'].map{ |r| r.strip.to_sym }
-        end
-        if conf['attributes']
-          # Recursively turn all hash keys into symbols
-          mapper = lambda do |h|
-            h.inject({}) {|result,(k,v)| result[k.to_sym] = (v.is_a?(Hash) ? mapper(v) : v); result }
-          end
-          conf['attributes'] = mapper.(conf['attributes'])
+      @aliases = PHP.unserialize(`#{@drush} eval 'print serialize(_drush_sitealias_all_list());'`).inject({}) do |h,(k,v)|
+        if k != '@none'
+          h[k.sub(/^@/,'')] = v
         end
+        h
       end
-    end
-
-    def site_aliases
-      PHP.unserialize(`#{@drush} eval 'print serialize(_drush_sitealias_all_list());'`).delete_if {|k,v| k == '@none'}
+      @normalized_aliases = {}
     end
 
     def lookup_site(sitename)
-      @aliases[sitename] || @aliases['@'+sitename]
+      sitename = sitename.sub(/^@/,'')
+      site = @normalized_aliases[sitename]
+      unless site
+        site = @aliases[sitename]        
+        if site
+          @normalized_aliases[sitename] = site = normalize_alias site
+        end
+      end
+      site
     end
 
     
@@ -87,7 +79,11 @@ module DrushDeploy
             when 'p'
               option_hash["port"] = words.shift
             when 'o'
-              option_hash.store(*(words.shift.split(/=/).tap {|opt| opt[0].downcase!}))
+              opt = words.shift.split(/=/)
+              if opt && opt.size == 2
+                opt[0].downcase!
+                option_hash.store *opt;
+              end
             end
           end
         else
@@ -97,25 +93,25 @@ module DrushDeploy
       option_hash
     end
 
-    def handle_option(sources,keys)
-      sources.inject(nil) do |dest,source|
-        source_val = keys.inject(source) {|h,k| h ? h[k] : nil}
-        yield dest,source_val
+    def normalize_alias(conf)
+      conf = conf.dup
+      if conf['ssh-options']
+        conf['ssh-options'] = Net::SSH::Config.translate translate_ssh_options(conf['ssh-options'])
       end
-    end
-
-    def copy_option(dest,sources,keys)
-      dest_val = handle_option(sources,keys) {|*a| yield *a}
-      if dest_val
-        keys.inject(dest).with_index do |h,k,i|
-          if i+1 == keys.size
-            h[k] = dest_val
-          else
-            h[k] = {} unless h[k]
-          end
-          h[k]
+      if conf['roles']
+        if conf['roles'].is_a? String
+          conf['roles'] = conf['roles'].split(/ *, */)
+        end
+        conf['roles'] = conf['roles'].map{ |r| r.strip.to_sym }
+      end
+      if conf['attributes']
+        # Recursively turn all hash keys into symbols
+        mapper = lambda do |h|
+          h.inject({}) {|result,(k,v)| result[k.to_sym] = (v.is_a?(Hash) ? mapper(v) : v); result }
         end
+        conf['attributes'] = mapper.(conf['attributes'])
       end
+      conf
     end
 
   end

data/lib/drush_deploy/recipes/setup.rb

@@ -20,6 +20,7 @@ set :update_modules, (ENV['UPDATE_MODULES'] =~ true_values) if ENV['UPDATE_MODUL
 set :target, ENV['TARGET'] if ENV['TARGET']
 set :source, ENV['SOURCE'] if ENV['SOURCE']
 
+set :application, 'Drupal'
 set :deploy_via, :copy
 set :use_sudo, false
 set :drush_bin, "drush"

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: drush-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &18923900 !ruby/object:Gem::Requirement
+  requirement: &23598360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *18923900
+  version_requirements: *23598360
 - !ruby/object:Gem::Dependency
   name: railsless-deploy
-  requirement: &18922960 !ruby/object:Gem::Requirement
+  requirement: &23597580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *18922960
+  version_requirements: *23597580
 - !ruby/object:Gem::Dependency
   name: php_serialize
-  requirement: &18921860 !ruby/object:Gem::Requirement
+  requirement: &23596880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *18921860
+  version_requirements: *23596880
 description: Utilizes capistrano to allow for doing intellegent deployments of drupal
   projects.
 email: matt@xforty.com
@@ -88,9 +88,9 @@ 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.10