aws-sdk 1.8.5 → 1.9.0

data/lib/aws/auto_scaling/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'AutoScaling', 'auto_scaling', 'autoscaling.us-east-1.amazonaws.com'
+  add_service 'AutoScaling', 'auto_scaling', 'autoscaling.%s.amazonaws.com'
 
 end

data/lib/aws/auto_scaling/group.rb

@@ -19,7 +19,7 @@ module AWS
     # @attr_reader [Array<String>] availability_zone_names
     #
     # @attr_reader [Time] created_time
-    # 
+    #
     # @attr_reader [Integer] default_cooldown
     #
     # @attr_reader [Integer] desired_capacity
@@ -41,7 +41,7 @@ module AWS
     #
     # @attr_reader [String,nil] placement_group
     #
-    # @attr_reader [Hash] suspended_processes A hash of suspended process 
+    # @attr_reader [Hash] suspended_processes A hash of suspended process
     #   names (keys) and reasons (values).
     #
     class Group < Core::Resource
@@ -70,7 +70,7 @@ module AWS
 
       attribute :enabled_metrics do
         translates_output do |metrics|
-          metrics.inject({}) do |hash,metric| 
+          metrics.inject({}) do |hash,metric|
             hash.merge(metric.metric => metric.granularity)
           end
         end
@@ -81,7 +81,7 @@ module AWS
       attribute :health_check_type, :to_sym => true
 
       attribute :instances
-      
+
       protected :instances
 
       attribute :launch_configuration_name
@@ -151,9 +151,9 @@ module AWS
       def auto_scaling_instances
         instances.collect do |details|
           Instance.new_from(
-            :describe_auto_scaling_groups, 
+            :describe_auto_scaling_groups,
             details,
-            details.instance_id, 
+            details.instance_id,
             :auto_scaling_group_name => name, # not provided by the response
             :config => config)
         end
@@ -163,12 +163,12 @@ module AWS
       # Auto Scaling group.  You can use this collection to further refine
       # the instances you are interested in:
       #
-      #   group.ec2_instances.filter('availability-zone', 'us-east-1a').each do |i|
-      #     puts instance.id
-      #   end
+      #     group.ec2_instances.filter('availability-zone', 'us-west-2a').each do |i|
+      #       puts instance.id
+      #     end
       #
-      # @return [EC2::InstanceCollection] Returns an instance collection 
-      #   (without making a request) that represents the instances 
+      # @return [EC2::InstanceCollection] Returns an instance collection
+      #   (without making a request) that represents the instances
       #   belonging to this Auto Scaling group.
       #
       def ec2_instances
@@ -197,13 +197,13 @@ module AWS
         end
       end
 
-      # Adjusts the desired size of the Auto Scaling group by initiating 
-      # scaling activities. When reducing the size of the group, it is 
-      # not possible to define which Amazon EC2 instances will be 
-      # terminated. This applies to any Auto Scaling decisions that might 
+      # Adjusts the desired size of the Auto Scaling group by initiating
+      # scaling activities. When reducing the size of the group, it is
+      # not possible to define which Amazon EC2 instances will be
+      # terminated. This applies to any Auto Scaling decisions that might
       # result in terminating instances.
       #
-      # @param [Integer] capacity The new capacity setting for this Auto 
+      # @param [Integer] capacity The new capacity setting for this Auto
       #   Scaling group.
       #
       # @param [Hash] options
@@ -223,9 +223,9 @@ module AWS
 
       # Suspends processes for this Auto Scaling group.
       #
-      #   # suspend two processes by name
-      #   auto_scaling_group.suspend_processes 'Launch', 'AZRebalance'
-      # 
+      #     # suspend two processes by name
+      #     auto_scaling_group.suspend_processes 'Launch', 'AZRebalance'
+      #
       # @param [Array<String>] processes A list of process to suspend.
       #
       # @return [nil]
@@ -246,9 +246,9 @@ module AWS
 
       # Resumes processes for this Auto Scaling group.
       #
-      #   # resume two processes by name
-      #   auto_scaling_group.suspend_processes 'Launch', 'AZRebalance'
-      # 
+      #     # resume two processes by name
+      #     auto_scaling_group.suspend_processes 'Launch', 'AZRebalance'
+      #
       # @param [Array<String>] processes A list of process to resume.
       #
       # @return [nil]
@@ -310,7 +310,7 @@ module AWS
       #
       def update options = {}
 
-        group_opts = group_options(options) 
+        group_opts = group_options(options)
 
         # tags must be updated using a separate request from the
         # other attributes, *sigh*
@@ -333,19 +333,18 @@ module AWS
 
       # Deletes specific tags from this Auto Scaling group.
       #
-      #   group.delete_tags([
-      #     { :key => 'role', :value => 'webserver' },
-      #   ])
+      #     group.delete_tags([
+      #       { :key => 'role', :value => 'webserver' },
+      #     ])
       #
       # You may also pass {Tag} objects.
       #
       # @param [Array<Tag,Hash>] tags An array of {Tag} objects or
       #   tag hashes to remove. If you pass hashes they should have
       #   the following keys:
-      #
-      #   * +:key+
-      #   * +:value+
-      #   * +:propagate_at_launch+
+      #     * `:key`
+      #     * `:value`
+      #     * `:propagate_at_launch`
       #
       # @return [nil]
       #
@@ -366,7 +365,7 @@ module AWS
         nil
       end
 
-      # Deletes the Auto Scaling group.  If you pass +:force+ as true
+      # Deletes the Auto Scaling group.  If you pass `:force` as true
       # then all the instances associated with this group will also
       # be terminated.
       #
@@ -375,7 +374,7 @@ module AWS
       # @param [Hash] options
       #
       # @option options [Boolean] :force (false) When true, the Auto Scaling
-      #   group will be deleted along with all instances associated with 
+      #   group will be deleted along with all instances associated with
       #   the group, without waiting for all instances to be terminated.
       #
       # @return [nil]
@@ -388,8 +387,8 @@ module AWS
         nil
       end
 
-      # Deletes the Auto Scaling group along with all instances 
-      # associated with the group, without waiting for all instances 
+      # Deletes the Auto Scaling group along with all instances
+      # associated with the group, without waiting for all instances
       # to be terminated.
       # @return [nil]
       def delete!
@@ -401,7 +400,7 @@ module AWS
       def exists?
         client_opts = {}
         client_opts[:auto_scaling_group_names] = [name]
-        resp = client.describe_auto_scaling_groups(client_opts)  
+        resp = client.describe_auto_scaling_groups(client_opts)
         !resp.auto_scaling_groups.empty?
       end
 
@@ -412,7 +411,7 @@ module AWS
       end
 
       def get_resource attr_name = nil
-        client.describe_auto_scaling_groups(:auto_scaling_group_names => [name])  
+        client.describe_auto_scaling_groups(:auto_scaling_group_names => [name])
       end
 
     end

data/lib/aws/auto_scaling/group_collection.rb

@@ -21,13 +21,13 @@ module AWS
 
       # Creates an Auto Scaling Group.
       #
-      #   group = auto_scaling.groups.create('group-name', 
-      #     :launch_configuration => 'launch-config-name',
-      #     :availability_zones => %(us-east-1a us-east-1b),
-      #     :min_size => 1,
-      #     :max_size => 4)
-      # 
-      # @param [String] name The name of the Auto Scaling group.  
+      #     group = auto_scaling.groups.create('group-name',
+      #       :launch_configuration => 'launch-config-name',
+      #       :availability_zones => %(us-west-2a us-west-2b),
+      #       :min_size => 1,
+      #       :max_size => 4)
+      #
+      # @param [String] name The name of the Auto Scaling group.
       #   Must be unique within the scope of your AWS account.
       #
       # @param [Hash] options
@@ -35,7 +35,7 @@ module AWS
       # @option (see GroupOptions#group_options)
       #
       # @option options [Array<ELB::LoadBalancer>,Array<String>] :load_balancers
-      #   A list of load balancers to use.  This can be an array of 
+      #   A list of load balancers to use.  This can be an array of
       #   {ELB::LoadBalancer} objects or an array of load balancer names.
       #
       # @return [Group]
@@ -76,7 +76,7 @@ module AWS
 
         resp = client.describe_auto_scaling_groups(options)
         resp.auto_scaling_groups.each do |details|
-          
+
           group = Group.new_from(
             :describe_auto_scaling_groups,
             details,
@@ -84,7 +84,7 @@ module AWS
             :config => config)
 
           yield(group)
-          
+
         end
 
         resp.data[:next_token]

data/lib/aws/auto_scaling/group_options.rb

@@ -36,42 +36,42 @@ module AWS
       #
       # @option options [required,Array<String>] :availability_zones
       #   A list of Availability Zones for the Auto Scaling group.
-      #   This can be {EC2::AvailabilityZone} objects or availability 
+      #   This can be {EC2::AvailabilityZone} objects or availability
       #   zone names.
       #
