amazon-ec2 0.9.15 → 0.9.17

data/lib/AWS/EC2/spot_instance_requests.rb

@@ -37,6 +37,7 @@ module AWS
         raise ArgumentError, ":addressing_type has been deprecated." if options[:addressing_type]
         raise ArgumentError, ":spot_price must be provided" if options[:spot_price].nil? || options[:spot_price].empty?
         raise ArgumentError, ":base64_encoded must be 'true' or 'false'" unless [true, false].include?(options[:base64_encoded])
+        raise ArgumentError, ":instance_type must specify a valid instance type" unless options[:instance_type].nil? || ["t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge", "cc1.4xlarge"].include?(options[:instance_type])
 
         user_data = extract_user_data(options)
 

data/lib/AWS/EC2/spot_prices.rb

@@ -2,7 +2,7 @@ module AWS
   module EC2
 
     class Base < AWS::Base
-      
+
       # This method returns historical information about spot prices.
       # 
       # Amazon periodically sets the spot price for each instance type based on 
@@ -16,7 +16,7 @@ module AWS
       def describe_spot_price_history( options = {} )
         raise ArgumentError, ":start_time must be a Time object" unless options[:start_time].nil? || options[:start_time].kind_of?(Time)
         raise ArgumentError, ":end_time must be a Time object" unless options[:end_time].nil? || options[:end_time].kind_of?(Time)
-        raise ArgumentError, ":instance_type must specify a valid instance type" unless options[:instance_type].nil? || ["m1.small", "m1.large", "m1.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge"].include?(options[:instance_type])
+        raise ArgumentError, ":instance_type must specify a valid instance type" unless options[:instance_type].nil? || ["t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge", "cc1.4xlarge"].include?(options[:instance_type])
         raise ArgumentError, ":product_description must be 'Linux/UNIX' or 'Windows'" unless options[:product_description].nil? || ["Linux/UNIX", "Windows"].include?(options[:product_description])
 
         params = {}
@@ -24,7 +24,7 @@ module AWS
         params.merge!("EndTime" => options[:end_time].iso8601) if options[:end_time]
         params.merge!("InstanceType" => options[:instance_type]) if options[:instance_type]
         params.merge!("ProductDescription" => options[:product_description]) if options[:product_description]
-        
+
         return response_generator(:action => "DescribeSpotPriceHistory", :params => params)
       end
 

data/lib/AWS/EC2/tags.rb

@@ -0,0 +1,47 @@
+module AWS
+  module EC2
+    class Base < AWS::Base
+
+      # The CreateTags operation adds or overwrites tags for the specified resource(s).
+      #
+      # @option options [Array] :resource_id ([]) The ids of the resource(s) to tag
+      # @option options [Array] :tag ([]) An array of Hashes representing the tags { tag_name => tag_value }. Use nil or empty string to get a tag without a value
+      #
+      def create_tags( options = {} )
+        raise ArgumentError, "No :resource_id provided" if options[:resource_id].nil? || options[:resource_id].empty?
+        raise ArgumentError, "No :tag provided" if options[:tag].nil? || options[:tag].empty?
+
+        params = pathlist("ResourceId", options[:resource_id] )
+        params.merge!(pathkvlist('Tag', options[:tag], 'Key', 'Value', {}))
+        return response_generator(:action => "CreateTags", :params => params)
+      end
+
+      # The DescribeTags operation lists the tags, If you do not specify any filters, all tags will be returned.
+      #
+      # @option options [optional, Array] :filter ([]) An array of Hashes representing the filters. Note that the values in the hashes have to be arrays. E.g. [{:key => ['name']}, {:resource_type => ['instance']},...]
+      #
+      def describe_tags( options = {} )
+        params = {}
+        if options[:filter]
+          params.merge!(pathkvlist('Filter', options[:filter], 'Name', 'Value', {:resource_id => 'resource-id', :resource_type => 'resource-type' }))
+        end
+        return response_generator(:action => "DescribeTags", :params => params)
+      end
+
+      # The DeleteTags operation deletes tags for the specified resource(s).
+      #
+      # @option options [Array] :resource_id ([]) The ids of the resource(s) to tag
+      # @option options [Array] :tag ([]) An array of Hashes representing the tags { tag_name => tag_value }. If a value is given (instead of nil/empty string), then the tag is only deleted if it has this value
+      #
+      def delete_tags( options = {} )
+        raise ArgumentError, "No :resource_id provided" if options[:resource_id].nil? || options[:resource_id].empty?
+        raise ArgumentError, "No :tag provided" if options[:tag].nil? || options[:tag].empty?
+
+        params = pathlist("ResourceId", options[:resource_id] )
+        params.merge!(pathkvlist('Tag', options[:tag], 'Key', 'Value', {}))
+        return response_generator(:action => "DeleteTags", :params => params)
+      end
+    end
+  end
+end
+

