awsum 0.5 → 0.5.1

data/lib/awsum/ec2/image.rb

@@ -48,7 +48,7 @@ module Awsum
       # * <tt>:key_name</tt> - The name of the key pair with which to launch instances
       # * <tt>:security_groups</tt> - The names of security groups to associate launched instances with
       # * <tt>:user_data</tt> - User data made available to instances (Note: Must be 16K or less, will be base64 encoded by Awsum)
-      # * <tt>:instance_type</tt> - The size of the instances to launch, can be one of [m1.small, m1.large, m1.xlarge, c1.medium, c1.xlarge], default is m1.small
+      # * <tt>:instance_type</tt> - The size of the instances to launch, can be one of [m1.small, m1.large, m1.xlarge, c1.medium, c1.xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cc1.4xlarge, cg1.4xlarge, t1.micro], default is m1.small
       # * <tt>:availability_zone</tt> - The name of the availability zone to launch this instance in
       # * <tt>:kernel_id</tt> - The ID of the kernel with which to launch instances
       # * <tt>:ramdisk_id</tt> - The ID of the RAM disk with which to launch instances

data/lib/awsum/ec2/instance.rb

@@ -23,6 +23,24 @@ module Awsum
         @launch_index = launch_index
       end
 
+      def reload
+        replacement_instance = @ec2.instance id
+        #TODO: Make this easier
+        @image_id = replacement_instance.image_id
+        @type = replacement_instance.type
+        @state = replacement_instance.state
+        @dns_name = replacement_instance.dns_name
+        @private_dns_name = replacement_instance.private_dns_name
+        @key_name = replacement_instance.key_name
+        @kernel_id = replacement_instance.kernel_id
+        @launch_time = replacement_instance.launch_time
+        @availability_zone = replacement_instance.availability_zone
+        @product_codes = replacement_instance.product_codes
+        @ramdisk_id = replacement_instance.ramdisk_id
+        @reason = replacement_instance.reason
+        @launch_index = replacement_instance.launch_index
+      end
+
       # Terminates this instance
       def terminate
         @ec2.terminate_instances(id)
@@ -36,15 +54,26 @@ module Awsum
 
       # Will create and attach a Volume to this Instance
       # You must specify a size or a snapshot_id
-      def create_volume(size = nil, snapshot_id = nil, device = '/dev/sdh')
-        raise ArgumentError.new('You must specify a size if not creating a volume from a snapshot') if size.blank? && snapshot_id.blank?
-        raise ArgumentError.new('You must specify a device to attach the volume to') unless device
-
-        volume = @ec2.create_volume availability_zone, :size => size, :snapshot_id => snapshot_id
+      #
+      # ===Options:
+      # :tags => Hash of tags
+      # :device => Will automatically attach the volume to the specified device
+      def create_volume(size_or_snapshot_id, options = {})
+        options = {:device => '/dev/sdh'}.merge(options)
+        if size_or_snapshot_id.is_a?(Numeric)
+          volume = @ec2.create_volume availability_zone, :size => size_or_snapshot_id
+        else
+          volume = @ec2.create_volume availability_zone, :snapshot_id => size_or_snapshot_id
+        end
+        if options[:tags]
+          @ec2.create_tags(volume.id, options[:tags])
+        end
         while volume.status != 'available'
           volume.reload
         end
-        attach volume, device
+        if options[:device]
+          attach volume, options[:device]
+        end
         volume
       end
 

data/lib/awsum/ec2/parsers/image_parser.rb

@@ -10,8 +10,8 @@ module Awsum
 
       def tag_start(tag, attributes)
         case tag
-          when 'imagesSet'
-            @stack << 'imagesSet'
+          when 'imagesSet', 'blockDeviceMapping', 'productCodes'
+            @stack << tag
           when 'item'
             case @stack[-1]
               when 'imagesSet'
@@ -21,8 +21,6 @@ module Awsum
                 @product_codes = []
                 @text = ''
             end
-          when 'productCodes'
-            @stack << 'productCodes'
         end
       end
 
