rudy 0.9.8.012 → 0.9.8.013

data/CHANGES.txt

@@ -12,6 +12,10 @@ Creating volume...
 (S)kip  (A)bort:
 
 
+#### 0.9.8.013 (2010-09-02) #######################
+
+* ADDED: use default user instead of assuming root
+
 #### 0.9.8.012 (2010-09-02) #######################
 
 * ADDED: rudy-sdb objects --destroy

data/lib/rudy.rb

@@ -44,7 +44,7 @@ module Rudy
       MAJOR = 0.freeze
       MINOR = 9.freeze
       TINY  = 8.freeze
-      PATCH = '012'.freeze
+      PATCH = '013'.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY, PATCH].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/lib/rudy/huxtable.rb

@@ -81,6 +81,9 @@ module Rudy
       base_dir
     end
     
+    def default_user
+      @@config.defaults.user || 'root'
+    end
     
     # Returns the name of the current keypair for the given user. 
     # If there's a private key path in the config this will return
@@ -89,12 +92,13 @@ module Rudy
     # name: <tt>key-ZONE-ENV-ROLE-USER</tt>. Or if this the user is 
     # root: <tt>key-ZONE-ENV-ROLE</tt>
     def user_keypairname(user=nil)
+      p default_user
       user ||= current_machine_user
       path = defined_keypairpath user
       if path
         Huxtable.keypair_path_to_name(path)
       else
-        n = (user.to_s == 'root') ? '' : "-#{user}"
+        n = (user.to_s == default_user) ? '' : "-#{user}"
         "key-%s-%s%s" % [@@global.zone, current_machine_group, n]
       end    
     end

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rudy"
   s.rubyforge_project = 'rudy'
-  s.version = "0.9.8.012"
+  s.version = "0.9.8.013"
   s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
   s.description = s.summary
   s.author = "Delano Mandelbaum"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 12
-  version: 0.9.8.012
+  - 13
+  version: 0.9.8.013
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -04:00
+date: 2010-10-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency