aws-sdk 1.5.7 → 1.5.8

data/lib/aws/auto_scaling/launch_configuration_collection.rb

@@ -26,7 +26,7 @@ module AWS
       # @param [String] name The name of the launch configuration to create.
       #
       # @param [EC2::Image,String] image An {EC2::Image} or image id string.
-      #   
+      #
       # @param [String] instance_type The type of instance (e.g.
       #   't1.micro', 'm1.small', 'm2.4xlarge', etc).
       #
@@ -34,10 +34,10 @@ module AWS
       #
       # @option options [Array<Hash>] :block_device_mappings
       #
-      # @option options [Boolean] :detailed_instance_monitoring (true) 
-      #   When enabled, CloudWatch will generate metrics every minute 
-      #   and your account will be charged a fee. When you disable 
-      #   detailed monitoring, by specifying False, Cloudwatch will 
+      # @option options [Boolean] :detailed_instance_monitoring (true)
+      #   When enabled, CloudWatch will generate metrics every minute
+      #   and your account will be charged a fee. When you disable
+      #   detailed monitoring, by specifying False, Cloudwatch will
       #   generate metrics every 5 minutes.
       #
       # @option options [String] :kernel_id The ID of the kernel to
@@ -53,19 +53,19 @@ module AWS
       # @option options [Array<EC2::SecurityGroup>,Array<String>] :security_groups
       #   The list of security groups to associate with the instances.
       #   This may be an array of {EC2::SecurityGroup} objects, security
-      #   group names or security group ids.  
+      #   group names or security group ids.
       #
-      # @option options [String] :user_data The user data available to 
+      # @option options [String] :user_data The user data available to
       #   the launched Amazon EC2 instances.
       #
       # @option options [String] :iam_instance_profile
       #
       # @option options [String] :spot_price
-      # 
+      #
       # @return [LaunchConfiguration]
       #
       def create name, image, instance_type, options = {}
-        
+
         client_opts = {}
         client_opts[:launch_configuration_name] = name
         client_opts[:image_id] = image_id_opt(image)
@@ -111,7 +111,7 @@ module AWS
 
         resp = client.describe_launch_configurations(options)
         resp.launch_configurations.each do |details|
-          
+
           launch_configuration = LaunchConfiguration.new_from(
             :describe_launch_configurations,
             details,
@@ -119,7 +119,7 @@ module AWS
             :config => config)
 
           yield(launch_configuration)
-          
+
         end
         resp.data[:next_token]
       end

data/lib/aws/auto_scaling/scaling_policy.rb

@@ -47,7 +47,7 @@ module AWS
       # @return [String]
       attr_reader :name
 
-      attribute :arn, :as => :policy_arn, :static => true
+      attribute :arn, :from => :policy_arn, :static => true
 
       attribute :adjustment_type
 

data/lib/aws/auto_scaling/scheduled_action.rb

@@ -43,7 +43,7 @@ module AWS
       # @return [String]
       attr_reader :name
 
-      attribute :arn, :as => :scheduled_action_arn
+      attribute :arn, :from => :scheduled_action_arn
 
       attribute :auto_scaling_group_name, :static => true
 

data/lib/aws/auto_scaling/tag.rb

@@ -26,13 +26,13 @@ module AWS
 
         super()
 
-        @resource = 
+        @resource =
           case options[:resource_type]
-          when 'auto-scaling-group' 
+          when 'auto-scaling-group'
             group_name = options[:resource_id]
             config = options.delete(:config)
             Group.new(group_name, :config => config)
-          else 
+          else
             msg = "unhandled resource type: #{options[:resource_type]}"
             raise ArgumentError, msg
           end

data/lib/aws/cloud_formation/stack.rb

@@ -66,7 +66,7 @@ module AWS
 
       ## returned by GetTemplate
 
-      template_attribute :template, :as => :template_body
+      template_attribute :template, :from => :template_body
 
       alias_method :template_body, :template
 
