amazon-ec2 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.2.3 2007-07-06
+ * Updated gem to work with new official release of AWS API version 2007-03-01 which occurred 
+ on July 6, 2007.
+  * Added support for primary new feature which supports Paid AMI's and the product codes 
+  associated with them.  Modified several methods to support this change, updated the test 
+  cases, and added a new method EC2#confirm_product_instance.
+
 === 0.2.2 2007-07-03
  * Minor change to test case.
 

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/EC2/responses.rb
 lib/EC2/images.rb
 lib/EC2/instances.rb
 lib/EC2/keypairs.rb
+lib/EC2/products.rb
 lib/EC2/image_attributes.rb
 lib/EC2/security_groups.rb
 License.txt
@@ -24,6 +25,7 @@ test/test_EC2_image_attributes.rb
 test/test_EC2_images.rb
 test/test_EC2_instances.rb
 test/test_EC2_keypairs.rb
+test/test_EC2_products.rb
 test/test_EC2_responses.rb
 test/test_EC2_security_groups.rb
 test/test_EC2_version.rb

data/lib/EC2.rb

@@ -22,7 +22,7 @@ module EC2
   DEFAULT_HOST = 'ec2.amazonaws.com'
   
   # This is the version of the API as defined by Amazon Web Services
-  API_VERSION = '2007-01-19'
+  API_VERSION = '2007-03-01'
   
   # This release version is passed in with each request as part
   # of the HTTP 'User-Agent' header.  Set this be the same value 

data/lib/EC2/image_attributes.rb

@@ -14,35 +14,45 @@ module EC2
     
     #Amazon Developer Guide Docs:
     #  
-    # The ModifyImageAttribute operation modifies an attribute of an AMI. 
-    # Currently the only attribute supported is launchPermission. By modifying this attribute it is possible to 
-    # make an AMI public or to grant specific users launch permissions for the AMI. To make the AMI public 
-    # add the group=all attribute item. To grant launch permissions for a specific user add a 
-    # userId=<userid> attribute item.
+    # The ModifyImageAttribute operation modifies an attribute of an AMI.  The following attributes may
+    # currently be modified: 
+    #
+    # 'launchPermission' : Controls who has permission to launch the AMI. Launch permissions can be 
+    # granted to specific users by adding userIds. The AMI can be made public by adding the 'all' group.
+    #
+    # 'productCodes' : Associates product codes with AMIs. This allows a developer to charge a user extra 
+    # for using the AMIs. productCodes is a write once attribute - once it has been set it can not be 
+    # changed or removed.  Currently only one product code is supported per AMI.
     #
     #Required Arguments:
     #
     # :image_id => String (default : "")
-    # :attribute => String (default : "launchPermission")
-    # :operation_type => String (default : "add")
+    # :attribute => String ('launchPermission' or 'productCodes', default : "launchPermission")
+    # :operation_type => String (default : "")
     #
     #Optional Arguments:
     #
     # :user_id => Array (default : [])
     # :group => Array (default : [])
+    # :product_code => Array (default : [])
     #
     def modify_image_attribute( options = {} )
       
       # defaults
       options = { :image_id => "", 
                   :attribute => "launchPermission", 
-                  :operation_type => "add", 
+                  :operation_type => "", 
                   :user_id => [], 
-                  :group => [] }.merge(options)
+                  :group => [],
+                  :product_code => [] }.merge(options)
       
       raise ArgumentError, "No ':image_id' provided" if options[:image_id].nil? || options[:image_id].empty?
       raise ArgumentError, "No ':attribute' provided" if options[:attribute].nil? || options[:attribute].empty?
