rudy 0.8.5 → 0.9.0

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

@@ -5,11 +5,6 @@ module AWS; module EC2;
   
   class Images < Rudy::CLI::CommandBase
     
-    #def print_header
-    #  puts @global.print_header, @@global.print_header
-    #end
-    
-    
     def images_valid?
       if @option.owner == 'self'
         raise "AWS_ACCOUNT_NUMBER not set" unless @@global.accountnum 
@@ -20,159 +15,36 @@ module AWS; module EC2;
     end
     def images
       
-      rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
       unless @option.all
         @option.owner ||= 'amazon' 
         puts "Images owned by #{@option.owner.bright}" unless @argv.awsid
       end
       
-      images = rimages.list(@option.owner, @argv) || []
+      images = Rudy::AWS::EC2::Images.list(@option.owner, @argv) || []
       images.each do |img|
         puts @@global.verbose > 0 ? img.inspect : img.dump(@@global.format)
       end
       puts "No images" if images.empty?
     end
-
-    ##def prepare_images_valid?
-    ##  true
-    ##end
-    ##def prepare_images
-    ##  opts = {}
-    ##  opts[:id] = @option.instid if @option.instid
-    ##  
-    ##  puts "This will do the following:"
-    ##  puts "- Clear bash history"
-    ##  # NOTE: We can't delete the host keys here. Otherwise we can't create the image. 
-    ##  #puts "- Delete host SSH keys (this is permanent!)"
-    ##  puts "" 
-    ##  
-    ##  ## TODO:       
-    ##  ## ~/.rudy, /etc/motd, history -c, /etc/hosts, /var/log/rudy*
-    ##  
-    ##  execute_check(:medium)
-    ##  
-    ##
-    ##  # Options to be sent to Net::SSH
-    ##  ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => STDERR  }
-    ##  if @@global.pkey 
-    ##    raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
-    ##    raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
-    ##    ssh_opts[:keys] = @@global.pkey 
-    ##  end
-    ##  
-    ##  
-    ##  rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-    ##  lt = rudy.list_group(nil, :running, opts[:id]) do |inst|
-    ##    
-    ##    puts "Preparing #{inst.dns_public}..."
-    ##    
-    ##    # Open the connection and run the command
-    ##    rbox = Rye::Box.new(inst.dns_public, ssh_opts)
-    ##    
-    ##    # We need to explicitly add the rm command for rbox so we
-    ##    # can delete the SSH host keys. This is will force the instance
-    ##    # to re-create it's SSH keys on first boot.
-    ##    def rbox.rm(*args); cmd('rm', args); end
-    ##    p ret = rbox.history(:c)
-    ##    p ret.exit_code
-    ##    p ret.stderr
-    ##    p ret.stdout
-    ##    
-    ##  end
-    ##  
-    ##  puts "done"
-    ##end
-    
-    def create_images_valid?
-      raise "No account number" unless @@global.accountnum
-      raise "No Amazon cert-***.pem" unless @@global.cert
-      raise "No Amazon pk-***.pem" unless @@global.privatekey
-      raise "You must supply a root keypair path" unless @@global.pkey
-      
-      @rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      @s3 = Rudy::AWS::S3.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      raise "No instances" unless @rinst.any?
-      raise "You must supply an S3 bucket name. See: 'rudy-s3 buckets'" unless @option.bucket
-      raise "You must supply an image name" unless @option.name
-      raise "The bucket '#{@option.bucket}' does not exist" unless @s3.bucket_exists?(@option.bucket)
-      true
-    end
-    
-    def create_images
-      opts = {}
-      opts[:id] = @option.instid if @option.instid
-      
-      @@global.user = 'root'
-      
-      puts "You may want to run rudy-ec2 #{@alias} --prepare first".bright
-      puts "NOTE 1: This process is currently Linux-only"
-      puts "NOTE 2: If you plan to create a public machine image, there are "
-      puts "additional steps to take to remove any sensitive information"
-      puts "before creating the image. See:"
-      puts "http://docs.amazonwebservices.com/AWSEC2/latest/DeveloperGuide/AESDG-chapter-sharingamis.html"
-      exit unless Annoy.pose_question("  Continue?\a ", /yes|y|ya|sure|you bet!/i, STDERR)
-
-      # Options to be sent to Net::SSH
-      ssh_opts = { :user => @@global.user || Rudy.sysinfo.user, :debug => nil  }
-      if @@global.pkey 
-        raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
-        raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
-        ssh_opts[:keys] = @@global.pkey 
-      end
-      
-      lt = @rinst.list_group(nil, :running, opts[:id]) do |inst|
-        
-        puts inst.to_s
-        
-        # Open the connection and run the command
-        rbox = Rye::Box.new(inst.dns_public, ssh_opts)
-        def rbox.bundle_vol(*args); cmd('ec2-bundle-vol', args); end
-        def rbox.upload_vol(*args); cmd('ec2-upload-bundle', args); end
-
-        rbox.upload(@@global.cert, @@global.privatekey, "/mnt")
-        rbox.touch("/root/firstrun")
-        
-        ## TODO: 
-        ## We have to delete the host keys just before we run the bundle command. 
-        ## The problem is that if we lose the connection we won't be able to connect
-        ## to the instance again. A better solution is to add the keys to the ignore
-        ## list for the bundle command. 
-        ##ret = rbox.rm('/etc/ssh/ssh_host_*_key*')
-
-        puts "Starting bundling process..."
-        
-        pkeyfile = File.basename(@@global.privatekey)
-        certfile = File.basename(@@global.cert)
-        
-        rbox.bundle_vol(:r, "i386", :p, @option.name, :k, "/mnt/#{pkeyfile}", :c, "/mnt/#{certfile}", :u, @@global.accountnum)
-        rbox.upload_vol(:b, @option.bucket, :m, "/tmp/#{@option.name}.manifest.xml", :a, @@global.accesskey, :s, @@global.secretkey)
-
-        @rimages.register("#{@option.bucket}/#{@option.name}.manifest.xml")
-        
-        break
-      end
-      
-    end
     
     def destroy_images_valid?
       unless @argv.ami && Rudy::Utils.is_id?(:image, @argv.ami)  
         raise "Must supply an AMI ID (ami-XXXXXXX)" 
       end
-      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      true
     end
     def destroy_images
-     puts @rimages.deregister(@argv.ami) ? "Done" : "Unknown error"
+     puts Rudy::AWS::EC2::Images.deregister(@argv.ami) ? "Done" : "Unknown error"
     end 
     
     def register_images_valid?
       unless @argv.first
         raise "Must supply a valid manifest path (bucket/ami-name.manifest.xml)"
       end
-      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      true
     end
     def register_images
-      puts @rimages.register(@argv.first)
+      puts Rudy::AWS::EC2::Images.register(@argv.first)
     end
 
 

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

@@ -16,8 +16,9 @@ module AWS; module EC2;
       raise "Cannot supply an instance ID" if @option.instid
       
       if @option.group
-        rgroup = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
-        raise "Group #{@option.group} does not exist" unless rgroup.exists?(@option.group)
+        unless Rudy::AWS::EC2::Groups.exists?(@option.group)
+          raise "Group #{@option.group} does not exist"
+        end
       end
       
       true
@@ -30,14 +31,15 @@ module AWS; module EC2;
         :size => 'm1.small',
         :zone => @@global.zone
       }
-      
-      radd = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      
+            
       if @option.address
         raise "Cannot specify both -a and -n" if @option.newaddress
-        raise "#{@option.address} is not allocated to you" unless radd.exists?(@option.address)
-        raise "#{@option.address} is already associated!" if radd.associated?(@option.address)
+        unless Rudy::AWS::EC2::Addresses.exists?(@option.address)
+          raise "#{@option.address} is not allocated to you" 
+        end
+        if Rudy::AWS::EC2::Addresses.associated?(@option.address)
+          raise "#{@option.address} is already associated!" 
+        end
       end
       
       # These can be sent directly to EC2 class
@@ -53,7 +55,7 @@ module AWS; module EC2;
         exit unless Annoy.proceed?(:low)
       end
       
-      instances = rinst.list_group(opts[:group], :running)
+      instances = Rudy::AWS::EC2::Instances.list_group(opts[:group], :running)
       
       if instances && instances.size > 0
         instance_count = (instances.size == 1) ? 'is 1 instance' : "are #{instances.size} instances"
@@ -63,19 +65,19 @@ module AWS; module EC2;
       
       if @option.newaddress
         print "Creating address... "
