solutious-rudy 0.8.5 → 0.9.0

data/lib/rudy/cli/disks.rb

@@ -6,16 +6,14 @@ module Rudy
 
       
       def disks
-        rdisk = Rudy::Disks.new
-        rback = Rudy::Backups.new
-        more, less = [], []
+        more, less = {}, []
         less = [:environment, :role] if @option.all
         # We first get the disk metadata
-        disk_list = rdisk.list(more, less) || []
+        disk_list = Rudy::Disks.list(more, less) || []
         # If there are no disks currently, there could be backups
         # so we grab those to create a list of disks. 
         if @option.backups
-          backups = rback.list(more, less) || []
+          backups = Rudy::Backups.list(more, less) || []
           backups.each_with_index do |b, index|
             disk_list << b.disk
           end
@@ -36,15 +34,15 @@ module Rudy
       end
       
       def disks_wash
-        rdisk = Rudy::Disks.new
-        dirt = (rdisk.list || [])#.select { |d| d.available? }
+        dirt = (Rudy::Disks.list || []).select { |d| !d.volume_exists? }
         if dirt.empty?
-          puts "Nothing to wash in #{rdisk.current_machine_group}"
+          puts "Nothing to wash in #{current_machine_group}"
           return
         end
         
         puts "The following disk metadata will be deleted:"
         puts dirt.collect {|d| d.name }
+        
         execute_check(:medium)
 
         dirt.each do |d|

data/lib/rudy/cli/execbase.rb

@@ -0,0 +1,53 @@
+
+
+module Rudy::CLI
+  
+  # A base for all Drydock executables (bin/rudy etc...). 
+  class Base
+    extend Drydock
+    
+    debug :off
+    
+    before do |obj|
+      # Don't print Rudy header unless requested to
+      obj.global.print_header = false  if (obj.global.verbose == 0)
+      @start = Time.now
+    end
+
+    after do |obj|  
+      if obj.global.verbose > 0
+        puts
+        @elapsed = Time.now - @start
+        puts "Elapsed: %.2f seconds" % @elapsed.to_f if @elapsed > 0.1
+      end
+    end
+    
+    # These globals are used by all bin/ executables
+    global :A, :accesskey, String, "AWS Access Key"
+    global :S, :secretkey, String, "AWS Secret Access Key"
+    global :R, :region, String, "Amazon service region (e.g. #{Rudy::DEFAULT_REGION})"
+    global :z, :zone, String, "Amazon Availability zone (e.g. #{Rudy::DEFAULT_ZONE})"
+    global :u, :user, String, "Provide a username (ie: #{Rudy.sysinfo.user})"
+    global :l, :localhost, String, "Provide a localhost (e.g. #{Rudy.sysinfo.hostname})"
+    global :i, :identity, String, "Path to SSH identity (private key) for RSA or DSA authentication"
+    global :k, :pkey, String, "AWS Private Encryption Key (pk-****.pem)"
+    global :c, :cert, String, "AWS Private Certificate (cert-****.pem)"
+    global :f, :format, String, "Output format"
+    global :n, :nocolor, "Disable output colors"
+    global :C, :config, String, "Specify another configuration file to read (e.g. #{Rudy::CONFIG_FILE})"
+    global :Y, :yes, "Assume a correct answer to confirmation questions"
+    global :q, :quiet, "Run with less output"
+    global :O, :offline, "Be cool about the internet being down"
+    global :v, :verbose, "Increase verbosity of output (e.g. -v or -vv or -vvv)" do
+      @verbose ||= 0
+      @verbose += 1
+    end
+    global :V, :version, "Display version number" do
+      puts "Rudy version: #{Rudy::VERSION}"
+      exit 0
+    end
+    
+    
+  end
+
+end

data/lib/rudy/cli/machines.rb

@@ -4,18 +4,16 @@ module Rudy
   module CLI
     class Machines < Rudy::CLI::CommandBase
       
-      
       def machines
         # Rudy::Machines.list takes two optional args for adding or 
         # removing metadata attributes to modify the select query. 
         # When all is specified we want to find machines in every
         # environment and role to we remove these attributes from
         # the select. 
-        more, less = nil, nil
-        less = [:environment, :role] if @option.all
+        fields, less = {}, []
+        less = Rudy::Metadata::COMMON_FIELDS if @option.all
         
-        rmach = Rudy::Machines.new
-        mlist = rmach.list(more, less) || []
+        mlist = Rudy::Machines.list(fields, less) || []
         if mlist.empty?
           if @option.all
             puts "No machines running"
