amazon-ec2 0.7.9 → 0.9.0

data/.gitignore

@@ -5,4 +5,5 @@ rdoc
 doc
 .yardoc
 pkg
+.idea
 

data/ChangeLog

@@ -1,3 +1,8 @@
+=== 0.9.0 2010-01-19
+ * Added EC2 Spot Instance Request Support (nirvdrum)
+ * Added EC2 describe_spot_price_history (tlossen)
+ * Added ELB describe_instance_health method (rubysolo)
+
 === 0.7.4 2009-12-05
  * Initial support for new EBS AMI's
  * Updated EC2 API version

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.9.0

data/amazon-ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.7.9"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2009-12-22}
+  s.date = %q{2010-01-19}
   s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling API's.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]
@@ -51,6 +51,8 @@ Gem::Specification.new do |s|
      "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/volumes.rb",
      "lib/AWS/ELB.rb",
      "lib/AWS/ELB/load_balancers.rb",
@@ -76,6 +78,8 @@ Gem::Specification.new do |s|
      "test/test_EC2_s3_xmlsimple.rb",
      "test/test_EC2_security_groups.rb",
      "test/test_EC2_snapshots.rb",
+     "test/test_EC2_spot_instance_requests.rb",
+     "test/test_EC2_spot_prices.rb",
      "test/test_EC2_volumes.rb",
      "test/test_ELB_load_balancers.rb",
      "test/test_RDS.rb",
@@ -108,6 +112,8 @@ Gem::Specification.new do |s|
      "test/test_EC2_s3_xmlsimple.rb",
      "test/test_EC2_security_groups.rb",
      "test/test_EC2_snapshots.rb",
+     "test/test_EC2_spot_instance_requests.rb",
+     "test/test_EC2_spot_prices.rb",
      "test/test_EC2_volumes.rb",
      "test/test_ELB_load_balancers.rb",
      "test/test_helper.rb",

data/lib/AWS.rb

@@ -29,6 +29,10 @@ class Hash
     end
   end
 
+  def type
+    self['type']
+  end
+
   def has?(key)
     self[key] && !self[key].to_s.empty?
   end
@@ -155,6 +159,20 @@ module AWS
 
     end
 
+    # If :user_data is passed in then URL escape and Base64 encode it
+    # as needed.  Need for URL Escape + Base64 encoding is determined
+    # by :base64_encoded param.
+    def extract_user_data( options = {} )
+      return unless options[:user_data]
+      if options[:user_data]
+        if options[:base64_encoded]
+          Base64.encode64(options[:user_data]).gsub(/\n/, "").strip()
+        else
+          options[:user_data]
+        end
+      end
+    end
+
 
     protected
 
@@ -256,7 +274,6 @@ module AWS
         http_response = make_request(options[:action], options[:params])
         http_xml = http_response.body
         return Response.parse(:xml => http_xml)
-
       end
 
       # Raises the appropriate error if the specified Net::HTTPResponse object

data/lib/AWS/EC2/instances.rb

@@ -36,7 +36,7 @@ module AWS
         raise ArgumentError, ":image_id must be provided" if options[:image_id].nil? || options[:image_id].empty?
         raise ArgumentError, ":min_count is not valid" unless options[:min_count].to_i > 0
         raise ArgumentError, ":max_count is not valid or must be >= :min_count" unless options[:max_count].to_i > 0 && options[:max_count].to_i >= options[:min_count].to_i
-        raise ArgumentError, ":instance_type must specify a valid instance size" 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? || ["m1.small", "m1.large", "m1.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge"].include?(options[:instance_type])
         raise ArgumentError, ":monitoring_enabled must be 'true' or 'false'" unless options[:monitoring_enabled].nil? || [true, false].include?(options[:monitoring_enabled])
         raise ArgumentError, ":disable_api_termination must be 'true' or 'false'" unless options[:disable_api_termination].nil? || [true, false].include?(options[:disable_api_termination])
         raise ArgumentError, ":instance_initiated_shutdown_behavior must be 'stop' or 'terminate'" unless options[:instance_initiated_shutdown_behavior].nil? || ["stop", "terminate"].include?(options[:instance_initiated_shutdown_behavior])