@@ -34,7 +32,7 @@ module Awsum
         case tag
           when 'DescribeImagesResponse', 'requestId'
             #no-op
-          when 'imagesSet', 'productCodes'
+          when 'imagesSet', 'productCodes', 'blockDeviceMapping'
             @stack.pop
           when 'item'
             case @stack[-1]

data/lib/awsum/ec2/parsers/instance_parser.rb

@@ -12,16 +12,8 @@ module Awsum
 
       def tag_start(tag, attributes)
         case tag
-          when 'reservationSet'
-            @stack << 'reservationSet'
-          when 'instancesSet'
-            @stack << 'instancesSet'
-          when 'productCodes'
-            @stack << 'productCodes'
-          when 'instanceState'
-            @stack << 'instanceState'
-          when 'placement'
-            @stack << 'placement'
+          when 'reservationSet', 'instancesSet', 'productCodes', 'instanceState', 'blockDeviceMapping', 'tagSet', 'placement'
+            @stack << tag
           when 'item'
             case @stack[-1]
               when 'reservationSet'
@@ -30,6 +22,10 @@ module Awsum
                 @state = {}
               when 'productCodes'
                 @product_codes = []
+              when 'blockDeviceMapping'
+                @blockDeviceMapping = {}
+              when 'tagSet'
+                @tagSet = {}
             end
         end
         @text = ''
@@ -43,7 +39,7 @@ module Awsum
         case tag
           when 'DescribeInstancesResponse', 'requestId', 'reservationId'
             #no-op
-          when 'reservationSet', 'instancesSet', 'productCodes', 'instanceState', 'placement'
+          when 'reservationSet', 'instancesSet', 'productCodes', 'instanceState', 'placement', 'blockDeviceMapping', 'tagSet'
             @stack.pop
           when 'item'
             case @stack[-1]
@@ -53,7 +49,7 @@ module Awsum
                                 @current['instanceId'],
                                 @current['imageId'],
                                 @current['instanceType'],
-                                @state,
+                                State.new(@state[:code], @state[:name]),
                                 @current['dnsName'],
                                 @current['privateDnsName'],
                                 @current['keyName'],
@@ -75,9 +71,22 @@ module Awsum
           when 'name'
             @state[:name] = @text.strip if @stack[-1] == 'instanceState'
           else
-            unless @text.nil? || @current.nil?
-              text = @text.strip
-              @current[tag] = (text == '' ? nil : text)
+            case @stack[-1]
+              when 'blockDeviceMapping'
+                unless @text.nil? || @blockDeviceMapping.nil?
+                  text = @text.strip
+                  @blockDeviceMapping[tag] = (text == '' ? nil : text)
+                end
+              when 'tagSet'
+                unless @text.nil? || @blockDeviceMapping.nil?
+                  text = @text.strip
+                  @blockDeviceMapping[tag] = (text == '' ? nil : text)
+                end
+              else
+                unless @text.nil? || @current.nil?
+                  text = @text.strip
+                  @current[tag] = (text == '' ? nil : text)
+                end
             end
         end
       end

data/lib/awsum/ec2/parsers/snapshot_parser.rb

@@ -15,8 +15,8 @@ module Awsum
         end
 
         case tag
-          when 'snapshotSet'
-            @stack << 'snapshotSet'
+          when 'snapshotSet', 'tagSet'
+            @stack << tag
           when 'item', 'CreateSnapshotResponse'
             case @stack[-1]
               when 'snapshotSet'
@@ -34,7 +34,7 @@ module Awsum
         case tag
           when 'DescribeSnapshotsResponts'
             #no-op
-          when 'snapshotSet'
+          when 'snapshotSet', 'tagSet'
             @stack.pop
           when 'item', 'CreateSnapshotResponse'
             case @stack[-1]

data/lib/awsum/ec2/parsers/tag_parser.rb