@@ -78,21 +78,21 @@ module AWS
 
       describe_attribute :stack_id, :static => true
 
-      describe_attribute :status, :as => :stack_status
+      describe_attribute :status, :from => :stack_status
 
-      describe_attribute :status_reason, :as => :stack_status_reason
+      describe_attribute :status_reason, :from => :stack_status_reason
 
       describe_attribute :capabilities
 
       describe_attribute :description
 
-      describe_attribute :disable_rollback, :as => :disable_rollback?
-      
+      describe_attribute :disable_rollback, :from => :disable_rollback?
+
       alias_method :disable_rollback?, :disable_rollback
 
       describe_attribute :notification_arns
 
-      describe_attribute :output_details, :as => :outputs
+      describe_attribute :output_details, :from => :outputs
 
       protected :output_details
 
@@ -104,7 +104,7 @@ module AWS
         end
       end
 
-      describe_attribute :timeout, :as => :timeout_in_minutes
+      describe_attribute :timeout, :from => :timeout_in_minutes
 
       alias_method :timeout_in_minutes, :timeout
 

data/lib/aws/cloud_formation/stack_collection.rb

@@ -88,7 +88,7 @@ module AWS
       #     'SecurityGroup' => 'security-group-name',
       #     'InstanceType' => 'm1.large',
       #   })
-      # 
+      #
       # @param [String] stack_name
       #
       # @param [String,URI,S3::S3Object,Object] template The stack template.
@@ -103,10 +103,10 @@ module AWS
       # @param [Hash] options
       #
       # @option options [Array<String>] :capabilities The list of capabilities
-      #   that you want to allow in the stack. If your stack contains IAM 
-      #   resources, you must specify the CAPABILITY_IAM value for this 
-      #   parameter; otherwise, this action returns an 
-      #   InsufficientCapabilities error. IAM resources are the following: 
+      #   that you want to allow in the stack. If your stack contains IAM
+      #   resources, you must specify the CAPABILITY_IAM value for this
+      #   parameter; otherwise, this action returns an
+      #   InsufficientCapabilities error. IAM resources are the following:
       #
       #   * AWS::IAM::AccessKey
       #   * AWS::IAM::Group
@@ -119,14 +119,14 @@ module AWS
       #
       # @option options [Object] :notify One or more SNS topics ARN
       #   string or {SNS::Topic} objects.  This param may be passed
-      #   as a single value or as an array. CloudFormation will publish 
+      #   as a single value or as an array. CloudFormation will publish
       #   stack related events to these topics.
       #
       # @option options [Hash] :parameters A hash that specifies the
       #   input parameters of the new stack.
       #
-      # @option options [Integer] :timeout The number of minutes 
-      #   that may pass before the stack creation fails.  If 
+      # @option options [Integer] :timeout The number of minutes
+      #   that may pass before the stack creation fails.  If
       #   +:disable_rollback+ is false, the stack will be rolled back.
       #
       # @return [Stack]
@@ -158,7 +158,7 @@ module AWS
       #   cloud_formation.stacks.with_status(:create_complete).each do |stack|
       #     puts stack.name
       #   end
-      # 
+      #
       # @param [Symbol,String] status_filter A status to filter stacks with.
       #   Valid values include:
       #   * +:create_in_progress+
@@ -188,12 +188,12 @@ module AWS
       protected
 
       def _each_item options = {}
-        client.describe_stacks.data[:stacks].each do |summary|
+        client.describe_stacks(options).data[:stacks].each do |summary|
 
           stack = Stack.new_from(
-            :describe_stacks, 
-            summary, 
-            summary[:stack_name], 
+            :describe_stacks,
+            summary,
+            summary[:stack_name],
             :config => config)
 
           yield(stack)

data/lib/aws/cloud_formation/stack_event_collection.rb

@@ -33,9 +33,9 @@ module AWS
       def _each_item options = {}
         options[:stack_name] = stack.name
         resp = client.describe_stack_events(options)