@@ -72,21 +72,6 @@ module AWS
         return response_generator(:action => "RunInstances", :params => params)
       end
 
-      # If :user_data is passed in then URL escape and Base64 encode it
-      # as needed.  Need for URL Escape + Base64 encoding is determined
-      # by :base64_encoded param.
-      def extract_user_data( options = {} )
-        return unless options[:user_data]
-        if options[:user_data]
-          if options[:base64_encoded]
-            Base64.encode64(options[:user_data]).gsub(/\n/,"").strip()
-          else
-            options[:user_data]
-          end
-        end
-      end
-
-
       # The DescribeInstances operation returns information about instances owned by the user
       # making the request.
       #

data/lib/AWS/EC2/spot_instance_requests.rb

@@ -0,0 +1,105 @@
+module AWS
+  module EC2
+
+    class Base < AWS::Base
+
+      # Creates a Spot Instance request. Spot Instances are instances that Amazon EC2 starts on your behalf
+      # when the maximum price that you specify exceeds the current Spot Price. Amazon EC2 periodically sets
+      # the Spot Price based on available Spot Instance capacity and current spot instance requests. For conceptual
+      # information about Spot Instances, refer to the Amazon Elastic Compute Cloud Developer Guide or Amazon Elastic
+      # Compute Cloud User Guide.
+      #
+      # @option options [String] :spot_price (nil) Specifies the maximum hourly price for any Spot Instance launched to fulfill the request.
+      # @option options [optional,Integer] :instance_count (1) The maximum number of Spot Instances to launch.
+      # @option options [optional,String] :type (nil) Specifies the Spot Instance type.
+      # @option options [optional,Date] :valid_from (nil) Start date of the request. If this is a one-time request, the request becomes active at this date and time and remains active until all instances launch, the request expires, or the request is canceled. If the request is persistent, the request becomes active at this date and time and remains active until it expires or is canceled.
+      # @option options [optional,Date] :valid_until (nil) End date of the request. If this is a one-time request, the request remains active until all instances launch, the request is canceled, or this date is reached. If the request is persistent, it remains active until it is canceled or this date and time is reached.
+      # @option options [optional,String] :launch_group (nil) Specifies the instance launch group. Launch groups are Spot Instances that launch together and terminate together.
+      # @option options [optional,String] :availability_zone_group ("") Specifies the Availability Zone group. If you specify the same Availability Zone group for all Spot Instance requests, all Spot Instances are launched in the same Availability Zone.
+      # @option options [optional,String] :image_id (nil) The AMI ID.
+      # @option options [optional,String] :key_name (nil) The name of the key pair.
+      # @option options [optional,Array of Strings or String] :security_group (nil) Name of the security group(s).
+      # @option options [optional,String] :user_data (nil) MIME, Base64-encoded user data.
+      # @option options [optional,String] :instance_type ("m1.small") Specifies the instance type.
+      # @option options [optional,String] :kernel_id (nil) The ID of the kernel to select.
+      # @option options [optional,String] :ramdisk_id (nil) The ID of the RAM disk to select. Some kernels require additional drivers at launch. Check the kernel requirements for information on whether you need to specify a RAM disk and search for the kernel ID.
+      # @option options [optional,String] :subnet_id (nil) Specifies the Amazon VPC subnet ID within which to launch the instance(s) for Amazon Virtual Private Cloud.
+      # @option options [optional,String] :availability_zone (nil) Specifies the placement constraints (Availability Zones) for launching the instances.
+      # @option options [optional, Array] :block_device_mapping ([]) An array of Hashes representing the elements of the block device mapping.  e.g. [{:device_name => '/dev/sdh', :virtual_name => '', :ebs_snapshot_id => '', :ebs_volume_size => '', :ebs_delete_on_termination => ''},{},...]
+      # @option options [optional, Boolean] :monitoring_enabled (false) Enables monitoring for the instance.
+      #
+      def request_spot_instances( options = {} )
+        options = { :instance_count => 1,
+                    :instance_type => 'm1.small',
+                    :base64_encoded => false }.merge(options)
+
+        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?
+
+        user_data = extract_user_data(options)
+
+        params = {}
+
+        if options[:security_group]
+          params.merge!(pathlist("LaunchSpecification.SecurityGroup", options[:security_group]))
+        end
+
+        if options[:block_device_mapping]
+          params.merge!(pathhashlist('LaunchSpecification.BlockDeviceMapping', options[:block_device_mapping].flatten, {:device_name => 'DeviceName', :virtual_name => 'VirtualName', :ebs_snapshot_id => 'Ebs.SnapshotId', :ebs_volume_size => 'Ebs.VolumeSize', :ebs_delete_on_termination => 'Ebs.DeleteOnTermination' }))
+        end
+
+        params["SpotPrice"]                                             = options[:spot_price]
+        params["InstanceCount"]                                         = options[:instance_count].to_s
+        params["Type"]                                                  = options[:type] unless options[:type].nil?
+        params["ValidFrom"]                                             = options[:valid_from].to_s unless options[:valid_from].nil?
+        params["ValidUntil"]                                            = options[:valid_until].to_s unless options[:valid_until].nil?
+        params["LaunchGroup"]                                           = options[:launch_group] unless options[:launch_group].nil?
+        params["AvailabilityZoneGroup"]                                 = options[:availability_zone_group] unless options[:availability_zone_group].nil?
+        params["LaunchSpecification.ImageId"]                           = options[:image_id] unless options[:image_id].nil?
+        params["LaunchSpecification.KeyName"]                           = options[:key_name] unless options[:key_name].nil?
+        params["LaunchSpecification.UserData"]                          = user_data unless user_data.nil?
+        params["LaunchSpecification.InstanceType"]                      = options[:instance_type] unless options[:instance_type].nil?
+        params["LaunchSpecification.KernelId"]                          = options[:kernel_id] unless options[:kernel_id].nil?
+        params["LaunchSpecification.RamdiskId"]                         = options[:ramdisk_id] unless options[:ramdisk_id].nil?
+        params["LaunchSpecification.SubnetId"]                          = options[:subnet_id] unless options[:subnet_id].nil?
+        params["LaunchSpecification.Placement.AvailabilityZone"]        = options[:availability_zone] unless options[:availability_zone].nil?
+        params["LaunchSpecification.Monitoring.Enabled"]                = options[:monitoring_enabled].to_s unless options[:monitoring_enabled].nil?
+        
+        return response_generator(:action => "RequestSpotInstances", :params => params)
+      end
+
+      # Describes Spot Instance requests. Spot Instances are instances that Amazon EC2 starts on your behalf when the
+      # maximum price that you specify exceeds the current Spot Price. Amazon EC2 periodically sets the Spot Price
+      # based on available Spot Instance capacity and current spot instance requests. For conceptual information about
+      # Spot Instances, refer to the Amazon Elastic Compute Cloud Developer Guide or Amazon Elastic Compute Cloud User Guide.
+      #
+      # @option options [Array] :spot_instance_request_id ([])
+      #
+      def describe_spot_instance_requests( options = {} )
+        options = { :spot_instance_request_id => []}.merge(options)
+        params = pathlist( "SpotInstanceRequestId", options[:spot_instance_request_id] )
+
+        return response_generator(:action => "DescribeSpotInstanceRequests", :params => params)
+      end
+
+      # Cancels one or more Spot Instance requests. Spot Instances are instances that Amazon EC2 starts on your behalf
+      # when the maximum price that you specify exceeds the current Spot Price. Amazon EC2 periodically sets the Spot
+      # Price based on available Spot Instance capacity and current spot instance requests. For conceptual information
+      # about Spot Instances, refer to the Amazon Elastic Compute Cloud Developer Guide or Amazon Elastic Compute Cloud
+      # User Guide.
+      #
+      # NB: Canceling a Spot Instance request does not terminate running Spot Instances associated with the request.
+      #
+      # @option options [Array] :spot_instance_request_id ([])
+      #
+      def cancel_spot_instance_requests( options = {} )
+        options = { :spot_instance_request_id => []}.merge(options)
+        params = pathlist( "SpotInstanceRequestId", options[:spot_instance_request_id] )
+
+        return response_generator(:action => "CancelSpotInstanceRequests", :params => params)
+      end
+
+    end
+  end
+end
+

