rudy 0.8.5 → 0.9.0

data/lib/rudy/disks.rb

@@ -0,0 +1,25 @@
+
+
+module Rudy
+  
+  module Disks
+    RTYPE = 'disk'.freeze
+    
+    extend self
+    extend Rudy::Metadata::ClassMethods
+    include Rudy::Huxtable
+    extend Rudy::Huxtable
+    
+    def get(path)
+      tmp = Rudy::Disk.new path
+      record = Rudy::Metadata.get tmp.name
+      return nil unless record.is_a?(Hash)
+      tmp.from_hash record
+    end
+    
+    def from_hash(h)
+      Rudy::Disk.from_hash h
+    end
+    
+  end
+end

data/lib/rudy/exceptions.rb

@@ -0,0 +1,99 @@
+module Rudy
+  
+  class Error < RuntimeError
+    def initialize(obj=nil); @obj = obj; end
+    def message; "#{self.class}: #{@obj}"; end
+  end
+  class InsecureKeyPermissions < Rudy::Error
+    def message
+      lines = ["Insecure file permissions for #{@obj}"]
+      lines << "Try: chmod 600 #{@obj}"
+      lines.join($/)
+    end
+  end
+  
+  #--
+  # TODO: Update exception Syntax based on:
+  # http://blog.rubybestpractices.com/posts/gregory/anonymous_class_hacks.html
+  #++
+  
+  class NoConfig < Rudy::Error
+    def message; "No configuration found!"; end
+  end
+  class NoGlobal < Rudy::Error
+    def message; "No globals defined!"; end
+  end
+  class NoMachinesConfig < Rudy::Error
+    def message; "No machines configuration. Check your configs!"; end
+  end
+  class NoRoutinesConfig < Rudy::Error
+    def message; "No routines configuration. Check your configs!"; end
+  end
+  class ServiceUnavailable < Rudy::Error
+    def message; "#{@obj} is not available. Check your internets!"; end
+  end
+  class MachineGroupAlreadyRunning < Rudy::Error
+    def message; "Machine group #{@obj} is already running."; end
+  end
+  class MachineGroupNotRunning < Rudy::Error
+    def message; "Machine group #{@obj} is not running."; end
+  end
+  class MachineGroupMetadataExists < Rudy::Error 
+    def message; "Machine group #{@obj} has existing metadata."; end
+  end
+  class MachineAlreadyRunning < Rudy::Error
+    def message; "Machine #{@obj} is already running."; end
+  end
+  class MachineNotRunning < Rudy::Error
+    def message; "Machine #{@obj} is not running."; end
+  end
+  class NoMachines < Rudy::Error;
+    def message
+      msg = "No machines running "
+      msg << "in #{@obj}" if @obj
+      msg
+    end
+  end 
+  class MachineGroupNotDefined < Rudy::Error 
+    def message; "#{@obj} is not defined in machines config."; end
+  end
+  class PrivateKeyFileExists < Rudy::Error
+    def message; "Private key #{@obj} already exists."; end
+  end
+  class PrivateKeyNotFound < Rudy::Error
+    def message; "Private key file #{@obj} not found."; end
+  end
+  class UnsupportedOS < Rudy::Error; end
+
+  
+  class NotImplemented < Rudy::Error; end
+  
+
+  module Metadata
+    class UnknownRecordType < Rudy::Error
+      def message; "Unknown record type: #{@obj}"; end
+    end
+    class UnknownObject < Rudy::Error
+      def message; "Unknown object: #{@obj}"; end
+    end
+    # Raised when trying to save a record with a key that already exists
+    class DuplicateRecord < Rudy::Error; end
+    
+  end
+  
+  module Disks
+    class NotAttached < Rudy::Error; end
+    class NotFormatted < Rudy::Error; end
+    class AlreadyFormatted < Rudy::Error; end
+    class AlreadyMounted < Rudy::Error; end
+    class AlreadyAttached < Rudy::Error; end
+    class NotMounted < Rudy::Error; end
+    class InUse < Rudy::Error; end
+  end
+  
+  module Backups
+    class NoDisk < Rudy::Error; end
+    class NoBackup < Rudy::Error; end
+  end
+  
+end

data/lib/rudy/global.rb

@@ -22,19 +22,23 @@ module Rudy
     field :verbose
     field :format
     field :print_header
-    field :yes
+    field :auto
+    field :force
     
     field :accesskey
     field :secretkey
     field :accountnum
     field :accountname  # TODO: use this. And accounttype (aws)
     field :cert
-    field :privatekey
+    field :pkey
     
-    field :local_user
-    field :local_hostname
+    field :localhost
+    field :parallel
+    field :identity
     
+    field :testrun
     field :offline
+    field :bucket
     
     field :config => String
     
@@ -46,45 +50,61 @@ module Rudy
       @verbose ||= 0
       @nocolor = true unless @nocolor == "false" || @nocolor == false
       @quiet ||= false
+      @parallel ||= false
+      @force ||= false
       @format ||= :string # as in, to_s
       @print_header = true if @print_header == nil
-      @yes = false if @yes.nil?
     end
     
     def apply_config(config)
+
       return unless config.is_a?(Rudy::Config)
+      clear_system_defaults  # temporarily unapply default values
+      
       if config.defaults?
         # Apply the "color" default before "nocolor" so nocolor has presedence
         @nocolor = !config.defaults.color unless config.defaults.color.nil?
-        %w[region zone environment role position user nocolor quiet yes].each do |name|
-          val = config.defaults.send(name)
-          self.send("#{name}=", val) unless val.nil?
+        # WARNING: Don't add user to this list. The global value should return
+        # the value specified on the command line or nil. If it is nil, we can
+        # check the value from the machines config. If that is nil, we use the
+        # value from the defaults config. 
+        # WARNING: Don't add bucket either or any machines configuration param 
+        # TODO: investigate removing this apply_config method
+        %w[region zone environment role position 
+           localhost nocolor quiet auto force parallel].each do |name|
+          curval, defval = self.send(name), config.defaults.send(name)
+          if curval.nil? && !defval.nil?
+            # Don't use the accessors. These are defaults so no Region  magic. 
+            self.instance_variable_set("@#{name}", defval) 
+          end
         end
       end
       
       if config.accounts? && config.accounts.aws
-        %w[accesskey secretkey accountnum cert privatekey].each do |name|
+        %w[accesskey secretkey accountnum cert pkey].each do |name|
           val = config.accounts.aws.send(name)
           self.send("#{name}=", val) unless val.nil?
         end
       end
-      
       postprocess
     end
     
-    
     def update(ghash={})
-      ghash = ghash.marshal_dump if ghash.is_a?(OpenStruct)
-      
-      if ghash.is_a?(Hash)
-        ghash.each_pair { |n,v| self.send("#{n}=", v) } 
-      else
-        raise "Unexpected #{ghash.class.to_s}"
-      end
-      
+      ghash = ghash.marshal_dump if ghash.is_a?(OpenStruct) 
+      ghash.each_pair { |n,v| self.send("#{n}=", v) } 
       postprocess
     end
     
+    def zone=(z)
+      @zone = z
+      @region = @zone.to_s.gsub(/[a-z]$/, '').to_sym
+    end
+    
+    def region=(r)
+      @region = r
+      @zone = "#{@region}b".to_sym
+    end
+    
     def to_s(*args)
       super()
     end
@@ -97,11 +117,12 @@ module Rudy
       apply_system_defaults
       @nocolor = !@color unless @color.nil?
       @cert &&= File.expand_path(@cert)
-      @privatekey &&= File.expand_path(@privatekey)
+      @pkey &&= File.expand_path(@pkey)
       @position &&= @position.to_s.rjust(2, '0')  
       @format &&= @format.to_sym rescue nil
       @quiet ? Rudy.enable_quiet : Rudy.disable_quiet