-      raise ArgumentError, "No ':operation_type' provided" if options[:operation_type].nil? || options[:operation_type].empty?
+      
+      # OperationType is not required if modifying a product code.
+      unless options[:attribute] == 'productCodes'
+        raise ArgumentError, "No ':operation_type' provided" if options[:operation_type].nil? || options[:operation_type].empty?
+      end
       
       params = {
         "ImageId" => options[:image_id],
@@ -53,22 +63,23 @@ module EC2
       # test options provided and make sure they are valid
       case options[:attribute]
       when "launchPermission"
+        
+        unless options[:operation_type] == "add" || options[:operation_type] == "remove"
+          raise ArgumentError, ":operation_type was #{options[:operation_type].to_s} but must be either 'add' or 'remove'"
+        end
+        
         if (options[:user_id].nil? || options[:user_id].empty?) && (options[:group].nil? || options[:group].empty?)
           raise ArgumentError, "Option :attribute=>'launchPermission' requires ':user_id' or ':group' options to also be specified"
         end
-        
         params.merge!(pathlist("UserId", options[:user_id])) unless options[:user_id].nil?
         params.merge!(pathlist("Group", options[:group])) unless options[:group].nil?
+      when "productCodes"
+        if (options[:product_code].nil? || options[:product_code].empty?)
+          raise ArgumentError, "Option :attribute=>'productCodes' requires ':product_code' to be specified"
+        end
+        params.merge!(pathlist("ProductCode", options[:product_code])) unless options[:product_code].nil?
       else
-        raise ArgumentError, "attribute : #{options[:attribute].to_s} is not an known option."
-      end
-      
-      # test options provided and make sure they are valid
-      case options[:operation_type]
-      when "add", "remove"
-        # these args are ok
-      else
-        raise ArgumentError, ":operation_type was #{options[:operation_type].to_s} but must be 'add' or 'remove'"
+        raise ArgumentError, "attribute : #{options[:attribute].to_s} is not an known attribute."
       end
       
       return response_generator(:action => "ModifyImageAttribute", :params => params)
@@ -82,7 +93,7 @@ module EC2
     #Required Arguments:
     #
     # :image_id => String (default : "")
-    # :attribute => String (default : "launchPermission")
+    # :attribute => String ("launchPermission" or "productCodes", default : "launchPermission")
     #
     #Optional Arguments:
     #
@@ -102,10 +113,10 @@ module EC2
       
       # test options provided and make sure they are valid
       case options[:attribute]
-      when "launchPermission"
+      when "launchPermission", "productCodes"
         # these args are ok
       else
-        raise ArgumentError, "attribute : #{options[:attribute].to_s} is not an known option."
+        raise ArgumentError, "attribute : #{options[:attribute].to_s} is not an known attribute."
       end
       
       return response_generator(:action => "DescribeImageAttribute", :params => params)
@@ -143,7 +154,7 @@ module EC2
       when "launchPermission"
         # these args are ok
       else
-        raise ArgumentError, "attribute : #{options[:attribute].to_s} is not an known option."
+        raise ArgumentError, "attribute : #{options[:attribute].to_s} is not an known attribute."
       end
       
       return response_generator(:action => "ResetImageAttribute", :params => params)

data/lib/EC2/instances.rb

@@ -39,6 +39,8 @@ module EC2
     # OpenSSH format). This can be done at boot time (as part of rclocal, for example) allowing for secure 
     # password-less access. As the need arises, other formats will also be considered.
     #
+    # If the AMI has a product code attached for which the user has not subscribed, the RunInstances call will fail.
+    #
     #Required Arguments:
     #
     # :image_id => String (Default : "")

data/lib/EC2/products.rb

@@ -0,0 +1,43 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Glenn Rempe  (mailto:glenn@elasticworkbench.com)
+# Copyright:: Copyright (c) 2007 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 ConfirmProductInstance operation returns true if the given product code is attached to the instance 
+    # with the given instance id. False is returned if the product code is not attached to the instance.
+    #
+    #Required Arguments:
+    #
+    # :product_code => String (default : "")
+    # :instance_id => String (default : "")
+    #
+    #Optional Arguments:
+    #
+    # none
+    #
+    def confirm_product_instance( options ={} )
+      
+      options = {:product_code => "", :instance_id => ""}.merge(options)
+      
+      raise ArgumentError, "No product code provided" if options[:product_code].nil? || options[:product_code].empty?
+      raise ArgumentError, "No instance ID provided" if options[:instance_id].nil? || options[:instance_id].empty?
+      
+      params = { "ProductCode" => options[:product_code], "InstanceId" => options[:instance_id] }
+      
+      return response_generator(:action => "ConfirmProductInstance", :params => params)
+      
+    end
+  end
+  
+end

data/lib/EC2/responses.rb

@@ -32,7 +32,13 @@ module EC2
   # mechanism for the whole library while making it more accurate and much less brittle to boot!
   #
   
-  require 'xmlsimple'
+  require 'rubygems'
+  begin
+    require 'xmlsimple'
+  rescue Exception => e
+    require 'xml-simple'
+  end
+  
   
   class Response < OpenStruct
     

data/lib/EC2/version.rb

@@ -12,7 +12,7 @@ module EC2 #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_EC2_console.rb

@@ -16,7 +16,7 @@ context "The EC2 console " do
     @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
     
     @get_console_output_response_body = <<-RESPONSE
-    <GetConsoleOutputResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <GetConsoleOutputResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <instanceId>i-28a64341</instanceId>
       <timestamp>2007-01-03 15:00:00</timestamp>
       <output>

data/test/test_EC2_image_attributes.rb

@@ -16,19 +16,19 @@ context "EC2 image_attributes " do
     @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
     
     @modify_image_attribute_response_body = <<-RESPONSE
-    <ModifyImageAttributeResponse xm-lns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <ModifyImageAttributeResponse xm-lns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </ModifyImageAttributeResponse>
     RESPONSE
     
     @reset_image_attribute_response_body = <<-RESPONSE
-    <ResetImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19"> 
+    <ResetImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
       <return>true</return>
     </ResetImageAttributeResponse>
     RESPONSE
     
-    @describe_image_attribute_response_body = <<-RESPONSE
-    <DescribeImageAttributeResponse xm-lns="http://ec2.amazonaws.com/doc/2007-01-19">
+    @describe_image_attribute_response_body_launch_permissions = <<-RESPONSE
+    <DescribeImageAttributeResponse xm-lns="http://ec2.amazonaws.com/doc/2007-03-01">
       <imageId>ami-61a54008</imageId>
       <launchPermission>
         <item>
@@ -41,6 +41,17 @@ context "EC2 image_attributes " do
     </DescribeImageAttributeResponse>
     RESPONSE
     
+    @describe_image_attribute_response_body_product_codes = <<-RESPONSE
+    <DescribeImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-03">
+      <imageId>ami-61a54008</imageId>
+      <productCodes>
+        <item>
+          <productCode>774F4FF8</productCode>
+        </item>
+      </productCodes>
+    </DescribeImageAttributeResponse>
+    RESPONSE
+    
   end
   
   
@@ -88,6 +99,18 @@ context "EC2 image_attributes " do
   end
   
   
+  specify "should be able to be changed with modify_image_attribute ( with :attribute=>'productCodes')" do
+    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008", 
+                                                            "Attribute"=>"productCodes", 
+                                                            "OperationType"=>"",
+                                                            "ProductCode.1"=>"774F4FF8"}).returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
+                                                            
+    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", 
+                                :attribute=>"productCodes", 
+                                :product_code=>["774F4FF8"]).should.be.an.instance_of EC2::Response
+  end
+  
+  
   specify "should be able to be changed with modify_image_attribute ( with :attribute and multiple :user_id and :group elements)" do
     @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008", 
                                                             "Attribute"=>"launchPermission", 
