amazon-ec2 0.2.13 → 0.2.15

data/CHANGELOG

@@ -1,3 +1,6 @@
+=== 0.2.14 2008-06-30
+ * Merged patch from 'orionz' which adds support for EC2 Availability Zones.  Thanks!
+
 === 0.2.12 2008-04-25
  * A few adjustments to work with GitHub.
 

data/lib/EC2/availability_zones.rb

@@ -0,0 +1,42 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
+# License::   Distributes under the same terms as Ruby
+# Home::      http://amazon-ec2.rubyforge.org
+#++
+
+module EC2
+
+  class Base
+
+    #Amazon Developer Guide Docs:
+    #
+    # The DescribeAvailabilityZones operation describes availability zones that are currently 
+    # available to the account and their states. 
+    #
+    # An optional list of zone names can be passed.
+    #
+    #Required Arguments:
+    #
+    # none
+    #
+    #Optional Arguments:
+    #
+    # :zone_name => Array (default : [])
+    #
+
+    def describe_availability_zones( options = {} )
+
+      options = { :zone_name => [] }.merge(options)
+
+      params = pathlist("ZoneName", options[:zone_name] )
+
+      return response_generator(:action => "DescribeAvailabilityZones", :params => params)
+
+    end
+  end
+end
+

data/lib/EC2/instances.rb

@@ -64,6 +64,7 @@ module EC2
     # :user_data => String (default : nil)
     # :addressing_type => String (default : "public")
     # :instance_type => String (default : "m1.small")
+    # :availability_zone => String (default : nil)
     # :base64_encoded => Boolean (default : false)
     #
     def run_instances( options = {} )
@@ -76,6 +77,7 @@ module EC2
                   :user_data => nil,
                   :addressing_type => "public",
                   :instance_type => "m1.small",
+                  :availability_zone => nil,
                   :base64_encoded => false }.merge(options)
 
       # Do some validation on the arguments provided
@@ -109,6 +111,7 @@ module EC2
       params["UserData"] = user_data unless user_data.nil?
       params["AddressingType"] = options[:addressing_type]
       params["InstanceType"] = options[:instance_type]
+      params["Placement.AvailabilityZone"] = options[:availability_zone] unless options[:availability_zone].nil?
 
       return response_generator(:action => "RunInstances", :params => params)
 

data/test/test_EC2_availability_zones.rb

@@ -0,0 +1,49 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
+# License::   Distributes under the same terms as Ruby
+# Home::      http://amazon-ec2.rubyforge.org
+#++
+
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "EC2 availability zones" do
+
+  setup do
+    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @describe_availability_zones_response_body = <<-RESPONSE
+    <DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2008-02-01/">
+      <availabilityZoneInfo>
+        <item>
+          <zoneName>us-east-1a</zoneName>
+          <zoneState>available</zoneState>
+        </item>
+        <item>
+          <zoneName>us-east-1b</zoneName>
+          <zoneState>available</zoneState>
+        </item>
+      </availabilityZoneInfo>
+    </DescribeAvailabilityZonesResponse>
+	 RESPONSE
+
+ end
+
+  specify "should be able to be described with describe_availability_zones" do
+    @ec2.stubs(:make_request).with('DescribeAvailabilityZones', { "ZoneName.1" => "us-east-1a", "ZoneName.2" => "us-east-1b" }).
+      returns stub(:body => @describe_availability_zones_response_body, :is_a? => true)
+    @ec2.describe_availability_zones( :zone_name => ["us-east-1a", "us-east-1b"] ).should.be.an.instance_of EC2::Response
+
+    response = @ec2.describe_availability_zones( :zone_name => ["us-east-1a", "us-east-1b"] )
+
+    response.availabilityZoneInfo.item[0].zoneName.should.equal "us-east-1a"
+    response.availabilityZoneInfo.item[0].zoneState.should.equal "available"
+
+    response.availabilityZoneInfo.item[1].zoneName.should.equal "us-east-1b"
+    response.availabilityZoneInfo.item[1].zoneState.should.equal "available"
+  end
+
+end

data/test/test_EC2_instances.rb

@@ -220,6 +220,12 @@ context "EC2 instances " do
   end
 
 
+  specify "should be able specify an availability_zone" do
+    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "Placement.AvailabilityZone" => "zone123", "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
+      returns stub(:body => @run_instances_response_body, :is_a? => true)
+    @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :availability_zone => "zone123", :group_id => [], :user_data => "foo", :base64_encoded => true ).should.be.an.instance_of EC2::Response
+  end
+
   specify "should be able to call run_instances with :user_data and :base64_encoded => true (default is false)" do
     @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
@@ -322,4 +328,4 @@ context "EC2 instances " do
     @response.instancesSet.item[1].previousState.name.should.equal "pending"
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.2.13
+  version: 0.2.15
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -9,11 +9,12 @@ autorequire: EC2
 bindir: bin
 cert_chain: []
 
-date: 2008-06-03 00:00:00 -07:00
+date: 2008-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: test-spec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rcov
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -66,6 +70,7 @@ files:
 - CHANGELOG
 - Rakefile
 - lib/EC2
+- lib/EC2/availability_zones.rb
 - lib/EC2/console.rb
 - lib/EC2/elastic_ips.rb
 - lib/EC2/exceptions.rb
@@ -78,6 +83,7 @@ files:
 - lib/EC2/security_groups.rb
 - lib/EC2.rb
 - test/test_EC2.rb
+- test/test_EC2_availability_zones.rb
 - test/test_EC2_console.rb
 - test/test_EC2_elastic_ips.rb
 - test/test_EC2_image_attributes.rb
@@ -118,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: An interface library that allows Ruby applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate cloud servers.