-        resp.stack_events.each do |details|
+        resp.data[:stack_events].each do |details|
 
-          event = StackEvent.new(stack, details.to_hash)
+          event = StackEvent.new(stack, details)
 
           yield(event)
 

data/lib/aws/cloud_formation/stack_resource.rb

@@ -99,7 +99,7 @@ module AWS
           end
         end
         provider.provides *common_attributes.keys
-        provider.provides :last_updated_timestamp, :get_as => :timestamp
+        provider.provides :last_updated_timestamp, :from => :timestamp
       end
 
       protected

data/lib/aws/cloud_formation/stack_resource_summary_collection.rb

@@ -32,10 +32,10 @@ module AWS
     # * +:resource_status+
     # * +:resource_status_reason+
     # * +:last_updated_timestamp+
-    # 
+    #
     class StackResourceSummaryCollection
 
-      include Core::Collection::Simple
+      include Core::Collection::WithNextToken
 
       # @param [Stack] stack
       # @param [Hash] options
@@ -49,22 +49,14 @@ module AWS
 
       protected
 
-      def _each_item options = {}
-        next_token = nil
-        begin
-
-          options = {}
-          options[:next_token] = next_token if next_token
-          options[:stack_name] = stack.name
-          resp = client.list_stack_resources(options)
-
-          resp.stack_resource_summaries.each do |summary|
-            yield(summary.to_hash)
-          end
-
-          next_token = resp.data[:next_token]
-
-        end while next_token
+      def _each_item next_token, options = {}, &block
+        options[:next_token] = next_token if next_token
+        options[:stack_name] = stack.name
+        resp = client.list_stack_resources(options)
+        resp.data[:stack_resource_summaries].each do |summary|
+          yield(summary)
+        end
+        resp.data[:next_token]
       end
 
     end

data/lib/aws/cloud_formation/stack_summary_collection.rb

@@ -49,7 +49,7 @@ module AWS
     #
     class StackSummaryCollection
 
-      include Core::Collection::Simple
+      include Core::Collection::WithNextToken
 
       # @private
       def initialize options = {}
@@ -72,7 +72,7 @@ module AWS
       #
       # Status names may be symbolized (snake-cased) or upper-cased strings
       # (e.g. :create_in_progress, 'CREATE_IN_PROGRESS').
-      # 
+      #
       # @param [Symbol,String] status_filters One or more statuses to filter
       #   stacks with. Valid values include:
       #   * +:create_in_progress+
@@ -93,7 +93,7 @@ module AWS
       #   * +:update_rollback_complete+
       #
       # @return [StackSummaryCollection] Returns a new stack summary
-      #   collection that restricts what stack summariess will be 
+      #   collection that restricts what stack summariess will be
       #   enumerated.
       #
       def with_status *status_filters
@@ -104,22 +104,18 @@ module AWS
 
       protected
 
-      def _each_item options = {}
-        next_token = nil
-        begin
-          
-          client_opts = {}
-          client_opts[:next_token] = next_token if next_token
-          client_opts[:stack_status_filter] = @filters if @filters
-          resp = client.list_stacks(client_opts)
+      def _each_item next_token, options = {}, &block
+
+        options[:next_token] = next_token if next_token
+        options[:stack_status_filter] = @filters if @filters
 
-          resp.stack_summaries.each do |summary|
-            yield(summary.to_hash)
-          end
+        resp = client.list_stacks(options)
+        resp.data[:stack_summaries].each do |summary|
+          yield(summary)
+        end
 
-          next_token = resp.data[:next_token]
+        resp.data[:next_token]
 
-        end while next_token
       end
 
     end

data/lib/aws/core.rb

@@ -22,9 +22,11 @@ require 'aws/core/autoloader'
 #
 # * {AWS::AutoScaling}
 # * {AWS::CloudFormation}
+# * {AWS::CloudWatch}
 # * {AWS::DynamoDB}
 # * {AWS::EC2}
 # * {AWS::ELB}
