solutious-rudy 0.9.1 → 0.9.2

data/lib/rudy.rb

@@ -42,7 +42,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 9.freeze
-      TINY  = 1.freeze
+      TINY  = 2.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -72,6 +72,12 @@ module Rudy
     DEFAULT_EC2_HOST = "ec2.amazonaws.com"
     DEFAULT_EC2_PORT = 443
     
+    DEFAULT_WINDOWS_FS = 'ntfs'
+    DEFAULT_LINUX_FS = 'ext3'
+    
+    DEFAULT_WINDOWS_DEVICE = 'xvdf'
+    DEFAULT_LINUX_DEVICE = '/dev/sdh'
+    
     MAX_INSTANCES = 5.freeze
     
     ID_MAP = {

data/lib/rudy/aws.rb

@@ -1,6 +1,6 @@
 
 
-require 'EC2'       # amazon-ec2 gem
+require 'AWS'       # amazon-ec2 gem
 
 
 module Rudy
@@ -27,7 +27,7 @@ module Rudy
     
     Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'aws', '{ec2,s3,sdb}', "*.rb")
     
-    class Error < ::EC2::Error; end
+    class Error < ::AWS::Error; end
   end
   
 end

data/lib/rudy/aws/ec2.rb

@@ -3,6 +3,8 @@ module Rudy; module AWS
   module EC2
 #    include Rudy::Huxtable
     
+    @@mutex = Mutex.new 
+    
     def self.connect(access_key=nil, secret_key=nil, region=nil, logger=nil)
 
       if region
@@ -15,7 +17,7 @@ module Rudy; module AWS
       host ||= DEFAULT_EC2_HOST
       port ||= DEFAULT_EC2_PORT
       
-      @@ec2 = ::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
+      @@ec2 = ::AWS::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
       @@logger = logger
     end
     
@@ -28,31 +30,36 @@ module Rudy; module AWS
     # Returns the return value from the request is returned untouched
     # or the default value on error or if the request returned nil. 
     def self.execute_request(default=nil, timeout=nil, &request)
-      timeout ||= 15
+      timeout ||= 30
       raise "No block provided" unless request
       response = nil
-      begin
-        Timeout::timeout(timeout) do
-          response = request.call
-        end
-      # Raise the EC2 exceptions
-      rescue ::EC2::Error, ::EC2::InvalidInstanceIDMalformed => ex  
-        raise Rudy::AWS::Error, ex.message
+      @@mutex.synchronize {
+        begin
+        
+          Timeout::timeout(timeout) do
+            response = request.call
+          end
       
-      # NOTE: The InternalError is returned for non-existent volume IDs. 
-      # It's probably a bug so we're ignoring it -- Dave. 
-      rescue ::EC2::InternalError => ex
-        raise Rudy::AWS::Error, ex.message
+        # Raise the EC2 exceptions
+        rescue ::AWS::Error, ::AWS::InvalidInstanceIDMalformed => ex  
+          raise Rudy::AWS::Error, ex.message
+      
+        # NOTE: The InternalError is returned for non-existent volume IDs. 
+        # It's probably a bug so we're ignoring it -- Dave. 
+        rescue ::AWS::InternalError => ex
+          raise Rudy::AWS::Error, ex.message
         
-      rescue Timeout::Error => ex
-        STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
-      rescue SocketError => ex
-        #STDERR.puts ex.message
-        #STDERR.puts ex.backtrace
-        raise SocketError, "Check your Internets!" unless @@global.offline
-      ensure
-        response ||= default
-      end
+        rescue Timeout::Error => ex
+          STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
+        rescue SocketError => ex
+          #STDERR.puts ex.message
+          #STDERR.puts ex.backtrace
+          raise SocketError, "Check your Internets!" unless @@global.offline
+        ensure
+          response ||= default
+        end
+        sleep 0.1  # defeat race conditions
+      }
       response
     end
     

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