@@ -0,0 +1,56 @@
+module Awsum
+  class Ec2
+    class TagParser < Awsum::Parser #:nodoc:
+      def initialize(ec2)
+        @ec2 = ec2
+        @tags = []
+        @text = nil
+        @stack = []
+      end
+
+      def tag_start(tag, attributes)
+        case tag
+          when 'tagSet'
+            @stack << tag
+          when 'item'
+            case @stack[-1]
+              when 'tagSet'
+                @current = {}
+            end
+        end
+        @text = ''
+      end
+
+      def text(text)
+        @text << text unless @text.nil?
+      end
+
+      def tag_end(tag)
+        case tag
+          when 'tagSet'
+            @stack.pop
+          when 'item'
+            case @stack[-1]
+              when 'tagSet'
+                @tags << Tag.new(
+                           @ec2,
+                           @current['resourceId'],
+                           @current['resourceType'],
+                           @current['key'],
+                           @current['value']
+                         )
+            end
+          else
+            unless @text.nil? || @current.nil?
+              text = @text.strip
+              @current[tag] = (text == '' ? nil : text)
+            end
+        end
+      end
+
+      def result
+        @tags
+      end
+    end
+  end
+end

data/lib/awsum/ec2/parsers/volume_parser.rb

@@ -15,10 +15,8 @@ module Awsum
         end
 
         case tag
-          when 'volumeSet'
-            @stack << 'volumeSet'
-          when 'attachmentSet'
-            @stack << 'attachmentSet'
+          when 'volumeSet', 'attachmentSet', 'tagSet'
+            @stack << tag
           when 'item', 'CreateVolumeResponse'
             case @stack[-1]
               when 'volumeSet'
@@ -37,7 +35,7 @@ module Awsum
         case tag
           when 'DescribeVolumesResponse'
             #no-op
-          when 'volumeSet', 'attachmentSet'
+          when 'volumeSet', 'attachmentSet', 'tagSet'
             @stack.pop
           when 'item', 'CreateVolumeResponse'
             case @stack[-1]

data/lib/awsum/ec2/region.rb

@@ -30,15 +30,18 @@ module Awsum
       #     region.availability_zones
       #   end
       def use(&block)
-        old_host = @ec2.host
-        @ec2.host = end_point
         if block_given?
-          block.arity < 1 ? instance_eval(&block) : block[self]
+          begin
+            old_host = @ec2.host
+            @ec2.host = end_point
+            block.arity < 1 ? instance_eval(&block) : block[self]
+          ensure
+            @ec2.host = old_host
+          end
         else
+          @ec2.host = end_point
           self
         end
-      ensure
-        @ec2.host = old_host
       end
 
     private

data/lib/awsum/ec2/security_group.rb

@@ -14,24 +14,20 @@ module Awsum
         @group_permissions = group_permissions
       end
 
-      # Authorize access for a group
-      def authorize_group(group_name, owner_id)
-        @ec2.authorize_security_group_ingress(@name, :source_security_group_name => group_name, :source_security_group_owner_id => owner_id)
+      # Authorize access
+      #
+      # ===Options:
+      # See Ec2#authorize_security_group_ingress
+      def authorize(arguments)
+        @ec2.authorize_security_group_ingress(@name, arguments)
       end
 
-      # Revoke access for a group
-      def revoke_group(group_name, owner_id)
-        @ec2.revoke_security_group_ingress(@name, :source_security_group_name => group_name, :source_security_group_owner_id => owner_id)
-      end
-
-      # Authorize access for an ip address
-      def authorize_ip(from_port, to_port, protocol = 'tcp', cidr_ip = '0.0.0.0/0')
-        @ec2.authorize_security_group_ingress(@name, :ip_protocol => protocol, :from_port => from_port, :to_port => to_port, :cidr_ip => cidr_ip)
-      end
-
-      # Revoke access from an ip address
-      def revoke_ip(from_port, to_port, protocol = 'tcp', cidr_ip = '0.0.0.0/0')
-        @ec2.revoke_security_group_ingress(@name, :ip_protocol => protocol, :from_port => from_port, :to_port => to_port, :cidr_ip => cidr_ip)
+      # Revoke access
+      #
+      # ===Options:
+      # See Ec2#revoke_security_group_ingress
+      def revoke(arguments)
+        @ec2.revoke_security_group_ingress(@name, arguments)
       end
 
       # Delete this SecurityGroup

