solutious-rudy 0.8.5 → 0.9.0

data/lib/rudy/cli/aws/ec2/keypairs.rb

@@ -3,15 +3,14 @@
 module Rudy; module CLI; 
 module AWS; module EC2;
   
-  class KeyPairs < Rudy::CLI::CommandBase
+  class EC2::Keypairs < Rudy::CLI::CommandBase
     
     def create_keypairs_valid?
       raise Drydock::ArgError.new('name', @alias) unless @argv.name
       true
     end
     def create_keypairs
-      rkey = Rudy::AWS::EC2::KeyPairs.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      kp = execute_action { rkey.create(@argv.name) }
+      kp = execute_action { Rudy::AWS::EC2::Keypairs.create(@argv.name) }
       if [:s, :string].member?(@@global.format)
         puts "Name: #{kp.name}"
         puts "Fingerprint: #{kp.fingerprint}", $/
@@ -28,21 +27,18 @@ module AWS; module EC2;
       true
     end
     def destroy_keypairs
-      rkey = Rudy::AWS::EC2::KeyPairs.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      raise "KeyPair #{@argv.name} does not exist" unless rkey.exists?(@argv.name)
-      kp = rkey.get(@argv.name)
+      raise "Keypair #{@argv.name} does not exist" unless Rudy::AWS::EC2::Keypairs.exists?(@argv.name)
+      kp = Rudy::AWS::EC2::Keypairs.get(@argv.name)
       puts "Destroying: #{kp.name}"
       execute_check(:medium)
-      execute_action { rkey.destroy(kp.name) }
-      keypairs
+      execute_action { Rudy::AWS::EC2::Keypairs.destroy(kp.name) }
     end
     
     def keypairs
-      rkey = Rudy::AWS::EC2::KeyPairs.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      (rkey.list || []).each do |kp|
+      (Rudy::AWS::EC2::Keypairs.list || []).each do |kp|
         puts @@global.verbose > 0 ? kp.inspect : kp.dump(@@global.format)
       end
-      puts "No keypairs" unless rkey.any?
+      puts "No keypairs" unless Rudy::AWS::EC2::Keypairs.any?
     end
     
     

data/lib/rudy/cli/aws/ec2/snapshots.rb

@@ -7,34 +7,30 @@ module AWS; module EC2;
     
     def create_snapshots_valid?
       raise Drydock::ArgError.new('volume ID', @alias) unless @option.volume
-      @rvol = Rudy::AWS::EC2::Volumes.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      @volume = @rvol.get(@argv.volid)
+      @volume = Rudy::AWS::EC2::Volumes.get(@argv.volid)
       raise "Volume #{@volume.awsid} does not exist" unless @volume
       true
     end
     def create_snapshots
-      rsnap = Rudy::AWS::EC2::Snapshots.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      snap = execute_action { rsnap.create(@volume.awsid) }
+      snap = execute_action { Rudy::AWS::EC2::Snapshots.create(@volume.awsid) }
       puts @@global.verbose > 0 ? snap.inspect : snap.dump(@@global.format)
     end
     
     def destroy_snapshots_valid?
       raise Drydock::ArgError.new('snapshot ID', @alias) unless @argv.snapid
-      @rsnap = Rudy::AWS::EC2::Snapshots.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      @snap = @rsnap.get(@argv.snapid)
+      @snap = Rudy::AWS::EC2::Snapshots.get(@argv.snapid)
       raise "Snapshot #{@snap.awsid} does not exist" unless @snap
       true
     end
     def destroy_snapshots
       puts "Destroying: #{@snap.awsid}"
       execute_check(:medium)
-      execute_action { @rsnap.destroy(@snap.awsid) }
+      execute_action { Rudy::AWS::EC2::Snapshots.destroy(@snap.awsid) }
       snapshots
     end
     
     def snapshots
-      rsnap = Rudy::AWS::EC2::Snapshots.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      snaps = rsnap.list || []
+      snaps = Rudy::AWS::EC2::Snapshots.list || []
       snaps.each do |snap|
         puts @@global.verbose > 0 ? snap.inspect : snap.dump(@@global.format)
       end

data/lib/rudy/cli/aws/ec2/volumes.rb

@@ -13,23 +13,27 @@ module AWS; module EC2;
     end
     def volumes_create
       puts "Creating #{@option.size}GB volume in #{@@global.zone}"
-      rvol = Rudy::AWS::EC2::Volumes.new(@@global.accesskey, @@global.secretkey, @@global.region)
       execute_check(:low)
       vol = execute_action("Create Failed") { 
-        rvol.create(@option.size, @@global.zone, @option.snapshot) 
+        Rudy::AWS::EC2::Volumes.create(@option.size, @@global.zone, @option.snapshot) 
       }
       puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
     end
 
 
     def destroy_volumes_valid?
-      raise "You must supply a volume ID. See rudy volume -h" unless @argv.volid      
+      raise "You must supply a volume ID. See rudy volume -h" unless @argv.volid    
+      
+      unless Rudy::AWS::EC2::Volumes.exists? @argv.volid
+        raise Rudy::AWS::EC2::UnknownVolume, @argv.volid
+      end
       true
     end
     
     def destroy_volumes
-      @rvol = Rudy::AWS::EC2::Volumes.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      @volume = @rvol.get(@argv.volid)
+      
+      @volume = Rudy::AWS::EC2::Volumes.get(@argv.volid)
+      
       raise "Volume #{@volume.awsid} does not exist" unless @volume
       raise "Volume #{@volume.awsid} is still in-use" if @volume.in_use?
       raise "Volume #{@volume.awsid} is still attached" if @volume.attached?
@@ -37,9 +41,10 @@ module AWS; module EC2;
       
       puts "Destroying #{@volume.awsid}"
       execute_check(:medium)
-      execute_action("Destroy Failed") { @rvol.destroy(@volume.awsid) }
+      execute_action("Destroy Failed") { Rudy::AWS::EC2::Volumes.destroy(@volume.awsid) }
       
-      vol = @rvol.get(@volume.awsid)
+      vol = Rudy::AWS::EC2::Volumes.get(@volume.awsid)
+
       puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
     end
     
@@ -51,20 +56,17 @@ module AWS; module EC2;
     end
     def volumes_attach
       @option.device ||= "/dev/sdh"
-      
-      rvol = Rudy::AWS::EC2::Volumes.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      raise "Volume #{@argv.volid} does not exist" unless rvol.exists?(@argv.volid)
-      raise "Volume #{@argv.volid} is already attached" if rvol.attached?(@argv.volid)
-      raise "Instance #{@option.instance} does not exist" unless rinst.exists?(@option.instance)
+      raise "Volume #{@argv.volid} does not exist" unless Rudy::AWS::EC2::Volumes.exists?(@argv.volid)
+      raise "Volume #{@argv.volid} is already attached" if Rudy::AWS::EC2::Volumes.attached?(@argv.volid)
+      raise "Instance #{@option.instance} does not exist" unless Rudy::AWS::EC2::Instances.exists?(@option.instance)
       
       puts "Attaching #{@argv.volid} to #{@option.instance} on #{@option.device}"
       execute_check(:low)
       execute_action("Attach Failed") { 
-        rvol.attach(@argv.volid, @option.instance, @option.device) 
+        Rudy::AWS::EC2::Volumes.attach(@argv.volid, @option.instance, @option.device) 
       }
       
-      vol = rvol.get(@argv.volid)
+      vol = Rudy::AWS::EC2::Volumes.get(@argv.volid)
       puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
     end
     
@@ -74,24 +76,21 @@ module AWS; module EC2;
     end
     
     def volumes_detach
-      rvol = Rudy::AWS::EC2::Volumes.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      raise "Volume #{@argv.volid} does not exist" unless rvol.exists?(@argv.volid)
-      
-      vol = rvol.get(@argv.volid)
+      raise "Volume #{@argv.volid} does not exist" unless Rudy::AWS::EC2::Volumes.exists?(@argv.volid)
+      vol = Rudy::AWS::EC2::Volumes.get(@argv.volid)
       raise "Volume #{vol.awsid} is not attached" unless vol.attached?
       
       puts "Detaching #{vol.awsid} from #{vol.instid}"
       execute_check(:medium)
