aws-sdk 1.8.3 → 1.8.3.1

data/lib/aws/core.rb

@@ -404,7 +404,7 @@ module AWS
     # @option options [String] :simple_email_service_endpoint ('email.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon Simple Email Service.
     #
-    # @option options [String] :simple_workflow_service ('swf.us-east-1.amazonaws.com')
+    # @option options [String] :simple_workflow_endpoint ('swf.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon Simple Workflow Service.
     #
     # @option options [CredentialProviders::Provider] :credential_provider (AWS::Core::CredentialProviders::DefaultProvider.new)

data/lib/aws/ec2/image.rb

@@ -143,6 +143,7 @@ module AWS
 
       alias_method :launch_permissions, :permissions
 
+      # @note This method will not return data for ephemeral volumes.
       # @return [Hash] Returns a hash of block
       #   device mappings for the image.  In each entry, the key is
       #   the device name (e.g. +"/dev/sda1"+) and the value is an
@@ -156,13 +157,22 @@ module AWS
       #
       #   [:delete_on_termination] True if the Amazon EBS volume is
       #                           deleted on instance termination.
+      # @see {#block_devices}
       def block_device_mappings
-        (block_device_mapping || []).inject({}) do |h,mapping|
-          h[mapping.device_name] = mapping.ebs
+        (block_device_mapping || []).inject({}) do |h, mapping|
+          if ebs = mapping[:ebs]
+            h[mapping[:device_name]] = ebs
+          end
           h
         end
       end
 
+      # @return [Array<Hash>] Returns a list of all block device mappings.
+      #   This list may contain ephemeral volumes.
+      def block_devices
+        block_device_mapping.to_a
+      end
+
       # Deregisters this AMI. Once deregistered, the AMI cannot be
       # used to launch new instances.
       # @return [nil]

data/lib/aws/version.rb

@@ -14,5 +14,5 @@
 
 module AWS
   # Current version of the AWS SDK for Ruby
-  VERSION = '1.8.3'
+  VERSION = '1.8.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -622,7 +622,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: AWS SDK for Ruby