data/lib/AWS/EC2/spot_prices.rb

@@ -0,0 +1,34 @@
+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 
+      # available capacity and current spot instance requests.
+      #
+      # @option options [Time] :start_time (nil)
+      # @option options [Time] :end_time (nil)
+      # @option options [String] :instance_type (nil)
+      # @option options [String] :product_description (nil)
+      #
+      def describe_spot_price_history( options = {} )
+        raise ArgumentError, ":start_time must be a Time object" unless options[:start_time].nil? || Time == options[:start_time].class
+        raise ArgumentError, ":end_time must be a Time object" unless options[:end_time].nil? || Time == options[:end_time].class
+        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, ":product_description must be 'Linux/UNIX' or 'Windows'" unless options[:product_description].nil? || ["Linux/UNIX", "Windows"].include?(options[:product_description])
+
+        params = {}
+        params.merge!("StartTime" => options[:start_time].iso8601) if options[:start_time]
+        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
+
+    end
+  end
+end
+

data/lib/AWS/ELB/load_balancers.rb

@@ -149,28 +149,69 @@ module AWS
         return response_generator(:action => "ConfigureHealthCheck", :params => params)
       end
 
-      # Not yet implemented
+      # This API returns the current state of the instances of the specified LoadBalancer. If no instances are specified,
+      # the state of all the instances for the LoadBalancer is returned.
       #
-      # @todo Implement this method
+      # You must have been the one who created in the LoadBalancer. In other words, in order to successfully call this API,
+      # you must provide the same account credentials as those that were used to create the LoadBalancer.
+      #
+      # @option options [Array<String>] :instances List of instances IDs whose state is being queried.
+      # @option options [String] :load_balancer_name The name of the load balancer
       #
       def describe_instance_health( options = {} )
-        raise "Not yet implemented"
+        raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
+
+        params = {}
+
+        params['LoadBalancerName'] = options[:load_balancer_name]
+        params.merge!(pathlist('Instances.member', [options[:instances]].flatten)) if options.has_key?(:instances)
+
+        return response_generator(:action => "DescribeInstanceHealth", :params => params)
       end
 
-      # Not yet implemented
+      # This API removes the specified EC2 Availability Zones from the set of configured Availability Zones for the
+      # LoadBalancer. Once an Availability Zone is removed, all the instances registered with the LoadBalancer that
+      # are in the removed Availability Zone go into the OutOfService state. Upon Availability Zone removal, the
+      # LoadBalancer attempts to equally balance the traffic among its remaining usable Availability Zones. Trying to
+      # remove an Availability Zone that was not associated with the LoadBalancer does nothing.
       #
-      # @todo Implement this method
+      # There must be at least one Availability Zone registered with a LoadBalancer at all times. You cannot remove
+      # all the Availability Zones from a LoadBalancer.
+      #
+      # In order for this call to be successful, you must have created the LoadBalancer. In other words, in order to
+      # successfully call this API, you must provide the same account credentials as those that were used to create
+      # the LoadBalancer.
+      #
+      # @option options [Array<String>] :availability_zones List of Availability Zones to be removed from the LoadBalancer.
+      # @option options [String] :load_balancer_name The name of the load balancer
       #
       def disable_availability_zones_for_load_balancer( options = {} )
-        raise "Not yet implemented"
+        raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
+        raise ArgumentError, "No :availability_zones provided" if options[:availability_zones].nil? || options[:availability_zones].empty?
+
+        params = {}
+
+        params['LoadBalancerName'] = options[:load_balancer_name]
+        params.merge!(pathlist('AvailabilityZones.member', [options[:availability_zones]].flatten))
+
+        return response_generator(:action => "DisableAvailabilityZonesForLoadBalancer", :params => params)
       end
 
