From a7b258b7ea2b1fe47d09f757a2ae8cae4bfb292e Mon Sep 17 00:00:00 2001 From: Michael Zeng Date: Mon, 3 Oct 2011 19:12:45 -0400 Subject: [PATCH] removed all tabs --- lib/fog/aws/cloud_watch.rb | 2 +- lib/fog/aws/models/cloud_watch/alarm_data.rb | 4 ++-- lib/fog/aws/models/cloud_watch/alarm_datum.rb | 20 +++++++++---------- .../aws/models/cloud_watch/alarm_history.rb | 2 +- lib/fog/aws/models/cloud_watch/alarms.rb | 4 ++-- lib/fog/aws/models/cloud_watch/metric.rb | 2 +- .../models/cloud_watch/metric_statistic.rb | 2 +- .../parsers/cloud_watch/describe_alarms.rb | 10 +++++----- .../cloud_watch/describe_alarms_for_metric.rb | 14 ++++++------- .../aws/requests/cloud_watch/delete_alarms.rb | 2 +- .../requests/cloud_watch/describe_alarms.rb | 6 +++--- .../cloud_watch/describe_alarms_for_metric.rb | 4 ++-- .../cloud_watch/disable_alarm_actions.rb | 6 +++--- .../cloud_watch/enable_alarm_actions.rb | 6 +++--- .../requests/cloud_watch/put_metric_alarm.rb | 8 ++++---- .../requests/cloud_watch/set_alarm_state.rb | 4 ++-- .../models/cloud_watch/alarm_history_tests.rb | 2 +- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/lib/fog/aws/cloud_watch.rb b/lib/fog/aws/cloud_watch.rb index a6edf413b..a1dd9c12f 100644 --- a/lib/fog/aws/cloud_watch.rb +++ b/lib/fog/aws/cloud_watch.rb @@ -27,7 +27,7 @@ module Fog collection :metrics model :metric_statistic collection :metric_statistics - model :alarm_datum + model :alarm_datum collection :alarm_data model :alarm_history collection :alarm_histories diff --git a/lib/fog/aws/models/cloud_watch/alarm_data.rb b/lib/fog/aws/models/cloud_watch/alarm_data.rb index fac0b2968..269452093 100644 --- a/lib/fog/aws/models/cloud_watch/alarm_data.rb +++ b/lib/fog/aws/models/cloud_watch/alarm_data.rb @@ -21,10 +21,10 @@ module Fog list_opts.merge!('Dimensions' => dimensions_array) end if period - list_opts.merge!('Period' => period) + list_opts.merge!('Period' => period) end if statistic - list_opts.merge!('Statistic' => statistic) + list_opts.merge!('Statistic' => statistic) end if unit list_opts.merge!('Unit' => unit) diff --git a/lib/fog/aws/models/cloud_watch/alarm_datum.rb b/lib/fog/aws/models/cloud_watch/alarm_datum.rb index 6c01152e8..ea773e010 100644 --- a/lib/fog/aws/models/cloud_watch/alarm_datum.rb +++ b/lib/fog/aws/models/cloud_watch/alarm_datum.rb @@ -5,7 +5,7 @@ module Fog class CloudWatch class AlarmDatum < Fog::Model - attribute :alarm_name, :aliases => 'AlarmName' + attribute :alarm_name, :aliases => 'AlarmName' attribute :metric_name, :aliases => 'MetricName' attribute :namespace, :aliases => 'Namespace' attribute :dimensions, :aliases => 'Dimensions' @@ -37,15 +37,15 @@ module Fog requires :threshold alarm_definition = { - 'AlarmName' => alarm_name, - 'ComparisonOperator' => comparison_operator, - 'EvaluationPeriods' => evaluation_periods, - 'MetricName' => metric_name, - 'Namespace' => namespace, - 'Period' => period, - 'Statistic' => statistic, - 'Threshold' => threshold - } + 'AlarmName' => alarm_name, + 'ComparisonOperator' => comparison_operator, + 'EvaluationPeriods' => evaluation_periods, + 'MetricName' => metric_name, + 'Namespace' => namespace, + 'Period' => period, + 'Statistic' => statistic, + 'Threshold' => threshold + } alarm_definition.merge!('ActionsEnabled' => action_enabled) if action_enabled alarm_definition.merge!('AlarmActions' => alarm_actions) if alarm_actions diff --git a/lib/fog/aws/models/cloud_watch/alarm_history.rb b/lib/fog/aws/models/cloud_watch/alarm_history.rb index c257529e4..5fb4c6b4f 100644 --- a/lib/fog/aws/models/cloud_watch/alarm_history.rb +++ b/lib/fog/aws/models/cloud_watch/alarm_history.rb @@ -5,7 +5,7 @@ module Fog class CloudWatch class AlarmHistory < Fog::Model - attribute :alarm_name, :aliases => 'AlarmName' + attribute :alarm_name, :aliases => 'AlarmName' attribute :end_date, :aliases => 'EndDate' attribute :history_item_type, :aliases => 'HistoryItemType' attribute :max_records, :aliases => 'MaxRecords' diff --git a/lib/fog/aws/models/cloud_watch/alarms.rb b/lib/fog/aws/models/cloud_watch/alarms.rb index 3cd5cc217..46d362286 100644 --- a/lib/fog/aws/models/cloud_watch/alarms.rb +++ b/lib/fog/aws/models/cloud_watch/alarms.rb @@ -7,8 +7,8 @@ module Fog class Alarms < Fog::Collection model Fog::AWS::CloudWatch::Alarm - - #alarm_names is an array of alarm names + + #alarm_names is an array of alarm names def delete(alarm_names) connection.delete_alarms(alarm_names) true diff --git a/lib/fog/aws/models/cloud_watch/metric.rb b/lib/fog/aws/models/cloud_watch/metric.rb index 47a97f5f3..d15ae8417 100644 --- a/lib/fog/aws/models/cloud_watch/metric.rb +++ b/lib/fog/aws/models/cloud_watch/metric.rb @@ -11,4 +11,4 @@ module Fog end end end -end +end \ No newline at end of file diff --git a/lib/fog/aws/models/cloud_watch/metric_statistic.rb b/lib/fog/aws/models/cloud_watch/metric_statistic.rb index 9f5213981..bc23ce30d 100644 --- a/lib/fog/aws/models/cloud_watch/metric_statistic.rb +++ b/lib/fog/aws/models/cloud_watch/metric_statistic.rb @@ -43,4 +43,4 @@ module Fog end end end -end +end \ No newline at end of file diff --git a/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb b/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb index 73c2226e9..99ad477a6 100644 --- a/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb +++ b/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb @@ -43,21 +43,21 @@ module Fog when 'AlarmActions', 'OKActions', 'InsufficientDataActions' @metric_alarms[name] = value.to_s.strip when 'AlarmName', 'Namespace', 'MetricName', 'AlarmDescription', 'AlarmArn', 'Unit', - 'StateValue', 'Statistic', 'ComparisonOperator', 'StateReason', 'ActionsEnabled' + 'StateValue', 'Statistic', 'ComparisonOperator', 'StateReason', 'ActionsEnabled' @metric_alarms[name] = value when 'StateUpdatedTimestamp', 'AlarmConfigurationUpdatedTimestamp' - @metric_alarms[name] = Time.parse value + @metric_alarms[name] = Time.parse value when 'Dimensions' @in_dimensions = false - when 'RequestId' + when 'RequestId' @response['ResponseMetadata'][name] = value when 'NextToken' @response['ResponseMetadata'][name] = value when 'member' if !@in_dimensions if @metric_alarms.has_key?('AlarmName') - @response['DescribeAlarmsResult']['MetricAlarms'] << @metric_alarms - reset_metric_alarms + @response['DescribeAlarmsResult']['MetricAlarms'] << @metric_alarms + reset_metric_alarms elsif @response['DescribeAlarmsResult']['MetricAlarms'].last != nil @response['DescribeAlarmsResult']['MetricAlarms'].last.merge!( @metric_alarms) end diff --git a/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb b/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb index 95a4d50ed..a8358c4da 100644 --- a/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb +++ b/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb @@ -32,7 +32,7 @@ module Fog def end_element(name) case name - when 'Name', 'Value' + when 'Name', 'Value' @dimension[name] = value when 'Period', 'EvaluationPeriods' @metric_alarms[name] = value.to_i @@ -42,20 +42,20 @@ module Fog @metric_alarms[name] = value.to_s.strip when 'AlarmName', 'Namespace', 'MetricName', 'AlarmDescription', 'AlarmArn', 'Unit', 'StateValue', 'Statistic', 'ComparisonOperator', 'StateReason', 'ActionsEnabled' - @metric_alarms[name] = value - when 'StateUpdatedTimestamp', 'AlarmConfigurationUpdatedTimestamp' - @metric_alarms[name] = Time.parse value + @metric_alarms[name] = value + when 'StateUpdatedTimestamp', 'AlarmConfigurationUpdatedTimestamp' + @metric_alarms[name] = Time.parse value when 'Dimensions' @in_dimensions = false when 'NextToken' @response['ResponseMetadata'][name] = value - when 'RequestId' + when 'RequestId' @response['ResponseMetadata'][name] = value when 'member' if !@in_dimensions if @metric_alarms.has_key?('AlarmName') - @response['DescribeAlarmsForMetricResult']['MetricAlarms'] << @metric_alarms - reset_metric_alarms + @response['DescribeAlarmsForMetricResult']['MetricAlarms'] << @metric_alarms + reset_metric_alarms elsif @response['DescribeAlarmsForMetricResult']['MetricAlarms'].last != nil @response['DescribeAlarmsForMetricResult']['MetricAlarms'].last.merge!( @metric_alarms) end diff --git a/lib/fog/aws/requests/cloud_watch/delete_alarms.rb b/lib/fog/aws/requests/cloud_watch/delete_alarms.rb index 95e6389fe..f94ef58f2 100644 --- a/lib/fog/aws/requests/cloud_watch/delete_alarms.rb +++ b/lib/fog/aws/requests/cloud_watch/delete_alarms.rb @@ -17,7 +17,7 @@ module Fog # def delete_alarms(alarm_names) - options = {} + options = {} options.merge!(AWS.indexed_param('AlarmNames.member.%d', [*alarm_names])) request({ 'Action' => 'DeleteAlarms', diff --git a/lib/fog/aws/requests/cloud_watch/describe_alarms.rb b/lib/fog/aws/requests/cloud_watch/describe_alarms.rb index 61999fe34..b1e78892d 100644 --- a/lib/fog/aws/requests/cloud_watch/describe_alarms.rb +++ b/lib/fog/aws/requests/cloud_watch/describe_alarms.rb @@ -3,13 +3,13 @@ module Fog class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/describe_alarms' + require 'fog/aws/parsers/cloud_watch/describe_alarms' - # Retrieves alarms with the specified names + # Retrieves alarms with the specified names # ==== Options # * ActionPrefix<~String>: The action name prefix # * AlarmNamePrefix<~String>: The alarm name prefix. - # AlarmNames cannot be specified if this parameter is specified + # AlarmNames cannot be specified if this parameter is specified # * AlarmNames<~Array>: A list of alarm names to retrieve information for. # * MaxRecords<~Integer>: The maximum number of alarm descriptions to retrieve # * NextToken<~String>: The token returned by a previous call to indicate that there is more data available diff --git a/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb b/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb index fc36ee0bd..db85c5958 100644 --- a/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb +++ b/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb @@ -3,9 +3,9 @@ module Fog class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/describe_alarms_for_metric' + require 'fog/aws/parsers/cloud_watch/describe_alarms_for_metric' - # Retrieves all alarms for a single metric + # Retrieves all alarms for a single metric # ==== Options # * Dimensions<~Array>: a list of dimensions to filter against # Name : The name of the dimension diff --git a/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb b/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb index af677e251..453ba4997 100644 --- a/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb +++ b/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb @@ -3,9 +3,9 @@ module Fog class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/disable_alarm_actions' + require 'fog/aws/parsers/cloud_watch/disable_alarm_actions' - # Disables actions for the specified alarms + # Disables actions for the specified alarms # ==== Options # * AlarmNames<~Array>: The names of the alarms to disable actions for # @@ -17,7 +17,7 @@ module Fog # def disable_alarm_actions(alarm_names) - options = {} + options = {} options.merge!(AWS.indexed_param('AlarmNames.member.%d', [*alarm_names])) request({ 'Action' => 'DisableAlarmActions', diff --git a/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb b/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb index ec07f449d..2c7f81529 100644 --- a/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb +++ b/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb @@ -3,9 +3,9 @@ module Fog class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/enable_alarm_actions' + require 'fog/aws/parsers/cloud_watch/enable_alarm_actions' - # Enables actions for the specified alarms + # Enables actions for the specified alarms # ==== Options # * AlarmNames<~Array>: The names of the alarms to enable actions for # @@ -17,7 +17,7 @@ module Fog # def enable_alarm_actions(alarm_names) - options = {} + options = {} options.merge!(AWS.indexed_param('AlarmNames.member.%d', [*alarm_names])) request({ 'Action' => 'EnableAlarmActions', diff --git a/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb b/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb index 96d621a85..ea8e39798 100644 --- a/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb +++ b/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb @@ -3,16 +3,16 @@ module Fog class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/put_metric_alarm' + require 'fog/aws/parsers/cloud_watch/put_metric_alarm' - # Creates or updates an alarm and associates it with the specified Amazon CloudWatch metric + # Creates or updates an alarm and associates it with the specified Amazon CloudWatch metric # ==== Options # * ActionsEnabled<~Boolean>: Indicates whether or not actions should be executed during any changes to the alarm's state # * AlarmActions<~Array>: A list of actions to execute # * AlarmDescription<~String>: The description for the alarm # * AlarmName<~String> The unique name for the alarm - # * ComparisonOperator<~String>: The arithmetic operation to use for comparison - # * Dimensions<~Array>: a list of dimensions to filter against, + # * ComparisonOperator<~String>: The arithmetic operation to use for comparison + # * Dimensions<~Array>: a list of dimensions to filter against, # Name : The name of the dimension # Value : The value to filter against # * EvaluationPeriods<~Integer>: The number of periods over which data is compared to the specified threshold diff --git a/lib/fog/aws/requests/cloud_watch/set_alarm_state.rb b/lib/fog/aws/requests/cloud_watch/set_alarm_state.rb index 474715187..cd004b005 100644 --- a/lib/fog/aws/requests/cloud_watch/set_alarm_state.rb +++ b/lib/fog/aws/requests/cloud_watch/set_alarm_state.rb @@ -3,9 +3,9 @@ module Fog class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/set_alarm_state' + require 'fog/aws/parsers/cloud_watch/set_alarm_state' - # Temporarily sets the state of an alarm + # Temporarily sets the state of an alarm # ==== Options # * AlarmName<~String>: The names of the alarm # * StateReason<~String>: The reason that this alarm is set to this specific state (in human-readable text format) diff --git a/tests/aws/models/cloud_watch/alarm_history_tests.rb b/tests/aws/models/cloud_watch/alarm_history_tests.rb index d2b6f728f..068c6c169 100644 --- a/tests/aws/models/cloud_watch/alarm_history_tests.rb +++ b/tests/aws/models/cloud_watch/alarm_history_tests.rb @@ -5,7 +5,7 @@ Shindo.tests("AWS::CloudWatch | alarm_histories", ['aws', 'cloudwatch']) do Fog::AWS[:cloud_watch].alarm_histories.all end - new_attributes = { + new_attributes = { :alarm_name => 'tmp-alarm', :end_date => '', :history_item_type => 'StateUpdate',