aws 2.5.6 → 2.5.7

data/lib/awsbase/awsbase.rb

@@ -314,12 +314,12 @@ module Aws
           puts 'RETRYING QUERY due to QueryTimeout...' if count > 0
           begin
             ret = request_info_impl(http_conn, bench, request, parser, options, &block)
-            break
           rescue Aws::AwsError => ex
             if !ex.include?(/QueryTimeout/) || count == retry_count
               raise ex
             end
           end
+          break if ret
           count += 1
         end
       ensure

data/lib/awsbase/errors.rb

@@ -214,7 +214,7 @@ module Aws
           last_errors_text     = @aws.last_errors.flatten.join("\n")
           # on redirect :
           if redirect_detected
-            location = response['location']
+            location = response['location'] ||  "#{request[:protocol]}://#{error_parser.instance_variable_get(:'@endpoint')}"
             # ... log information and ...
             @aws.logger.info("##### #{@aws.class.name} redirect requested: #{response.code} #{response.message} #####")
             @aws.logger.info("##### New location: #{location} #####")

data/lib/awsbase/parsers.rb

@@ -196,9 +196,9 @@ module Aws
           @code = @text
         when 'Message';
           @message = @text
-#       when 'Endpoint'  ; @endpoint  = @text
-#       when 'HostId'    ; @host_id   = @text
-#       when 'Bucket'    ; @bucket    = @text
+        when 'Endpoint'  ; @endpoint  = @text
+        when 'HostId'    ; @host_id   = @text
+        when 'Bucket'    ; @bucket    = @text
         when 'Error';
           @errors << [@code, @message]
       end
@@ -224,4 +224,4 @@ module Aws
       @result = response.is_a?(Net::HTTPSuccess)
     end
   end
-end
+end

data/lib/awsbase/require_relative.rb

@@ -1,11 +1,20 @@
 # require_relative was introduced in 1.9.2. This makes it
-# available to younger rubies.
-# From: http://stackoverflow.com/questions/4333286/ruby-require-vs-require-relative-best-practice-to-workaround-running-in-both-r/4338241#4338241
+# available to younger rubies.  It trys hard to not re-require
+# files.
+
 unless Kernel.respond_to?(:require_relative)
   module Kernel
     def require_relative(path)
-#      puts 'IN NEW REQUIRE_RELATIVE ' + path.to_s
-      require File.join(File.dirname(caller[0]), path.to_str)
+      desired_path = File.expand_path('../' + path.to_str, caller[0])
+      shortest = desired_path
+      $:.each do |path|
+        path += '/'
+        if desired_path.index(path) == 0
+          candidate = desired_path.sub(path, '')
+          shortest = candidate if candidate.size < shortest.size
+        end
+      end
+      require shortest
     end
   end
 end

data/lib/ec2/ec2.rb

@@ -183,6 +183,12 @@ module Aws
       return groups
     end
 
+    def hash_params_with_suffix(prefix, suffix, list) #:nodoc:
+      groups = {}
+      list.each_index { |i| groups.update("#{prefix}.#{i+1}.suffix"=>list[i]) }
+      return groups
+    end
+
     #-----------------------------------------------------------------
     #      Images
     #-----------------------------------------------------------------
@@ -321,19 +327,18 @@ module Aws
     # instead of modify_image_attribute because the signature of
     # modify_image_attribute may change with EC2 service changes.
     #
-    #  attribute      : currently, only 'launchPermission' is supported.
-    #  operation_type : currently, only 'add' & 'remove' are supported.
+    #  operation_type : currently, only 'Add' & 'Remove' are supported.
     #  vars:
     #    :user_group  : currently, only 'all' is supported.
     #    :user_id
     #    :product_code
-    def modify_image_attribute(image_id, attribute, operation_type = nil, vars = {})
-      params = {'ImageId'   => image_id,
-                'Attribute' => attribute}
-      params['OperationType'] = operation_type if operation_type
-      params.update(hash_params('UserId', vars[:user_id].to_a)) if vars[:user_id]
-      params.update(hash_params('UserGroup', vars[:user_group].to_a)) if vars[:user_group]
+    #    :description
+    def modify_image_attribute(image_id, operation_type = nil, vars = {})
+      params = {'ImageId' => image_id }
+      params.update(hash_params_with_suffix("LaunchPermission.#{operation_type}", 'UserId', vars[:user_id].to_a)) if vars[:user_id]
+      params.update(hash_params_with_suffix("LaunchPermission.#{operation_type}", 'Group', vars[:user_group].to_a)) if vars[:user_group]
       params.update(hash_params('ProductCode', vars[:product_code])) if vars[:product_code]
+      params.update('Description.Value' => vars[:description].to_s) if vars[:description]
       link = generate_request("ModifyImageAttribute", params)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -346,7 +351,7 @@ module Aws
     #
     #  ec2.modify_image_launch_perm_add_users('ami-e444444d',['000000000777','000000000778']) #=> true
     def modify_image_launch_perm_add_users(image_id, user_id=[])
-      modify_image_attribute(image_id, 'launchPermission', 'add', :user_id => user_id.to_a)
+      modify_image_attribute(image_id, 'Add', :user_id => user_id.to_a)
     end
 
     # Revokes image launch permissions for users. +userId+ is a list of users AWS accounts ids. Returns +true+ or an exception.
@@ -354,7 +359,7 @@ module Aws
     #  ec2.modify_image_launch_perm_remove_users('ami-e444444d',['000000000777','000000000778']) #=> true
     #
     def modify_image_launch_perm_remove_users(image_id, user_id=[])
-      modify_image_attribute(image_id, 'launchPermission', 'remove', :user_id => user_id.to_a)
+      modify_image_attribute(image_id, 'Remove', :user_id => user_id.to_a)
     end
 
     # Add image launch permissions for users groups (currently only 'all' is supported, which gives public launch permissions).
@@ -363,7 +368,7 @@ module Aws
     #  ec2.modify_image_launch_perm_add_groups('ami-e444444d') #=> true
     #
     def modify_image_launch_perm_add_groups(image_id, user_group=['all'])
-      modify_image_attribute(image_id, 'launchPermission', 'add', :user_group => user_group.to_a)
+      modify_image_attribute(image_id, 'Add', :user_group => user_group.to_a)
     end
 
     # Remove image launch permissions for users groups (currently only 'all' is supported, which gives public launch permissions).
@@ -371,7 +376,7 @@ module Aws
     #  ec2.modify_image_launch_perm_remove_groups('ami-e444444d') #=> true
     #
     def modify_image_launch_perm_remove_groups(image_id, user_group=['all'])
-      modify_image_attribute(image_id, 'launchPermission', 'remove', :user_group => user_group.to_a)
+      modify_image_attribute(image_id, 'Remove', :user_group => user_group.to_a)
     end
 
     # Add product code to image
@@ -379,7 +384,15 @@ module Aws
     #  ec2.modify_image_product_code('ami-e444444d','0ABCDEF') #=> true
     #
     def modify_image_product_code(image_id, product_code=[])
-      modify_image_attribute(image_id, 'productCodes', nil, :product_code => product_code.to_a)
+      modify_image_attribute(image_id, nil, :product_code => product_code.to_a)
+    end
+
+    # Change image description
+    #
+    #  ec2.modify_image_description('ami-e444444d','My new AMI') #=> true
+    #
+    def modify_image_description(image_id, description='')
+      modify_image_attribute(image_id, nil, :description => description)
     end
 
     #-----------------------------------------------------------------
@@ -562,13 +575,13 @@ module Aws
       unless Aws::Utils.blank?(options[:block_device_mappings])
         options[:block_device_mappings].size.times do |n|
           if options[:block_device_mappings][n][:virtual_name]
-            params["BlockDeviceMapping.#{n+1}.VirtualName"] = options[:block_device_mappings][n][:virtual_name] 
+            params["BlockDeviceMapping.#{n+1}.VirtualName"] = options[:block_device_mappings][n][:virtual_name]
           end
           if options[:block_device_mappings][n][:device_name]
-            params["BlockDeviceMapping.#{n+1}.DeviceName"] = options[:block_device_mappings][n][:device_name]  
+            params["BlockDeviceMapping.#{n+1}.DeviceName"] = options[:block_device_mappings][n][:device_name]
           end
           if options[:block_device_mappings][n][:ebs_snapshot_id]
-            params["BlockDeviceMapping.#{n+1}.Ebs.SnapshotId"] = options[:block_device_mappings][n][:ebs_snapshot_id]  
+            params["BlockDeviceMapping.#{n+1}.Ebs.SnapshotId"] = options[:block_device_mappings][n][:ebs_snapshot_id]
           end
         end
       end
@@ -607,7 +620,7 @@ module Aws
     rescue Exception
       on_exception
     end
-    
+
     # Stop EBS-backed EC2 instances. Returns a list of instance state changes or an exception.
     #
     #  ec2.stop_instances(['i-f222222d', 'i-f222222e']) #=>
@@ -628,7 +641,7 @@ module Aws
     rescue Exception
       on_exception
     end
-    
+
     # Start EBS-backed EC2 instances. Returns a list of instance state changes or an exception.
     #
     #  ec2.start_instances(['i-f222222d', 'i-f222222e']) #=>
@@ -649,7 +662,7 @@ module Aws
     rescue Exception
       on_exception
     end
-    
+
     # Retreive EC2 instance OS logs. Returns a hash of data or an exception.
     #
     #  ec2.get_console_output('i-f222222d') =>
@@ -806,23 +819,23 @@ module Aws
     #      :aws_owner       => "000000000888",
     #      :aws_description => "a default security group",
     #      :aws_perms       =>
-    #        [ {:protocol => "tcp", :from_port=>"1000", :to_port=>"2000", 
+    #        [ {:protocol => "tcp", :from_port=>"1000", :to_port=>"2000",
     #           :ip_ranges=>[{cidr_ip=>"10.1.2.3/32"}, {cidr_ip=>"192.168.1.10/24"}],
     #           :groups =>  [{:owner=>"123456789012", :group_name="default"}] },
-    #    
+    #
     #          {:protocol ="icmp", :from_port="-1", :to_port=>"-1",
-    #           :ip_ranges=>[{:cidr_ip=>"0.0.0.0/0"}], 
+    #           :ip_ranges=>[{:cidr_ip=>"0.0.0.0/0"}],
     #           :groups=>[] },
-    #      
-    #          {:protocol=>"udp", :from_port=>"0", :to_port=>"65535", 
-    #           :ip_ranges=>[], 
-    #           :groups=>[{:owner=>"123456789012", :group_name=>"newgroup"}, {:owner=>"123456789012", :group_name=>"default"}], 
-    #          
+    #
+    #          {:protocol=>"udp", :from_port=>"0", :to_port=>"65535",
+    #           :ip_ranges=>[],
+    #           :groups=>[{:owner=>"123456789012", :group_name=>"newgroup"}, {:owner=>"123456789012", :group_name=>"default"}],
+    #
     #          {:protocol=>"tcp", :from_port="22", :to_port=>"22",
     #           :ip_ranges=>[{:cidr_ip=>"0.0.0.0/0"}],
     #           :groups=>[{:owner=>"", :group_name=>"default"}] },
-    #   
-    #         ..., {...} 
+    #
+    #         ..., {...}
     #        ]
     #
     def describe_security_groups(list=[])
@@ -883,19 +896,19 @@ module Aws
     end
 
     # Authorize OR Revoke ingress for security group, depending on the value of the 'action' parameter.
-    # If you 'authorize' then you allow instances that are member of some other 
-    # security groups, or some range of ip addresses to open connections to instances in 
+    # If you 'authorize' then you allow instances that are member of some other
+    # security groups, or some range of ip addresses to open connections to instances in
     # my group. Can specify an array of ip addresses, source groups or mix of both in a single rule:
     #
     # ec2.manage_security_group_ingress('authorize', 'new_firewall', 80, 80, 'tcp', ['192.168.0.1/32', '10.0.0.1/24'],
     #             [{'group_name'=>'default', 'owner'=>'297467797945'}, {'group_name'=>'test', 'owner'=>'123456789012'}])
     #
-    # ec2.manage_security_group_ingress('new_firewall', 0, 1000, 'udp', 'revoke', [], 
+    # ec2.manage_security_group_ingress('new_firewall', 0, 1000, 'udp', 'revoke', [],
     #                             [{'group_name'=>'default', 'owner'=>'123456789012'}])
     #