@@ -30,10 +28,9 @@ module Rudy
       end
       
       def machines_wash
-        rmach = Rudy::Machines.new
-        dirt = (rmach.list || []).select { |m| !m.running? }
+        dirt = (Rudy::Machines.list || []).select { |m| !m.instance_running? }
         if dirt.empty?
-          puts "Nothing to wash in #{rmach.current_machine_group}"
+          puts "Nothing to wash in #{current_machine_group}"
           return
         end
         
@@ -49,14 +46,14 @@ module Rudy
       
       
       def ssh
-        # TODO: Give this methos a good look over
-        pkey = user_keypairpath(@@global.user)
+        # TODO: Give this method a good look over
+        pkey = current_user_keypairpath
         unless pkey
-          puts "No private key configured for #{@@global.user} in #{current_machine_group}"
+          puts "No private key configured for #{current_machine_user} in #{current_machine_group}"
         end
         
         # Options to be sent to Net::SSH
-        ssh_opts = { :user => @@global.user || Rudy.sysinfo.user, :debug => nil }
+        ssh_opts = { :user => current_machine_user, :debug => nil }
         if pkey 
           raise "Cannot find file #{pkey}" unless File.exists?(pkey)
           raise InsecureKeyPermissions, @pkey unless File.stat(pkey).mode == 33152
@@ -68,7 +65,7 @@ module Rudy
         # session so we need to prepare the command and its arguments
         if @argv.first
           command, command_args = @argv.shift, @argv || []
-          puts "#{command} #{command_args.join(' ')}" if @@global.verbose > 1
+          Rudy::Huxtable.ld "COMMAND: #{command} #{command_args.join(' ')}" if @@global.verbose > 1
 
         # otherwise, we'll open an ssh session or print command
         else
@@ -77,14 +74,13 @@ module Rudy
 
 
         checked = false
-        rudy = Rudy::Machines.new
-        lt = rudy.list 
+        lt = Rudy::Machines.list 
         unless lt
-          puts "No machines running in #{rudy.current_machine_group}"
+          puts "No machines running in #{current_machine_group}"
           exit
         end
         lt.each do |machine|
-          machine.update  # make sure we have the latest DNS info
+          machine.refresh!  # make sure we have the latest DNS info
           
           # mount -t ext3 /dev/sdr /rudy/disk1
           
@@ -92,7 +88,7 @@ module Rudy
           if @@global.quiet
             print "You are #{ssh_opts[:user].to_s.bright}. " if !checked # only the 1st
           else
-            puts machine_separator(machine.name, machine.awsid)
+            puts machine_separator(machine.name, machine.instid)
             puts "Connecting #{ssh_opts[:user].to_s.bright}@#{machine.dns_public} "
             puts
           end

data/lib/rudy/cli/metadata.rb

@@ -2,34 +2,48 @@
 
 module Rudy
   module CLI
-    class MetaData < Rudy::CLI::CommandBase
+    class Metadata < Rudy::CLI::CommandBase
       
+      def metadata_valid?
+        @option.rtype ||= 'm'
+        @metaobj = Rudy::Metadata.get_rclass @option.rtype
+        true
+      end
       
       def metadata
-        more, less = [], []
-        less = [:environment, :role, :zone, :region] if @option.all
-        more += [:rtype, @option.otype] if @option.otype
+        unless @argv.empty?
+          h = Rudy::Metadata.get(@argv.first)
+          return if h.nil?
+          @metaobj = Rudy::Metadata.get_rclass h['rtype'].first
+          objlist = Hash[@argv.first => @metaobj.from_hash(h)]
+        else
+          more, less = {}, []
+          less = [:environment, :role, :zone, :region, :position] if @option.all
+          objlist = @metaobj.list_as_hash(more, less) || {}
+        end
         
-        rdebug = Rudy::MetaData::Debug.new
-        objlist = rdebug.list(more, less) || []
-        objlist.each do |o|
-          p o
+        objlist.each_pair do |k,o|
+          puts "#{k}: " << o.inspect
         end
       end
       
       def metadata_delete_valid?
         raise "Must supply object ID" unless @argv.oid
+        raise Rudy::Metadata::UnknownObject, @argv.oid unless Rudy::Metadata.exists? @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)
+        
+        execute_check(:medium)
+        
+        Rudy::Metadata.destroy @argv.oid
       end
     
     end

data/lib/rudy/cli/routines.rb