-        address = radd.create
+        address = Rudy::AWS::EC2::Addresses.create
         puts "#{address.ipaddress}"
         @option.address = address.ipaddress
       end
          
       execute_action do
         first_instance = true
-        rinst.create(opts) do |inst| # Rudy::AWS::EC2::Instance objects
+        Rudy::AWS::EC2::Instances.create(opts) do |inst| # Rudy::AWS::EC2::Instance objects
         
           # Assign IP address to only the first instance
           if first_instance && @option.address
             puts "Associating #{@option.address} to #{inst.awsid}"
-            radd.associate(@option.address, inst.awsid)
+            Rudy::AWS::EC2::Addresses.associate(@option.address, inst.awsid)
             first_instance = false
           end
         
@@ -89,16 +91,16 @@ module AWS; module EC2;
       raise NoInstanceError.new(nil, @alias) if !@option.group && !@argv.instid
       
       if @option.group
-        rgroup = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
-        raise "Group #{@option.group} does not exist" unless rgroup.exists?(@option.group)
+        unless Rudy::AWS::EC2::Groups.exists?(@option.group)
+          raise "Group #{@option.group} does not exist"
+        end
       end
       
       if @option.private
         raise Drydock::OptsError.new(nil, @alias, "Cannot allocate public IP for private instance") if @option.address || @option.newadress
       end
       
-      @rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      raise "No instances" unless @rinst.any?
+      raise "No instances" unless Rudy::AWS::EC2::Instances.any?
       true
     end
     alias :instances_destroy_valid? :instances_restart_valid?
@@ -112,12 +114,11 @@ module AWS; module EC2;
     end
     
     def consoles_valid?
-      @rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
       if @@global.pkey
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
         raise "Insecure permissions for #{@@global.pkey}" unless (File.stat(@@global.pkey).mode & 600) == 0
       end
-      raise "No instances" unless @rinst.any?
+      raise "No instances" unless Rudy::AWS::EC2::Instances.any?
       true
     end
     def consoles
@@ -126,9 +127,9 @@ module AWS; module EC2;
       opts[:id] = @argv.instid if @argv.instid
       opts[:id] &&= [opts[:id]].flatten
       
-      lt = @rinst.list_group(opts[:group], :any, opts[:id]) do |inst|
+      lt = Rudy::AWS::EC2::Instances.list_group(opts[:group], :any, opts[:id]) do |inst|
         puts instance_separator(inst.dns_public || inst.state, inst.awsid)
-        console = @rinst.console(inst.awsid)
+        console = Rudy::AWS::EC2::Instances.console(inst.awsid)
         output = console ? Base64.decode64(console) : "Unavailable"
         
         # The linux console can include ANSI escape codes for color, 
@@ -163,7 +164,7 @@ module AWS; module EC2;
       opts[:group] = @option.group if @option.group
       opts[:state] = @option.state if @option.state
 
-      # A nil value forces the @ec2.instances.list to return all instances
+      # A nil value forces the @@ec2.instances.list to return all instances
       if @option.all
         opts[:state] = :any
         opts[:group] = :any
@@ -172,8 +173,7 @@ module AWS; module EC2;
       opts[:id] = @argv.instid if @argv.instid
       opts[:id] &&= [opts[:id]].flatten
     
-      rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      lt = rudy.list_group(opts[:group], opts[:state], opts[:id]) do |inst|
+      lt = Rudy::AWS::EC2::Instances.list_group(opts[:group], opts[:state], opts[:id]) do |inst|
         puts @@global.verbose > 0 ? inst.inspect : inst.dump(@@global.format)
       end
       puts "No instances running" if !lt || lt.empty?
@@ -190,7 +190,7 @@ module AWS; module EC2;
       opts[:id] = @argv.instid if @argv.instid
       opts[:id] &&= [opts[:id]].flatten
       
-      instances = @rinst.list_group(opts[:group], :running, opts[:id])
+      instances = Rudy::AWS::EC2::Instances.list_group(opts[:group], :running, opts[:id])
       raise "No matching instances running" if instances.nil?
       
       inst_names = instances.collect { |inst| inst.dns_public || inst.awsid }
@@ -204,7 +204,7 @@ module AWS; module EC2;
       execute_check(:medium)
       
       execute_action("#{action.to_s.capitalize} Failed") { 
-        @rinst.send(action, inst_ids)
+        Rudy::AWS::EC2::Instances.send(action, inst_ids)
       }
       status
     end

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