solutious-rudy 0.8.5 → 0.9.0

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

@@ -22,13 +22,12 @@ module Rudy::AWS
       end
     end
   
-    class Addresses
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
-    
-      
+    module Addresses
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
+  
       def create
-        ret = @ec2.allocate_address
+        ret = @@ec2.allocate_address
         return false unless ret && ret['publicIp']
         address = Rudy::AWS::EC2::Address.new
         address.ipaddress = ret['publicIp']
@@ -42,7 +41,7 @@ module Rudy::AWS
         opts ={
           :public_ip => address || raise("No public IP address supplied")
         }
-        ret = @ec2.release_address(opts)
+        ret = @@ec2.release_address(opts)
         (ret && ret['return'] == 'true')
       end
 
@@ -61,7 +60,7 @@ module Rudy::AWS
           :instance_id => instance,
           :public_ip => address
         }
-        ret = @ec2.associate_address(opts)
+        ret = @@ec2.associate_address(opts)
         (ret && ret['return'] == 'true')
       end
 
@@ -76,7 +75,7 @@ module Rudy::AWS
         opts ={
           :public_ip => address
         }
-        ret = @ec2.disassociate_address(opts)
+        ret = @@ec2.disassociate_address(opts)
         (ret && ret['return'] == 'true')
       end
 
@@ -93,7 +92,7 @@ module Rudy::AWS
       def list_as_hash(addresses=[])
         addresses ||= []
         addresses = [addresses].flatten.compact
-        alist = @ec2.describe_addresses(:addresses=> addresses)
+        alist = @@ec2.describe_addresses(:addresses=> addresses)
         
         return nil unless alist['addressesSet'].is_a?(Hash)
       
@@ -102,7 +101,7 @@ module Rudy::AWS
           address = Addresses.from_hash(address)
           addresses[address.ipaddress] = address
         end
-        
+        addresses = nil if addresses.empty?
         addresses
       end
     

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

@@ -42,7 +42,7 @@ module Rudy::AWS
       lines.join($/)
     end
     
-    def inspect
+    def pretty
       lines = [@name.bright]
       field_names.each do |key|
         next unless self.respond_to?(key)
@@ -84,15 +84,15 @@ module Rudy::AWS
   
   
   module EC2
-    class Groups
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+    module Groups
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
   
       # Create a new EC2 security group
       # Returns list of created groups
       def create(name, desc=nil, addresses=[], ports=[], protocols=[], &each_group)
         desc ||= "Security Group #{name}"
-        ret = @ec2.create_security_group(:group_name => name, :group_description => desc)
+        ret = @@ec2.create_security_group(:group_name => name, :group_description => desc)
         return false unless (ret && ret['return'] == 'true')
         authorize(name, addresses, ports, protocols)
         get(name, &each_group)
@@ -102,7 +102,7 @@ module Rudy::AWS
       # Returns true/false whether successful
       def destroy(name, &each_group)
         list(name, &each_group) if each_group
-        ret = @ec2.delete_security_group(:group_name => name)
+        ret = @@ec2.delete_security_group(:group_name => name)
         (ret && ret['return'] == 'true')
       end
       
@@ -140,7 +140,7 @@ module Rudy::AWS
       # Returns an Array of Rudy::AWS::EC2::Group objects
       def list_as_hash(group_names=[], &each_group)
         group_names = [group_names].flatten.compact
-        glist = @ec2.describe_security_groups(:group_name => group_names) || {}
+        glist = @@ec2.describe_security_groups(:group_name => group_names) || {}
         return unless glist['securityGroupInfo'].is_a?(Hash)
         groups = {}
         glist['securityGroupInfo']['item'].each do |oldg| 
@@ -148,6 +148,7 @@ module Rudy::AWS
           groups[g.name] = g
         end
         groups.each_value { |g| each_group.call(g) } if each_group
+        groups = nil if groups.empty?
         groups
       end
       
@@ -274,7 +275,7 @@ module Rudy::AWS
           :to_port => to_port,
           :cidr_ip => ipa
         }
-        ret = @ec2.send("#{meth}_security_group_ingress", opts)
+        ret = @@ec2.send("#{meth}_security_group_ingress", opts)
         (ret && ret['return'] == 'true')
       end
       
@@ -289,7 +290,7 @@ module Rudy::AWS
           :source_security_group_name => gname,
           :source_security_group_owner_id => gowner
         }
-        ret = @ec2.send("#{meth}_security_group_ingress", opts)
+        ret = @@ec2.send("#{meth}_security_group_ingress", opts)
         (ret && ret['return'] == 'true')
       end
 

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

@@ -52,11 +52,11 @@ module Rudy::AWS
     
   end
   
-  module EC2
-    
-    class Images
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+  module EC2    
+    module Images
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
+
       
       def list(owner=[], image_ids=[], executable_by=[], &each_image)
         images = list_as_hash(owner, image_ids, executable_by)
@@ -81,7 +81,7 @@ module Rudy::AWS
           :executable_by => executable_by || []
         }
         
-        response = execute_request({}) { @ec2.describe_images(opts) }
+        response = Rudy::AWS::EC2.execute_request({}) { @@ec2.describe_images(opts) }
         
         return nil unless response['imagesSet'].is_a?(Hash)  # No instances 
       
@@ -105,7 +105,7 @@ module Rudy::AWS
         opts = {
           :image_id => id
         }
-        ret = @ec2.deregister_image(opts)
+        ret = @@ec2.deregister_image(opts)
         return false unless ret && ret.is_a?(Hash)
         true
       end
@@ -116,7 +116,7 @@ module Rudy::AWS
         opts = {
           :image_location => path
         }
-        ret = @ec2.register_image(opts)
+        ret = @@ec2.register_image(opts)
         return nil unless ret && ret.is_a?(Hash)
         ret['imageId']
       end

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

@@ -46,7 +46,7 @@ module Rudy::AWS
       lines.join($/)
     end
     
-    def inspect
+    def pretty
       lines = []
       lines << liner_note
       field_names.each do |key|
@@ -67,9 +67,9 @@ module Rudy::AWS
   
   
   module EC2
-    class Instances
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+    module Instances
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
       
       unless defined?(KNOWN_STATES)
         KNOWN_STATES = [:running, :pending, :shutting_down, :terminated, :degraded].freeze 
@@ -81,6 +81,7 @@ module Rudy::AWS
       #
       # +opts+ supports the following parameters:
       #
+      # * +:zone+
       # * +:ami+          
       # * +:group+        
       # * +:size+          
@@ -112,13 +113,11 @@ module Rudy::AWS
           :instance_type => opts[:size].to_s,
           :kernel_id => nil
         }
-        #p opts[:machine_data]
-        #exit
         
-        response = execute_request({}) { @ec2.run_instances(old_opts) }
+        response = Rudy::AWS::EC2.execute_request({}) { @@ec2.run_instances(old_opts) }
         return nil unless response['instancesSet'].is_a?(Hash)
         instances = response['instancesSet']['item'].collect do |inst|
