rudy 0.9.8.015 → 0.9.8.016

data/CHANGES.txt

@@ -1,16 +1,25 @@
 RUDY, CHANGES 
 
-* TODO: http://github.com/solutious/rudy/issues/#issue/46
-* TODO: http://github.com/solutious/rudy/issues/#issue/43
-* TODO: Warning in latest Ruby 1.9.1: httpclient/http.rb:367: warning: variable $KCODE
-* rudy create-disks
- Executing routine: create-disks 
-  disks:
-  Timeout (30): execution expired!
-Creating volume... 
-  NameError: uninitialized constant Rudy::Metadata::UnknownObject
-(S)kip  (A)bort:
+#### 0.9.8.016 (2010-10-26) #######################
 
+NOTE: If you're using Ubuntu you'll need to update your 
+configuration to use this release. 
+
+* ADDED: new config parameter: 'root'. In previous releases
+Rudy used the default user to determine which account to use
+when launching new instances with EC2. With this release, 
+you now need to use "root". Either in the defaults config or
+the machines config for you ubuntu instances:
+
+defaults do
+  root "ubuntu"
+end
+
+machines do
+  role :ubuntu
+    root "ubuntu"
+  end
+end
 
 
 #### 0.9.8.015 (2010-10-25) #######################
@@ -482,5 +491,3 @@ NOTE: This is a complete re-write from 0.1
 
 * Initial public release
 
-
-

data/Rudyfile

@@ -72,6 +72,12 @@ machines do
       #end
     end
     
+    role :ubuntu do
+      ami 'ami-1a837773'
+      root 'ubuntu'
+      user 'ubuntu'
+    end
+    
   end  
 
 end
@@ -181,6 +187,7 @@ defaults do
   environment :stage
   role :app
   color true                         # Terminal colors? true/false
+  #root 'rootuser'                   # The "root" account (on Ubuntu, set to "ubuntu")
   #user 'someuser'                   # The default remote user
   #localhost 'hostname'              # A local hostname instead of localhost
   #auto true                         # Skip interactive confirmation?

data/lib/rudy.rb

@@ -44,7 +44,7 @@ module Rudy
       MAJOR = 0.freeze
       MINOR = 9.freeze
       TINY  = 8.freeze
-      PATCH = '015'.freeze
+      PATCH = '016'.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/cli/machines.rb

@@ -153,8 +153,8 @@ module Rudy
       
       def update_machines
         mlist = get_machines
-        rset = Rye::Set.new(current_group_name, :parallel => @@global.parallel, :user => default_user)
-        rset.add_key user_keypairpath(default_user)
+        rset = Rye::Set.new(current_group_name, :parallel => @@global.parallel, :user => current_machine_root)
+        rset.add_key user_keypairpath(current_machine_root)
         os = current_machine_os
         mlist.each do |m|
           li "Updating #{m.name}"
@@ -199,7 +199,7 @@ module Rudy
       end
       
       def ssh
-
+        
         
         # TODO: Give this method a good look over
         pkey = current_user_keypairpath
@@ -275,7 +275,7 @@ module Rudy
 
           # Make sure we want to run this command on all instances
           if !checked && command != :interactive_ssh 
-            execute_check(:low) if rye_opts[:user] == "root"
+            execute_check(:low) if current_machine_user == "root"
             checked = true
           end
           

data/lib/rudy/config.rb