@@ -114,13 +137,21 @@ context "EC2 image_attributes " do
     lambda { @ec2.modify_image_attribute(:image_id=>nil, :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
     lambda { @ec2.modify_image_attribute(:image_id=>"", :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
     
-    # :attribute currently has one option which is 'launchPermission', it should fail with any other value, nil, or empty
+    # :attribute currently has two options which are 'launchPermission' and 'productCodes, it should fail with any other value, nil, or empty
     lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil, :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
     lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"", :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
     lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo", :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
     
-    # :attribute option should fail if neither :group nor :user_id are also provided
+    # :attribute => 'launchPermission' option should fail if neither :group nor :user_id are also provided
     lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group => nil) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group => "") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id => nil) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id => "") }.should.raise(EC2::ArgumentError)
+    
+    # :attribute => 'productCodes' option should fail if :product_code isn't also provided
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"productCodes", :product_code=>nil) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"productCodes", :product_code=>"") }.should.raise(EC2::ArgumentError)
     
     # :operation_type currently has two options which are 'add' and 'remove', and it should fail with any other, nil or empty
     lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>nil, :group=>["all"]) }.should.raise(EC2::ArgumentError)
@@ -129,10 +160,10 @@ context "EC2 image_attributes " do
   end
   
   
-  specify "method describe_image_attribute should return the proper attributes" do
+  specify "method describe_image_attribute should return the proper attributes when called with launchPermission" do
     @ec2.stubs(:make_request).with('DescribeImageAttribute', {"ImageId"=>"ami-61a54008", 
                                                               "Attribute"=>"launchPermission" }).