+# * {AWS::EMR}
 # * {AWS::IAM}
 # * {AWS::S3}
 # * {AWS::SNS}
@@ -66,7 +68,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.5.7"
+  VERSION = "1.5.8"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'
@@ -278,6 +280,10 @@ module AWS
     # @option options [String] :s3_endpoint ('s3.amazonaws.com') The 
     #   service endpoint for Amazon S3.
     #
+    # @option options [Boolean] :s3_force_path_style (false) When
+    #   +true+, requests will always use path style.  This can be useful
+    #   for testing environments.
+    #
     # @option options [Integer] :s3_multipart_max_parts (1000) The maximum 
     #   number of parts to split a file into when uploading in parts to S3.
     #

data/lib/aws/core/collection.rb

@@ -23,12 +23,12 @@ module AWS
       end
 
       include Enumerable
-  
+
       # Yields once for every item in this collection.
       #
       #   collection.each {|item| ... }
       #
-      # @note If you want fewer than all items, it is generally better 
+      # @note If you want fewer than all items, it is generally better
       #   to call {#page} than {#each} with a +:limit+.
       #
       # @param [Hash] options
@@ -36,13 +36,13 @@ module AWS
       # @option options [Integer] :limit (nil) The maximum number of
       #   items to enumerate from this collection.
       #
-      # @option options [next_token] :next_token (nil) 
+      # @option options [next_token] :next_token (nil)
       #   Acts as an offset.  +:next_token+ may be returned by {#each} and
       #   {#each_batch} when a +:limit+ is provided.
       #
       # @return [nil_or_next_token] Returns nil if all items were enumerated.
       #   If some items were excluded because of a +:limit+ option then
-      #   a +next_token+ is returned.  Calling an enumerable method on 
+      #   a +next_token+ is returned.  Calling an enumerable method on
       #   the same collection with the +next_token+ acts like an offset.
       #
       def each options = {}, &block
@@ -82,7 +82,7 @@ module AWS
         _each_batch(options.dup, &block)
       end
 
-      # Use this method when you want to call a method provided by 
+      # Use this method when you want to call a method provided by
       # Enumerable, but you need to pass options:
       #
       #   # raises an error because collect does not accept arguments
@@ -99,7 +99,7 @@ module AWS
       #   collection.
       #
       def enum options = {}
-        Enumerator.new(self, :each, options) 
+        Enumerator.new(self, :each, options)
       end
       alias_method :enumerator, :enum
 
@@ -113,7 +113,7 @@ module AWS
       end
 
       # Yields items from this collection in groups of an exact
-      # size (except for perhaps the last group). 
+      # size (except for perhaps the last group).
       #
       #   collection.in_groups_of (10, :limit => 30) do |group|
       #
@@ -124,7 +124,7 @@ module AWS
       #     end
       #
       #   end
-      #   
+      #
       # @param [Integer] size Size each each group of objects
       #   should be yielded in.
       # @param [Hash] options
@@ -187,13 +187,13 @@ module AWS
       #
       # @option options [String] :next_token (nil) A token that indicates
       #   an offset to use when paging items.  Next tokens are returned
-      #   by {PageResult#next_token}.  
+      #   by {PageResult#next_token}.
       #
       #   Next tokens should only be consumed by the same collection that
       #   created them.
       #
       def page options = {}
-        
+
         each_opts = options.dup
 
         per_page = each_opts.delete(:per_page)
@@ -241,7 +241,7 @@ module AWS
         limit = limit.to_i if limit
         limit
       end
-  
+
       # Override this method in collection classes that provide
       # an alternative way to provide the limit than passinging
       # it to the enumerable method as :limit.
@@ -252,7 +252,7 @@ module AWS
       #
       # The collection class including this module should define _limit
       # and return the cached limit value (of 10 from this example).
-      # This value may still be overridden by a locally passed 
+      # This value may still be overridden by a locally passed
       # +:limit+ option:
       #
       #   # limit 5 wins out