data/lib/awsum/ec2/snapshot.rb

@@ -18,6 +18,15 @@ module Awsum
       def delete
         @ec2.delete_snapshot id
       end
+
+      def reload
+        reloaded_snapshot = @ec2.snapshot id
+
+        @volume_id = reloaded_snapshot.volume_id
+        @status = reloaded_snapshot.status
+        @start_time = reloaded_snapshot.start_time
+        @progress = reloaded_snapshot.progress
+      end
     end
   end
 end

data/lib/awsum/ec2/state.rb

@@ -0,0 +1,22 @@
+module Awsum
+  class Ec2
+    class State
+      attr_reader :code, :name
+
+      def initialize(code, name)
+        @code = code.to_i
+        @name = name
+      end
+
+      def ==(other)
+        if other.is_a?(Numeric)
+          @code == other
+        elsif other.is_a?(String)
+          @name == other
+        else
+          @code = other.code && @name == other.name
+        end
+      end
+    end
+  end
+end

data/lib/awsum/ec2/tag.rb

@@ -0,0 +1,17 @@
+require 'awsum/ec2/parsers/tag_parser'
+
+module Awsum
+  class Ec2
+    class Tag
+      attr_reader :resource_id, :resource_type, :key, :value
+
+      def initialize(ec2, resource_id, resource_type, key, value) #:nodoc:
+        @ec2 = ec2
+        @resource_id = resource_id
+        @resource_type = resource_type
+        @key = key
+        @value = value
+      end
+    end
+  end
+end

data/lib/awsum/ec2/volume.rb

@@ -50,9 +50,19 @@ module Awsum
         @ec2.delete_volume id
       end
 
+      # Force delete this volume
+      # will detach it first
+      def delete!
+        detach true
+        while status != 'available'
+          reload
+        end
+        @ec2.delete_volume id
+      end
+
       # Creates a Snapshot of this Volume
-      def create_snapshot
-        @ec2.create_snapshot id
+      def create_snapshot(options = {})
+        @ec2.create_snapshot id, options
       end
 
       # Lists the Snapshot(s) of this Volume

data/lib/awsum/requestable.rb

@@ -197,14 +197,64 @@ module Awsum
 
     # Converts an array of paramters into <param_name>.<num> format
     def array_to_params(arr, param_name)
-      arr = [arr] unless arr.is_a?(Array)
+      arr = [arr].flatten
       params = {}
-      arr.each_with_index do |value,i|
-        params["#{param_name}.#{i+1}"] = value
+      arr.each_with_index do |value, i|
+        if value.respond_to?(:keys)
+          value.each do |key, val|
+            param_key = "#{param_name}.#{i+1}.#{parameterize(key)}"
+            if val.is_a?(Array) || val.respond_to?(:keys)
+              params.merge! array_to_params(val, param_key)
+            else
+              params[param_key] = val
+            end
+          end
+        else
+          params["#{param_name}.#{i+1}"] = value
+        end
       end
       params
     end
 
+    def parameterize(string)
+      string.to_s.split(/_/).map{ |w| w.downcase.sub(/^(.)/){ $1.upcase } }.join
+    end
+
+    def parse_filters(filters, tags = nil)
+      result = []
+      if filters
+        filters.each do |k,v|
+          values = v.is_a?(Array) ? v : [v]
+          result << {:name => k, :value => values}
+        end
+      end
+      if tags
+        tags.each do |k,v|
+          values = v.is_a?(Array) ? v : [v]
+          result << {:name => "tag:#{k}", :value => values}
+        end
+      end
+      if result.size > 0
+        array_to_params(result, "Filter")
+      else
+        {}
+      end
+    end
+
+    def parse_tag_keys(tags)
+      result = []
+      if tags
+        tags.each do |k,v|
+          result << {:key => k, :value => v}
+        end
+      end
+      if result.size > 0
+        array_to_params(result, "Tag")
+      else
+        {}
+      end
+    end
+
     # Sign a string with a digest, wrap in HMAC digest and base64 encode
     #
     # ===Returns