-      returns stub(:body => @describe_image_attribute_response_body, :is_a? => true)
+      returns stub(:body => @describe_image_attribute_response_body_launch_permissions, :is_a? => true)
     
     @ec2.describe_image_attribute(:image_id => "ami-61a54008", :attribute => "launchPermission").
       should.be.an.instance_of EC2::Response
@@ -144,16 +175,35 @@ context "EC2 image_attributes " do
   end
   
   
+  specify "method describe_image_attribute should return the proper attributes when called with productCodes" do
+    @ec2.stubs(:make_request).with('DescribeImageAttribute', {"ImageId"=>"ami-61a54008", 
+                                                              "Attribute"=>"productCodes" }).
+      returns stub(:body => @describe_image_attribute_response_body_product_codes, :is_a? => true)
+    
+    @ec2.describe_image_attribute(:image_id => "ami-61a54008", :attribute => "productCodes").
+      should.be.an.instance_of EC2::Response
+    
+    response = @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"productCodes")
+    response.imageId.should.equal "ami-61a54008"
+    response.productCodes.item[0].productCode.should.equal "774F4FF8"
+  end
+  
+  
   specify "should raise an exception when describe_image_attribute is called with incorrect arguments" do
     # method args can't be nil or empty
     lambda { @ec2.describe_image_attribute() }.should.raise(EC2::ArgumentError)
     lambda { @ec2.describe_image_attribute(:image_id=>"") }.should.raise(EC2::ArgumentError)
     
-    # :image_id option must be not be empty or nil
+    # :image_id option must be not be empty or nil w/ launchPermission
     lambda { @ec2.describe_image_attribute(:image_id=>nil, :attribute=>"launchPermission") }.should.raise(EC2::ArgumentError)
     lambda { @ec2.describe_image_attribute(:image_id=>"", :attribute=>"launchPermission") }.should.raise(EC2::ArgumentError)
     
-    # :attribute currently has one option which is 'launchPermission', it should fail with any other value, nil, or empty
+    # :image_id option must be not be empty or nil w/ productCodes
+    lambda { @ec2.describe_image_attribute(:image_id=>nil, :attribute=>"productCodes") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>"", :attribute=>"productCodes") }.should.raise(EC2::ArgumentError)
+    
+    # :attribute currently has two options which are 'launchPermission' and 'productCodes', it should fail with any other values,
+    # nil, or empty
     lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil) }.should.raise(EC2::ArgumentError)
     lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"") }.should.raise(EC2::ArgumentError)
     lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo") }.should.raise(EC2::ArgumentError)

data/test/test_EC2_images.rb

@@ -16,13 +16,13 @@ context "An EC2 image " do
     @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
     
     @register_image_response_body = <<-RESPONSE
-    <RegisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19"> 
+    <RegisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
       <imageId>ami-61a54008</imageId>
     </RegisterImageResponse>
     RESPONSE
     
     @describe_image_response_body = <<-RESPONSE
-    <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19"> 
+    <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
       <imagesSet>
         <item>
           <imageId>ami-61a54008</imageId>
@@ -30,6 +30,11 @@ context "An EC2 image " do
           <imageState>available</imageState>
           <imageOwnerId>AAAATLBUXIEON5NQVUUX6OMPWBZIAAAA</imageOwnerId>
           <isPublic>true</isPublic>
+          <productCodes>
+            <item>
+              <productCode>774F4FF8</productCode>
+            </item>
+          </productCodes>
         </item>
         <item>
           <imageId>ami-61a54009</imageId>
@@ -43,7 +48,7 @@ context "An EC2 image " do
     RESPONSE
     
     @deregister_image_response_body = <<-RESPONSE
-    <DeregisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19"> 
+    <DeregisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
       <return>true</return> 
     </DeregisterImageResponse>
     RESPONSE
@@ -93,6 +98,7 @@ context "An EC2 image " do
     response.imagesSet.item[0].imageState.should.equal "available"
     response.imagesSet.item[0].imageOwnerId.should.equal "AAAATLBUXIEON5NQVUUX6OMPWBZIAAAA"
     response.imagesSet.item[0].isPublic.should.equal "true"
+    response.imagesSet.item[0].productCodes.item[0].productCode.should.equal "774F4FF8"
     
     # test second 'Item' object returned
     response.imagesSet.item[1].imageId.should.equal "ami-61a54009"

data/test/test_EC2_instances.rb

@@ -16,7 +16,7 @@ context "EC2 instances " do
     @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
     
     @run_instances_response_body = <<-RESPONSE
-    <RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <reservationId>r-47a5402e</reservationId>
       <ownerId>495219933132</ownerId>
       <groupSet>
@@ -63,7 +63,7 @@ context "EC2 instances " do
     RESPONSE
     
     @describe_instances_response_body = <<-RESPONSE
-    <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <reservationSet>
         <item>
           <reservationId>r-44a5402d</reservationId>
@@ -84,6 +84,11 @@ context "EC2 instances " do
               <privateDnsName>domU-12-31-35-00-1E-01.z-2.compute-1.internal</privateDnsName>
               <dnsName>ec2-72-44-33-4.z-2.compute-1.amazonaws.com</dnsName>
               <keyName>example-key-name</keyName>
+              <productCodesSet>
+                <item>
+                  <productCode>774F4FF8</productCode>
+                </item>
+              </productCodesSet>
             </item>
           </instancesSet>
         </item>
@@ -92,13 +97,13 @@ context "EC2 instances " do
     RESPONSE
     
     @reboot_instances_response_body = <<-RESPONSE
-    <RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </RebootInstancesResponse>
     RESPONSE
     
     @terminate_instances_response_body = <<-RESPONSE
-    <TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19"> 
+    <TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
       <instancesSet> 
         <item> 
           <instanceId>i-28a64341</instanceId> 
@@ -238,6 +243,7 @@ context "EC2 instances " do
     response.reservationSet.item[0].instancesSet.item[0].privateDnsName.should.equal "domU-12-31-35-00-1E-01.z-2.compute-1.internal"
     response.reservationSet.item[0].instancesSet.item[0].dnsName.should.equal "ec2-72-44-33-4.z-2.compute-1.amazonaws.com"
     response.reservationSet.item[0].instancesSet.item[0].keyName.should.equal "example-key-name"
+    response.reservationSet.item[0].instancesSet.item[0].productCodesSet.item[0].productCode.should.equal "774F4FF8"
   end
   
   
@@ -256,6 +262,7 @@ context "EC2 instances " do
     response.reservationSet.item[0].instancesSet.item[0].privateDnsName.should.equal "domU-12-31-35-00-1E-01.z-2.compute-1.internal"
     response.reservationSet.item[0].instancesSet.item[0].dnsName.should.equal "ec2-72-44-33-4.z-2.compute-1.amazonaws.com"
     response.reservationSet.item[0].instancesSet.item[0].keyName.should.equal "example-key-name"
+    response.reservationSet.item[0].instancesSet.item[0].productCodesSet.item[0].productCode.should.equal "774F4FF8"
   end
   
   

data/test/test_EC2_keypairs.rb

@@ -16,7 +16,7 @@ context "EC2 keypairs " do
     @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
     
     @create_keypair_response_body = <<-RESPONSE
-      <CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19"> 
+      <CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
       <keyName>example-key-name</keyName> 
       <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f</keyFingerprint> 
       <keyMaterial>-----BEGIN RSA PRIVATE KEY-----
@@ -46,7 +46,7 @@ context "EC2 keypairs " do
     RESPONSE
     
     @describe_keypairs_response_body = <<-RESPONSE
-    <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <keySet>
         <item>
           <keyName>example-key-name</keyName>
@@ -57,7 +57,7 @@ context "EC2 keypairs " do
     RESPONSE
     
     @delete_keypair_body = <<-RESPONSE
-    <DeleteKeyPair xmlns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <DeleteKeyPair xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </DeleteKeyPair>
     RESPONSE

data/test/test_EC2_products.rb