@@ -3,6 +3,30 @@
 module Rudy; module CLI;
   class Routines < Rudy::CLI::CommandBase
     
+    def routines_valid?
+      raise Rudy::NoRoutinesConfig unless @@config.routines
+      true
+    end
+    
+    def routines
+      if @@config.nil? || @@config.empty?
+        return if @@global.quiet
+        raise Rudy::NoConfig
+      end
+      
+      if @option.all
+        routine = @@config.routines
+      else
+        routine = {}
+        routine.merge! @@config.routines.find_deferred(@@global.environment, @@global.role) || {}
+        routine.merge! @@config.routines.find(@@global.role) || {}
+      end
+      
+      outform = @@global.format == :json ? :to_json : :to_yaml
+      
+      puts routine.to_hash.send(outform)
+    end
+    
     def startup_valid?
       @rr = Rudy::Routines::Startup.new(@alias, @option, @argv)
       @rr.raise_early_exceptions
@@ -12,7 +36,7 @@ module Rudy; module CLI;
       machines = @rr.execute || []
       puts $/, "The following machines are now available:" unless machines.empty?
       machines.each do |machine|
-        puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
+        puts machine
       end
     end
     
@@ -25,7 +49,7 @@ module Rudy; module CLI;
       machines = @rr.execute
       puts $/, "The following machines have been restarted:"
       machines.each do |machine|
-        puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
+        puts machine
       end
     end
     
@@ -48,12 +72,13 @@ module Rudy; module CLI;
     # raise an exception.
     #
     def passthrough
+            
       machines = @rr.execute
       
-      unless machines.empty?
+      if @global.verbose > 1 && !machines.empty?
         puts $/, "The following machines were processed:"
         machines.each do |machine|
-          puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
+          puts machine
         end
       end
       
@@ -78,9 +103,10 @@ module Rudy; module CLI;
       execute_check :medium
       
       machines = @rr.execute
+      
       puts $/, "The following instances have been destroyed:"
       machines.each do |machine|
-        puts '%s %s ' % [machine.name.bright, machine.awsid]
+        puts '%s %s ' % [machine.name.bright, machine.instid]
       end
       
       

data/lib/rudy/config.rb

@@ -10,19 +10,13 @@ module Rudy
     dsl Rudy::Config::Routines::DSL    # Organized processes
     dsl Rudy::Config::Machines::DSL    # Organized instances
     dsl Rudy::Config::Commands::DSL    # Custom SSH commands
-    #dsl Rudy::Config::Networks::DSL    # Network design
-    #dsl Rudy::Config::Controls::DSL    # Network access
-    #dsl Rudy::Config::Services::DSL    # Stuff running on ports
-    
-    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 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 #!
     
+    def accounts?; self.respond_to?(:accounts) && !self[:accounts].nil?; end 
+    def defaults?; self.respond_to?(:defaults) && !self[:defaults].nil?; end 
+    def machines?; self.respond_to?(:machines) && !self[:machines].nil?; end 
+    def commands?; self.respond_to?(:commands) && !self[:commands].nil?; end 
+    def routines?; self.respond_to?(:routines) && !self[:routines].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
     # for a particular config (machines, @routines, etc...) we can
@@ -65,6 +59,7 @@ module Rudy
         break
       end
       
+      # self.keys returns the current config types (machines, routines, etc...)
       typelist = self.keys.collect { |g| "#{g}.rb" }.join(',')
       
       # Rudy then looks for the rest of the config in these locations
@@ -89,18 +84,18 @@ module Rudy
 
       unless File.exists?(Rudy::CONFIG_FILE)
         puts "Creating #{Rudy::CONFIG_FILE}"
-        rudy_config = Rudy::Utils.without_indent %Q{
-          accounts do                           # Account Access Indentifiers
-            aws do                              # amazon web services 
+        rudy_config = Rudy::Utils.without_indent %Q`
+          accounts {                           # Account Access Indentifiers
+            aws {                              # amazon web services 
               name "Rudy Default"
-              accountnum ""
-              accesskey ""
-              secretkey ""
-              privatekey "~/path/2/pk-xxxx.pem" 
+              accountnum "012345678912"
+              accesskey "ACCESSACCESS"
+              secretkey "SECRETSECRET"
+              pkey "~/path/2/pk-xxxx.pem" 
               cert "~/path/2/cert-xxxx.pem"
-            end
-          end
-        }
+            }
+          }
+        `
         Rudy::Utils.write_to_file(Rudy::CONFIG_FILE, rudy_config, 'w', 0600)
       end
     end

data/lib/rudy/config/objects.rb

@@ -9,6 +9,8 @@ class Rudy::Config
   end
   
   class Accounts < Caesars
+    include Gibbler::Complex
+    
     def valid?
       (!aws.nil? && !aws.accesskey.nil? && !aws.secretkey.nil?) &&
       (!aws.account.empty? && !aws.accesskey.empty? && !aws.secretkey.empty?)
@@ -18,6 +20,8 @@ class Rudy::Config
   # Default configuration. All of the defaults can be overridden 
   # on the command line with global options.
   class Defaults < Caesars
+    include Gibbler::Complex
+    
     class DoubleDefined < Rudy::Config::Error
       def message; "Check your defaults config. '#{@obj}' has been defined twice"; end
     end
@@ -29,10 +33,14 @@ class Rudy::Config
         next unless self[k].is_a?(Array)
         raise Defaults::DoubleDefined.new(:defaults, k)
       end
+      self.keydir &&= File.expand_path(self.keydir)
     end
   end
   
-  class Machines < Caesars; end
+  class Machines < Caesars
+    include Gibbler::Complex
+    
+  end
   
   # Modify the SSH command available in routines. The default
   # set of commands is defined by Rye::Cmd (Rudy executes all
@@ -42,6 +50,8 @@ class Rudy::Config
   # important that new keywords do not conflict with existing
   # Rudy keywords. Strange things may happen!
   class Commands < Caesars
+    include Gibbler::Complex
+    
     class AlreadyDefined < Rudy::Config::Error
       def message; "The command '#{@obj}' has already been defined for this project"; end
     end
@@ -102,12 +112,12 @@ 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.
         if Rye::Cmd.can?(cmd)
-          STDERR.puts "Redefining #{cmd}" #if @@global.verbose > 0
+          STDERR.puts "Redefining #{cmd}" if Rudy::Huxtable.global.verbose > 2
         end
         
         if args.last.is_a?(Proc)
           block = args.pop
-          Rye::Cmd.add_command(cmd, nil, args, &block)
+          Rye::Cmd.add_command(cmd, nil, *args, &block)
         else
           # If no path was specified, we can assume cmd is in the remote path so
           # when we add the method to Rye::Cmd, we'll it the path is "cmd".
@@ -115,7 +125,7 @@ class Rudy::Config
           
           raise PathNotString.new(:commands, cmd) if path && !path.is_a?(String)
           
-          Rye::Cmd.add_command cmd, path, args
+          Rye::Cmd.add_command cmd, path, *args
           
         end
         
@@ -137,6 +147,11 @@ class Rudy::Config
   end
   
   class Routines < Caesars
+    include Gibbler::Complex
+    
+    # All routines
+    forced_array :before         
+    forced_array :after
     
     # Disk routines
     forced_hash :create
@@ -147,37 +162,36 @@ class Rudy::Config
     forced_hash :mount
     forced_hash :attach
     forced_hash :detach
-    forced_hash :snapshot
+    forced_hash :archive
     forced_hash :restore
+    forced_hash :format
     
-    # Script blocks
-    forced_hash :before        
-    forced_hash :after         
-    forced_hash :script_local
-    forced_hash :before_local  
-    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
-    chill :after_local           # inside a Rye::Box object.
-    chill :script
-    chill :script_local
-    
-    # Version control systems
-    forced_hash :git
-    forced_hash :svn
-    
+    # Passthrough routines
+    forced_hash :local              # Force hash b/c we want to 
+    forced_hash :remote             # store the usernames.
+    chill :local                    # Chill b/c we want to execute
+    chill :remote                   # the blocks with Rye::Box#batch
+    forced_hash :xlocal              
+    forced_hash :xremote             
+    chill :xlocal                    
+    chill :xremote                   
+        
+    forced_hash :network
+    chill :network
+       
+    # Startup, Shutdown, Reboot routines
+    forced_hash :before_local
+    forced_hash :before_remote
+    forced_hash :after_local
+    forced_hash :after_remote            
+    chill :before_local
+    chill :before_remote
+    chill :after_local           
+    chill :after_remote
+                       
     def init      
     end
 
   end
   
-  
-  class Networks < Caesars #:nodoc:all
-  end
-  class Controls < Caesars #:nodoc:all
-  end
-  class Services < Caesars #:nodoc:all
-  end
 end