@@ -171,7 +171,7 @@ module Rudy::AWS
       def exists?(name)
         begin
           g = list([name.to_s])
-        rescue ::EC2::InvalidGroupNotFound
+        rescue ::AWS::InvalidGroupNotFound
           return false 
         end
       

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

@@ -13,37 +13,9 @@ module Rudy::AWS
     field :visibility
     field :location
     field :kind
-    
-    def liner_note
-      info = @location
-      # Highlight "debian-5" in /dir/debian-5.manifest.xml
-      #info = info.split(/\//) 
-      #info[-1].gsub!(/(.+?)((\.img)?\.manifest\.xml)/) { |m,n| ($1 || "").bright << $2 }
-      #info = info.join('/')
-      "%s %-6s (%s)" % [self.awsid.bright, self.arch, info] 
-    end
         
     def to_s(with_title=false)
-      lines = []
-      lines << liner_note
-      #if self.available?
-      #  p = public? ? "public" : "private" 
-      #  k, r = @aki || 'aki-unknown', @ari || 'ari-unknown'
-      #  lines << @@sformat % %w{arch owner aki ari visibility} if with_title
-      #  lines << @@sformat % [@arch, @owner, k, r, p]
-      #end
-      lines.join($/)
-    end
-    
-    def inspect
-      lines = []
-      lines << liner_note
-      field_names.each do |key|
-        next unless self.respond_to?(key)
-        val = self.send(key)
-        lines << sprintf(" %22s: %s", key, (val.is_a?(Array) ? val.join(', ') : val))
-      end
-      lines.join($/)
+      [@awsid.bright, @arch, @visibility, @location].join '; '
     end
     
     def available?; @state && @state == "available"; end

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

@@ -23,38 +23,9 @@ module Rudy::AWS
       @groups ||= []
     end
     
-    def liner_note
-      info = self.running? ? self.dns_public : self.state
-      "%s  %-30s" % [self.awsid.bright, info]
-    end
-
-    def to_s(with_title=false)
-      lines = []
-      if @groups
-        gpstr = [@groups].flatten.compact.join(', ')
-        gpstr &&= "(#{gpstr})"
-      else
-        gpstr = ''
-      end
-      
-      lines << "%s  %s" % [liner_note, gpstr]
-      #if self.running?
-      #  k, g = @keyname || 'no-keypair', self.groups.join(', ')
-      #  lines << @@sformat % %w{zone size ami keyname groups} if with_title
-      #  lines << @@sformat % [@zone, @size, @ami, k, g]
-      #end
-      lines.join($/)
-    end
-    
-    def pretty
-      lines = []
-      lines << liner_note
-      field_names.each do |key|
-        next unless self.respond_to?(key)
-        val = self.send(key)
-        lines << sprintf(" %22s: %s", key, (val.is_a?(Array) ? val.join(', ') : val))
-      end
-      lines.join($/)
+    def to_s(*args)
+      groups = [@groups].flatten.compact.join(', ')
+      [self.awsid.bright, self.state, self.dns_public, groups].join '; '
     end
     
     def running?; self.state && self.state == 'running'; end
@@ -307,6 +278,7 @@ module Rudy::AWS
       # +inst_id+ is an instance ID
       # Returns an Instance object
       def get(inst_id)
+        return nil if inst_id.nil?
         inst_id = inst_id.awsid if inst_id.is_a?(Rudy::AWS::EC2::Instance)
         inst = list(:any, inst_id) 
         inst &&= inst.first

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

@@ -8,13 +8,8 @@ module Rudy::AWS
       field :fingerprint
       field :private_key  
       
-      def liner_note
-        "%-20s   %s" % [self.name.bright, self.fingerprint]
-      end
-      
       def to_s(titles=false)
-        str = titles ? "%-20s   %s#{$/}" % ['name', 'fingerprint'] : ""
-        str << liner_note
+        [@name.bright, @fingerprint].join '; '
       end
       
       def public_key

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

@@ -3,7 +3,6 @@
 module Rudy::AWS
   module EC2
     class Snapshot < Storable
-      @@sformat = "%s <- %10s; %s"
       
       field :awsid
       field :progress
@@ -11,25 +10,8 @@ module Rudy::AWS
       field :volid
       field :status
       
-      def liner_note
-        t = Time.parse(@created)
-        info = t.strftime("%Y-%m-%d %H:%M:%S")
-        "%s (%s)" % [(self.awsid || '').bright, info]
-      end
-      
       def to_s(with_title=false)
-        @@sformat % [liner_note,  @volid, @status]
-      end
-      
-      def pretty
-        lines = []
-        lines << liner_note
-        field_names.each do |key|
-          next unless self.respond_to?(key)
-          val = self.send(key)
-          lines << sprintf(" %22s: %s", key, (val.is_a?(Array) ? val.join(', ') : val))
-        end
-        lines.join($/)
+        [@awsid.bright, @volid, @created, @status, @progress].join '; '
       end
       
       def completed?
@@ -98,7 +80,7 @@ module Rudy::AWS
       end
       
       def get(snap_id)
-        list(snap_id).first || nil
+        list(snap_id).first rescue nil
       end
       
       def exists?(snap_id)

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

@@ -20,23 +20,8 @@ module Rudy::AWS
         @size &&= @size.to_i
       end
       
-      def liner_note
-        info = attached? ? "attached to #{@instid}" : @status
-        "%s (%s)" % [(self.awsid || '').bright, info]
-      end
-      
-      def to_s(with_title=false)
-        line = @@sformat % [liner_note, @zone, @size, @device]
-        line << " <- %s" % [@snapid] if @snapid
-        line
-      end
-      
-      def pretty
-        lines = [liner_note]
-        field_names.each do |n|
-           lines << sprintf(" %12s:  %s", n, self.send(n)) if self.send(n)
-         end
-        lines.join($/)
+      def to_s(*args)
+        [@awsid.bright, @zone, @size, @created, @instid, @snapid].join '; '
       end
     
       # Alias for status
@@ -155,7 +140,14 @@ module Rudy::AWS
         volumes = nil if volumes.empty?
         volumes
       end
-    
+      
+      def list_by_instance(instid, &each_vol)
+        instid = instid.awsid if instid.is_a? Rudy::AWS::EC2::Instance
+        volumes = list(:attached, &each_vol)
+        volumes &&= volumes.select { |v| v.instid == instid }
+        volumes
+      end
+      
       def any?(state=nil,vol_id=[])
         vols = list(state, vol_id)
         !vols.nil?
@@ -180,7 +172,7 @@ module Rudy::AWS
           vol_id = Volumes.get_vol_id(vol_id)
           return false unless vol_id
           vol = get(vol_id)
-          (vol && vol.status == state)
+          (vol && vol.status == state) ? true : false
         end
       end
     

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

@@ -8,13 +8,8 @@ module Rudy::AWS
       field :region
       field :state  
       
-      def liner_note
-        "%-10s  %9s  %s" % [self.name, self.region, self.state]
-      end
-      
       def to_s(titles=false)
-        str = titles ? "%-20s   %s#{$/}" % ['name', 'region', 'state'] : ""
-        str << liner_note
+        [@name.bright, @region, @state].join '; '
       end
 
     end

data/lib/rudy/aws/sdb.rb

@@ -181,7 +181,7 @@ module Rudy
       # Returns the return value from the request is returned untouched
       # or the default value on error or if the request returned nil. 
       def execute_request(default=nil, timeout=nil, &request)
-        timeout ||= 15
+        timeout ||= 30
         raise "No block provided" unless request
         response = nil
         begin

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

@@ -7,7 +7,7 @@ module AWS; module EC2;
     
     def addresses_create
       address = Rudy::AWS::EC2::Addresses.create
-      puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
+      print_stobject address
     end
     
     def addresses_destroy_valid?
@@ -24,7 +24,6 @@ module AWS; module EC2;
       puts "NOTE: this IP address will become available to other EC2 customers.".bright
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Addresses.destroy(@argv.ipaddress) }
-      self.addresses
     end
 
     def associate_addresses_valid?
@@ -58,7 +57,7 @@ module AWS; module EC2;
       execute_check(:low)
       execute_action { Rudy::AWS::EC2::Addresses.associate(address, instance.awsid) }
       address = Rudy::AWS::EC2::Addresses.get(address)
-      puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
+      print_stobject address
     end
     
     def disassociate_addresses_valid?
@@ -76,17 +75,12 @@ module AWS; module EC2;
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Addresses.disassociate(@argv.ipaddress) }
       address = Rudy::AWS::EC2::Addresses.get(@argv.ipaddress)
-      puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
+      print_stobject address
     end
     
     def addresses
       addresses = Rudy::AWS::EC2::Addresses.list || []
-      
-      addresses.each do |address|
-        puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
-      end
-      
-      puts "No Addresses" if addresses.empty?
+      print_stobjects addresses
     end
     
     

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

@@ -33,7 +33,6 @@ module AWS; module EC2;
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Groups.destroy(@argv.name) }
       @argv.clear # so groups will print all other groups
-      groups
     end
     
     def revoke_groups_valid?; modify_group_valid?; end

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

@@ -21,10 +21,7 @@ module AWS; module EC2;
       end
       
       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?
+      print_stobjects images
     end
     
     def destroy_images_valid?

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

@@ -0,0 +1,63 @@
+
+
+module Rudy; module CLI
+module AWS; module EC2;
+
+  class Info < Rudy::CLI::CommandBase
+
+    def info
+      process_region @@global.region
+      oregions = Rudy::AWS::VALID_REGIONS - [@@global.region.to_sym]
+      if @option.all
+        oregions.each do |region| 
+          Rudy::AWS::EC2.connect @@global.accesskey, @@global.secretkey, region
+          process_region region
+        end
+      else
+        puts $/, "Other regions: " << oregions.join(', ')
+      end
+    end
+    
+    
+    private 
+    def process_region(region)
+      puts " Region: %s %30s".att(:reverse) % [region, '']
+      puts "  Instances".bright
+      istatus = @option.all ? :any : :running
+      (Rudy::AWS::EC2::Instances.list(istatus) || []).collect do |inst| 
+        #puts "    %s (%s): %s; %s; %s" % [inst.awsid, inst.state, inst.dns_public || '[no dns]', inst.size, inst.created]
+        puts "    #{inst.to_s.noatt}"
+      end
+      
+      puts "  Volumes".bright
+      (Rudy::AWS::EC2::Volumes.list || []).collect do |vol|
+        puts "    %s (%s): %sGB; %s" % [vol.awsid, vol.instid || vol.status, vol.size, vol.created]
+      end
+              
+      puts "  Snapshots".bright
+      (Rudy::AWS::EC2::Snapshots.list || []).collect do |snap|
+        puts "    %s: %s; %s" % [snap.awsid, snap.volid, snap.created]
+      end
+      
+      puts "  Addresses".bright
+      (Rudy::AWS::EC2::Addresses.list || []).collect do |o| 
+        puts "    %s (%s)" % [o.ipaddress, o.instid || 'available']
+      end
+      
+      puts "  Groups".bright
+      puts (Rudy::AWS::EC2::Groups.list || []).collect { |o| "    #{o.name}" }
+      
+      puts "  Keypairs".bright
+      puts (Rudy::AWS::EC2::Keypairs.list || []).collect { |o| "    #{o.name}" }
+
+      puts "  Images".bright
+      (Rudy::AWS::EC2::Images.list('self') || []).collect do |o|
+        puts "    %s: %s; %s; %s" % [o.awsid, o.location, o.arch, o.visibility]
+      end
+      puts
+    end
+    
+  end
+  
+end; end
+end; end