-          self.class.from_hash(inst)
+          self.from_hash(inst)
         end
         instances.each { |inst| 
           each_inst.call(inst) 
@@ -130,8 +129,8 @@ module Rudy::AWS
         instances = list(:running, inst_ids, &each_inst) || []
         raise NoRunningInstances if instances.empty?
         inst_ids = objects_to_instance_ids(inst_ids)
-        response = execute_request({}) {
-          @ec2.reboot_instances(:instance_id => inst_ids)
+        response = Rudy::AWS::EC2.execute_request({}) {
+          @@ec2.reboot_instances(:instance_id => inst_ids)
         }
         response['return'] == 'true'
       end
@@ -142,8 +141,8 @@ module Rudy::AWS
       
         inst_ids = objects_to_instance_ids(inst_ids)
             
-        response = execute_request({}) {
-          @ec2.terminate_instances(:instance_id => inst_ids)
+        response = Rudy::AWS::EC2.execute_request({}) {
+          @@ec2.terminate_instances(:instance_id => inst_ids)
         }
       
         #instancesSet: 
@@ -228,8 +227,8 @@ module Rudy::AWS
         # This method always returns an Array.
         inst_ids = objects_to_instance_ids(inst_ids)
       
-        response = execute_request({}) {
-          @ec2.describe_instances(:instance_id => inst_ids)
+        response = Rudy::AWS::EC2.execute_request({}) {
+          @@ec2.describe_instances(:instance_id => inst_ids)
         }
       
         # requestId: c16878ac-28e4-4859-9878-ef93af45789c
@@ -280,8 +279,8 @@ module Rudy::AWS
       #
       def console(inst_id, &each_inst)
         inst_ids = objects_to_instance_ids([inst_id])
-        response = execute_request({}) { 
-          @ec2.get_console_output(:instance_id => inst_ids.first)
+        response = Rudy::AWS::EC2.execute_request({}) { 
+          @@ec2.get_console_output(:instance_id => inst_ids.first)
         }
         response['output']
       end

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

@@ -2,7 +2,7 @@
 module Rudy::AWS
   module EC2
     
-    class KeyPair < Storable
+    class Keypair < Storable
       
       field :name
       field :fingerprint
@@ -25,20 +25,20 @@ module Rudy::AWS
 
     end
     
-    class KeyPairs
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+    module EC2::Keypairs
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
       
       def create(name)
         raise "No name provided" unless name
-        ret = @ec2.create_keypair(:key_name => name)
-        self.class.from_hash(ret)
+        ret = @@ec2.create_keypair(:key_name => name)
+        from_hash(ret)
       end
       
       def destroy(name)
-        name = name.name if name.is_a?(Rudy::AWS::EC2::KeyPair)
+        name = name.name if name.is_a?(Rudy::AWS::EC2::Keypair)
         raise "No name provided" unless name.is_a?(String)
-        ret = @ec2.delete_keypair(:key_name => name)
+        ret = @@ec2.delete_keypair(:key_name => name)
         (ret && ret['return'] == 'true') # BUG? Always returns true
       end
       
@@ -50,23 +50,24 @@ module Rudy::AWS
       
       def list_as_hash(*names)
         names = names.flatten
-        klist = @ec2.describe_keypairs(:key_name => names)
+        klist = @@ec2.describe_keypairs(:key_name => names)
         return unless klist['keySet'].is_a?(Hash)
         keypairs = {}
         klist['keySet']['item'].each do |oldkp| 
-          kp = self.class.from_hash(oldkp)
+          kp = from_hash(oldkp)
           keypairs[kp.name] = kp
         end
+        keypairs = nil if keypairs.empty?
         keypairs
       end
       
-      def self.from_hash(h)
+      def from_hash(h)
         # keyName: test-c5g4v3pe
         # keyFingerprint: 65:d0:ce:e7:6a:b0:88:4a:9c:c7:2d:b8:33:0c:fd:3b:c8:0f:0a:3c
         # keyMaterial: |-
         #   -----BEGIN RSA PRIVATE KEY-----
         # 
-        keypair = Rudy::AWS::EC2::KeyPair.new
+        keypair = Rudy::AWS::EC2::Keypair.new
         keypair.fingerprint = h['keyFingerprint']
         keypair.name = h['keyName']
         keypair.private_key = h['keyMaterial']
@@ -91,13 +92,7 @@ module Rudy::AWS
       end
       
     end
-    
-    class Keypairs #:nodoc:
-      def initialize(*args)
-        raise "Oops! The correct class uses a capital 'P': Rudy::AWS::EC2::KeyPairs"
-      end
-    end
-    
+        
   end
 end
 

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

@@ -21,7 +21,7 @@ module Rudy::AWS
         @@sformat % [liner_note,  @volid, @status]
       end
       
-      def inspect
+      def pretty
         lines = []
         lines << liner_note
         field_names.each do |key|
@@ -38,9 +38,10 @@ module Rudy::AWS
       
     end
     
-    class Snapshots
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+    module Snapshots
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
+
 
       def list(snap_id=[])
         snapshots = list_as_hash(snap_id)
@@ -51,25 +52,26 @@ module Rudy::AWS
       end
       def list_as_hash(snap_id=[])
         snap_id = [snap_id].flatten.compact
-        slist = @ec2.describe_snapshots(:snapshot_id => snap_id)
+        slist = @@ec2.describe_snapshots(:snapshot_id => snap_id)
         return unless slist['snapshotSet'].is_a?(Hash)
         snapshots = {}
         slist['snapshotSet']['item'].each do |snap| 
-          kp = self.class.from_hash(snap)
+          kp = self.from_hash(snap)
           snapshots[kp.awsid] = kp
         end
+        snapshots = nil if snapshots.empty?
         snapshots
       end
       
       def create(vol_id)
         vol_id = (vol_id.is_a?(Rudy::AWS::EC2::Volume)) ? vol_id.awsid : vol_id
-        shash = @ec2.create_snapshot(:volume_id => vol_id)
+        shash = @@ec2.create_snapshot(:volume_id => vol_id)
         snap = Snapshots.from_hash(shash)
         snap
       end
       
       def destroy(snap_id)
-        ret = @ec2.delete_snapshot(:snapshot_id => snap_id)
+        ret = @@ec2.delete_snapshot(:snapshot_id => snap_id)
         (ret && ret['return'] == 'true') 
       end
       
@@ -99,10 +101,15 @@ module Rudy::AWS
         list(snap_id).first || nil
       end
       
-      def exists?(id)
+      def exists?(snap_id)
         !get(snap_id).nil?
       end
       
+      def completed?(snap_id)
+        s = get(snap_id)
+        return false if s.nil?
+        s.completed?
+      end
     end
     
   end

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

@@ -7,14 +7,19 @@ module Rudy::AWS
       
       field :awsid
       field :status
-      field :size
+      field :size  => Integer
       field :snapid
-      field :zone
-      field :create_time
-      field :attach_time
+      field :zone  => Symbol
+      field :create_time => Time
+      field :attach_time => Time
       field :instid
       field :device
     
+      def postprocess
+        @zone &&= @zone.to_sym
+        @size &&= @size.to_i
+      end
+      
       def liner_note
         info = attached? ? "attached to #{@instid}" : @status
         "%s (%s)" % [(self.awsid || '').bright, info]
@@ -26,7 +31,7 @@ module Rudy::AWS
         line
       end
       
-      def inspect
+      def pretty
         lines = [liner_note]
         field_names.each do |n|
            lines << sprintf(" %12s:  %s", n, self.send(n)) if self.send(n)
@@ -48,10 +53,11 @@ module Rudy::AWS
     end
   
   
-    class Volumes
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
-    
+    module Volumes
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
+      
+      
       unless defined?(KNOWN_STATES)
         KNOWN_STATES = [:available, :creating, :deleting, :attached, :detaching].freeze 
       end
@@ -72,11 +78,11 @@ module Rudy::AWS
         # "availabilityZone"=>"us-east-1b", 
         # "createTime"=>"2009-03-17T20:10:48.000Z", 
         # "volumeId"=>"vol-48826421"
-        vol = execute_request({}) { @ec2.create_volume(opts) }
+        vol = Rudy::AWS::EC2.execute_request({}) { @@ec2.create_volume(opts) }
       
         # TODO: use a waiter?
         #Rudy.waiter(1, 30) do
-        #  ret = @@ec2.volumes.available?(volume.awsid)
+        #  ret = @@@ec2.volumes.available?(volume.awsid)
         #end
       
         reqid = vol['requestId']
@@ -86,7 +92,7 @@ module Rudy::AWS
       def destroy(vol_id)
         vol_id = Volumes.get_vol_id(vol_id)
         raise VolumeNotAvailable, vol_id unless available?(vol_id)
-        ret = execute_request({}) { @ec2.delete_volume(:volume_id => vol_id) }
+        ret = Rudy::AWS::EC2.execute_request({}) { @@ec2.delete_volume(:volume_id => vol_id) }
         (ret['return'] == 'true') 
       end
     
@@ -103,7 +109,7 @@ module Rudy::AWS
           :instance_id => inst_id, 
           :device => device.to_s    # Solaris devices are numbers
         }
-        ret = execute_request(false) { @ec2.attach_volume(opts) }
+        ret = Rudy::AWS::EC2.execute_request(false) { @@ec2.attach_volume(opts) }
         (ret['status'] == 'attaching')
       end
     
@@ -111,16 +117,20 @@ module Rudy::AWS
         vol_id = Volumes.get_vol_id(vol_id)
         raise NoVolumeID unless vol_id
         raise VolumeNotAttached, vol_id unless attached?(vol_id)
-        ret = execute_request({}) { @ec2.detach_volume(:volume_id => vol_id) }
+        ret = Rudy::AWS::EC2.execute_request({}) { 
+          @@ec2.detach_volume(:volume_id => vol_id) 
+        }
         (ret['status'] == 'detaching') 
       end
     
     
-      def list(state=nil, vol_id=[])
-        list_as_hash(state, vol_id).values
+      def list(state=nil, vol_id=[], &each_vol)
+        volumes = list_as_hash(state, vol_id, &each_vol)
+        volumes &&= volumes.values
+        volumes
       end
     
-      def list_as_hash(state=nil, vol_id=[])
+      def list_as_hash(state=nil, vol_id=[], &each_vol)
         state &&= state.to_sym
         state = nil if state == :any
         # A nil state is fine, but we don't want an unknown one!
@@ -130,7 +140,9 @@ module Rudy::AWS
           :volume_id => vol_id ? [vol_id].flatten : [] 
         }
 
-        vlist = execute_request({}) { @ec2.describe_volumes(opts) }
+        vlist = Rudy::AWS::EC2.execute_request({}) { 
+          @@ec2.describe_volumes(opts) 
+        }
 
         volumes = {}
         return volumes unless vlist['volumeSet'].is_a?(Hash)
@@ -139,16 +151,21 @@ module Rudy::AWS
           next if state && v.state != state.to_s
           volumes[v.awsid] = v
         end
+        volumes.values.each { |v| each_vol.call(v) } if each_vol
+        volumes = nil if volumes.empty?
         volumes
       end
     
       def any?(state=nil,vol_id=[])
-        !list(state, vol_id).nil?
+        vols = list(state, vol_id)
+        !vols.nil?
       end
     
       def exists?(vol_id)
         vol_id = Volumes.get_vol_id(vol_id)
         vol = get(vol_id)
+        return false if vol.nil?
+        return false if vol.deleting?
         !vol.nil?
       end
     
@@ -203,6 +220,7 @@ module Rudy::AWS
           vol.attach_time = item['attachTime']
           vol.instid = item['instanceId']
         end
+        vol.postprocess
         vol
       end
 
@@ -223,8 +241,3 @@ module Rudy::AWS
   end
 end
 
-
-class Rudy::AWS::EC2::Volumes
-  
-
-end