data/lib/AWS/EC2/volumes.rb

@@ -88,7 +88,7 @@ module AWS
           "VolumeId" => options[:volume_id],
           "InstanceId" => options[:instance_id],
           "Device" => options[:device],
-          "Force" => options[:force]
+          "Force" => options[:force].to_s
         }
         return response_generator(:action => "DetachVolume", :params => params)
       end

data/lib/AWS/ELB.rb

@@ -8,8 +8,6 @@ module AWS
     #   export ELB_URL='https://elasticloadbalancing.amazonaws.com'
     if ENV['ELB_URL']
       ELB_URL = ENV['ELB_URL']
-      VALID_HOSTS = ['elasticloadbalancing.amazonaws.com']
-      raise ArgumentError, "Invalid ELB_URL environment variable : #{ELB_URL}" unless VALID_HOSTS.include?(ELB_URL)
       DEFAULT_HOST = URI.parse(ELB_URL).host
     else
       # Default US API endpoint

data/lib/AWS/RDS.rb

@@ -8,8 +8,6 @@ module AWS
     #   export RDS_URL='https://rds.amazonaws.com'
     if ENV['RDS_URL']
       RDS_URL = ENV['RDS_URL']
-      VALID_HOSTS = ['rds.amazonaws.com']
-      raise ArgumentError, "Invalid RDS_URL environment variable : #{RDS_URL}" unless VALID_HOSTS.include?(RDS_URL)
       DEFAULT_HOST = URI.parse(RDS_URL).host
     else
       # Default US API endpoint

data/lib/AWS/RDS/rds.rb

@@ -14,7 +14,7 @@ module AWS
       # @option options [String] :port is the port the database accepts connections on (3306)
       # @option options [String] :db_name contains the name of the database to create when created (nil)
       # @option options [String] :db_parameter_group is the database parameter group to associate with this instance (nil)
-      # @option options [String] :db_security_groups are the list of db security groups to associate with the instance (nil)
+      # @option options [Array] :db_security_groups are the list of db security groups to associate with the instance (nil)
       # @option options [String] :availability_zone is the availability_zone to create the instance in (nil)
       # @option options [String] :preferred_maintenance_window in format: ddd:hh24:mi-ddd:hh24:mi (nil)
       # @option options [String] :backup_retention_period is the number of days which automated backups are retained (1)
@@ -43,7 +43,7 @@ module AWS
         params["Port"] = options[:port].to_s if options.has?(:port)
         params["DBName"] = options[:db_name] if options.has?(:db_name)
         params["DBParameterGroup"] = options[:db_parameter_group] if options.has?(:db_parameter_group)
-        params["DBSecurityGroups"] = options[:db_security_groups] if options.has?(:db_security_groups)
+        params.merge!(pathlist("DBSecurityGroups.member", [options[:db_security_groups]].flatten)) if options.has_key?(:db_security_groups)
         params["AvailabilityZone"] = options[:availability_zone] if options.has?(:availability_zone)
         params["PreferredMaintenanceWindow"] = options[:preferred_maintenance_window] if options.has?(:preferred_maintenance_window)
         params["BackupRetentionPeriod"] = options[:backup_retention_period].to_s if options.has?(:backup_retention_period)
