amazon-ec2 0.9.2 → 0.9.3

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/amazon-ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-11}
   s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling API's.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]

data/lib/AWS/Autoscaling/autoscaling.rb

@@ -73,6 +73,7 @@ module AWS
       #   When called as a hash, the values must look like: {:name => "name", :value => "value"}
       #   In the array format, the first value is assumed to be the name and the second is assumed to be the value
       # @option options [String] :measure_name (nil) the measure name associated with the metric used by the trigger
+      # @option options [optional,String] :namespace (nil) namespace of the metric on which to trigger. Used to describe the monitoring metric.
       # @option options [String|Integer] :period (nil) the period associated with the metric in seconds
       # @option options [String] :statistic (nil) The particular statistic used by the trigger when fetching metric statistics to examine. Must be one of the following: Minimum, Maximum, Sum, Average
       # @option options [String] :trigger_name (nil) the name for this trigger
@@ -102,7 +103,7 @@ module AWS
         end
 
         params = {}
-        params['Unit'] = options[:unit] || "Seconds"
+        params['Unit'] = options[:unit] if options[:unit]
         params['AutoScalingGroupName'] = options[:autoscaling_group_name]
         case options[:dimensions]
         when Array
@@ -112,9 +113,10 @@ module AWS
           params["Dimensions.member.1.Name"] = options[:dimensions][:name]
           params["Dimensions.member.1.Value"] = options[:dimensions][:value]
         else
-          raise ArgumentError, "Dimensionss must be either an array or a hash"
+          raise ArgumentError, "Dimensions must be either an array or a hash"
         end
         params['MeasureName'] = options[:measure_name]
+        params['Namespace'] = options[:namespace] if options[:namespace]
         params['Statistic'] = options[:statistic]
         params['Period'] = options[:period].to_s
         params['TriggerName'] = options[:trigger_name]

data/test/test_Autoscaling_groups.rb

@@ -110,10 +110,11 @@ context "autoscaling " do
       'LowerBreachScaleIncrement' => "-1",
       'UpperThreshold' => "1.5",
       'UpperBreachScaleIncrement' => "1",
-      'BreachDuration' => "120"
+      'BreachDuration' => "120",
+      'Namespace' => "AWS/EC2",              
     }).returns stub(:body => @create_or_update_trigger_response, :is_a? => true)
 
-    valid_create_or_update_scaling_trigger_params = {:autoscaling_group_name => "AutoScalingGroupName", :dimensions => {:name => "AutoScalingGroupName", :value => "Bob"}, :unit => "Seconds", :measure_name => "CPUUtilization", :statistic => "Average", :period => 120, :trigger_name => "AFunNameForATrigger", :lower_threshold => 0.2, :lower_breach_scale_increment => "-1", :upper_threshold => 1.5, :upper_breach_scale_increment => 1, :breach_duration => 120}
+    valid_create_or_update_scaling_trigger_params = {:autoscaling_group_name => "AutoScalingGroupName", :dimensions => {:name => "AutoScalingGroupName", :value => "Bob"}, :unit => "Seconds", :measure_name => "CPUUtilization", :namespace => "AWS/EC2", :statistic => "Average", :period => 120, :trigger_name => "AFunNameForATrigger", :lower_threshold => 0.2, :lower_breach_scale_increment => "-1", :upper_threshold => 1.5, :upper_breach_scale_increment => 1, :breach_duration => 120}
 
     %w(dimensions autoscaling_group_name measure_name statistic period trigger_name lower_threshold lower_breach_scale_increment upper_threshold upper_breach_scale_increment breach_duration).each do |meth_str|
       lambda { @as.create_or_updated_scaling_trigger(valid_create_or_update_scaling_trigger_params.merge(meth_str.to_sym=>nil)) }.should.raise(AWS::ArgumentError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -08:00
+date: 2010-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency