rudy 0.8.4 → 0.8.5

data/CHANGES.txt

@@ -1,5 +1,25 @@
 RUDY, CHANGES
 
+#### 0.9.0 (TBD) ###############################
+
+NOTE: The following changes are planned for the 0.9.0 release. 
+
+* group identifier will be changed to 'grp' from 'g'
+* machine identifier will be changes to 'mach' from 'm'
+* private keys are stored in ~/.ssh/
+* zone is now a single letter: a, b, c, etc... The long form (us-east-1b) will set the region too.
+* Disk syntax in the routines DSL will change. The DSL no longer accepts arguments, just the action (create, destroy, ...). 
+* Disk backups will be removed (temporarily -- probably until on of the early 1.x releases). 
+
+
+#### 0.8.5 (2009-06-??) ###############################
+
+* FIXED: Bug in DiskHelper. mount method tried to attach when already attached. 
+* CHANGE: rudy config now displays account info (but keeps secret key hidden)
+* CHANGE: defaults configuration has been removed from the default ~/.rudy/config. 
+  It is now recommended to put it in the same place as machines, routines config.
+* FIXED: Bug in addresses which prevented assigning elastic IP addresses. 
+
 
 #### 0.8.4 (2009-06-04) ###############################
 
@@ -109,7 +129,6 @@ RUDY, CHANGES
 * ADDED: Support for arbitrary routines via passthrough
 
 
-
 #### 0.6.8 (2009-04-24) ###############################
 
 * CHANGE: Renamed rudy config --rudy option to --project. This was important 

data/README.rdoc

@@ -16,7 +16,13 @@ All configuration is organized into the zones, environments, and roles that you
 
 <b>See Getting-Started[http://solutious.com/products/rudy/getting-started.html] for more info.</b>
 
-<em>NOTE: This is a BETA release. That means Rudy's not ready for production use! See Project-Status[http://wiki.github.com/solutious/rudy/project-status].</em>
+
+== Project Status
+
+<em>This is a BETA release. That means Rudy's not ready for production use! See Project-Status[http://wiki.github.com/solutious/rudy/project-status].</em>
+
+I'm currently rebuilding[http://github.com/solutious/rudy/tree/metadata-refactor] the metadata implementation. This is the part of Rudy that stores your machine, disk, and backup infoz in SimpleDB so it's pretty important! The implementation in the 0.8.4 release (and this master branch) are functional but frail so I want to re-emphasize not to use Rudy for production right now.
+
 
 == Configuration
 
@@ -150,12 +156,16 @@ I'm very open to contributions!
 
 == Related Projects
 
+* Sprinkle -- http://github.com/crafterm/sprinkle/
+* Wakame -- http://wakame.rubyforge.org/
 * Pool Party -- http://www.poolpartyrb.com/
 * Rubber -- http://github.com/wr0ngway/rubber/wikis
 * Moonshine -- http://github.com/railsmachine/moonshine/tree
 * Boto -- http://code.google.com/p/boto/
 * Fabric -- http://www.nongnu.org/fab/
 
+
+
 == License
 
 See: LICENSE.txt

data/Rudyfile

@@ -17,11 +17,11 @@
 # it's ADDED or APPENDED depending on context. This means you can split 
 # configuration across many files as you please. 
 #
-# There are four sections: accounts, defaults, machines, commands and routines.
+# There are five sections: accounts, defaults, machines, commands and routines.
 # 
-# By convention, accounts and defaults go in ~/.rudy/config or ./.rudy/config 
-# machines, commands and routines configuration go in ./Rudyfile or into 
-# separate files in ./.rudy or ./config/rudy (machines.rb, commands.rb, ...)
+# By convention, accounts go in ./.rudy/config or ~/.rudy/config 
+# machines, commands, routines, and defaults configuration go in ./Rudyfile or  
+# into separate files in ./.rudy or ./config/rudy (machines.rb, commands.rb, ...)
 #
 
 # ---------------------------------------------------------  MACHINES  --------
@@ -62,9 +62,9 @@ machines do
     end
     
     users do                         # Specify existing private keys per user
-      #root do                       
-      #  keypair "/path/2/private-key"
-      #end
+      rudy do                       
+        keypair "/path/2/private-key"
+      end
     end
     
   end  
@@ -92,7 +92,6 @@ end
 # allow COMMAND-NAME, '/path/2/COMMAND', 'default argument', 'another arg'
 #
 commands do
-  allow :make
   allow :gem_install, '/usr/bin/gem', 'install', :V, '--no-rdoc', '--no-ri'
   allow :apt_get, 'apt-get', :y, :q
   allow :floo, :time, 1 do
@@ -183,3 +182,18 @@ routines do
   end
 end
 
+
+# ----------------------------------------------------------- DEFAULTS --------
+# These values are used as defaults for their respective global settings. All
+# non-boolean values are expected to be Symbols. 
+#
+defaults do
+  region :"us-east-1" 
+  zone :"us-east-1b"
+  environment :stage
+  role :app
+  user Rudy.sysinfo.user.to_sym      # This will be the user running Rudy
+  color false                        # Terminal colors? true/false
+  yes false                          # Auto-confirm? true/false
+end
+

data/bin/rudy

@@ -36,7 +36,7 @@ class RudyCLI < Rudy::CLI::Base
   # ------------------------------------------------------------------
   
   about "View Machines"
-  option :l, :all, "Display all machines"
+  option :l, :all, "Display machines for all environments and roles"
   action :W, :wash, "Wash machine metadata."
   command :machines => Rudy::CLI::Machines
   command_alias :machines, :m
@@ -48,6 +48,16 @@ class RudyCLI < Rudy::CLI::Base
   command :disks => Rudy::CLI::Disks
   command_alias :disks, :d
   
+  about "View raw metadata"
+  usage "rudy metadata"
+  usage "rudy metadata -l -o [disk|back|m]"
+  usage "rudy metadata -D object-id"
+  option :o, :otype, String, "Object type. One of: disk, back, m"
+  option :l, :all, "Display metadata for all environments and roles"
+  action :D, :delete, "Delete an object"
+  argv :oid
+  command :metadata => Rudy::CLI::MetaData
+  
   about "Log in to a machine"
   command :ssh => Rudy::CLI::Machines
   

data/bin/rudy-ec2

@@ -184,7 +184,7 @@ module RudyCLI_EC2
   about "Amazon EC2 Volumes"
   usage "rudy-ec2 volumes"
   usage "rudy-ec2 volumes -C -s size [-d device-path]"
-  usage "rudy-ec2 volumes -A volume-id instance-id"
+  usage "rudy-ec2 volumes -A -i instance-id volume-id"
   usage "rudy-ec2 volumes -N volume-id"
   usage "rudy-ec2 volumes -D volume-id"
   option :i, :instance, String, "Instance ID"

data/lib/rudy.rb

@@ -4,8 +4,9 @@ unless defined?(RUDY_HOME)
   RUDY_LIB = File.join(File.dirname(__FILE__), '..', 'lib')
 end
 
-local_libs = %w{net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
-local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
+local_libs = %w{net-ssh net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
+#local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
+#require 'rubygems'
 
 require 'digest/md5'
 require 'stringio'
@@ -38,28 +39,34 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 8.freeze
-      TINY  = 4.freeze
+      TINY  = 5.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
   end
   
-  unless defined?(Rudy::DOMAIN) # We can assume all constants are defined
+  unless defined? Rudy::DOMAIN # We can assume all constants are defined
+    
+    @@quiet = false
+    @@yes = false
+    @@debug = false
+    @@sysinfo = SysInfo.new.freeze
+    
     # SimpleDB accepts dashes in the domain name on creation and with the query syntax. 
     # However, with select syntax it says: "The specified query expression syntax is not valid"
     DOMAIN = "rudy_state".freeze
     DELIM  = '-'.freeze
   
-    CONFIG_DIR = File.join(ENV['HOME'] || ENV['USERPROFILE'], '.rudy').freeze
+    CONFIG_DIR = File.join(@@sysinfo.home, '.rudy').freeze
     CONFIG_FILE = File.join(Rudy::CONFIG_DIR, 'config').freeze
     
-    DEFAULT_REGION = 'us-east-1'.freeze 
-    DEFAULT_ZONE = 'us-east-1b'.freeze 
-    DEFAULT_ENVIRONMENT = 'stage'.freeze
-    DEFAULT_ROLE = 'app'.freeze
+    DEFAULT_REGION = :'us-east-1'.freeze 
+    DEFAULT_ZONE = :'us-east-1b'.freeze 
+    DEFAULT_ENVIRONMENT = :'stage'.freeze
+    DEFAULT_ROLE = :'app'.freeze
     DEFAULT_POSITION = '01'.freeze
     
-    DEFAULT_USER = 'rudy'.freeze
+    DEFAULT_USER = :'rudy'.freeze
     
     DEFAULT_EC2_HOST = "ec2.amazonaws.com"
     DEFAULT_EC2_PORT = 443
@@ -86,12 +93,7 @@ module Rudy
       :dns_public => 'ec2',
       :dns_private => 'domU',
     }.freeze
-    
-    @@quiet = false
-    @@yes = false
-    @@debug = false
-    @@sysinfo = SysInfo.new.freeze
-    
+
   end
   
   def Rudy.debug?; @@debug == true; end
@@ -163,6 +165,3 @@ require 'rudy/aws'        # is
 require 'rudy/metadata'   # important
 require 'rudy/machines'
 require 'rudy/routines'
-
-
-

data/lib/rudy/aws/ec2/address.rb

@@ -134,7 +134,7 @@ module Rudy::AWS
       # Returns true if the given address is assigned to the current account
       def exists?(address)
         address = address.ipaddress if address.is_a?(Rudy::AWS::EC2::Address)
-        list do |a|
+        list.each do |a|
           return true if a.ipaddress == address
         end
         false

data/lib/rudy/aws/sdb.rb

@@ -65,14 +65,15 @@ module Rudy
       
       # Takes a zipped Array or Hash of criteria.
       # Returns a string suitable for a SimpleDB Select
-      def self.generate_select(*args)
-        fields, domain, args = *args
-        q = args.is_a?(Hash) ? args : Hash[*args.flatten]
+      def self.generate_select(fields, domain, *args)
+        q = args.first.is_a?(Hash)? args.first : Hash[*args.flatten]
         query = []
-        q.each do |n,v| 
+        q.each_pair do |n,v| 
           query << "#{Rudy::AWS.escape n}='#{Rudy::AWS.escape v}'"
         end
-        "select * from #{domain} where " << query.join(' and ')
+        str = "select * from #{domain} " 
+        str << " where "<< query.join(' and ') unless query.empty?
+        str
       end
 
       

data/lib/rudy/cli.rb

@@ -48,9 +48,6 @@ module Rudy
           exit 81
         end
         
-        # And then update global again b/c some values come from @@config
-        Rudy::Huxtable.update_global
-        
         @@global.nocolor ? String.disable_color : String.enable_color
         @@global.yes ? Annoy.enable_skip : Annoy.disable_skip
       
@@ -103,9 +100,7 @@ module Rudy
       end
       
       def machine_separator(name, awsid)
-        dashes = 80 - name.size # 
-        dashes = 0 if dashes < 1
-        ('%s %-63s awsid: %s ' % [$/, name, awsid]).att(:reverse)
+        ('%s %-50s awsid: %s ' % [$/, name, awsid]).att(:reverse)
       end
       
     end

data/lib/rudy/cli/config.rb

@@ -54,10 +54,11 @@ module Rudy
           puts conf.to_hash.send(outform) if conf
           
         else
-          puts "# ACCOUNTS: [not displayed]" if types.delete(:accounts)
+          #puts "# ACCOUNTS: [not displayed]" if types.delete(:accounts)
           types.each do |conftype|
             puts "# #{conftype.to_s.upcase}"
             next unless @@config[conftype]  # Nothing to output
+            @@config[conftype][:aws][:secretkey] = '[hidden]' if conftype == :accounts
             puts @@config[conftype].to_hash.send(outform)
           end
         end

data/lib/rudy/cli/disks.rb

@@ -29,7 +29,7 @@ module Rudy
           if @option.backups
             d.list_backups.each_with_index do |b, index|
               puts '  %s' % b.name
-              break if @option.all.nil? && index >= 2 # display only 3, unless all
+              ##break if @option.all.nil? && index >= 2 # display only 3, unless all
             end
           end
         end

data/lib/rudy/cli/metadata.rb

@@ -0,0 +1,37 @@
+
+
+module Rudy
+  module CLI
+    class MetaData < Rudy::CLI::CommandBase
+      
+      
+      def metadata
+        more, less = [], []
+        less = [:environment, :role, :zone, :region] if @option.all
+        more += [:rtype, @option.otype] if @option.otype
+        
+        rdebug = Rudy::MetaData::Debug.new
+        objlist = rdebug.list(more, less) || []
+        objlist.each do |o|
+          p o
+        end
+      end
+      
+      def metadata_delete_valid?
+        raise "Must supply object ID" unless @argv.oid
+        true
+      end
+      
+      def metadata_delete
+        rdebug = Rudy::MetaData::Debug.new
+        unless @@global.quiet
+          msg = "NOTE: This will delete only the metadata and "
+          msg << "not the EC2 object (volume, instance, etc...)"
+          puts msg
+        end
+        p rdebug.get( @argv.oid)
+      end
+    
+    end
+  end
+end

data/lib/rudy/config.rb

@@ -17,11 +17,11 @@ module Rudy
     def accounts?; self.respond_to?(:accounts) && !self[:accounts].nil?; end #a
     def defaults?; self.respond_to?(:defaults) && !self[:defaults].nil?; end #u
     def machines?; self.respond_to?(:machines) && !self[:machines].nil?; end #t
-    def routines?; self.respond_to?(:routines) && !self[:routines].nil?; end #o
-    def networks?; self.respond_to?(:networks) && !self[:networks].nil?; end #g
-    def controls?; self.respond_to?(:controls) && !self[:controls].nil?; end #e
-    def commands?; self.respond_to?(:commands) && !self[:commands].nil?; end #n
-    def services?; self.respond_to?(:services) && !self[:services].nil?; end #!
+    def commands?; self.respond_to?(:commands) && !self[:commands].nil?; end #o
+    def routines?; self.respond_to?(:routines) && !self[:routines].nil?; end #g
+    #def networks?; self.respond_to?(:networks) && !self[:networks].nil?; end #e
+    #def controls?; self.respond_to?(:controls) && !self[:controls].nil?; end #n
+    #def services?; self.respond_to?(:services) && !self[:services].nil?; end #!
     
     # This method is called by Caesars::Config.refresh for every DSL 
     # file that is loaded and parsed. If we want to run processing
@@ -44,6 +44,10 @@ module Rudy
       # the case. Rudy::Config::Commands knows to only raise the
       # exception one time (using a boolean flag in a class var).
       @commands.postprocess if @commands
+      @defaults.postprocess if @defaults
+      
+      # default will be nil if non was specified. We at least want the object.
+      @defaults = Rudy::Config::Defaults.new if @defaults.nil?
     end
     
     def look_and_load(adhoc_path=nil)
@@ -96,16 +100,6 @@ module Rudy
               cert "~/path/2/cert-xxxx.pem"
             end
           end
-          
-          defaults do                          # Global Defaults
-            region :"us-east-1" 
-            zone :"us-east-1b"
-            environment :stage
-            role :app
-            user Rudy.sysinfo.user.to_sym
-            color false                        # Terminal colors? true/false
-            yes false                          # Auto-confirm? true/false
-          end
         }
         Rudy::Utils.write_to_file(Rudy::CONFIG_FILE, rudy_config, 'w', 0600)
       end

data/lib/rudy/config/objects.rb

@@ -7,11 +7,33 @@ class Rudy::Config
     end
     def message; "Error in #{@ctype}: #{@obj}"; end
   end
+  
+  class Accounts < Caesars
+    def valid?
+      (!aws.nil? && !aws.accesskey.nil? && !aws.secretkey.nil?) &&
+      (!aws.account.empty? && !aws.accesskey.empty? && !aws.secretkey.empty?)
+    end
+  end
+  
+  # Default configuration. All of the defaults can be overridden 
+  # on the command line with global options.
+  class Defaults < Caesars
+    class DoubleDefined < Rudy::Config::Error
+      def message; "Check your defaults config. '#{@obj}' has been defined twice"; end
+    end
+    # 
+    # All values should scalars
+    # 
+    def postprocess
+      self.keys.each do |k| 
+        next unless self[k].is_a?(Array)
+        raise Defaults::DoubleDefined.new(:defaults, k)
+      end
+    end
+  end
+  
   class Machines < Caesars; end
-  class Defaults < Caesars; end
-  class Networks < Caesars; end
-  class Controls < Caesars; end
-  class Services < Caesars; end
+  
   # Modify the SSH command available in routines. The default
   # set of commands is defined by Rye::Cmd (Rudy executes all
   # SSH commands via Rye). 
@@ -79,7 +101,9 @@ class Rudy::Config
         
         # We can allow existing commands to be overridden but we
         # print a message to STDERR so the user knows what's up.
-        STDERR.puts "Redefining #{cmd}" if Rye::Cmd.can?(cmd)
+        if Rye::Cmd.can?(cmd)
+          STDERR.puts "Redefining #{cmd}" #if @@global.verbose > 0
+        end
         
         if args.last.is_a?(Proc)
           block = args.pop
@@ -112,13 +136,6 @@ class Rudy::Config
     end
   end
   
-  class Accounts < Caesars
-    def valid?
-      (!aws.nil? && !aws.accesskey.nil? && !aws.secretkey.nil?) &&
-      (!aws.account.empty? && !aws.accesskey.empty? && !aws.secretkey.empty?)
-    end
-  end
-  
   class Routines < Caesars
     
     # Disk routines
@@ -128,6 +145,8 @@ class Rudy::Config
     forced_hash :umount
     forced_hash :unmount
     forced_hash :mount
+    forced_hash :attach
+    forced_hash :detach
     forced_hash :snapshot
     forced_hash :restore
     
@@ -136,8 +155,8 @@ class Rudy::Config
     forced_hash :after         
     forced_hash :script_local
     forced_hash :before_local  
-    forced_hash :after_local     # We force hash the script keywords 
-    forced_hash :script          # b/c we want them to store the usernames
+    forced_hash :after_local     # We force hash the script keywords b/c
+    forced_hash :script          # we want them to store the usernames 
     chill :before                # as hash keys. 
     chill :after                 # We also chill them b/c we want to execute
     chill :before_local          # the command blocks with an instance_eval
@@ -153,4 +172,12 @@ class Rudy::Config
     end
 
   end
+  
+  
+  class Networks < Caesars #:nodoc:all
+  end
+  class Controls < Caesars #:nodoc:all
+  end
+  class Services < Caesars #:nodoc:all
+  end
 end

data/lib/rudy/global.rb

@@ -50,7 +50,7 @@ module Rudy
       @print_header = true if @print_header == nil
       @yes = false if @yes.nil?
     end
-      
+    
     def apply_config(config)
       return unless config.is_a?(Rudy::Config)
       if config.defaults?

data/lib/rudy/guidelines.rb

@@ -10,7 +10,7 @@ module Rudy
     def inspect
       all = Guidelines.constants
       g = all.collect { |c| '%s="%s"' % [c, const_get(c)] }
-      %q{#<Rudy::Guidelines:%s %s>} % [self.object_id, g.join(' ')]
+      %q{#<Rudy::Guidelines:0x%s %s>} % [self.object_id, g.join(' ')]
     end
   end
 end

data/lib/rudy/huxtable.rb

@@ -1,4 +1,4 @@
-
+  
 
 
 module Rudy
@@ -21,38 +21,28 @@ module Rudy
   #
   module Huxtable
     
-    # TODO: investigate @@debug bug. When this is true, Caesars.debug? returns true
-    # too. It's possible this is intentional but probably not. 
-    @@debug = false
-    @@abort = false
-    
     @@config = Rudy::Config.new
     @@global = Rudy::Global.new
     @@logger = StringIO.new    # BUG: memory-leak for long-running apps
     
-    @@sacred_params = [:accesskey, :secretkey, :cert, :privatekey]
-    
-    # NOTE: These methods conflict with Drydock::Command classes. It's
-    # probably a good idea to not expose these anyway since it can be
-    # done via Rudy::Huxtable.update_global etc...
-    #def config; @@config; end
-    #def global; @@global; end
-    #def logger; @@logger; end
+    def self.config; @@config; end
+    def self.global; @@global; end
+    def self.logger; @@logger; end
     
     def self.update_config(path=nil)
       @@config.verbose = (@@global.verbose > 1)
       # 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_logger(logger);   @@logger = logger; 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
+    def self.reset_global; @@global = Rudy::Global.new; end
     
     def self.create_domain
       @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
@@ -68,29 +58,6 @@ module Rudy
       Rudy::DOMAIN
     end
     
-    def self.change_zone(v); @@global.zone = v; end
-    def self.change_role(v); @@global.role = v; end
-    def self.change_region(v); @@global.region = v; end
-    def self.change_environment(v); @@global.environment = v; end  
-    def self.change_position(v); @@global.position = v; end
-    
-    def debug?; Rudy::Huxtable.debug?; end
-    def Huxtable.debug?; @@debug == true; end
-    def check_keys
-      raise "No EC2 .pem keys provided" unless has_pem_keys?
-      raise "No SSH key provided for #{current_user}!" unless has_keypair?
-      raise "No SSH key provided for root!" unless has_keypair?(:root)
-    end
-      
-    def has_pem_keys?
-      (@@global.cert       && File.exists?(@@global.cert) && 
-       @@global.privatekey && File.exists?(@@global.privatekey))
-    end
-     
-    def has_keys?
-      (@@global.accesskey && !@@global.accesskey.empty? && @@global.secretkey && !@@global.secretkey.empty?)
-    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
@@ -224,11 +191,6 @@ module Rudy
       end
     end
     
-    def group_metadata(env=@@global.environment, role=@@global.role)
-      query = "['environment' = '#{env}'] intersection ['role' = '#{role}']"
-      @sdb.query_with_attributes(Rudy::DOMAIN, query)
-    end
-    
     def self.keypair_path_to_name(kp)
       return nil unless kp
       name = File.basename kp
@@ -338,8 +300,9 @@ module Rudy
     
     # Returns true if this is the default machine environment and role
     def default_machine_group?
-      @@global.environment == @@config.defaults.environment &&
-      @@global.role == @@config.defaults.role
+      default_env = @@config.defaults.environment || Rudy::DEFAULT_ENVIRONMENT
+      default_rol = @@config.defaults.role || Rudy::DEFAULT_ROLE
+      @@global.environment == default_env && @@global.role == default_rol
     end
     
     def fetch_machine_config

data/lib/rudy/machines.rb

@@ -82,7 +82,7 @@ module Rudy
     end
     
     def get_instance
-      @ec2inst.get(@awsid)
+      @ec2inst.get(@awsid) rescue nil
     end
     
     def update
@@ -176,7 +176,7 @@ module Rudy
     
     def running?
       return false if @awsid.nil? || @awsid.empty?
-      @ec2inst.running?(@awsid)
+      @ec2inst.running?(@awsid) rescue nil
     end
       
   end

data/lib/rudy/metadata.rb

@@ -3,6 +3,8 @@ module Rudy
   module MetaData
     include Rudy::Huxtable
     
+    attr_reader :sdb_domain
+    
     def initialize(*args)
       a, s, r = @@global.accesskey, @@global.secretkey, @@global.region
       @sdb = Rudy::AWS::SDB.new(a, s, r)
@@ -10,6 +12,7 @@ module Rudy
       @rinst = Rudy::AWS::EC2::Instances.new(a, s, r)
       @rgrp = Rudy::AWS::EC2::Groups.new(a, s, r)
       @rkey = Rudy::AWS::EC2::KeyPairs.new(a, s, r)
+      @sdb_domain = Rudy::DOMAIN
       init(*args)
     end
     
@@ -22,10 +25,17 @@ module Rudy
       [dat.year, mon, day, Rudy::DELIM, hour, min, Rudy::DELIM, sec].join
     end
     
+    def destroy
+      @sdb.destroy(@sdb_domain, name)
+      true
+    end
+    
   private
   
     # Returns a generic zipped Array of metadata
     # (There is region, zone, environment, role, but no rtype)
+    # NOTE: I've encoded some mega bullshit in here. more is actually an Array
+    # of name values [n1, v1, n2, v2] (wtf!) which makes local unnecessary.
     def build_criteria(more=[], less=[], local={})
       # TODO: This build_criteria treats "more" differently than the
       # ObjectBase one. Sort it out! (This way is better)
@@ -42,7 +52,7 @@ module Rudy
     end
   
     def to_select(more=[], less=[], local={})
-      Rudy::AWS::SDB.generate_select ['*'], Rudy::DOMAIN, build_criteria(more, less, local)
+      Rudy::AWS::SDB.generate_select ['*'], @sdb_domain, build_criteria(more, less, local)
     end
     
   end

data/lib/rudy/metadata/backups.rb

@@ -30,7 +30,9 @@ class Backups
   end
 
   def list_as_hash(more=[], less=[], local={}, &each_backup)
-    query = to_select([:rtype, 'back'], less, local)
+    more ||= []
+    more += [:rtype, 'back']
+    query = to_select(more, less, local)
     list = @sdb.select(query) || {}
     backups = {}
     list.each_pair do |n,d|

data/lib/rudy/metadata/debug.rb

@@ -0,0 +1,38 @@
+
+
+module Rudy; module MetaData
+class Debug
+  include Rudy::MetaData
+  
+  def init
+  end
+  
+  def list(more=[], less=[], local={}, &block)
+    objects = list_as_hash(more, less, local, &block)
+    objects &&= objects.values
+    objects
+  end
+
+  def list_as_hash(more=[], less=[], local={}, &block)
+    query = to_select(more, less, local)
+    list = @sdb.select(query) || {}
+    objects = {}
+    list.each_pair do |n,d|
+      objects[n] = d
+    end
+    objects.each_pair { |n,obj| block.call(obj) } if block
+    objects = nil if objects.empty?
+    objects
+  end
+  
+  
+  def to_select(more, less, local)
+    query = super(more, less, local)
+#    query << " order by created desc"
+    puts query if @@global.verbose > 0
+    query
+  end
+  
+end
+end; end
+

data/lib/rudy/metadata/disk.rb

@@ -28,7 +28,7 @@ class Disk < Storable
   
   field :created
   
-  def init(path=nil, size=nil, device=nil, position=nil)
+  def init(path=nil, size=1, device='/dev/sdh', position=nil)
     @path, @size, @device = path, size, device
     @rtype = 'disk'
     @region = @@global.region

data/lib/rudy/metadata/objectbase.rb

@@ -5,6 +5,8 @@ module Rudy
     module ObjectBase
       include Rudy::Huxtable
       
+      attr_accessor :sdb_domain
+      
       def initialize(*args)
         a, s, r = @@global.accesskey, @@global.secretkey, @@global.region
         @sdb = Rudy::AWS::SDB.new(a, s, r)
@@ -12,6 +14,7 @@ module Rudy
         @rvol = Rudy::AWS::EC2::Volumes.new(a, s, r)
         @radd = Rudy::AWS::EC2::Addresses.new(a, s, r)
         @rsnap = Rudy::AWS::EC2::Snapshots.new(a, s, r)
+        @sdb_domain = Rudy::DOMAIN
         init(*args)
       end
       
@@ -24,7 +27,8 @@ module Rudy
       end
     
       def to_select(more=[], less=[])
-        Rudy::AWS::SDB.generate_select ['*'], Rudy::DOMAIN, build_criteria(more, less)
+        s = Rudy::AWS::SDB.generate_select ['*'], @sdb_domain, build_criteria(more, less)
+        s
       end
       
       def name(identifier, zon, env, rol, pos, *other)
@@ -35,19 +39,19 @@ module Rudy
       def save(replace=true)
         replace = true if replace.nil?
         @sdb ||= Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
-        @sdb.put(Rudy::DOMAIN, name, self.to_hash, replace) # Always returns nil
+        @sdb.put(@sdb_domain, name, self.to_hash, replace) # Always returns nil
         true
       end
     
       def destroy
         @sdb ||= Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
-        @sdb.destroy(Rudy::DOMAIN, name)
+        @sdb.destroy(@sdb_domain, name)
         true
       end
     
       def refresh
         @sdb ||= Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
-        h = @sdb.get(Rudy::DOMAIN, name) || {}
+        h = @sdb.get(@sdb_domain, name) || {}
         from_hash(h)
       end
       

data/lib/rudy/routines.rb

@@ -149,7 +149,8 @@ module Rudy
           
           if is_available
             # TODO: trap rbox errors. We could get an authentication error. 
-            opts = { :keys =>  root_keypairpath, :user => remote_user, :info => @@global.verbose > 3 }
+            opts = { :keys =>  root_keypairpath, :user => remote_user, 
+                     :info => @@global.verbose > 3, :debug => false }
             begin
               rbox = Rye::Box.new(machine.dns_public, opts)
               Rudy::Utils.waiter(2, 10, STDOUT, nil, 0) { rbox.connect }
@@ -208,11 +209,11 @@ module Rudy
             enjoy_every_sandwich {
               if Rudy::Routines::DiskHelper.disks?(routine)         # disk
                 task_separator("DISKS")
-                if rbox.ostype == "sunos"
-                  puts "Sorry, Solaris disks are not supported yet!"
-                else
+                ##if rbox.ostype == "sunos"
+                ##  puts "Sorry, Solaris disks are not supported yet!"
+                ##else
                   Rudy::Routines::DiskHelper.execute(routine, machine, rbox)
-                end    
+                ##end    
               end
             }
           
@@ -320,7 +321,7 @@ module Rudy
       end
       
       def machine_separator(name, awsid)
-        ('%s %-63s awsid: %s ' % [$/, name, awsid]).att(:reverse)
+        ('%s %-50s awsid: %s ' % [$/, name, awsid]).att(:reverse)
       end
       
       def routine_separator(name)

data/lib/rudy/routines/helpers/diskhelper.rb

@@ -78,13 +78,13 @@ module Rudy; module Routines;
           return
         else
           disk.fstype = props[:fstype] || 'ext3'
-          back = (rback.list(nil, nil, props) || []).first
+          more = [:environment, props[:environment]] if props[:environment]
+          more += [:role, props[:role]] if props[:role]
+          back = (rback.list(more, nil) || []).first
           raise "No backup found" unless back
           puts "Found backup #{back.name} "
         end
         
-        
-        
         unless disk.exists? # Checks the EBS volume
           msg = "Creating volume from snapshot (#{back.awsid})... "
           disk.create(back.size, @@global.zone, back.awsid)
@@ -210,6 +210,76 @@ module Rudy; module Routines;
       end
     end
     
+    
+    
+    
+    def attach(disks)
+      rdisk = Rudy::Disks.new
+      
+      disks.each_pair do |path, props|
+        disk = Rudy::MetaData::Disk.new(path, props[:size], props[:device], @machine.position)
+        olddisk = rdisk.get(disk.name)
+        if olddisk && olddisk.exists?
+          disk.update
+          puts "Disk found: #{olddisk.name}"
+          if disk.attached?
+            puts "In use. Skipping...".color(:red)
+            return
+          else
+            disk = olddisk
+          end
+        else
+          puts "Creating #{disk.name} "
+        end
+        p disk
+        p [disk.exists?, disk.available?, olddisk.exists?, olddisk.available?]
+        disk.save
+        
+        unless disk.exists? # Checks the EBS volume
+          msg = "Creating volume... "
+          disk.create
+          Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+            disk.available?
+          }
+        end
+        
+        unless disk.attached?
+          msg = "Attaching #{disk.awsid} to #{@machine.awsid}... "
+          disk.attach(@machine.awsid)
+          Rudy::Utils.waiter(2, 10, STDOUT, msg) { 
+            disk.attached?
+          }
+        end
+      end
+    end
+    
+    def detach(disks, destroy=false)
+      rdisk = Rudy::Disks.new
+      disks.each_pair do |path, props|
+        adisk = Rudy::MetaData::Disk.new(path, props[:size], props[:device], @machine.position)
+        disk = rdisk.get adisk.name
+        
+        if disk == nil
+          puts "Not found: #{adisk.name}".color(:red)
+          return
+        end
+        
+        if disk.attached?
+          msg = "Detaching #{disk.awsid}..."
+          disk.detach 
+          Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+            disk.available? 
+          }
+        end
+        
+        if destroy 
+          puts "Destroying volume and metadata... "
+          disk.destroy
+        end
+        
+      end
+    end
+    
     def mount(disks)
       rdisk = Rudy::Disks.new
       disks.each_pair do |path, props|
@@ -220,13 +290,15 @@ module Rudy; module Routines;
           return
         end
         
-        msg = "Attaching #{disk.awsid} to #{@machine.awsid}... "
-        disk.attach(@machine.awsid)
-        Rudy::Utils.waiter(2, 10, STDOUT, msg) { 
-          disk.attached?
-        }
+        unless disk.attached?
+          msg = "Attaching #{disk.awsid} to #{@machine.awsid}... "
+          disk.attach(@machine.awsid)
+          Rudy::Utils.waiter(2, 10, STDOUT, msg) { 
+            disk.attached?
+          }
         
-        sleep 2
+          sleep 2
+        end
         
         begin
           @rbox.mkdir(:p, disk.path)

data/lib/rudy/routines/reboot.rb

@@ -19,7 +19,7 @@ module Rudy; module Routines;
       machines = []
       generic_machine_runner(:list) do |machine,rbox|
         puts $/, "Rebooting...", $/
-        rbox.disconnect
+        rbox.disconnect unless rbox.nil?
         machine.restart
         sleep 4
         msg = preliminary_separator("Checking if instance is running...")

data/lib/rudy/utils.rb

@@ -17,7 +17,7 @@ module Rudy
     def external_ip_address
       ip = nil
       begin
-        %w{solutious.com/ip/ myip.dk/ whatismyip.com }.each do |sponge| # w/ backup
+        %w{solutious.heroku.com/ip}.each do |sponge|
           ipstr = Net::HTTP.get(URI.parse("http://#{sponge}")) || ''
           ip = /([0-9]{1,3}\.){3}[0-9]{1,3}/.match(ipstr).to_s
           break if ip && !ip.empty?

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.8.4"
+	s.version = "0.8.5"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -14,11 +14,11 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
   
-  s.add_dependency 'drydock', '>= 0.6.3'
-  s.add_dependency 'caesars', '>= 0.7.0'
+  s.add_dependency 'drydock', '>= 0.6.5'
+  s.add_dependency 'caesars', '>= 0.7.1'
   s.add_dependency 'rye', '>= 0.7.4'
   s.add_dependency 'sysinfo', '>= 0.5.1'
-  s.add_dependency 'storable', '>= 0.5.2'
+  s.add_dependency 'storable', '>= 0.5.3'
   s.add_dependency 'annoy', '>= 0.5.2'
   
   s.add_dependency 'echoe'
@@ -88,6 +88,7 @@
   lib/rudy/cli/config.rb
   lib/rudy/cli/disks.rb
   lib/rudy/cli/machines.rb
+  lib/rudy/cli/metadata.rb
   lib/rudy/cli/routines.rb
   lib/rudy/config.rb
   lib/rudy/config/objects.rb
@@ -98,6 +99,7 @@
   lib/rudy/metadata.rb
   lib/rudy/metadata/backup.rb
   lib/rudy/metadata/backups.rb
+  lib/rudy/metadata/debug.rb
   lib/rudy/metadata/disk.rb
   lib/rudy/metadata/disks.rb
   lib/rudy/metadata/objectbase.rb
@@ -123,4 +125,3 @@
 
   
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -04:00
+date: 2009-06-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        version: 0.6.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: caesars
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.0
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rye
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.2
+        version: 0.5.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: annoy
@@ -218,6 +218,7 @@ files:
 - lib/rudy/cli/config.rb
 - lib/rudy/cli/disks.rb
 - lib/rudy/cli/machines.rb
+- lib/rudy/cli/metadata.rb
 - lib/rudy/cli/routines.rb
 - lib/rudy/config.rb
 - lib/rudy/config/objects.rb
@@ -228,6 +229,7 @@ files:
 - lib/rudy/metadata.rb
 - lib/rudy/metadata/backup.rb
 - lib/rudy/metadata/backups.rb
+- lib/rudy/metadata/debug.rb
 - lib/rudy/metadata/disk.rb
 - lib/rudy/metadata/disks.rb
 - lib/rudy/metadata/objectbase.rb