-      # Not yet implemented
+      # This API is used to add one or more EC2 Availability Zones to the LoadBalancer.
       #
-      # @todo Implement this method
+      # @option options [Array<String>] :availability_zones List of Availability Zones to be added to the LoadBalancer.
+      # @option options [String] :load_balancer_name The name of the load balancer
       #
       def enable_availability_zones_for_load_balancer( options = {} )
-        raise "Not yet implemented"
+        raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
+        raise ArgumentError, "No :availability_zones provided" if options[:availability_zones].nil? || options[:availability_zones].empty?
+
+        params = {}
+
+        params['LoadBalancerName'] = options[:load_balancer_name]
+        params.merge!(pathlist('AvailabilityZones.member', [options[:availability_zones]].flatten))
+
+        return response_generator(:action => "EnableAvailabilityZonesForLoadBalancer", :params => params)
       end
 
     end

data/test/test_EC2_spot_instance_requests.rb

@@ -0,0 +1,178 @@
+#--
+# 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 "An EC2 spot instances request " do
+
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @create_spot_instances_request_response_body = <<-RESPONSE
+    <RequestSpotInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+      <spotInstanceRequestSet>
+        <item>
+          <spotInstanceRequestId>sir-f102a405</spotInstanceRequestId>
+          <spotPrice>0.50</spotPrice>
+          <type>one-time</type>
+          <state>open</state>
+          <fault/>
+          <validFrom/>
+          <validUntil/>
+          <launchGroup/>
+          <availabilityZoneGroup>MyAzGroup</availabilityZoneGroup>
+          <launchSpecification>
+            <imageId> i-43a4412a</imageId>
+            <keyName>MyKeypair</keyName>
+            <groupSet>websrv</groupSet>
+            <instanceType>m1.small</instanceType>
+          </launchSpecification>
+          <instanceId>i-123345678</instanceId>
+          <createTime>2009-10-19T00:00:00+0000</createTime>
+          <productDescription/>
+        </item>
+      </spotInstanceRequestSet>
+    </RequestSpotInstancesResponse>
+    RESPONSE
+
+    @describe_spot_instance_requests_response_body = <<-RESPONSE
+    <DescribeSpotInstanceRequestsResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+      <spotInstanceRequestSet>
+        <item>
+          <spotInstanceRequestId>sir-e95fae02</spotInstanceRequestId>
+          <spotPrice>0.01</spotPrice>
+          <type>one-time</type>
+          <state>open</state>
+          <createTime>2009-12-04T22:51:14.000Z</createTime>
+          <productDescription>Linux/UNIX</productDescription>
+          <launchSpecification>
+            <imageId>ami-235fba4a</imageId>
+            <groupSet>
+              <item>
+                <groupId>default</groupId>
+              </item>
+            </groupSet>
+            <instanceType>m1.small</instanceType>
+            <blockDeviceMapping/>
+            <monitoring>
+              <enabled>false</enabled>
+            </monitoring>
+          </launchSpecification>
+          <instanceId>i-2fd4ca67</instanceId>
+        </item>
+        <item>
+          <spotInstanceRequestId>sir-e95fae03</spotInstanceRequestId>
+          <spotPrice>0.10</spotPrice>
+          <type>persistent</type>
+          <state>open</state>
+          <createTime>2009-12-04T22:51:14.000Z</createTime>
+          <productDescription>Linux/UNIX</productDescription>
+          <launchSpecification>
+            <imageId>ami-235fba4a</imageId>
+            <groupSet>
+              <item>
+                <groupId>default</groupId>
+              </item>
+            </groupSet>
+            <instanceType>m1.medium</instanceType>
+            <blockDeviceMapping/>
+            <monitoring>
+              <enabled>false</enabled>
+            </monitoring>
+          </launchSpecification>
+          <instanceId>i-2fd4ca90</instanceId>
+        </item>
+      </spotInstanceRequestSet>
+    </DescribeSpotInstanceRequestsResponse>
+    RESPONSE
+
+    @cancel_spot_instance_requests_response_body = <<-RESPONSE
+    <CancelSpotInstanceRequestsResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+      <requestId>59dbff89-35bd-4eac-99ed-be587ed81825</requestId>
+      <spotInstanceRequestSet>
+        <item>
+          <spotInstanceRequestId>sir-e95fae02</spotInstanceRequestId>
+          <state>cancelled</state>
+        </item>
+      </spotInstanceRequestSet>
+    </CancelSpotInstanceRequestsResponse>
+    RESPONSE
+
+  end
+
+
+  specify "should be able to be created" do
+    @ec2.stubs(:make_request).with('RequestSpotInstances', {"SpotPrice"=>"0.50", 'LaunchSpecification.InstanceType' => 'm1.small', "InstanceCount"=>"1"}).
+      returns stub(:body => @create_spot_instances_request_response_body, :is_a? => true)
+    @ec2.request_spot_instances(:spot_price => "0.50").should.be.an.instance_of Hash
+    @ec2.request_spot_instances(:spot_price => "0.50").spotInstanceRequestSet.item[0].spotInstanceRequestId.should.equal "sir-f102a405"
+  end
+
+
+  specify "method create_spot_instances_request should raise an exception when called with nil/empty string arguments" do
+    lambda { @ec2.request_spot_instances() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.request_spot_instances(:spot_price => "") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.request_spot_instances(:spot_price => nil) }.should.raise(AWS::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('DescribeSpotInstanceRequests', {}).
+      returns stub(:body => @describe_spot_instance_requests_response_body, :is_a? => true)
+    @ec2.describe_spot_instance_requests.should.be.an.instance_of Hash
+    response = @ec2.describe_spot_instance_requests
+    response.should.be.an.instance_of Hash
+  end
+
+
+  specify "should be able to be described with no params and return a spotInstanceRequestSet" do
+    @ec2.stubs(:make_request).with('DescribeSpotInstanceRequests', {}).
+      returns stub(:body => @describe_spot_instance_requests_response_body, :is_a? => true)
+    @ec2.describe_spot_instance_requests.spotInstanceRequestSet.item.length.should.equal 2
+  end
+
+  specify "should be able to be described by an Array of SpotInstanceRequestId.N ID's and return an array of Items" do
+    @ec2.stubs(:make_request).with('DescribeSpotInstanceRequests', {"SpotInstanceRequestId.1"=>"sir-e95fae02", "SpotInstanceRequestId.2"=>"sir-e95fae03"}).
+      returns stub(:body => @describe_spot_instance_requests_response_body, :is_a? => true)
+    @ec2.describe_spot_instance_requests( :spot_instance_request_id => ["sir-e95fae02", "sir-e95fae03"] ).spotInstanceRequestSet.item.length.should.equal 2
+
+    response = @ec2.describe_spot_instance_requests( :spot_instance_request_id => ["sir-e95fae02", "sir-e95fae03"] )
+
+    # test first 'Item' object returned
+    response.spotInstanceRequestSet.item[0].spotInstanceRequestId.should.equal "sir-e95fae02"
+    response.spotInstanceRequestSet.item[0].spotPrice.should.equal "0.01"
+    response.spotInstanceRequestSet.item[0].type.should.equal "one-time"
+    response.spotInstanceRequestSet.item[0].state.should.equal "open"
+    response.spotInstanceRequestSet.item[0].createTime.should.equal "2009-12-04T22:51:14.000Z"
+    response.spotInstanceRequestSet.item[0].productDescription.should.equal "Linux/UNIX"
+    response.spotInstanceRequestSet.item[0].launchSpecification.imageId.should.equal "ami-235fba4a"
+    response.spotInstanceRequestSet.item[0].launchSpecification.instanceType.should.equal "m1.small"
+    response.spotInstanceRequestSet.item[0].instanceId.should.equal "i-2fd4ca67"
+
+    # test second 'Item' object returned
+    response.spotInstanceRequestSet.item[1].spotInstanceRequestId.should.equal "sir-e95fae03"
+    response.spotInstanceRequestSet.item[1].spotPrice.should.equal "0.10"
+    response.spotInstanceRequestSet.item[1].type.should.equal "persistent"
+    response.spotInstanceRequestSet.item[1].state.should.equal "open"
+    response.spotInstanceRequestSet.item[1].createTime.should.equal "2009-12-04T22:51:14.000Z"
+    response.spotInstanceRequestSet.item[1].productDescription.should.equal "Linux/UNIX"
+    response.spotInstanceRequestSet.item[1].launchSpecification.imageId.should.equal "ami-235fba4a"
+    response.spotInstanceRequestSet.item[1].launchSpecification.instanceType.should.equal "m1.medium"
+    response.spotInstanceRequestSet.item[1].instanceId.should.equal "i-2fd4ca90"
+  end
+
+  specify "should be able to be destroyed" do
+    @ec2.stubs(:make_request).with('CancelSpotInstanceRequests', {"SpotInstanceRequestId.1"=>"sir-e95fae02"}).
+      returns stub(:body => @cancel_spot_instance_requests_response_body, :is_a? => true)
+    @ec2.cancel_spot_instance_requests(:spot_instance_request_id => "sir-e95fae02" ).should.be.an.instance_of Hash
+    @ec2.cancel_spot_instance_requests(:spot_instance_request_id => "sir-e95fae02" ).spotInstanceRequestSet.item[0].state.should.equal "cancelled"
+  end
+
+end

data/test/test_EC2_spot_prices.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "Spot price history " do
+
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @describe_spot_price_history_response_body = <<-RESPONSE
+    <DescribeSpotPriceHistoryResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+      <spotPriceHistorySet>
+        <item>
+          <instanceType>m1.small</instanceType>
+          <productDescription>Linux/UNIX</productDescription>
+          <spotPrice>0.287</spotPrice>
+          <timestamp>2009-12-04T20:56:05.000Z</timestamp>
+        </item>
+        <item>
+          <instanceType>m1.small</instanceType>
+          <productDescription>Windows</productDescription>
+          <spotPrice>0.033</spotPrice>
+          <timestamp>2009-12-04T22:33:47.000Z</timestamp>
+        </item>
+      </spotPriceHistorySet>
+    </DescribeSpotPriceHistoryResponse>
+    RESPONSE
+  end
+
+  specify "should be able to be listed" do
+    @ec2.stubs(:make_request).with('DescribeSpotPriceHistory', {}).
+      returns stub(:body => @describe_spot_price_history_response_body, :is_a? => true)
+    @ec2.describe_spot_price_history().should.be.an.instance_of Hash
+    @ec2.describe_spot_price_history().spotPriceHistorySet.item.should.be.an.instance_of Array
+  end
+
+  specify "should reject a start_time which is not a Time object" do
+    lambda { @ec2.describe_spot_price_history(:start_time => "foo") }.should.raise(AWS::ArgumentError)
+  end
+
+  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 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.7.9
+  version: 0.9.0
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -08:00
+date: 2010-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +108,8 @@ files:
 - 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/volumes.rb
 - lib/AWS/ELB.rb
 - lib/AWS/ELB/load_balancers.rb
@@ -133,6 +135,8 @@ files:
 - test/test_EC2_s3_xmlsimple.rb
 - test/test_EC2_security_groups.rb
 - test/test_EC2_snapshots.rb
+- test/test_EC2_spot_instance_requests.rb
+- test/test_EC2_spot_prices.rb
 - test/test_EC2_volumes.rb
 - test/test_ELB_load_balancers.rb
 - test/test_RDS.rb
@@ -190,6 +194,8 @@ test_files:
 - test/test_EC2_s3_xmlsimple.rb
 - test/test_EC2_security_groups.rb
 - test/test_EC2_snapshots.rb
+- test/test_EC2_spot_instance_requests.rb
+- test/test_EC2_spot_prices.rb
 - test/test_EC2_volumes.rb
 - test/test_ELB_load_balancers.rb
 - test/test_helper.rb