-      execute_action("Detach Failed") { rvol.detach(vol.awsid) }
+      execute_action("Detach Failed") { Rudy::AWS::EC2::Volumes.detach(vol.awsid) }
       
-      vol = rvol.get(vol.awsid)
+      vol = Rudy::AWS::EC2::Volumes.get(vol.awsid)
       puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
     end
     
     
     def volumes
-      rvol = Rudy::AWS::EC2::Volumes.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      volumes = rvol.list || []
+      volumes = Rudy::AWS::EC2::Volumes.list || []
       volumes.each do |vol|
         puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
       end

data/lib/rudy/cli/aws/ec2/zones.rb

@@ -7,11 +7,10 @@ module AWS; module EC2;
     
     
     def zones
-      rzone = Rudy::AWS::EC2::Zones.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      rzone.list_as_hash(@argv.name).each_value do |zon|
+      Rudy::AWS::EC2::Zones.list_as_hash(@argv.name).each_value do |zon|
         puts zon.dump(@@global.format)
       end
-      puts "No zones" unless rzone.any?
+      puts "No zones" unless Rudy::AWS::EC2::Zones.any?
     end
     
     

data/lib/rudy/cli/aws/sdb/domains.rb

@@ -4,32 +4,31 @@ module Rudy; module CLI;
 module AWS; module SDB;
   
   class Domains < Rudy::CLI::CommandBase
-    
-    
+        
     def domains
-      sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      domains = sdb.list_domains
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      domains = @sdb.list_domains
       puts domains
       puts "No domains" if domains.nil? || domains.empty?
     end
     
     def domains_create_valid?
-      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
       raise "No name specified" unless @argv.name
       true
     end
     def domains_create
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
       @sdb.create_domain @argv.name
       execute_check(:low)
       domains
     end
     
     def domains_destroy_valid?
-      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
       raise "No name specified" unless @argv.name
       true
     end
     def domains_destroy
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
       execute_check(:medium)
       @sdb.destroy_domain @argv.name
       domains

data/lib/rudy/cli/aws/sdb/objects.rb

@@ -0,0 +1,33 @@
+
+
+module Rudy; module CLI; 
+module AWS; module SDB;
+  
+  class Objects < Rudy::CLI::CommandBase
+    
+    
+    def objects_valid?
+      raise "Must supply domain" if @argv.empty?
+      true
+    end
+    def objects
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      
+      if @argv.key.nil?
+        query = "select * from #{@argv.name}"
+        items = @sdb.select query
+      else
+        items = [@sdb.get( @argv.name, @argv.key)]
+      end
+      
+      exit unless items
+      
+      items.each do |i|
+        p i
+      end
+    end
+    
+  end
+  
+end; end
+end; end

data/lib/rudy/cli/aws/sdb/select.rb

@@ -0,0 +1,23 @@
+
+module Rudy; module CLI; 
+module AWS; module SDB;
+  
+  class Select < Rudy::CLI::CommandBase
+    
+    def query_valid?
+      raise "No select query supplied" if @argv.empty?
+      true
+    end
+    
+    def query
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      results = @sdb.select @argv.query 
+      return if results.nil?
+      results.each do |r|
+        p r
+      end
+    end
+  end
+  
+end; end
+end; end

data/lib/rudy/cli/backups.rb

@@ -0,0 +1,38 @@
+
+
+module Rudy
+  module CLI
+    class Backups < Rudy::CLI::CommandBase
+
+      
+      def backups
+        more, less = {}, []
+        less = [:environment, :role] if @option.all
+        # We first get the disk metadata
+        b_list = Rudy::Backups.list(more, less) || []
+        b_list.each do |back|
+          puts @global.verbose > 0 ? "#{back.name}: #{back.inspect}" : back.name
+        end
+      end
+      
+      def backups_wash
+        dirt = (Rudy::Backups.list || []).select { |b| !b.snapshot_exists? }
+        if dirt.empty?
+          puts "Nothing to wash in #{current_machine_group}"
+          return
+        end
+        
+        puts "The following backup metadata will be deleted:"
+        puts dirt.collect {|b| b.name }
+        
+        execute_check(:medium)
+
+        dirt.each do |b|
+          b.destroy(:force)
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/rudy/cli/base.rb