@@ -0,0 +1,48 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Glenn Rempe  (mailto:glenn@elasticworkbench.com)
+# Copyright:: Copyright (c) 2007 Glenn Rempe
+# License::   Distributes under the same terms as Ruby
+# Home::      http://amazon-ec2.rubyforge.org
+#++
+
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "An EC2 instance " do
+  
+  setup do
+    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+    
+    @confirm_product_instance_response_body = <<-RESPONSE
+    <ConfirmProductInstanceResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
+      <result>true</result>
+      <ownerId>254933287430</ownerId>
+    </ConfirmProductInstanceResponse>
+    RESPONSE
+    
+  end
+  
+  
+  specify "should indicate whether a product code is attached to an instance" do
+    @ec2.stubs(:make_request).with('ConfirmProductInstance', {"ProductCode"=>"774F4FF8", "InstanceId"=>"i-10a64379"}).
+       returns stub(:body => @confirm_product_instance_response_body, :is_a? => true)
+    
+    @ec2.confirm_product_instance( :product_code => "774F4FF8", :instance_id => "i-10a64379" ).should.be.an.instance_of EC2::Response
+    response = @ec2.confirm_product_instance( :product_code => "774F4FF8", :instance_id => "i-10a64379" )
+    response.ownerId.should.equal "254933287430"
+    response.result.should.equal "true"
+  end
+  
+  
+  specify "method get_console_output should raise an exception when called without nil/empty string arguments" do
+    lambda { @ec2.confirm_product_instance() }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.confirm_product_instance(:product_code => "774F4FF8", :instance_id => nil) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.confirm_product_instance(:product_code => "774F4FF8", :instance_id => "") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.confirm_product_instance(:product_code => nil, :instance_id => "i-10a64379") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.confirm_product_instance(:product_code => "", :instance_id => "i-10a64379") }.should.raise(EC2::ArgumentError)
+  end
+  
+  
+end

data/test/test_EC2_responses.rb

@@ -15,7 +15,7 @@ context "The Response classes " do
   
   setup do
     @http_xml = <<-RESPONSE
-    <RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </RebootInstancesResponse>
     RESPONSE

data/test/test_EC2_security_groups.rb

@@ -16,19 +16,19 @@ context "EC2 security groups " do
     @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
     
     @create_security_group_response_body = <<-RESPONSE
-    <CreateSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19"> 
+    <CreateSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
       <return>true</return> 
     </CreateSecurityGroupResponse>
     RESPONSE
     
     @delete_security_group_response_body = <<-RESPONSE
-    <DeleteSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-19"> 
+    <DeleteSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
       <return>true</return> 
     </DeleteSecurityGroupResponse>
     RESPONSE
     
     @describe_security_groups_response_body = <<-RESPONSE
-    <DescribeSecurityGroupsResponse xm-lns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <DescribeSecurityGroupsResponse xm-lns="http://ec2.amazonaws.com/doc/2007-03-01">
       <securityGroupInfo>
         <item>
           <ownerId>UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM</ownerId>
@@ -67,13 +67,13 @@ context "EC2 security groups " do
     RESPONSE
     
     @authorize_security_group_ingress_response_body = <<-RESPONSE
-    <AuthorizeSecurityGroupIngressResponse xm-lns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <AuthorizeSecurityGroupIngressResponse xm-lns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </AuthorizeSecurityGroupIngressResponse>
     RESPONSE
     
     @revoke_security_group_ingress_response_body = <<-RESPONSE
-    <RevokeSecurityGroupIngressResponse xm-lns="http://ec2.amazonaws.com/doc/2007-01-19">
+    <RevokeSecurityGroupIngressResponse xm-lns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </RevokeSecurityGroupIngressResponse>
     RESPONSE

data/test/test_EC2_version.rb

@@ -16,7 +16,7 @@ context "The EC2 Gem " do
   setup do
     @major = 0
     @minor = 2
-    @tiny = 2
+    @tiny = 3
     @string = [@major, @minor, @tiny].join('.')
   end
   

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Amazon Web Services EC2 Ruby Gem</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/amazon-ec2"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/amazon-ec2" class="numbers">0.2.2</a>
+      <a href="http://rubyforge.org/projects/amazon-ec2" class="numbers">0.2.3</a>
     </div>
     <h2>&#x2192; &#8216;amazon-ec2&#8217;</h2>
 
@@ -65,6 +65,13 @@
 	<p>This release (&gt;= 0.2.0) represents a major re-write of this gem and contains contributions from several people who make use of this gem for their own applications.  Trust us, its worth the pain of upgrading if you have been using an older version.  Some of the major enhancements you will find are:</p>
 
 