@@ -344,7 +344,7 @@ module AWS
       # @option options [String] :port is the port the database accepts connections on (3306)
       # @option options [String] :db_name contains the name of the database to create when created (nil)
       # @option options [String] :db_parameter_group_name is the database parameter group to associate with this instance (nil)
-      # @option options [String] :db_security_groups are the list of db security groups to associate with the instance (nil)
+      # @option options [Array] :db_security_groups are the list of db security groups to associate with the instance (nil)
       # @option options [String] :availability_zone is the availability_zone to create the instance in (nil)
       # @option options [String] :preferred_maintenance_window in format: ddd:hh24:mi-ddd:hh24:mi (nil)
       # @option options [String] :backup_retention_period is the number of days which automated backups are retained (1)
@@ -367,7 +367,7 @@ module AWS
         params["Port"] = options[:port].to_s if options.has?(:port)
         params["DBName"] = options[:db_name] if options.has?(:db_name)
         params["DBParameterGroupName"] = options[:db_parameter_group_name] if options.has?(:db_parameter_group_name)
-        params["DBSecurityGroups"] = options[:db_security_groups] if options.has?(:db_security_groups)
+        params.merge!(pathlist("DBSecurityGroups.member", [options[:db_security_groups]].flatten)) if options.has_key?(:db_security_groups)
         params["AvailabilityZone"] = options[:availability_zone] if options.has?(:availability_zone)
         params["PreferredMaintenanceWindow"] = options[:preferred_maintenance_window] if options.has?(:preferred_maintenance_window)
         params["BackupRetentionPeriod"] = options[:backup_retention_period].to_s if options.has?(:backup_retention_period)
@@ -471,7 +471,7 @@ module AWS
       # @option options [optional, Boolean] :use_latest_restorable_time specifies that the db be restored to the latest restored time. Conditional, cannot be specified if :restore_time parameter is provided.
       # @option options [optional, Date] :restore_time specifies the date and time to restore from. Conditional, cannot be specified if :use_latest_restorable_time parameter is true.
       # @option options [String] :target_db_instance_identifier is the name of the new database instance to be created.
-      # @option options [optional, String] :db_instance_class specifies the class of the compute and memory of the EC2 instance, Options : db.m1.small | db.m1.large | db.m1.xlarge | db.m2.2xlarge | db.m2.4xlarge
+      # @option options [optional, String] :db_instance_class specifies the class of the compute and memory of the EC2 instance, Options : db.m1.small | db.m1.large | db.m1.xlarge | db.m2.2xlarge | db.m2.4xlarge | db.cc1.4xlarge
       # @option options [optional, Integer] :port is the port which the db can accept connections on. Constraints: Value must be 1115-65535
       # @option options [optional, String] :availability_zone is the EC2 zone which the db instance will be created
       #

data/lib/AWS/version.rb

@@ -0,0 +1,3 @@
+module AWS
+  VERSION = "0.9.17"
+end

data/test/test_EC2.rb

@@ -61,8 +61,8 @@ context "The EC2 method " do
   end
 
   specify "AWS.encode should return the expected string" do
-    AWS.encode("secretaccesskey", "foobar123", urlencode=true).should.equal "e3jeuDc3DIX2mW8cVqWiByj4j5g%3D"
-    AWS.encode("secretaccesskey", "foobar123", urlencode=false).should.equal "e3jeuDc3DIX2mW8cVqWiByj4j5g="
+    AWS.encode("secretaccesskey", "foobar123", urlencode=true).should.equal "CPzGGhtvlG3P3yp88fPZp0HKouUV8mQK1ZcdFGQeAug%3D"
+    AWS.encode("secretaccesskey", "foobar123", urlencode=false).should.equal "CPzGGhtvlG3P3yp88fPZp0HKouUV8mQK1ZcdFGQeAug="
   end
 
 end

data/test/test_EC2_instances.rb

@@ -217,6 +217,27 @@ context "EC2 instances " do
     </UnmonitorInstancesResponse>
 
     RESPONSE
+
+    @describe_instance_attribute_response_body = <<-RESPONSE
+    <DescribeInstanceAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+      <instanceId>i-10a64379</instanceId>
+      <kernel>
+        <value>aki-f70657b2</value>
+      </kernel>
+    </DescribeInstanceAttributeResponse>
+    RESPONSE
+
+    @modify_instance_attribute_response_body = <<-RESPONSE
+    <ModifyInstanceAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+      <return>true</return>
+    </ModifyInstanceAttributeResponse>
+    RESPONSE
+
+    @reset_instance_attribute_response_body = <<-RESPONSE
+    <ResetInstanceAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+      <return>true</return>
+    </ResetInstanceAttributeResponse>
+    RESPONSE
   end
 
 
@@ -304,9 +325,13 @@ context "EC2 instances " do
     lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 2, :max_count => 1 ) }.should.raise(AWS::ArgumentError)
 
     # :instance_type
-    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "InstanceType" => 'm1.small').
-      returns stub(:body => @run_instances_response_body, :is_a? => true)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :instance_type => "m1.small" ) }.should.not.raise(AWS::ArgumentError)
+
+    ["t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge", "cc1.4xlarge"].each do |type|
+      @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "InstanceType" => type).
+        returns stub(:body => @run_instances_response_body, :is_a? => true)
+      lambda { @ec2.run_instances( :image_id => "ami-60a54009", :instance_type => type ) }.should.not.raise(AWS::ArgumentError)
+    end
+
     lambda { @ec2.run_instances( :image_id => "ami-60a54009", :instance_type => "m1.notarealsize" ) }.should.raise(AWS::ArgumentError)
 
     # :monitoring_enabled
@@ -608,4 +633,72 @@ context "EC2 instances " do
     @response.instancesSet.item[1].monitoring.state.should.equal "disabling"
   end
 
+  specify "should get an ArgumentError when trying to describe/modify/reset an instance attribute without an istance id" do
+    lambda { @ec2.describe_instance_attribute(:attribute => "ramdisk") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_instance_attribute(:attribute => "ramdisk") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_instance_attribute(:attribute => "ramdisk") }.should.raise(AWS::ArgumentError)
+
+    lambda { @ec2.describe_instance_attribute(:attribute => "ramdisk", :instance_id => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_instance_attribute(:attribute => "ramdisk", :instance_id => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_instance_attribute(:attribute => "ramdisk", :instance_id => nil) }.should.raise(AWS::ArgumentError)
+
+    lambda { @ec2.describe_instance_attribute(:attribute => "ramdisk", :instance_id => "") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_instance_attribute(:attribute => "ramdisk", :instance_id => "") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_instance_attribute(:attribute => "ramdisk", :instance_id => "") }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should get an ArgumentError when trying to describe/modify/reset an instance attribute without an attribute" do
+    lambda { @ec2.describe_instance_attribute(:instance_id => "i-33457a5a") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_instance_attribute(:instance_id => "i-33457a5a") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_instance_attribute(:instance_id => "i-33457a5a") }.should.raise(AWS::ArgumentError)
+
+    lambda { @ec2.describe_instance_attribute(:instance_id => "i-33457a5a", :attribute => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_instance_attribute(:instance_id => "i-33457a5a", :attribute => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_instance_attribute(:instance_id => "i-33457a5a", :attribute => nil) }.should.raise(AWS::ArgumentError)
+
+    lambda { @ec2.describe_instance_attribute(:instance_id => "i-33457a5a", :attribute => "") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_instance_attribute(:instance_id => "i-33457a5a", :attribute => "") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_instance_attribute(:instance_id => "i-33457a5a", :attribute => "") }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should get an ArgumentError when trying to describe/modify/reset an instance attribute without a valid attribute" do
+    lambda { @ec2.describe_instance_attribute(:instance_id => "i-33457a5a", :attribute => 'party') }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_instance_attribute(:instance_id => "i-33457a5a", :attribute => 'party') }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_instance_attribute(:instance_id => "i-33457a5a", :attribute => 'party') }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should not get an ArgumentError when trying to describe/modify/reset an instance attribute with a valid attribute" do
+    @ec2.stubs(:make_request).returns stub(:body => @describe_instance_attribute_response_body, :is_a? => true)
+    %w(instanceType kernel ramdisk userData disableApiTermination instanceInitiatedShutdownBehavior rootDevice blockDeviceMapping).each do |a|
+      lambda { @ec2.describe_instance_attribute(:instance_id => "i-33457a5a", :attribute => a) }.should.not.raise(AWS::ArgumentError)
+      lambda { @ec2.modify_instance_attribute(:instance_id => "i-33457a5a", :attribute => 'party') }.should.raise(AWS::ArgumentError)
+    end
+    %w(kernel ramdisk).each do |a|
+      lambda { @ec2.reset_instance_attribute(:instance_id => "i-33457a5a", :attribute => 'party') }.should.raise(AWS::ArgumentError)
+    end
+  end
+
+  specify "should successfully describe instance attribute" do
+    @ec2.stubs(:make_request).with('DescribeInstanceAttribute', {"InstanceId"=>"i-33457a5a", "Attribute" => "kernel"}).
+      returns stub(:body => @describe_instance_attribute_response_body, :is_a? => true)
+    @response = @ec2.describe_instance_attribute(:instance_id => "i-33457a5a", :attribute => 'kernel')
+    @response.class.should.equal Hash
+    @response.kernel.value.should.equal "aki-f70657b2"
+  end
+
+  specify "should successfully modify instance attribute" do
+    @ec2.stubs(:make_request).with('ModifyInstanceAttribute', {"InstanceId"=>"i-33457a5a", "Attribute" => "disableApiTermination", "Value" => "true"}).
+      returns stub(:body => @modify_instance_attribute_response_body, :is_a? => true)
+    @response = @ec2.modify_instance_attribute(:instance_id => "i-33457a5a", :attribute => 'disableApiTermination', :value => true)
+    @response.class.should.equal Hash
+    @response.return.should.equal "true"
+  end
+
+  specify "should successfully reset instance attribute" do
+    @ec2.stubs(:make_request).with('ResetInstanceAttribute', {"InstanceId"=>"i-33457a5a", "Attribute" => "kernel"}).
+      returns stub(:body => @reset_instance_attribute_response_body, :is_a? => true)
+    @response = @ec2.reset_instance_attribute(:instance_id => "i-33457a5a", :attribute => 'kernel')
+    @response.class.should.equal Hash
+    @response.return.should.equal "true"
+  end
 end

data/test/test_EC2_password.rb

@@ -0,0 +1,46 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
+# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
+# License::   Distributes under the same terms as Ruby
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
+#++
+
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "The EC2 password " do
+
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @get_password_data_response_body = <<-RESPONSE
+    <GetPasswordDataResponse xmlns="http://ec2.amazonaws.com/doc/2010-06-15/">
+      <instanceId>i-2574e22a</instanceId>
+      <timestamp>2009-10-24 15:00:00</timestamp>
+      <passwordData>TGludXggdmVyc2lvbiAyLjYuMTYteGVuVSAoYnVpbGRlckBwYXRjaGJhdC5hbWF6b25zYSkgKGdj</passwordData></GetPasswordDataResponse>
+    RESPONSE
+
+  end
+
+
+  specify "should return an encrypted password encoded by base64 " do
+    @ec2.stubs(:make_request).with('GetPasswordData', {"InstanceId"=>"i-2574e22a"}).
+       returns stub(:body => @get_password_data_response_body, :is_a? => true)
+    @ec2.get_password_data( :instance_id => "i-2574e22a" ).should.be.an.instance_of Hash
+    response = @ec2.get_password_data( :instance_id => "i-2574e22a" )
+    response.instanceId.should.equal "i-2574e22a"
+    response.timestamp.should.equal "2009-10-24 15:00:00"
+    response.passwordData.should.equal "TGludXggdmVyc2lvbiAyLjYuMTYteGVuVSAoYnVpbGRlckBwYXRjaGJhdC5hbWF6b25zYSkgKGdj"
+  end
+
+
+  specify "method get_password_data should raise an exception when called without nil/empty string arguments" do
+    lambda { @ec2.get_password_data() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.get_password_data(:instance_id => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.get_password_data(:instance_id => "") }.should.raise(AWS::ArgumentError)
+  end
+
+
+end

data/test/test_EC2_spot_instance_requests.rb

@@ -107,6 +107,17 @@ context "An EC2 spot instances request " do
 
   end
 
+  specify "should be able to be requested with various instance sizes" do
+    ["t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge", "cc1.4xlarge"].each do |type|
+      @ec2.stubs(:make_request).with('RequestSpotInstances', {"SpotPrice"=>"0.50", 'LaunchSpecification.InstanceType' => type, 'LaunchSpecification.ImageId' => 'ami-60a54009', "InstanceCount"=>"1"}).
+        returns stub(:body => @create_spot_instances_request_response_body, :is_a? => true)
+      lambda { @ec2.request_spot_instances( :image_id => "ami-60a54009", :instance_type => type, :spot_price => '0.50' ) }.should.not.raise(AWS::ArgumentError)
+    end
+  end
+
+  specify "should raise an exception with a bad instance type" do
+    lambda { @ec2.request_spot_instances({"SpotPrice"=>"0.50", 'LaunchSpecification.InstanceType' => 'm1.notarealsize', "InstanceCount"=>"1"}) }.should.raise(AWS::ArgumentError)
+  end
 
   specify "should be able to be created" do
     @ec2.stubs(:make_request).with('RequestSpotInstances', {"SpotPrice"=>"0.50", 'LaunchSpecification.InstanceType' => 'm1.small', "InstanceCount"=>"1"}).

data/test/test_EC2_spot_prices.rb

@@ -39,13 +39,21 @@ context "Spot price history " do
   specify "should reject an end_time which is not a Time object" do
     lambda { @ec2.describe_spot_price_history(:end_time => 42) }.should.raise(AWS::ArgumentError)
   end
-  
+
+  specify "should be able to be requested with various instance types" do
+    ["t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge", "cc1.4xlarge"].each do |type|
+      @ec2.stubs(:make_request).with('DescribeSpotPriceHistory', {'InstanceType' => type}).
+        returns stub(:body => @describe_spot_price_history_response_body, :is_a? => true)
+      lambda { @ec2.describe_spot_price_history( :instance_type => type ) }.should.not.raise(AWS::ArgumentError)
+    end
+  end
+
   specify "should reject an invalid instance type" do
     lambda { @ec2.describe_spot_price_history(:instance_type => 'm1.tiny') }.should.raise(AWS::ArgumentError)
   end
-  
+
   specify "should reject an invalid product description" do
     lambda { @ec2.describe_spot_price_history(:product_description => 'Solaris') }.should.raise(AWS::ArgumentError)
   end
-  
+
 end

data/test/test_EC2_volumes.rb

@@ -139,4 +139,20 @@ context "EC2 volumes " do
     response.status.should.equal "detaching"
   end
 
+  specify "should be able to be force detached with a string" do
+    @ec2.stubs(:make_request).with('DetachVolume', {"VolumeId" => "vol-4d826724", "InstanceId"=>"i-6058a509", "Device"=>"", "Force"=>"true"}).
+      returns stub(:body => @detach_volume_response_body, :is_a? => true)
+
+    response = @ec2.detach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509", :force => 'true' )
+    response.volumeId.should.equal "vol-4d826724"
+  end
+
+  specify "should be able to be force detached with a Boolean" do
+    @ec2.stubs(:make_request).with('DetachVolume', {"VolumeId" => "vol-4d826724", "InstanceId"=>"i-6058a509", "Device"=>"", "Force"=>"true"}).
+      returns stub(:body => @detach_volume_response_body, :is_a? => true)
+
+    response = @ec2.detach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509", :force => true )
+    response.volumeId.should.equal "vol-4d826724"
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 9
-  - 15
-  version: 0.9.15
+  - 17
+  version: 0.9.17
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -07:00
+date: 2010-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 41
         segments: 
         - 0
         - 9
-        - 8
-        version: 0.9.8
+        - 9
+        version: 0.9.9
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -74,12 +74,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 41
         segments: 
         - 0
         - 9
-        - 6
-        version: 0.9.6
+        - 9
+        version: 0.9.9
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -90,17 +90,35 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 9
-        version: 0.3.9
+        - 5
+        - 4
+        version: 0.5.4
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 6
+        - 2
+        version: 0.6.2
+  type: :development
+  version_requirements: *id006
 description: A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling APIs.
-email: glenn@rempe.us
+email: 
+- glenn@rempe.us
 executables: 
+- awshell
 - ec2-gem-example.rb
 - ec2-gem-profile.rb
 - ec2sh
@@ -111,17 +129,18 @@ extra_rdoc_files:
 - ChangeLog
 - LICENSE
 - README.rdoc
-- README_dev.rdoc
 files: 
 - .gitignore
 - .yardopts
 - ChangeLog
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
-- README_dev.rdoc
 - Rakefile
 - VERSION
 - amazon-ec2.gemspec
+- bin/awshell
 - bin/ec2-gem-example.rb
 - bin/ec2-gem-profile.rb
 - bin/ec2sh
@@ -141,12 +160,14 @@ files:
 - lib/AWS/EC2/images.rb
 - lib/AWS/EC2/instances.rb
 - lib/AWS/EC2/keypairs.rb
+- lib/AWS/EC2/password.rb
 - lib/AWS/EC2/products.rb
 - lib/AWS/EC2/security_groups.rb
 - lib/AWS/EC2/snapshots.rb
 - lib/AWS/EC2/spot_instance_requests.rb
 - lib/AWS/EC2/spot_prices.rb
 - lib/AWS/EC2/subnets.rb
+- lib/AWS/EC2/tags.rb
 - lib/AWS/EC2/volumes.rb
 - lib/AWS/ELB.rb
 - lib/AWS/ELB/load_balancers.rb
@@ -154,10 +175,7 @@ files:
 - lib/AWS/RDS/rds.rb
 - lib/AWS/exceptions.rb
 - lib/AWS/responses.rb
-- perftools/ec2prof
-- perftools/ec2prof-results.dot
-- perftools/ec2prof-results.txt
-- perftools/ec2prof.symbols
+- lib/AWS/version.rb
 - test/test_Autoscaling_groups.rb
 - test/test_EC2.rb
 - test/test_EC2_availability_zones.rb
@@ -167,6 +185,7 @@ files:
 - test/test_EC2_images.rb
 - test/test_EC2_instances.rb
 - test/test_EC2_keypairs.rb
+- test/test_EC2_password.rb
 - test/test_EC2_products.rb
 - test/test_EC2_responses.rb
 - test/test_EC2_s3_xmlsimple.rb
@@ -222,7 +241,7 @@ rubyforge_project: amazon-ec2
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Amazon EC2 Ruby Gem
+summary: Amazon EC2 Ruby gem
 test_files: 
 - test/test_Autoscaling_groups.rb
 - test/test_EC2.rb
@@ -233,6 +252,7 @@ test_files:
 - test/test_EC2_images.rb
 - test/test_EC2_instances.rb
 - test/test_EC2_keypairs.rb
+- test/test_EC2_password.rb
 - test/test_EC2_products.rb
 - test/test_EC2_responses.rb
 - test/test_EC2_s3_xmlsimple.rb
@@ -243,5 +263,5 @@ test_files:
 - test/test_EC2_subnets.rb
 - test/test_EC2_volumes.rb
 - test/test_ELB_load_balancers.rb
-- test/test_helper.rb
 - test/test_RDS.rb
+- test/test_helper.rb