aws 2.4.3 → 2.4.4

data/lib/ec2/ec2.rb

@@ -1132,6 +1132,21 @@ module Aws
       on_exception
     end
 
+    # Creates an Amazon EBS-backed AMI from an Amazon EBS-backed instance
+    # Instance must be either the running or stopped state
+    #
+    # ec2.create_image('i-4jhdmaw', 'New image')
+    #
+    def create_image(instance_id, name, description="")
+      link = generate_request("CreateImage",
+                              "InstanceId" => instance_id,
+                              "Name" => name,
+                              "Description" => description)
+      request_info(link, QEc2CreateImageParser.new(:logger => @logger))
+    rescue
+        on_exception
+    end
+
     # Attach the specified EBS volume to a specified instance, exposing the
     # volume using the specified device name.
     #
@@ -1573,6 +1588,10 @@ module Aws
                        :ami_launch_index  => '',
                        :ssh_key_name      => '',
                        :aws_state         => '',
+                       :root_device_type  => '',
+                       :root_device_name  => '',
+                       :architecture      => '',
+                       :block_device_mappings => [],
                        :aws_product_codes => [],
                        :tags              => {}}
         end
@@ -1580,6 +1599,12 @@ module Aws
 
       def tagend(name)
         case name
+          when  'rootDeviceType' then
+            @instance[:root_device_type] = @text
+          when 'architecture' then
+            @instance[:architecture] = @text
+          when 'rootDeviceName' then
+            @instance[:root_device_name] = @text
           # reservation
           when 'reservationId' then
             @reservation[:aws_reservation_id] = @text
@@ -1626,6 +1651,10 @@ module Aws
             @tag_key = @text
           when 'value' then
             @tag_value = @text
+          when 'deviceName' then
+            @device_name = @text
+          when 'volumeId' then
+            @volume_id = @text
           when 'state'
             if @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet/item/monitoring' || # DescribeInstances property
             @xmlpath == 'RunInstancesResponse/instancesSet/item/monitoring' # RunInstances property
@@ -1634,6 +1663,8 @@ module Aws
           when 'item'
             if @xmlpath=='DescribeInstancesResponse/reservationSet/item/instancesSet/item/tagSet' # Tags
               @instance[:tags][@tag_key] = @tag_value
+            elsif @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet/item/blockDeviceMapping' # Block device mappings
+              @instance[:block_device_mappings] << { @device_name => @volume_id }
             elsif @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet' || # DescribeInstances property
             @xmlpath == 'RunInstancesResponse/instancesSet' # RunInstances property
               @reservation[:instances_set] << @instance
@@ -1677,6 +1708,12 @@ module Aws
       end
     end
 
+    class QEc2CreateImageParser < AwsParser #:nodoc:
+      def tagend(name)
+        @result = @text  if name == 'imageId'
+      end
+    end
+
 
     class QEc2TerminateInstancesParser < AwsParser #:nodoc:
       def tagstart(name, attributes)

data/lib/s3/bucket.rb