@@ -114,16 +114,16 @@ module Rudy
         puts "Creating #{Rudy::CONFIG_FILE}"
         rudy_config = Rudy::Utils.without_indent %Q`
           accounts {                           # Account Access Indentifiers
-            aws {                              # amazon web services 
+            aws {                              # amazon web services
               name "Rudy Default"
               accountnum ""
               accesskey ""
               secretkey ""
-              pkey "~/path/2/pk-xxxx.pem" 
+              pkey "~/path/2/pk-xxxx.pem"
               cert "~/path/2/cert-xxxx.pem"
             }
           }
-        `
+`
         Rudy::Utils.write_to_file(Rudy::CONFIG_FILE, rudy_config, 'w', 0600)
       end
     end

data/lib/rudy/huxtable.rb

@@ -1,4 +1,4 @@
-  
+
 
 
 module Rudy
@@ -81,10 +81,23 @@ module Rudy
       base_dir
     end
     
+    def default_root
+      (@@config.defaults.root || 'root').to_s
+    end
+    
     def default_user
-      @@config.defaults.user.to_s || 'root'
+      (@@config.defaults.user || current_machine_root).to_s
+    end
+    
+    def current_machine_root
+      (fetch_machine_param(:root) || default_root).to_s
+    end
+    
+    def current_machine_user
+      (@@global.user || fetch_machine_param(:user) || default_user || Rudy.sysinfo.user).to_s
     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
     # the basename (it's assumed the Amazon Keypair has the same
@@ -97,17 +110,22 @@ module Rudy
       if path
         Huxtable.keypair_path_to_name(path)
       else
-        n = (user.to_s == default_user) ? '' : "-#{user}"
+        n = current_user_is_root?(user) ? '' : "-#{user}"
         "key-%s-%s%s" % [@@global.zone, current_machine_group, n]
       end    
     end
     def root_keypairname
-      user_keypairname :root
+      user_keypairname current_machine_root
     end
     def current_user_keypairname
       user_keypairname current_machine_user
     end
     
+    def current_user_is_root?(user=nil)
+      user ||= current_machine_user
+      user.to_s == current_machine_root
+    end
+    
     def user_keypairpath(name=nil)
       name ||= current_machine_user
       path = defined_keypairpath name
@@ -123,7 +141,7 @@ module Rudy
       path
     end
     def root_keypairpath
-      user_keypairpath :root
+      user_keypairpath current_machine_root
     end
     def current_user_keypairpath
       user_keypairpath current_machine_user
@@ -197,11 +215,7 @@ module Rudy
     def current_machine_name
       [@@global.zone, current_machine_group, @@global.position].join(Rudy::DELIM)
     end
-    
-    def current_machine_user
-      @@global.user || fetch_machine_param(:user) || default_user || Rudy.sysinfo.user
-    end
-    
+
     def current_machine_bucket
       @@global.bucket || fetch_machine_param(:bucket) || nil
     end

data/lib/rudy/routines/handlers/host.rb

@@ -95,12 +95,11 @@ module Rudy; module Routines; module Handlers;
       # NOTE: This will set hostname every time a routine is
       # run so we may want to make this an explicit action.
       hntype = current_machine_hostname || :rudy
-      this_default_user = default_user
       return if hntype.to_s.to_sym == :default
       rset.batch do
         unless self.stash.os == :windows
           hn = hntype == :rudy ? self.stash.name : hntype
-          if self.user.to_s == this_default_user
+          if self.user.to_s == 'root'  # ubuntu has a root user
             hostname hn
           else
             sudo do

data/lib/rudy/routines/handlers/keypair.rb

@@ -7,7 +7,8 @@ module Rudy; module Routines; module Handlers;
     ##Rudy::Routines.add_handler :machines, self
     
     
-    def raise_early_exceptions(name=:root)
+    def raise_early_exceptions(name=nil)
+      name ||= current_machine_root
       keyname = user_keypairname name
       kp_file = pkey name
       if registered? keyname
@@ -20,7 +21,8 @@ module Rudy; module Routines; module Handlers;
       end 
     end
     
-    def create(name=:root)
+    def create(name=nil)
+      name ||= current_machine_root
       keyname = user_keypairname name
       kp_file = pkey name
 
@@ -53,32 +55,38 @@ module Rudy; module Routines; module Handlers;
       kp
     end
     
-    def unregister(name=:root)
+    def unregister(name=nil)
+      name ||= current_machine_root
       keyname = user_keypairname name
       raise "Keypair not registered: #{keyname}" unless registered?(name)
       Rudy::AWS::EC2::Keypairs.destroy keyname
     end
     
-    def delete_pkey(name=:root)
+    def delete_pkey(name=nil)
+      name ||= current_machine_root
       kp_file = pkey name
       raise PrivateKeyNotFound, kp_file unless pkey?(name)
       File.unlink kp_file
     end
     
-    def exists?(name=:root)
+    def exists?(name=nil)
+      name ||= current_machine_root
       registered?(name) && pkey?(name)
     end
     
-    def registered?(name=:root)
+    def registered?(name=nil)
+      name ||= current_machine_root
       keyname = user_keypairname name
       Rudy::AWS::EC2::Keypairs.exists?(keyname)
     end
     
-    def pkey(name=:root)
+    def pkey(name=nil)
+      name ||= current_machine_root
       user_keypairpath name
     end
     
-    def pkey?(name=:root)
+    def pkey?(name=nil)
+      name ||= current_machine_root
       File.exists? pkey(name)
     end
     

data/lib/rudy/routines/handlers/rye.rb

@@ -17,7 +17,8 @@ module Rudy::Routines::Handlers;
          :user => current_machine_user, 
          :ostype => current_machine_os || :unix,
          :impltype => :linux, 
-         :info => STDOUT
+         :info => STDOUT,
+         :paranoid => false  # doesn't get passed through (Rye bug?)
        }.merge opts
        
        nickname = hostname
@@ -80,7 +81,7 @@ module Rudy::Routines::Handlers;
          :quiet => Rudy.quiet?
        }.merge(opts)
        set = ::Rye::Set.new current_machine_group, opts 
-
+       
        opts.delete(:parallel)   # Not used by Rye::Box.new
 
        hostnames.each do |m| 

data/lib/rudy/routines/shutdown.rb

@@ -83,7 +83,7 @@ module Rudy; module Routines;
       ## it prevents shutting down.
       # Check private key after machine group, otherwise we could get an error
       # about there being no key which doesn't make sense if the group isn't running.
-      ##raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
+      ##raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(current_machine_root)
       if @routine
         bad = @routine.keys - @@allowed_actions
         raise UnsupportedActions.new(@name, bad) unless bad.empty?

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.015"
+  s.version = "0.9.8.016"
   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: 57
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 15
-  version: 0.9.8.015
+  - 16
+  version: 0.9.8.016
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency