amazon-ec2 0.2.5 → 0.2.6

data/lib/EC2/version.rb

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

data/test/test_EC2.rb

@@ -11,42 +11,42 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "The EC2 method " do
-  
+
   setup do
   end
-  
+
   specify "EC2::Base attribute readers should be available" do
     @ec2 = EC2::Base.new( :access_key_id => "not a key",
                                        :secret_access_key => "not a secret",
                                        :use_ssl => true,
                                        :server => "foo.example.com" )
-    
+
     @ec2.use_ssl.should.equal true
     @ec2.port.should.equal 443
     @ec2.server.should.equal "foo.example.com"
   end
-  
-  
+
+
   specify "EC2::Base should work with insecure connections as well" do
     @ec2 = EC2::Base.new( :access_key_id => "not a key",
                                        :secret_access_key => "not a secret",
                                        :use_ssl => false,
                                        :server => "foo.example.com" )
-    
+
     @ec2.use_ssl.should.equal false
     @ec2.port.should.equal 80
     @ec2.server.should.equal "foo.example.com"
   end
-  
-  
+
+
   specify "EC2.canonical_string(path) should data that is stripped of ?,&,= " do
     path = "?name1=value1&name2=value2&name3=value3"
     EC2.canonical_string(path).should.equal "name1value1name2value2name3value3"
   end
-  
+
   specify "EC2.encode should return the expected string" do
     EC2.encode("secretaccesskey", "foobar123", urlencode=true).should.equal "e3jeuDc3DIX2mW8cVqWiByj4j5g%3D"
     EC2.encode("secretaccesskey", "foobar123", urlencode=false).should.equal "e3jeuDc3DIX2mW8cVqWiByj4j5g="
   end
-  
+
 end

data/test/test_EC2_console.rb

@@ -11,29 +11,29 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "The EC2 console " do
-  
+
   setup 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-03-01">
       <instanceId>i-28a64341</instanceId>
       <timestamp>2007-01-03 15:00:00</timestamp>
       <output>
-        YyB2ZXJzaW9uIDQuMC4xIDIwMDUwNzI3IChSZWQgSGF0IDQuMC4xLTUpKSAjMSBTTVAgVGh1IE9j 
-        dCAyNiAwODo0MToyNiBTQVNUIDIwMDYKQklPUy1wcm92aWRlZCBwaHlzaWNhbCBSQU0gbWFwOgpY 
-        ZW46IDAwMDAwMDAwMDAwMDAwMDAgLSAwMDAwMDAwMDZhNDAwMDAwICh1c2FibGUpCjk4ME1CIEhJ 
-        R0hNRU0gYXZhaWxhYmxlLgo3MjdNQiBMT1dNRU0gYXZhaWxhYmxlLgpOWCAoRXhlY3V0ZSBEaXNh 
-        YmxlKSBwcm90ZWN0aW9uOiBhY3RpdmUKSVJRIGxvY2t1cCBkZXRlY3Rpb24gZGlzYWJsZWQKQnVp 
-        bHQgMSB6b25lbGlzdHMKS2VybmVsIGNvbW1hbmQgbGluZTogcm9vdD0vZGV2L3NkYTEgcm8gNApF 
+        YyB2ZXJzaW9uIDQuMC4xIDIwMDUwNzI3IChSZWQgSGF0IDQuMC4xLTUpKSAjMSBTTVAgVGh1IE9j
+        dCAyNiAwODo0MToyNiBTQVNUIDIwMDYKQklPUy1wcm92aWRlZCBwaHlzaWNhbCBSQU0gbWFwOgpY
+        ZW46IDAwMDAwMDAwMDAwMDAwMDAgLSAwMDAwMDAwMDZhNDAwMDAwICh1c2FibGUpCjk4ME1CIEhJ
+        R0hNRU0gYXZhaWxhYmxlLgo3MjdNQiBMT1dNRU0gYXZhaWxhYmxlLgpOWCAoRXhlY3V0ZSBEaXNh
+        YmxlKSBwcm90ZWN0aW9uOiBhY3RpdmUKSVJRIGxvY2t1cCBkZXRlY3Rpb24gZGlzYWJsZWQKQnVp
+        bHQgMSB6b25lbGlzdHMKS2VybmVsIGNvbW1hbmQgbGluZTogcm9vdD0vZGV2L3NkYTEgcm8gNApF
         bmFibGluZyBmYXN0IEZQVSBzYXZlIGFuZCByZXN0b3JlLi4uIGRvbmUuCg==
         </output>
     </GetConsoleOutputResponse>
     RESPONSE
-    
+
   end
-  
-  
+
+
   specify "should return info written to a specific instances console" do
     @ec2.stubs(:make_request).with('GetConsoleOutput', {"InstanceId"=>"i-2ea64347"}).
        returns stub(:body => @get_console_output_response_body, :is_a? => true)
@@ -42,13 +42,13 @@ context "The EC2 console " do
     response.instanceId.should.equal "i-28a64341"
     response.timestamp.should.equal "2007-01-03 15:00:00"
   end
-  
-  
+
+
   specify "method get_console_output should raise an exception when called without nil/empty string arguments" do
     lambda { @ec2.get_console_output() }.should.raise(EC2::ArgumentError)
     lambda { @ec2.get_console_output(:instance_id => nil) }.should.raise(EC2::ArgumentError)
     lambda { @ec2.get_console_output(:instance_id => "") }.should.raise(EC2::ArgumentError)
   end
-  
-  
+
+
 end

data/test/test_EC2_image_attributes.rb

@@ -11,22 +11,22 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 image_attributes " do
-  
+
   setup 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-03-01">
       <return>true</return>
     </ModifyImageAttributeResponse>
     RESPONSE
-    
+
     @reset_image_attribute_response_body = <<-RESPONSE
-    <ResetImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
+    <ResetImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </ResetImageAttributeResponse>
     RESPONSE
-    
+
     @describe_image_attribute_response_body_launch_permissions = <<-RESPONSE
     <DescribeImageAttributeResponse xm-lns="http://ec2.amazonaws.com/doc/2007-03-01">
       <imageId>ami-61a54008</imageId>
@@ -40,7 +40,7 @@ context "EC2 image_attributes " do
       </launchPermission>
     </DescribeImageAttributeResponse>
     RESPONSE
-    
+
     @describe_image_attribute_response_body_product_codes = <<-RESPONSE
     <DescribeImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-03">
       <imageId>ami-61a54008</imageId>
@@ -51,188 +51,188 @@ context "EC2 image_attributes " do
       </productCodes>
     </DescribeImageAttributeResponse>
     RESPONSE
-    
+
   end
-  
-  
+
+
   specify "should be able to be changed with modify_image_attribute (with :attribute and single value :user_id and :group)" do
-    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008", 
-                                                            "Attribute"=>"launchPermission", 
+    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008",
+                                                            "Attribute"=>"launchPermission",
                                                             "OperationType"=>"add",
                                                             "UserId.1"=>"123",
                                                             "Group.1"=>"all"}).
        returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
     @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id=>["123"], :group=>["all"]).should.be.an.instance_of EC2::Response
   end
-  
-  
+
+
   specify "should be able to be changed with modify_image_attribute ( with :attribute but specifying :group only)" do
-    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008", 
-                                                            "Attribute"=>"launchPermission", 
+    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008",
+                                                            "Attribute"=>"launchPermission",
                                                             "OperationType"=>"add",
                                                             "Group.1"=>"all"}).
        returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
     @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]).should.be.an.instance_of EC2::Response
   end
-  
-  
+
+
   specify "should be able to be changed with modify_image_attribute ( with :operation_type 'remove')" do
-    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008", 
-                                                            "Attribute"=>"launchPermission", 
+    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008",
+                                                            "Attribute"=>"launchPermission",
                                                             "OperationType"=>"remove",
                                                             "Group.1"=>"all"}).
        returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
     @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"remove", :group=>["all"]).should.be.an.instance_of EC2::Response
   end
-  
-  
+
+
   specify "should be able to be changed with modify_image_attribute ( with :attribute but specifying :user_id only)" do
-    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008", 
-                                                            "Attribute"=>"launchPermission", 
+    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008",
+                                                            "Attribute"=>"launchPermission",
                                                             "OperationType"=>"add",
                                                             "UserId.1"=>"123"}).returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
-                                                            
-    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", 
-                                :attribute=>"launchPermission", 
-                                :operation_type=>"add", 
+
+    @ec2.modify_image_attribute(:image_id=>"ami-61a54008",
+                                :attribute=>"launchPermission",
+                                :operation_type=>"add",
                                 :user_id=>["123"]).should.be.an.instance_of EC2::Response
   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", 
+    @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", 
+
+    @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", 
+    @ec2.stubs(:make_request).with('ModifyImageAttribute', {"ImageId"=>"ami-61a54008",
+                                                            "Attribute"=>"launchPermission",
                                                             "OperationType"=>"add",
                                                             "UserId.1"=>"123",
                                                             "UserId.2"=>"345",
                                                             "Group.1"=>"123",
                                                             "Group.2"=>"all"}).returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
-       
-    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", 
-                                :attribute=>"launchPermission", 
-                                :operation_type=>"add", 
-                                :user_id=>["123", "345"], 
+
+    @ec2.modify_image_attribute(:image_id=>"ami-61a54008",
+                                :attribute=>"launchPermission",
+                                :operation_type=>"add",
+                                :user_id=>["123", "345"],
                                 :group=>["123", "all"]).should.be.an.instance_of EC2::Response
   end
-  
-  
+
+
   specify "should raise an exception when modify_image_attribute is called with incorrect arguments" do
     # method args can't be nil or empty
     lambda { @ec2.modify_image_attribute() }.should.raise(EC2::ArgumentError)
     lambda { @ec2.modify_image_attribute(:image_id=>"") }.should.raise(EC2::ArgumentError)
-    
+
     # :image_id option must be not be empty or nil
     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 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 => '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)
     lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"", :group=>["all"]) }.should.raise(EC2::ArgumentError)
     lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"foo", :group=>["all"]) }.should.raise(EC2::ArgumentError)
   end
-  
-  
+
+
   specify "method describe_image_attribute should return the proper attributes when called with launchPermission" do
-    @ec2.stubs(:make_request).with('DescribeImageAttribute', {"ImageId"=>"ami-61a54008", 
+    @ec2.stubs(:make_request).with('DescribeImageAttribute', {"ImageId"=>"ami-61a54008",
                                                               "Attribute"=>"launchPermission" }).
       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
-    
+
     response = @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission")
     response.imageId.should.equal "ami-61a54008"
     response.launchPermission.item[0].group.should.equal "all"
     response.launchPermission.item[1].userId.should.equal "495219933132"
   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", 
+    @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 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)
-    
+
     # :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)
   end
-  
-  
+
+
   specify "should be able to reset attributes with reset_image_attribute " do
-    @ec2.stubs(:make_request).with('ResetImageAttribute', {"ImageId"=>"ami-61a54008", 
+    @ec2.stubs(:make_request).with('ResetImageAttribute', {"ImageId"=>"ami-61a54008",
                                                             "Attribute"=>"launchPermission"}).
        returns stub(:body => @reset_image_attribute_response_body, :is_a? => true)
     @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission").should.be.an.instance_of EC2::Response
     @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission").return.should.equal "true"
   end
-  
-  
+
+
   specify "should raise an exception when reset_image_attribute is called with incorrect arguments" do
     # method args can't be nil or empty
     lambda { @ec2.reset_image_attribute() }.should.raise(EC2::ArgumentError)
     lambda { @ec2.reset_image_attribute(:image_id=>"") }.should.raise(EC2::ArgumentError)
-    
+
     # :image_id option must be not be empty or nil
     lambda { @ec2.reset_image_attribute(:image_id=>nil, :attribute=>"launchPermission") }.should.raise(EC2::ArgumentError)
     lambda { @ec2.reset_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
     lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil) }.should.raise(EC2::ArgumentError)
     lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"") }.should.raise(EC2::ArgumentError)
     lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo") }.should.raise(EC2::ArgumentError)
   end
-  
-  
+
+
 end

data/test/test_EC2_images.rb

@@ -11,18 +11,18 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "An EC2 image " do
-  
+
   setup 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-03-01"> 
+    <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-03-01"> 
+    <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <imagesSet>
         <item>
           <imageId>ami-61a54008</imageId>
@@ -46,30 +46,30 @@ context "An EC2 image " do
       </imagesSet>
     </DescribeImagesResponse>
     RESPONSE
-    
+
     @deregister_image_response_body = <<-RESPONSE
-    <DeregisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
-      <return>true</return> 
+    <DeregisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
+      <return>true</return>
     </DeregisterImageResponse>
     RESPONSE
-    
+
   end
-  
-  
+
+
   specify "should be able to be registered" do
     @ec2.stubs(:make_request).with('RegisterImage', {"ImageLocation"=>"mybucket-myimage.manifest.xml"}).
       returns stub(:body => @register_image_response_body, :is_a? => true)
     @ec2.register_image(:image_location => "mybucket-myimage.manifest.xml").imageId.should.equal "ami-61a54008"
     @ec2.register_image(:image_location => "mybucket-myimage.manifest.xml").should.be.an.instance_of EC2::Response
   end
-  
-  
+
+
   specify "method register_image should raise an exception when called without nil/empty string arguments" do
     lambda { @ec2.register_image() }.should.raise(EC2::ArgumentError)
     lambda { @ec2.register_image(:image_location => "") }.should.raise(EC2::ArgumentError)
   end
-  
-  
+
+
   specify "should be able to be described and return the correct Ruby response class for parent and members" do
     @ec2.stubs(:make_request).with('DescribeImages', {}).
       returns stub(:body => @describe_image_response_body, :is_a? => true)
@@ -77,21 +77,21 @@ context "An EC2 image " do
     response = @ec2.describe_images
     response.should.be.an.instance_of EC2::Response
   end
-  
-  
+
+
   specify "should be able to be described with no params and return an imagesSet" do
     @ec2.stubs(:make_request).with('DescribeImages', {}).
       returns stub(:body => @describe_image_response_body, :is_a? => true)
     @ec2.describe_images.imagesSet.item.length.should.equal 2
   end
-  
+
   specify "should be able to be described by an Array of ImageId.N ID's and return an array of Items" do
     @ec2.stubs(:make_request).with('DescribeImages', {"ImageId.1"=>"ami-61a54008", "ImageId.2"=>"ami-61a54009"}).
       returns stub(:body => @describe_image_response_body, :is_a? => true)
     @ec2.describe_images( :image_id => ["ami-61a54008", "ami-61a54009"] ).imagesSet.item.length.should.equal 2
-    
+
     response = @ec2.describe_images( :image_id => ["ami-61a54008", "ami-61a54009"] )
-    
+
     # test first 'Item' object returned
     response.imagesSet.item[0].imageId.should.equal "ami-61a54008"
     response.imagesSet.item[0].imageLocation.should.equal "foobar1/image.manifest.xml"
@@ -99,7 +99,7 @@ context "An EC2 image " do
     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"
     response.imagesSet.item[1].imageLocation.should.equal "foobar2/image.manifest.xml"
@@ -107,91 +107,91 @@ context "An EC2 image " do
     response.imagesSet.item[1].imageOwnerId.should.equal "ZZZZTLBUXIEON5NQVUUX6OMPWBZIZZZZ"
     response.imagesSet.item[1].isPublic.should.equal "false"
   end
-  
-  
+
+
   specify "should be able to be described by an owners with Owner.N ID's and return an array of Items" do
     @ec2.stubs(:make_request).with('DescribeImages', "Owner.1" => "AAAATLBUXIEON5NQVUUX6OMPWBZIAAAA", "Owner.2" => "ZZZZTLBUXIEON5NQVUUX6OMPWBZIZZZZ").
       returns stub(:body => @describe_image_response_body, :is_a? => true)
     @ec2.describe_images( :owner_id => ["AAAATLBUXIEON5NQVUUX6OMPWBZIAAAA", "ZZZZTLBUXIEON5NQVUUX6OMPWBZIZZZZ"] ).imagesSet.item.length.should.equal 2
-    
+
     # owner ID's
     response = @ec2.describe_images( :owner_id => ["AAAATLBUXIEON5NQVUUX6OMPWBZIAAAA", "ZZZZTLBUXIEON5NQVUUX6OMPWBZIZZZZ"] )
     response.imagesSet.item[0].imageId.should.equal "ami-61a54008"
     response.imagesSet.item[1].imageId.should.equal "ami-61a54009"
   end
-  
-  
+
+
   specify "should be able to be described by an owner of 'self' and return an array of Items that I own" do
     @ec2.stubs(:make_request).with('DescribeImages', "Owner.1" => "self").
       returns stub(:body => @describe_image_response_body, :is_a? => true)
     @ec2.describe_images( :owner_id => "self" ).imagesSet.item.length.should.equal 2
-    
+
     # 'self' - Those that I own
     response = @ec2.describe_images( :owner_id => "self" )
     response.imagesSet.item[0].imageId.should.equal "ami-61a54008"
   end
-  
-  
+
+
   specify "should be able to be described by an owner of 'amazon' and return an array of Items that are Amazon Public AMI's" do
     @ec2.stubs(:make_request).with('DescribeImages', "Owner.1" => "amazon").
       returns stub(:body => @describe_image_response_body, :is_a? => true)
     @ec2.describe_images( :owner_id => "amazon" ).imagesSet.item.length.should.equal 2
-    
+
     # 'amazon' - Those that are owned and created by AWS
     response = @ec2.describe_images( :owner_id => "amazon" )
     response.imagesSet.item[0].imageId.should.equal "ami-61a54008"
   end
-  
-  
+
+
   specify "should be able to be described by an owners with Owner.N ID's who can execute AMI's and return an array of Items" do
     @ec2.stubs(:make_request).with('DescribeImages', "ExecutableBy.1" => "AAAATLBUXIEON5NQVUUX6OMPWBZIAAAA", "ExecutableBy.2" => "ZZZZTLBUXIEON5NQVUUX6OMPWBZIZZZZ").
       returns stub(:body => @describe_image_response_body, :is_a? => true)
     @ec2.describe_images( :executable_by => ["AAAATLBUXIEON5NQVUUX6OMPWBZIAAAA", "ZZZZTLBUXIEON5NQVUUX6OMPWBZIZZZZ"] ).imagesSet.item.length.should.equal 2
-    
+
     # executable by owner ID's
     response = @ec2.describe_images( :executable_by => ["AAAATLBUXIEON5NQVUUX6OMPWBZIAAAA", "ZZZZTLBUXIEON5NQVUUX6OMPWBZIZZZZ"] )
     response.imagesSet.item[0].imageId.should.equal "ami-61a54008"
     response.imagesSet.item[1].imageId.should.equal "ami-61a54009"
   end
-  
-  
+
+
   specify "should be able to be described by an owners with Owner.N of 'self' who can execute AMI's and return an array of Items" do
     @ec2.stubs(:make_request).with('DescribeImages', "ExecutableBy.1" => "self").
       returns stub(:body => @describe_image_response_body, :is_a? => true)
     @ec2.describe_images( :executable_by => "self" ).imagesSet.item.length.should.equal 2
-    
+
     # executable by owner ID's
     response = @ec2.describe_images( :executable_by => "self" )
     response.imagesSet.item[0].imageId.should.equal "ami-61a54008"
     response.imagesSet.item[1].imageId.should.equal "ami-61a54009"
   end
-  
-  
+
+
   specify "should be able to be described by an owners with Owner.N of 'all' who can execute AMI's and return an array of Items" do
     @ec2.stubs(:make_request).with('DescribeImages', "ExecutableBy.1" => "all").
       returns stub(:body => @describe_image_response_body, :is_a? => true)
     @ec2.describe_images( :executable_by => "all" ).imagesSet.item.length.should.equal 2
-    
+
     # executable by owner ID's
     response = @ec2.describe_images( :executable_by => "all" )
     response.imagesSet.item[0].imageId.should.equal "ami-61a54008"
     response.imagesSet.item[1].imageId.should.equal "ami-61a54009"
   end
-  
-  
+
+
   specify "should be able to be de-registered" do
     @ec2.stubs(:make_request).with('DeregisterImage', {"ImageId"=>"ami-61a54008"}).
       returns stub(:body => @deregister_image_response_body, :is_a? => true)
     @ec2.deregister_image(:image_id => "ami-61a54008" ).should.be.an.instance_of EC2::Response
     @ec2.deregister_image(:image_id => "ami-61a54008" ).return.should.equal "true"
   end
-  
-  
+
+
   specify "method deregister_image should raise an exception when called without nil/empty string arguments" do
     lambda { @ec2.deregister_image() }.should.raise(EC2::ArgumentError)
     lambda { @ec2.deregister_image( :image_id => nil ) }.should.raise(EC2::ArgumentError)
     lambda { @ec2.deregister_image( :image_id => "" ) }.should.raise(EC2::ArgumentError)
   end
-  
-  
+
+
 end