-    # ec2.manage_security_group_ingress('new_firewall', 0, 1000, 'udp', 'authorize', ['0.0.0.0/0']) 
+    # ec2.manage_security_group_ingress('new_firewall', 0, 1000, 'udp', 'authorize', ['0.0.0.0/0'])
     #
-    # Similarly, if you specify 'revoke' as the action parameter then you will remove the specified 
+    # Similarly, if you specify 'revoke' as the action parameter then you will remove the specified
     # source ip addresses or source groups from access to instances in the named group:
     #
     def manage_security_group_ingress(name, from_port, to_port, protocol, action, source_ip_ranges, source_groups = [])
@@ -903,11 +916,11 @@ module Aws
                       'IpPermissions.1.IpProtocol' => protocol.to_s,
                        'IpPermissions.1.FromPort'   => from_port.to_s,
                        'IpPermissions.1.ToPort'     => to_port.to_s  }
-      source_ip_ranges.each_index do |i| 
+      source_ip_ranges.each_index do |i|
         call_params.merge!({"IpPermissions.1.IpRanges.#{i+1}.CidrIp" => source_ip_ranges[i].to_s})
       end
       source_groups.each_index do |i|
-        call_params.merge!({"IpPermissions.1.Groups.#{i+1}.GroupName" => source_groups[i]['group_name'].to_s, 
+        call_params.merge!({"IpPermissions.1.Groups.#{i+1}.GroupName" => source_groups[i]['group_name'].to_s,
                             "IpPermissions.1.Groups.#{i+1}.UserId"=> source_groups[i]['owner'].to_s.gsub(/-/,'')})
       end
       unless ['Authorize', 'Revoke'].include?(action.capitalize)
@@ -916,7 +929,7 @@ module Aws
       link = generate_request("#{action.capitalize}SecurityGroupIngress", call_params)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
       rescue Exception
-        on_exception  
+        on_exception
     end
 
     # Authorize named ingress for security group. Allows instances that are member of someone
@@ -1310,6 +1323,18 @@ module Aws
       on_exception
     end
 
+    def describe_owned_snapshots(list=[])
+      params = {"Owner" => "self"}
+      snap_ids = hash_params('SnapshotId', list.to_a)
+      params.update(snap_ids)
+      link = generate_request("DescribeSnapshots",
+                              params)
+      request_cache_or_info :describe_owned_snapshots, link, QEc2DescribeSnapshotsParser, @@bench, list.nil? || list.empty?
+    rescue Exception
+      on_exception
+    end
+
+
     # Create a snapshot of specified volume.
     #
     #  ec2.create_snapshot('vol-898a6fe0') #=>
@@ -1430,6 +1455,102 @@ module Aws
       on_exception
     end
 
+    #-----------------------------------------------------------------
+    #      VPC related
+    #-----------------------------------------------------------------
+
+    # Create VPC
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVpc.html
+    #
+    # ec2.create_vpc("10.0.0.0/16")
+    # FIXME: EVen though the EC2 docs describe the parameter instanceTenancy,
+    # I could not get it to recognize that
+    def create_vpc(cidr_block = "10.0.0.0/16")
+      params = { "CidrBlock" => cidr_block }
+      link = generate_request("CreateVpc", params)
+      request_info(link, QEc2VpcsParser.new("vpc", :logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+
+    # Describe  VPC's
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVpcs.html
+    #
+    # ec2.describe_vpcs
+    # ec2.describe_vpcs(vpcId1, vpcId2, 'Filter.1.Name' => 'state', 'Filter.1.Value' = > 'pending', ...)
+    def describe_vpcs(*args)
+      if args.last.is_a?(Hash)
+        params = args.pop.dup
+      else
+        params = {}
+      end
+      1.upto(args.size) { |i| params["VpcId.#{i}"] = args[i-1] }
+      link = generate_request("DescribeVpcs", params)
+      request_info(link, QEc2VpcsParser.new("item", :logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Delete VPC
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteVpc.html
+    #
+    # ec2.delete_vpc(vpc_id)
+    def delete_vpc(vpc_id)
+      params = { "VpcId" => vpc_id }
+      link = generate_request("DeleteVpc", params)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Create subnet in a VPC
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSubnet.html
+    #
+    # ec2.create_subnet(vpc_id, cidr_block)
+    # ec2.create_subnet(vpc_id, cidr_block, availability_zone))
+    def create_subnet(vpc_id, cidr_block, availability_zone = nil)
+      params = { "VpcId" => vpc_id, "CidrBlock" => cidr_block }
+      params["AvailabilityZone"] = availability_zone if availability_zone
+      link = generate_request("CreateSubnet", params)
+      request_info(link, QEc2SubnetsParser.new("subnet", :logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Describe subnets
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSubnets.html
+    #
+    # ec2.describe_subnets
+    # ecs.describe_subnets(subnetId1, SubnetId2, ...,
+    #                      'Filter.1.Name' => 'state',
+    #                      'Filter.1.Value.1' => 'pending',
+    #                      'Filter.2.Name' => ...)
+    def describe_subnets(*args)
+      if args.last.is_a?(Hash)
+        params = args.pop.dup
+      else
+        params = {}
+      end
+      1.upto(args.size) { |i| params["SubnetId.#{i}"] = args[i-1] }
+      link = generate_request("DescribeSubnets", params)
+      request_info(link, QEc2SubnetsParser.new("item", :logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Delete Subnet
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSubnet.html
+    #
+    # ec2.delete_subnet(subnet_id)
+    def delete_subnet(subnet_id)
+      params = { "SubnetId" => subnet_id }
+      link = generate_request("DeleteSubnet", params)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
     #-----------------------------------------------------------------
     #      PARSERS: Boolean Response Parser
     #-----------------------------------------------------------------
@@ -1493,7 +1614,7 @@ module Aws
 
     class QEc2IpRangeItemType #:nodoc:
       attr_accessor :cidrIp
-    end  
+    end
 
     class QEc2IpPermissionType #:nodoc:
       attr_accessor :ipProtocol
@@ -1600,6 +1721,12 @@ module Aws
             @image[:aws_kernel_id] = @text
           when 'ramdiskId' then
             @image[:aws_ramdisk_id] = @text
+          when 'rootDeviceType' then
+            @image[:aws_root_device_type] = @text
+          when 'rootDeviceName' then
+            @image[:aws_root_device_name] = @text
+          when 'hypervisor' then
+            @image[:aws_hypervisor] = @text
           when 'item' then
             @result << @image if @xmlpath[%r{.*/imagesSet$}]
         end
@@ -1686,6 +1813,8 @@ module Aws
                        :root_device_type  => '',
                        :root_device_name  => '',
                        :architecture      => '',
+                       :subnet_id         => '',
+                       :vpc_id            => '',
                        :block_device_mappings => [],
                        :aws_product_codes => [],
                        :tags              => {}}
@@ -1742,6 +1871,10 @@ module Aws
             @instance[:aws_availability_zone] = @text
           when 'privateIpAddress' then
             @instance[:aws_private_ip_address] = @text
+          when 'subnetId' then
+            @instance[:subnet_id] = @text
+          when 'vpcId' then
+            @instance[:vpc_id] = @text
           when 'key' then
             @tag_key = @text
           when 'value' then
@@ -1840,12 +1973,12 @@ module Aws
         @result = []
       end
     end
-    
+
     class QEc2StopInstancesParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         @instance = {} if name == 'item'
       end
-      
+
       def tagend(name)
         case name
           when 'instanceId' then
@@ -1866,7 +1999,7 @@ module Aws
             @result << @instance
         end
       end
-      
+
       def reset
         @result = []
       end
@@ -1876,7 +2009,7 @@ module Aws
       def tagstart(name, attributes)
         @instance = {} if name == 'item'
       end
-      
+
       def tagend(name)
         case name
           when 'instanceId' then
@@ -1897,12 +2030,12 @@ module Aws
             @result << @instance
         end
       end
-      
+
       def reset
         @result = []
       end
     end
-   
+
 
     #-----------------------------------------------------------------
     #      PARSERS: Console
@@ -2176,12 +2309,12 @@ module Aws
     #-----------------------------------------------------------------
 
     class QEc2DescribeSnapshotsParser < AwsParser #:nodoc:
-      
+
       def initialize (params={})
         @inside_tagset = false
         super(params)
       end
-     
+
       def tagstart(name, attributes)
         case name
           when 'tagSet'
@@ -2275,8 +2408,73 @@ module Aws
       end
     end
 
-  end
+    #-----------------------------------------------------------------
+    #      PARSERS: Vpc
+    #-----------------------------------------------------------------
 
-end
+    class QEc2VpcsParser < AwsParser #:nodoc:
+      def initialize(wrapper, opts = {})
+        super(opts)
+        @wrapper = wrapper
+      end
+
+      def tagstart(name, attribute)
+        @vpc = {} if name == @wrapper
+      end
+
+      def tagend(name)
+        case name
+          when 'vpcId' then
+            @vpc[:vpc_id] = @text
+          when 'state' then
+            @vpc[:state] = @text
+          when 'cidrBlock' then
+            @vpc[:cidr_block] = @text
+          when 'dhcpOptionsId' then
+            @vpc[:dhcp_options_id] = @text
+          when @wrapper
+            @result << @vpc
+        end
+      end
+
+      def reset
+        @result = []
+      end
+    end
 
+    class QEc2SubnetsParser < AwsParser #:nodoc
+      def initialize(wrapper, opts = {})
+        super(opts)
+        @wrapper = wrapper
+      end
 
+      def tagstart(name, attribute)
+        @subnet = {} if name == @wrapper
+      end
+
+      def tagend(name)
+        case name
+          when 'subnetId' then
+            @subnet[:subnet_id] = @text
+          when 'state' then
+            @subnet[:state] = @text
+          when 'vpcId' then
+            @subnet[:vpc_id] = @text
+          when 'cidrBlock' then
+            @subnet[:cidr_block] = @text
+          when 'availableIpAddressCount' then
+            @subnet[:available_ip_address_count] = @text
+          when 'availabilityZone' then
+            @subnet[:availability_zone] = @text
+          when @wrapper
+            @result << @subnet
+        end
+      end
+
+      def reset
+        @result = []
+      end
+    end
+  end
+
+end

data/lib/s3/bucket.rb

@@ -181,9 +181,9 @@ module Aws
     #  data = bucket.get('logs/today/1.log') #=>
     #  puts data #=> 'sasfasfasdf'
     #
-    def get(key, headers={})
+    def get(key, headers={}, &block)
       key = S3::Key.create(self, key.to_s) unless key.is_a?(S3::Key)
-      key.get(headers)
+      key.get(headers, &block)
     end
 
      # Retrieve object data from Amazon.

data/lib/sdb/sdb_interface.rb

@@ -183,7 +183,12 @@ module Aws
         if $1 # if escaped '\?' is found - replace it by '?' without backslash
           "?"
         else # well, if no backslash precedes '?' then replace it by next param from the list
-          ret = escape(params[i])
+          case params[i]
+          when Array
+            ret = "(#{params[i].map{|p| escape(p)}.join(",")})"
+          else
+            ret = escape(params[i])
+          end
           i   +=1
           ret
         end

metadata

@@ -1,61 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aws
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.5.7
   prerelease: 
-  version: 2.5.6
 platform: ruby
-authors: 
+authors:
 - Travis Reeder
 - Chad Arimura
 - RightScale
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: uuidtools
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: http_connection
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http_connection
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: AWS Ruby Library for interfacing with Amazon Web Services including EC2, S3, SQS, SimpleDB and most of their other services as well. By http://www.appoxy.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: AWS Ruby Library for interfacing with Amazon Web Services including EC2,
+  S3, SQS, SimpleDB and most of their other services as well. By http://www.appoxy.com
 email: travis@appoxy.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - lib/acf/acf_interface.rb
 - lib/aws.rb
 - lib/awsbase/aws_response_array.rb
@@ -84,30 +97,26 @@ files:
 - README.markdown
 homepage: http://github.com/appoxy/aws/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: AWS Ruby Library for interfacing with Amazon Web Services. By http://www.appoxy.com
 test_files: []
-