@@ -1,265 +1,267 @@
-module Aws
-
-
-  class S3::Bucket
-    attr_reader :s3, :name, :owner, :creation_date
-
-    # Create a Bucket instance.
-    # If the bucket does not exist and +create+ is set, a new bucket
-    # is created on S3. Launching this method with +create+=+true+ may
-    # affect on the bucket's ACL if the bucket already exists.
-    # Returns Bucket instance or +nil+ if the bucket does not exist
-    # and +create+ is not set.
-    #
-    #  s3 = Aws::S3.new(aws_access_key_id, aws_secret_access_key)
-    #   ...
-    #  bucket1 = Aws::S3::Bucket.create(s3, 'my_awesome_bucket_1')
-    #  bucket1.keys  #=> exception here if the bucket does not exists
-    #   ...
-    #  bucket2 = Aws::S3::Bucket.create(s3, 'my_awesome_bucket_2', true)
-    #  bucket2.keys  #=> list of keys
-    #  # create a bucket at the European location with public read access
-    #  bucket3 = Aws::S3::Bucket.create(s3,'my-awesome-bucket-3', true, 'public-read', :location => :eu)
-    #
-    #  see http://docs.amazonwebservices.com/AmazonS3/2006-03-01/RESTAccessPolicy.html
-    #  (section: Canned Access Policies)
-    #
-    def self.create(s3, name, create=false, perms=nil, headers={})
-      s3.bucket(name, create, perms, headers)
-    end
-
-
-    # Create a bucket instance. In normal use this method should
-    # not be called directly.
-    # Use Aws::S3::Bucket.create or Aws::S3.bucket instead.
-    def initialize(s3, name, creation_date=nil, owner=nil)
-      @s3            = s3
-      @name          = name
-      @owner         = owner
-      @creation_date = creation_date
-      if @creation_date && !@creation_date.is_a?(Time)
-        @creation_date = Time.parse(@creation_date)
-      end
-    end
-
-    # Return bucket name as a String.
-    #
-    #  bucket = Aws::S3.bucket('my_awesome_bucket')
-    #  puts bucket #=> 'my_awesome_bucket'
-    #
-    def to_s
-      @name.to_s
-    end
-
-    alias_method :full_name, :to_s
-
-    # Return a public link to bucket.
-    #
-    #  bucket.public_link #=> 'https://s3.amazonaws.com:443/my_awesome_bucket'
-    #
-    def public_link
-      params = @s3.interface.params
-      "#{params[:protocol]}://#{params[:server]}:#{params[:port]}/#{full_name}"
-    end
-
-    # Returns the bucket location
-    def location
-      @location ||= @s3.interface.bucket_location(@name)
-    end
-
-    # Retrieves the logging configuration for a bucket.
-    # Returns a hash of {:enabled, :targetbucket, :targetprefix}
-    #
-    #   bucket.logging_info()
-    #   => {:enabled=>true, :targetbucket=>"mylogbucket", :targetprefix=>"loggylogs/"}
-    def logging_info
-      @s3.interface.get_logging_parse(:bucket => @name)
-    end
-
-    # Enables S3 server access logging on a bucket.  The target bucket must have been properly configured to receive server
-    # access logs.
-    #  Params:
-    #   :targetbucket - either the target bucket object or the name of the target bucket
-    #   :targetprefix - the prefix under which all logs should be stored
-    #
-    #  bucket.enable_logging(:targetbucket=>"mylogbucket", :targetprefix=>"loggylogs/")
-    #    => true
-    def enable_logging(params)
-      AwsUtils.mandatory_arguments([:targetbucket, :targetprefix], params)
-      AwsUtils.allow_only([:targetbucket, :targetprefix], params)
-      xmldoc = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><BucketLoggingStatus xmlns=\"http://doc.s3.amazonaws.com/2006-03-01\"><LoggingEnabled><TargetBucket>#{params[:targetbucket]}</TargetBucket><TargetPrefix>#{params[:targetprefix]}</TargetPrefix></LoggingEnabled></BucketLoggingStatus>"
-      @s3.interface.put_logging(:bucket => @name, :xmldoc => xmldoc)
-    end
-
-    # Disables S3 server access logging on a bucket.  Takes no arguments.
-    def disable_logging
-      xmldoc = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><BucketLoggingStatus xmlns=\"http://doc.s3.amazonaws.com/2006-03-01\"></BucketLoggingStatus>"
-      @s3.interface.put_logging(:bucket => @name, :xmldoc => xmldoc)
-    end
-
-    # Retrieve a group of keys from Amazon.
-    # +options+ is a hash: { 'prefix'=>'', 'marker'=>'', 'max-keys'=>5, 'delimiter'=>'' }).
-    # Retrieves meta-headers information if +head+ it +true+.
-    # Returns an array of Key instances.
-    #
-    #  bucket.keys                     #=> # returns all keys from bucket
-    #  bucket.keys('prefix' => 'logs') #=> # returns all keys that starts with 'logs'
-    #
-    def keys(options={}, head=false)
-      keys_and_service(options, head)[0]
-    end
-
-    # Same as +keys+ method but return an array of [keys, service_data].
-    # where +service_data+ is a hash with additional output information.
-    #
-    #  keys, service = bucket.keys_and_service({'max-keys'=> 2, 'prefix' => 'logs'})
-    #  p keys    #=> # 2 keys array
-    #  p service #=> {"max-keys"=>"2", "prefix"=>"logs", "name"=>"my_awesome_bucket", "marker"=>"", "is_truncated"=>true}
-    #
-    def keys_and_service(options={}, head=false)
-      opt = {}; options.each { |key, value| opt[key.to_s] = value }
-      service_data = {}
-      thislist     = {}
-      list         = []
-      @s3.interface.incrementally_list_bucket(@name, opt) do |thislist|
-        thislist[:contents].each do |entry|
-          owner = S3::Owner.new(entry[:owner_id], entry[:owner_display_name])
-          key   = S3::Key.new(self, entry[:key], nil, {}, {}, entry[:last_modified], entry[:e_tag], entry[:size], entry[:storage_class], owner)
-          key.head if head
-          list << key
-        end
-      end
-      thislist.each_key do |key|
-        service_data[key] = thislist[key] unless (key == :contents || key == :common_prefixes)
-      end
-      [list, service_data]
-    end
-
-    # Retrieve key information from Amazon.
-    # The +key_name+ is a +String+ or Key instance.
-    # Retrieves meta-header information if +head+ is +true+.
-    # Returns new Key instance.
-    #
-    #  key = bucket.key('logs/today/1.log', true) #=> #<Aws::S3::Key:0xb7b1e240 ... >
-    #   # is the same as:
-    #  key = Aws::S3::Key.create(bucket, 'logs/today/1.log')
-    #  key.head
-    #
-    def key(key_name, head=false)
-      raise 'Key name can not be empty.' if key_name.blank?
-      key_instance = nil
-      # if this key exists - find it ....
-      keys({'prefix'=>key_name}, head).each do |key|
-        if key.name == key_name.to_s
-          key_instance = key
-          break
-        end
-      end
-      # .... else this key is unknown
-      unless key_instance
-        key_instance = S3::Key.create(self, key_name.to_s)
-      end
-      key_instance
-    end
-
-    # Store object data.
-    # The +key+ is a +String+ or Key instance.
-    # Returns +true+.
-    #
-    #  bucket.put('logs/today/1.log', 'Olala!') #=> true
-    #
-    def put(key, data=nil, meta_headers={}, perms=nil, headers={})
-      key = S3::Key.create(self, key.to_s, data, meta_headers) unless key.is_a?(S3::Key)
-      key.put(data, perms, headers)
-    end
-
-    # Retrieve object data from Amazon.
-    # The +key+ is a +String+ or Key.
-    # Returns Key instance.
-    #
-    #  key = bucket.get('logs/today/1.log') #=>
-    #  puts key.data #=> 'sasfasfasdf'
-    #
-    def get(key, headers={})
-      key = S3::Key.create(self, key.to_s) unless key.is_a?(S3::Key)
-      key.get(headers)
-    end
-
-    # Rename object. Returns Aws::S3::Key instance.
-    #
-    #  new_key = bucket.rename_key('logs/today/1.log','logs/today/2.log')   #=> #<Aws::S3::Key:0xb7b1e240 ... >
-    #  puts key.name   #=> 'logs/today/2.log'
-    #  key.exists?     #=> true
-    #
-    def rename_key(old_key_or_name, new_name)
-      old_key_or_name = S3::Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(S3::Key)
-      old_key_or_name.rename(new_name)
-      old_key_or_name
-    end
-
-    # Create an object copy. Returns a destination Aws::S3::Key instance.
-    #
-    #  new_key = bucket.copy_key('logs/today/1.log','logs/today/2.log')   #=> #<Aws::S3::Key:0xb7b1e240 ... >
-    #  puts key.name   #=> 'logs/today/2.log'
-    #  key.exists?     #=> true
-    #
-    def copy_key(old_key_or_name, new_key_or_name)
-      old_key_or_name = S3::Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(S3::Key)
-      old_key_or_name.copy(new_key_or_name)
-    end
-
-    # Move an object to other location. Returns a destination Aws::S3::Key instance.
-    #
-    #  new_key = bucket.copy_key('logs/today/1.log','logs/today/2.log')   #=> #<Aws::S3::Key:0xb7b1e240 ... >
-    #  puts key.name   #=> 'logs/today/2.log'
-    #  key.exists?     #=> true
-    #
-    def move_key(old_key_or_name, new_key_or_name)
-      old_key_or_name = S3::Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(S3::Key)
-      old_key_or_name.move(new_key_or_name)
-    end
-
-    # Remove all keys from a bucket.
-    # Returns +true+.
-    #
-    #  bucket.clear #=> true
-    #
-    def clear
-      @s3.interface.clear_bucket(@name)
-    end
-
-    # Delete all keys where the 'folder_key' can be interpreted
-    # as a 'folder' name.
-    # Returns an array of string keys that have been deleted.
-    #
-    #  bucket.keys.map{|key| key.name}.join(', ') #=> 'test, test/2/34, test/3, test1, test1/logs'
-    #  bucket.delete_folder('test')               #=> ['test','test/2/34','test/3']
-    #
-    def delete_folder(folder, separator='/')
-      @s3.interface.delete_folder(@name, folder, separator)
-    end
-
-    # Delete a bucket. Bucket must be empty.
-    # If +force+ is set, clears and deletes the bucket.
-    # Returns +true+.
-    #
-    #  bucket.delete(true) #=> true
-    #
-    def delete(force=false)
-      force ? @s3.interface.force_delete_bucket(@name) : @s3.interface.delete_bucket(@name)
-    end
-
-    # Deletes an object from s3 in this bucket.
-    def delete_key(key)
-      @s3.interface.delete(name, key)
-    end
-
-    # Return a list of grantees.
-    #
-    def grantees
-      Grantee::grantees(self)
-    end
-
-  end
-
-end
+module Aws
+
+
+  class S3::Bucket
+    attr_reader :s3, :name, :owner, :creation_date
+
+    # Create a Bucket instance.
+    # If the bucket does not exist and +create+ is set, a new bucket
+    # is created on S3. Launching this method with +create+=+true+ may
+    # affect on the bucket's ACL if the bucket already exists.
+    # Returns Bucket instance or +nil+ if the bucket does not exist
+    # and +create+ is not set.
+    #
+    #  s3 = Aws::S3.new(aws_access_key_id, aws_secret_access_key)
+    #   ...
+    #  bucket1 = Aws::S3::Bucket.create(s3, 'my_awesome_bucket_1')
+    #  bucket1.keys  #=> exception here if the bucket does not exists
+    #   ...
+    #  bucket2 = Aws::S3::Bucket.create(s3, 'my_awesome_bucket_2', true)
+    #  bucket2.keys  #=> list of keys
+    #  # create a bucket at the European location with public read access
+    #  bucket3 = Aws::S3::Bucket.create(s3,'my-awesome-bucket-3', true, 'public-read', :location => :eu)
+    #
+    #  see http://docs.amazonwebservices.com/AmazonS3/2006-03-01/RESTAccessPolicy.html
+    #  (section: Canned Access Policies)
+    #
+    def self.create(s3, name, create=false, perms=nil, headers={})
+      s3.bucket(name, create, perms, headers)
+    end
+
+
+    # Create a bucket instance. In normal use this method should
+    # not be called directly.
+    # Use Aws::S3::Bucket.create or Aws::S3.bucket instead.
+    def initialize(s3, name, creation_date=nil, owner=nil)
+      @s3            = s3
+      @name          = name
+      @owner         = owner
+      @creation_date = creation_date
+      if @creation_date && !@creation_date.is_a?(Time)
+        @creation_date = Time.parse(@creation_date)
+      end
+    end
+
+    # Return bucket name as a String.
+    #
+    #  bucket = Aws::S3.bucket('my_awesome_bucket')
+    #  puts bucket #=> 'my_awesome_bucket'
+    #
+    def to_s
+      @name.to_s
+    end
+
+    alias_method :full_name, :to_s
+
+    # Return a public link to bucket.
+    #
+    #  bucket.public_link #=> 'https://s3.amazonaws.com:443/my_awesome_bucket'
+    #
+    def public_link
+      params = @s3.interface.params
+      "#{params[:protocol]}://#{params[:server]}:#{params[:port]}/#{full_name}"
+    end
+
+    # Returns the bucket location
+    def location
+      @location ||= @s3.interface.bucket_location(@name)
+    end
+
+    # Retrieves the logging configuration for a bucket.
+    # Returns a hash of {:enabled, :targetbucket, :targetprefix}
+    #
+    #   bucket.logging_info()
+    #   => {:enabled=>true, :targetbucket=>"mylogbucket", :targetprefix=>"loggylogs/"}
+    def logging_info
+      @s3.interface.get_logging_parse(:bucket => @name)
+    end
+
+    # Enables S3 server access logging on a bucket.  The target bucket must have been properly configured to receive server
+    # access logs.
+    #  Params:
+    #   :targetbucket - either the target bucket object or the name of the target bucket
+    #   :targetprefix - the prefix under which all logs should be stored
+    #
+    #  bucket.enable_logging(:targetbucket=>"mylogbucket", :targetprefix=>"loggylogs/")
+    #    => true
+    def enable_logging(params)
+      AwsUtils.mandatory_arguments([:targetbucket, :targetprefix], params)
+      AwsUtils.allow_only([:targetbucket, :targetprefix], params)
+      xmldoc = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><BucketLoggingStatus xmlns=\"http://doc.s3.amazonaws.com/2006-03-01\"><LoggingEnabled><TargetBucket>#{params[:targetbucket]}</TargetBucket><TargetPrefix>#{params[:targetprefix]}</TargetPrefix></LoggingEnabled></BucketLoggingStatus>"
+      @s3.interface.put_logging(:bucket => @name, :xmldoc => xmldoc)
+    end
+
+    # Disables S3 server access logging on a bucket.  Takes no arguments.
+    def disable_logging
+      xmldoc = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><BucketLoggingStatus xmlns=\"http://doc.s3.amazonaws.com/2006-03-01\"></BucketLoggingStatus>"
+      @s3.interface.put_logging(:bucket => @name, :xmldoc => xmldoc)
+    end
+
+    # Retrieve a group of keys from Amazon.
+    # +options+ is a hash: { 'prefix'=>'', 'marker'=>'', 'max-keys'=>5, 'delimiter'=>'' }).
+    # Retrieves meta-headers information if +head+ it +true+.
+    # Returns an array of Key instances.
+    #
+    #  bucket.keys                     #=> # returns all keys from bucket
+    #  bucket.keys('prefix' => 'logs') #=> # returns all keys that starts with 'logs'
+    #
+    def keys(options={}, head=false)
+      keys_and_service(options, head)[0]
+    end
+
+    # Same as +keys+ method but return an array of [keys, service_data].
+    # where +service_data+ is a hash with additional output information.
+    #
+    #  keys, service = bucket.keys_and_service({'max-keys'=> 2, 'prefix' => 'logs'})
+    #  p keys    #=> # 2 keys array
+    #  p service #=> {"max-keys"=>"2", "prefix"=>"logs", "name"=>"my_awesome_bucket", "marker"=>"", "is_truncated"=>true}
+    #
+    def keys_and_service(options={}, head=false)
+      opt = {}; options.each { |key, value| opt[key.to_s] = value }
+      service_data = {}
+      service_list = {}
+      thislist     = {}
+      list         = []
+      @s3.interface.incrementally_list_bucket(@name, opt) do |thislist|
+        service_list = thislist
+        thislist[:contents].each do |entry|
+          owner = S3::Owner.new(entry[:owner_id], entry[:owner_display_name])
+          key   = S3::Key.new(self, entry[:key], nil, {}, {}, entry[:last_modified], entry[:e_tag], entry[:size], entry[:storage_class], owner)
+          key.head if head
+          list << key
+        end
+      end
+      service_list.each_key do |key|
+        service_data[key] = service_list[key] unless (key == :contents || key == :common_prefixes)
+      end
+      [list, service_data]
+    end
+
+    # Retrieve key information from Amazon.
+    # The +key_name+ is a +String+ or Key instance.
+    # Retrieves meta-header information if +head+ is +true+.
+    # Returns new Key instance.
+    #
+    #  key = bucket.key('logs/today/1.log', true) #=> #<Aws::S3::Key:0xb7b1e240 ... >
+    #   # is the same as:
+    #  key = Aws::S3::Key.create(bucket, 'logs/today/1.log')
+    #  key.head
+    #
+    def key(key_name, head=false)
+      raise 'Key name can not be empty.' if key_name.blank?
+      key_instance = nil
+      # if this key exists - find it ....
+      keys({'prefix'=>key_name}, head).each do |key|
+        if key.name == key_name.to_s
+          key_instance = key
+          break
+        end
+      end
+      # .... else this key is unknown
+      unless key_instance
+        key_instance = S3::Key.create(self, key_name.to_s)
+      end
+      key_instance
+    end
+
+    # Store object data.
+    # The +key+ is a +String+ or Key instance.
+    # Returns +true+.
+    #
+    #  bucket.put('logs/today/1.log', 'Olala!') #=> true
+    #
+    def put(key, data=nil, meta_headers={}, perms=nil, headers={})
+      key = S3::Key.create(self, key.to_s, data, meta_headers) unless key.is_a?(S3::Key)
+      key.put(data, perms, headers)
+    end
+
+    # Retrieve object data from Amazon.
+    # The +key+ is a +String+ or Key.
+    # Returns Key instance.
+    #
+    #  key = bucket.get('logs/today/1.log') #=>
+    #  puts key.data #=> 'sasfasfasdf'
+    #
+    def get(key, headers={})
+      key = S3::Key.create(self, key.to_s) unless key.is_a?(S3::Key)
+      key.get(headers)
+    end
+
+    # Rename object. Returns Aws::S3::Key instance.
+    #
+    #  new_key = bucket.rename_key('logs/today/1.log','logs/today/2.log')   #=> #<Aws::S3::Key:0xb7b1e240 ... >
+    #  puts key.name   #=> 'logs/today/2.log'
+    #  key.exists?     #=> true
+    #
+    def rename_key(old_key_or_name, new_name)
+      old_key_or_name = S3::Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(S3::Key)
+      old_key_or_name.rename(new_name)
+      old_key_or_name
+    end
+
+    # Create an object copy. Returns a destination Aws::S3::Key instance.
+    #
+    #  new_key = bucket.copy_key('logs/today/1.log','logs/today/2.log')   #=> #<Aws::S3::Key:0xb7b1e240 ... >
+    #  puts key.name   #=> 'logs/today/2.log'
+    #  key.exists?     #=> true
+    #
+    def copy_key(old_key_or_name, new_key_or_name)
+      old_key_or_name = S3::Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(S3::Key)
+      old_key_or_name.copy(new_key_or_name)
+    end
+
+    # Move an object to other location. Returns a destination Aws::S3::Key instance.
+    #
+    #  new_key = bucket.copy_key('logs/today/1.log','logs/today/2.log')   #=> #<Aws::S3::Key:0xb7b1e240 ... >
+    #  puts key.name   #=> 'logs/today/2.log'
+    #  key.exists?     #=> true
+    #
+    def move_key(old_key_or_name, new_key_or_name)
+      old_key_or_name = S3::Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(S3::Key)
+      old_key_or_name.move(new_key_or_name)
+    end
+
+    # Remove all keys from a bucket.
+    # Returns +true+.
+    #
+    #  bucket.clear #=> true
+    #
+    def clear
+      @s3.interface.clear_bucket(@name)
+    end
+
+    # Delete all keys where the 'folder_key' can be interpreted
+    # as a 'folder' name.
+    # Returns an array of string keys that have been deleted.
+    #
+    #  bucket.keys.map{|key| key.name}.join(', ') #=> 'test, test/2/34, test/3, test1, test1/logs'
+    #  bucket.delete_folder('test')               #=> ['test','test/2/34','test/3']
+    #
+    def delete_folder(folder, separator='/')
+      @s3.interface.delete_folder(@name, folder, separator)
+    end
+
+    # Delete a bucket. Bucket must be empty.
+    # If +force+ is set, clears and deletes the bucket.
+    # Returns +true+.
+    #
+    #  bucket.delete(true) #=> true
+    #
+    def delete(force=false)
+      force ? @s3.interface.force_delete_bucket(@name) : @s3.interface.delete_bucket(@name)
+    end
+
+    # Deletes an object from s3 in this bucket.
+    def delete_key(key)
+      @s3.interface.delete(name, key)
+    end
+
+    # Return a list of grantees.
+    #
+    def grantees
+      Grantee::grantees(self)
+    end
+
+  end
+
+end

data/lib/s3/s3_interface.rb

@@ -1249,7 +1249,7 @@ module Aws
     class S3HttpResponseBodyParser < S3HttpResponseParser # :nodoc:
       def parse(response)
         x = response.body
-        x.force_encoding("UTF-8")
+        x= x.respond_to?(:force_encoding) ? x.force_encoding("UTF-8") : x
 #        puts 'x.encoding = ' + response.body.encoding.to_s
         @result = {
             :object  => x,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-24 00:00:00.000000000 -08:00
+date: 2011-02-25 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &27201060 !ruby/object:Gem::Requirement
+  requirement: &28505268 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27201060
+  version_requirements: *28505268
 - !ruby/object:Gem::Dependency
   name: http_connection
-  requirement: &27200772 !ruby/object:Gem::Requirement
+  requirement: &28504980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27200772
+  version_requirements: *28504980
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &27200484 !ruby/object:Gem::Requirement
+  requirement: &28504692 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27200484
+  version_requirements: *28504692
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &27200196 !ruby/object:Gem::Requirement
+  requirement: &28504404 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27200196
+  version_requirements: *28504404
 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