-      @yes ? Rudy.enable_yes : Rudy.disable_yes
+      @auto ? Rudy.enable_auto : Rudy.disable_auto
+      
     end
     
     def apply_environment_variables
@@ -109,18 +130,36 @@ module Rudy
       @secretkey ||= ENV['AWS_SECRET_KEY'] || ENV['AWS_SECRET_ACCESS_KEY']
       @accountnum ||= ENV['AWS_ACCOUNT_NUMBER']
       @cert ||= ENV['EC2_CERT']
-      @privatekey ||= ENV['EC2_PRIVATE_KEY']
-      @local_user = ENV['USER'] || :rudy
-      @local_hostname = Socket.gethostname || :localhost  
+      @pkey ||= ENV['EC2_PRIVATE_KEY']
     end
     
+    # Apply defaults for parameters that must have values
     def apply_system_defaults
-      @region ||= Rudy::DEFAULT_REGION
-      @zone ||= Rudy::DEFAULT_ZONE
+      if    @region.nil? && @zone.nil?
+        @region, @zone = Rudy::DEFAULT_REGION, Rudy::DEFAULT_ZONE
+      elsif @region.nil?
+        @region = @zone.to_s.gsub(/[a-z]$/, '').to_sym
+      elsif @zone.nil?
+        @zone = "#{@region}b".to_sym
+      end
+      
       @environment ||= Rudy::DEFAULT_ENVIRONMENT
       @role ||= Rudy::DEFAULT_ROLE
-      @position ||= Rudy::DEFAULT_POSITION
-      @user ||= Rudy::DEFAULT_USER
+      @localhost ||= Rudy.sysinfo.hostname || 'localhost'
+      @auto = false if @auto.nil?
+    end
+    
+    # Unapply defaults for parameters that must have values. 
+    # This is important when reloading configuration since
+    # we don't overwrite existing values. If the default
+    # ones remained the configuration would not be applied.
+    def clear_system_defaults
+      @region = nil if @region == Rudy::DEFAULT_REGION
+      @zone = nil if @zone == Rudy::DEFAULT_ZONE
+      @environment = nil if @environment == Rudy::DEFAULT_ENVIRONMENT
+      @role = nil if @role == Rudy::DEFAULT_ROLE
+      @localhost = nil if @localhost == (Rudy.sysinfo.hostname || 'localhost')
+      @auto = nil if @auto == false
     end
     
   end

data/lib/rudy/guidelines.rb

@@ -1,12 +1,13 @@
 
 
 module Rudy
-  module Guidelines #:nodoc:all
+  module Guidelines
     extend self
-    AFE = "Always fail early"   # [ed: the A's are a work in progress]
+    AFE = "Always fail early"
     ABA = "Always be accurate"
     CBC = "Consistency before cuteness"
     UNO = "Ugly's not okay"
+    WOC = "Write offensive code"
     def inspect
       all = Guidelines.constants
       g = all.collect { |c| '%s="%s"' % [c, const_get(c)] }

data/lib/rudy/huxtable.rb

@@ -20,6 +20,7 @@ module Rudy
   #     end
   #
   module Huxtable
+    extend self
     
     @@config = Rudy::Config.new
     @@global = Rudy::Global.new
@@ -30,15 +31,13 @@ module Rudy
     def self.logger; @@logger; end
     
     def self.update_config(path=nil)
-      @@config.verbose = (@@global.verbose > 1)
+      @@config.verbose = (@@global.verbose >= 3)   # -vvv
       # nil and bad paths sent to look_and_load are ignored
       @@config.look_and_load(path || @@global.config)
       @@global.apply_config(@@config)
-      # And then update global again b/c some values come from @@config
-      update_global  ## TODO: Check if this can be removed
     end
 
-    def self.update_global(ghash={}); @@global.update(ghash); end
+    def self.update_global(ghash); @@global.update(ghash); end
     def self.update_logger(logger);   @@logger = logger; end
     
     def self.reset_config; @@config = Rudy::Config.new; end