-      # @option options [Integer] :default_cooldown 
-      #   The amount of time, in seconds, after a scaling activity completes 
+      # @option options [Integer] :default_cooldown
+      #   The amount of time, in seconds, after a scaling activity completes
       #   before any further trigger-related scaling activities can start.
       #
       # @option options [Integer] :desired_capacity
-      #   The number of Amazon EC2 instances that should be running in 
+      #   The number of Amazon EC2 instances that should be running in
       #   the group.
       #
       # @option options [Integer] :health_check_grace_period
-      #   Length of time in seconds after a new Amazon EC2 instance comes 
+      #   Length of time in seconds after a new Amazon EC2 instance comes
       #   into service that Auto Scaling starts checking its health.
       #
       # @option options [Symbol] :health_check_type
-      #   The service you want the health status from, 
-      #   Amazon EC2 or Elastic Load Balancer. Valid values are 
-      #   +:ec2+ or +:elb+.
+      #   The service you want the health status from,
+      #   Amazon EC2 or Elastic Load Balancer. Valid values are
+      #   `:ec2` or `:elb`.
       #
       # @option options [String] :placement_group
-      #   Physical location of your cluster placement group created in 
+      #   Physical location of your cluster placement group created in
       #   Amazon EC2. For more information about cluster placement group, see
-      #   {Using Cluster Instances}[http://docs.amazonwebservices.com/AWSEC2/latest/UserGuide/using_cluster_computing.html].
+      #   [Using Cluster Instances](http://docs.amazonwebservices.com/AWSEC2/latest/UserGuide/using_cluster_computing.html).
       #
       # @option options [Array<Hash>] :tags A list of tags to apply launched
       #   instances.  Each tag hash may have the following keys:
       #
-      #   * +:key+ - (required,String) The tag name.
-      #   * +:value+ - (String) The optional tag value.
-      #   * +:propagate_at_launch+ - (Boolean) Whether or not to propagate 
-      #     to instances, defaults to true.
+      #     * `:key` - (required,String) The tag name.
+      #     * `:value` - (String) The optional tag value.
+      #     * `:propagate_at_launch` - (Boolean) Whether or not to propagate
+      #       to instances, defaults to true.
       #
       # @option options [Array<EC2::Subnet>,Array<String>] :subnets
-      #   A list of subnet identifiers of Amazon Virtual Private Clouds 
-      #   (Amazon VPCs). Ensure the subnets' Availability Zones match the 
+      #   A list of subnet identifiers of Amazon Virtual Private Clouds
+      #   (Amazon VPCs). Ensure the subnets' Availability Zones match the
       #   Availability Zones specified.
       #
       # @return [Hash]
@@ -95,11 +95,11 @@ module AWS
         group_opts[:tags] = tags_opt(options) if
           options.key?(:tags)
 
-        [ 
+        [
           :min_size,
           :max_size,
-          :default_cooldown, 
-          :desired_capacity, 
+          :default_cooldown,
+          :desired_capacity,
           :health_check_grace_period,
           :placement_group,
         ].each do |opt|

data/lib/aws/auto_scaling/instance.rb

@@ -16,30 +16,30 @@ module AWS
 
     # A small wrapper around an {EC2::Instance}.
     #
-    # == Getting Auto Scaling Instances
+    # ## Getting Auto Scaling Instances
     #
-    # If you know the EC2 instance id, you can use {InstanceCollection#[]} 
+    # If you know the EC2 instance id, you can use {InstanceCollection#[]}
     # to get the Auto Scaling instance.
     #
-    #   instance = auto_scaling.instances['i-1234578']
-    #   instance.health_statue #=> :healthy
-    #   instance.ec2_instance #=> <AWS::EC2::Instance instance_id:i-1234578>
+    #     instance = auto_scaling.instances['i-1234578']
+    #     instance.health_statue #=> :healthy
+    #     instance.ec2_instance #=> <AWS::EC2::Instance instance_id:i-1234578>
     #
-    # == Enumerating Auto Scaling Instances
+    # ## Enumerating Auto Scaling Instances
     #
     # You can enumerate *ALL* instances like so:
     #
-    #   auto_scaling = AWS::AutoScaling.new
-    #   auto_scaling.instances.each do |auto_scaling_instance|
-    #     # ... 
-    #   end
+    #     auto_scaling = AWS::AutoScaling.new
+    #     auto_scaling.instances.each do |auto_scaling_instance|
+    #       # ...
+    #     end
     #
     # If you want the instances for a single auto scaling group:
     #
-    #   group = auto_scaling.groups['group-name']
-    #   group.auto_scaling_instances.each do |instance|
-    #     # ...
-    #   end
+    #     group = auto_scaling.groups['group-name']
+    #     group.auto_scaling_instances.each do |instance|
+    #       # ...
+    #     end
     #
     # If you prefer {EC2::Instance} objects you should use
     # {Group#ec2_instances} instead.
@@ -70,10 +70,10 @@ module AWS
 
       attribute :auto_scaling_group_name, :static => true
 
-      attribute :availability_zone_name, 
+      attribute :availability_zone_name,
         :from => :availability_zone,
         :static => true
-          
+
       attribute :health_status
 
       attribute :launch_configuration_name, :static => true
@@ -116,19 +116,19 @@ module AWS
       def availability_zone
         EC2::AvailabilityZone.new(availability_zone_name, :config => config)
       end
-      
+
       # @return [LaunchConfiguration]
       def launch_configuration
         LaunchConfiguration.new(launch_configuration_name, :config => config)
       end
 
-      # @param [String] status Sets the health status of an instance.  
+      # @param [String] status Sets the health status of an instance.
       #   Valid values inculde 'Healthy' and 'Unhealthy'
       #
       # @param [Hash] options
       #
-      # @option options [Boolean] :respect_grace_period (false) If true, 
-      #   this call should respect the grace period associated with 
+      # @option options [Boolean] :respect_grace_period (false) If true,
+      #   this call should respect the grace period associated with
       #   this instance's Auto Scaling group.
       #
       # @return [nil]
@@ -137,12 +137,12 @@ module AWS
         client_opts = {}
         client_opts[:instance_id] = instance_id
         client_opts[:health_status] = status
-        client_opts[:should_respect_grace_period] = 
+        client_opts[:should_respect_grace_period] =
           options[:respect_grace_period] == true
         client.set_instance_health(client_opts)
       end
 
-      # @return [Boolean] Returns true if there exists an Auto Scaling 
+      # @return [Boolean] Returns true if there exists an Auto Scaling
       #   instance with this instance id.
       def exists?
         !get_resource.auto_scaling_instances.empty?
@@ -150,8 +150,8 @@ module AWS
 
       # Terminates the current Auto Scaling instance.
       #
-      # @param [Boolean] decrement_desired_capacity Specifies whether or not 
-      #   terminating this instance should also decrement the size of 
+      # @param [Boolean] decrement_desired_capacity Specifies whether or not
+      #   terminating this instance should also decrement the size of
       #   the AutoScalingGroup.
       #
       # @return [Activity] Returns an activity that represents the
@@ -161,15 +161,15 @@ module AWS
 
         client_opts = {}
         client_opts[:instance_id] = instance_id
-        client_opts[:should_decrement_desired_capacity] = 
+        client_opts[:should_decrement_desired_capacity] =
           decrement_desired_capacity
 
         resp = client.terminate_instance_in_auto_scaling_group(client_opts)
 
         Activity.new_from(
           :terminate_instance_in_auto_scaling_group,
-          resp.activity, 
-          resp.activity.activity_id, 
+          resp.activity,
+          resp.activity.activity_id,
           :config => config)
 
       end

data/lib/aws/auto_scaling/instance_collection.rb

@@ -16,20 +16,20 @@ module AWS
 
     # Allows you to enumerate Auto Scaling instances.
     #
-    #   auto_scaling = AWS::AutoScaling.new
-    #   auto_scaling.instances.each do |instance|
-    #     # ...
-    #   end
-    # 
+    #     auto_scaling = AWS::AutoScaling.new
+    #     auto_scaling.instances.each do |instance|
+    #       # ...
+    #     end
+    #
     # You can also get an Auto Scaling instance by its EC2 instance id.
     #
-    #   auto_scaling_instance = auto_scaling.instances['i-12345678']
-    #   auto_scaling_instance.class #=> AWS::AutoScaling::Instance
+    #     auto_scaling_instance = auto_scaling.instances['i-12345678']
+    #     auto_scaling_instance.class #=> AWS::AutoScaling::Instance
     #
     class InstanceCollection
 
       include Core::Collection::WithLimitAndNextToken
-      
+
       # @param [String] instance_id An {EC2::Instance} id string.
       # @return [AutoScaling::Instance]
       def [] instance_id
@@ -45,7 +45,7 @@ module AWS
 
         resp = client.describe_auto_scaling_instances(options)
         resp.auto_scaling_instances.each do |details|
-          
+
           instance = Instance.new_from(
             :describe_auto_scaling_instances,
             details,
@@ -53,7 +53,7 @@ module AWS
             :config => config)
 
           yield(instance)
-          
+
         end
         resp.data[:next_token]
       end