+	<ul>
+	<li>Updated <span class="caps">API</span> version in the query <span class="caps">API</span> request to 2007-03-01, and added all known method calls
+in this version of the <span class="caps">API</span> to the gem (including paid <span class="caps">AMI</span> support with product codes, reboot, viewing console output, <span class="caps">NAT</span> addressing 
+and more!)</li>
+	</ul>
+
+
 	<ul>
 	<li><span class="caps">MAJOR</span> library changes : <span class="caps">THESE CHANGES ARE NOT BACKWARD COMPATIBLE</span>!!  You will need to update 
 the way in which you make calls, handle responses, and rescue exceptions from this library.  
@@ -120,13 +127,6 @@ Marcel Molina&#8217;s fine <span class="caps">AWS</span>::S3 library.</li>
 	</ul>
 
 
-	<ul>
-	<li>Updated <span class="caps">API</span> version in the query <span class="caps">API</span> request to 2007-01-19, and added all known method calls
-in this version of the <span class="caps">API</span> to the gem (including reboot, viewing console output, <span class="caps">NAT</span> addressing 
-and more!)</li>
-	</ul>
-
-
 	<ul>
 	<li>Removed .parse method as it is no longer needed or wanted.</li>
 	</ul>
@@ -543,7 +543,7 @@ ami-23b6534a
 
 	<p>Comments, patches, and bug reports are welcome. Send an email to the address below or use the RubyForge forum for this project.</p>
     <p class="coda">
-      <a href="mailto:grempe-at-rubyforge-dot-org">Glenn Rempe</a>, 3rd July 2007<br>
+      <a href="mailto:grempe-at-rubyforge-dot-org">Glenn Rempe</a>, 6th July 2007<br>
     </p>
 </div>
 

data/website/index.txt

@@ -22,6 +22,10 @@ h2. What's new?
 
 This release (>= 0.2.0) represents a major re-write of this gem and contains contributions from several people who make use of this gem for their own applications.  Trust us, its worth the pain of upgrading if you have been using an older version.  Some of the major enhancements you will find are:
 
+* Updated API version in the query API request to 2007-03-01, and added all known method calls
+in this version of the API to the gem (including paid AMI support with product codes, reboot, viewing console output, NAT addressing 
+and more!)
+
 * MAJOR library changes : THESE CHANGES ARE NOT BACKWARD COMPATIBLE!!  You will need to update 
 the way in which you make calls, handle responses, and rescue exceptions from this library.  
 If you prefer not to make these changes you can feel free to continue to use the older version 
@@ -59,10 +63,6 @@ which contain your ACCESS_KEY_ID and SECRET_ACCESS_KEY for this to work.  Otherw
 will be thrown when you try to start it.  This is way cool and shamelessly borrowed from 
 Marcel Molina's fine AWS::S3 library.
 
-* Updated API version in the query API request to 2007-01-19, and added all known method calls
-in this version of the API to the gem (including reboot, viewing console output, NAT addressing 
-and more!)
-
 * Removed .parse method as it is no longer needed or wanted.
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2007-07-03 00:00:00 -07:00
+  version: 0.2.3
+date: 2007-07-06 00:00:00 -07:00
 summary: An interface library that allows Ruby or Ruby on Rails applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate server instances.
 require_paths: 
 - lib
@@ -41,6 +41,7 @@ files:
 - lib/EC2/images.rb
 - lib/EC2/instances.rb
 - lib/EC2/keypairs.rb
+- lib/EC2/products.rb
 - lib/EC2/image_attributes.rb
 - lib/EC2/security_groups.rb
 - License.txt
@@ -55,6 +56,7 @@ files:
 - test/test_EC2_images.rb
 - test/test_EC2_instances.rb
 - test/test_EC2_keypairs.rb
+- test/test_EC2_products.rb
 - test/test_EC2_responses.rb
 - test/test_EC2_security_groups.rb
 - test/test_EC2_version.rb
@@ -71,6 +73,7 @@ test_files:
 - test/test_EC2_images.rb
 - test/test_EC2_instances.rb
 - test/test_EC2_keypairs.rb
+- test/test_EC2_products.rb
 - test/test_EC2_responses.rb
 - test/test_EC2_security_groups.rb
 - test/test_EC2_version.rb