@@ -58,6 +57,17 @@ module Rudy
       Rudy::DOMAIN
     end
     
+    # Puts +msg+ to +@@logger+
+    def self.li(*msg); msg.each { |m| @@logger.puts m } if !@@global.quiet; end
+    # Puts +msg+ to +@@logger+ if +Rudy.debug?+ returns true
+    def self.ld(*msg); msg.each { |m| @@logger.puts "D: #{m}" } if Rudy.debug?; end
+    # Puts +msg+ to +@@logger+ with "ERROR: " prepended
+    def self.le(*msg); msg.each { |m| @@logger.puts "  #{m}" }; end
+    
+    def li(*msg); Rudy::Huxtable.li *msg; end
+    def ld(*msg); Rudy::Huxtable.ld *msg; end
+    def le(*msg); Rudy::Huxtable.le *msg; end
+    
     def config_dirname
       raise "No config paths defined" unless @@config.is_a?(Rudy::Config) && @@config.paths.is_a?(Array)
       base_dir = File.dirname @@config.paths.first
@@ -65,21 +75,18 @@ module Rudy
       base_dir
     end
     
-    def has_keypair?(name=nil)
-      kp = user_keypairpath(name)
-      (!kp.nil? && File.exists?(kp))
-    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
+    # the basename (it's assumed the Amazon Keypair has the same
     # name as the file). Otherwise this returns the Rudy style
     # 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)
-      kp = user_keypairpath(user)
-      if kp
-        kp = Huxtable.keypair_path_to_name(kp)
+    def user_keypairname(user=nil)
+      user ||= current_machine_user
+      path = defined_keypairpath user
+      if path
+        Huxtable.keypair_path_to_name(path)
       else
         n = (user.to_s == 'root') ? '' : "-#{user}"
         "key-%s-%s%s" % [@@global.zone, current_machine_group, n]
@@ -88,50 +95,56 @@ module Rudy
     def root_keypairname
       user_keypairname :root
     end
+    def current_user_keypairname
+      user_keypairname current_machine_user
+    end
     
-    
-    def user_keypairpath(name)
-      raise Rudy::Error, "No user provided" unless name
-      raise NoConfig unless @@config
-      raise NoMachinesConfig unless @@config.machines
-      raise NoGlobal unless @@global
-      zon, env, rol = @@global.zone, @@global.environment, @@global.role
-      #Caesars.enable_debug
-      path = @@config.machines.find_deferred(zon, env, rol, [:users, name, :keypair])
-      path ||= @@config.machines.find_deferred(env, rol, [:users, name, :keypair])
-      path ||= @@config.machines.find_deferred(rol, [:users, name, :keypair])
-      
-      # EC2 Keypairs that were created are intended for starting the machine instances. 
-      # These are used as the root SSH keys. If we can find a user defined key, we'll 
-      # check the config path for a generated one. 
-      if !path && name.to_s == 'root'
-        path = File.join(self.config_dirname, "key-#{@@global.zone}-#{current_machine_group}")
+    def user_keypairpath(name=nil)
+      name ||= current_machine_user
+      path = defined_keypairpath name
+      # If we can't find a user defined key, we'll 
+      # check the config path for a generated one.
+      if path
+        raise "Private key file not found (#{path})" unless File.exists?(path)
+        path = File.expand_path(path)
+      else
+        ssh_key_dir = @@config.defaults.keydir || Rudy::SSH_KEY_DIR
+        path = File.join(ssh_key_dir, user_keypairname(name))
       end
-      path = File.expand_path(path) if path && File.exists?(path)
       path
     end
     def root_keypairpath
       user_keypairpath :root
     end
-    
-    def has_root_keypair?
-      path = user_keypairpath(:root)
-      (!path.nil? && !path.empty?)
+    def current_user_keypairpath
+      user_keypairpath current_machine_user
     end
     