@@ -0,0 +1,98 @@
+
+
+module Rudy::CLI
+  
+  class CommandBase < Drydock::Command
+    include Rudy::Huxtable
+
+    attr_reader :config
+
+  protected
+    def init
+
+      if Drydock.debug?
+        #Caesars.enable_debug
+        Rudy.enable_debug
+      end
+
+      # The CLI wants output!
+      Rudy::Huxtable.update_logger STDOUT
+
+      # Send The Huxtables the global values from the command-line
+      Rudy::Huxtable.update_global @global
+
+      # Reload configuration. This must come after update_global 
+      # so it will catch the @@global.config path (if supplied).
+      begin
+        Rudy::Huxtable.update_config
+      rescue Caesars::SyntaxError => ex
+        STDERR.puts ex.message
+        STDERR.puts ex.backtrace if @@global.verbose > 0
+        exit 81
+      end
+
+      @@global.nocolor ? String.disable_color : String.enable_color
+      @@global.yes ? Annoy.enable_skip : Annoy.disable_skip
+
+      unless @@global.accesskey && @@global.secretkey
+        STDERR.puts "No AWS credentials. Check your configs!"
+        STDERR.puts "Try: rudy init"
+        exit 1
+      end
+
+      if @@global.environment =~ /^prod/ && Rudy.debug?
+        puts Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
+        exit 1
+      end
+
+      if @@global.verbose >= 4    # -vvvv
+        format = @@global.format == :json ? :json : :yaml
+        gcopy = @@global.dup
+        gcopy.secretkey = "[HIDDEN]"
+        puts "# GLOBALS: ", gcopy.dump(format)
+      end
+
+      Rudy::Metadata.connect @@global.accesskey, @@global.secretkey, @@global.region
+      Rudy::AWS::EC2.connect @@global.accesskey, @@global.secretkey, @@global.region
+    end
+
+    def execute_action(emsg="Failed", &action)
+      begin
+        ret = action.call
+        raise emsg unless ret
+        ret
+      rescue Rudy::AWS::EC2::NoAMI => ex
+        raise Drydock::OptError.new('-a', @alias)
+      end
+    end
+
+    def execute_check(level=:medium)
+      ret = Annoy.are_you_sure?(level)
+      exit 0 unless ret
+      ret
+    end
+
+    # Print a default header to the screen for every command.
+    #
+    def print_header
+
+      # Send The Huxtables the global values again because they could be
+      # updated after initialization but before the command was executed
+      Rudy::Huxtable.update_global @global
+
+      puts Rudy::CLI.generate_header(@@global, @@config) if @@global.print_header
+
+      unless @@global.quiet
+        if @@global.environment == "prod"
+          msg = "YOU ARE PLAYING WITH PRODUCTION"
+          puts Rudy::Utils.banner(msg, :normal), $/
+        end
+      end
+    end
+
+    def machine_separator(name, awsid)
+      ('%s %-50s awsid: %s ' % [$/, name, awsid]).att(:reverse)
+    end
+
+  end
+end

data/lib/rudy/cli/candy.rb

@@ -4,8 +4,7 @@ module Rudy
     class Candy < Rudy::CLI::CommandBase
       
       def open
-        rmach = Rudy::Machines.new
-        machines = rmach.list
+        machines = Rudy::Machines.list
         
         if machines
           `open http://#{machines.first.dns_public}`

data/lib/rudy/cli/config.rb

@@ -24,14 +24,17 @@ module Rudy
       # i.e. if [prod][app][ami] is not available, it will check [prod][ami]
       # and then [ami]. 
       #
-      #     # Display the value for a specific machine.
-      #     $ rudy -e prod -r db config param-name
-      #
       #     # Display all configuration
       #     $ rudy config --all
       #
+      #     # Display just machines
+      #     $ rudy config --defaults
+      #
       def config
-        # if Rudy.in_situ? # TODO: do something intelligent when running on EC2
+        
+        # TODO: Re-enable:
+        #     # Display the value for a specific machine.
+        #     $ rudy -e prod -r db config param-name
         
         if @@config.nil? || @@config.empty?
           return if @@global.quiet