-    def current_user
-      @@global.user
-    end
-    def current_user_keypairpath
-      user_keypairpath(current_user)
+    def defined_keypairpath(name=nil)
+      name ||= current_machine_user
+      raise Rudy::Error, "No user provided" unless name
+      ## NOTE: I think it is more appropriate to return nil here
+      ## than raise errors. This stuff should be checked already
+      ##raise NoConfig unless @@config
+      ##raise NoMachinesConfig unless @@config.machines
+      ##raise NoGlobal unless @@global
+      return unless @@global && @@config && @@config.machines
+      zon, env, rol = @@global.zone, @@global.environment, @@global.role
+      path = @@global.identity
+      path ||= @@config.machines.find_deferred(zon, env, rol, [:users, name, :keypair])
+      path ||= @@config.machines.find_deferred(env, rol, [:users, name, :keypair])
+      path ||= @@config.machines.find_deferred(rol, [:users, name, :keypair])
+      path ||= @@config.machines.find_deferred(@@global.region, [:users, name, :keypair])
+      path
     end
     
+    
     def current_machine_group
       [@@global.environment, @@global.role].join(Rudy::DELIM)
     end
     
     def current_group_name
-      "g-#{current_machine_group}"
+      "grp-#{@@global.zone}-#{current_machine_group}"
     end
     
     def current_machine_count
@@ -175,20 +188,13 @@ module Rudy
     def current_machine_name
       [@@global.zone, current_machine_group, @@global.position].join(Rudy::DELIM)
     end
-
-    # +name+ the name of the remote user to use for the remainder of the command
-    # (or until switched again). If no name is provided, the user will be revert
-    # to whatever it was before the previous switch. 
-    # TODO: deprecate
-    def switch_user(name=nil)
-      if name == nil && @switch_user_previous
-        @@global.user = @switch_user_previous
-      elsif @@global.user != name
-        raise "No root keypair defined for #{name}!" unless has_keypair?(name)
-        @@logger.puts "Remote commands will be run as #{name} user"
-        @switch_user_previous = @@global.user
-        @@global.user = name
-      end
+    
+    def current_machine_user
+      @@global.user || fetch_machine_param(:user) || @@config.defaults.user || Rudy.sysinfo.user
+    end
+    
+    def current_machine_bucket
+      @@global.bucket || fetch_machine_param(:bucket) || nil
     end
     
     def self.keypair_path_to_name(kp)
@@ -247,7 +253,7 @@ module Rudy
       raise NoRoutinesConfig unless @@config.routines
       raise NoGlobal unless @@global
       
-      action = action.to_s.tr('-', '_')
+      action = action.to_s.tr('-:', '_')
       
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
       
@@ -264,12 +270,12 @@ module Rudy
       
       routine.disks.each_pair do |raction,disks|
         unless disks.kind_of?(Hash)
-          @@logger.puts "#{raction} is not defined. Check your #{action} routines config.".color(:red)
+          li "#{raction} is not defined. Check your #{action} routines config.".color(:red)
           next
         end
         disks.each_pair do |path, props|
           unless disk_defs.has_key?(path)
-            @@logger.puts "#{path} is not defined. Check your #{action} machines config.".color(:red)
+            li "#{path} is not defined. Check your #{action} machines config.".color(:red)
             routine.disks[raction].delete(path) 
             next
           end
@@ -311,12 +317,15 @@ module Rudy
       raise NoGlobal unless @@global
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
       hashes = []
+      # This is fucked!
       hashes << @@config.machines.find(env, rol)
       hashes << @@config.machines.find(zon, env, rol)
       hashes << @@config.machines.find(zon, [env, rol])
       hashes << @@config.machines.find(zon, env)
       hashes << @@config.machines.find(env)
       hashes << @@config.machines.find(zon)
+      hashes << @@config.machines.find(rol)
+      hashes << @@config.machines.find(@@global.region)
       compilation = {}
       hashes.reverse.each do |conf|
         compilation.merge! conf if conf