amazon-ec2 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/amazon-ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-25}
   s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling APIs.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]

data/lib/AWS/EC2/snapshots.rb

@@ -22,6 +22,7 @@ module AWS
       # The CreateSnapshot operation creates a snapshot of an Amazon EBS volume and stores it in Amazon S3. You can use snapshots for backups, to launch instances from identical snapshots, and to save data before shutting down an instance.
       #
       # @option options [String] :volume_id ('')
+      # @option options [optional,String] :description ('') Description of the Amazon EBS snapshot.
       #
       def create_snapshot( options = {} )
         options = { :volume_id => '' }.merge(options)
@@ -29,6 +30,7 @@ module AWS
         params = {
           "VolumeId" => options[:volume_id]
         }
+        params["Description"] = options[:description] unless options[:description].nil?
         return response_generator(:action => "CreateSnapshot", :params => params)
       end
 

data/lib/AWS/EC2/spot_prices.rb

@@ -14,8 +14,8 @@ module AWS
       # @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, ":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, ":product_description must be 'Linux/UNIX' or 'Windows'" unless options[:product_description].nil? || ["Linux/UNIX", "Windows"].include?(options[:product_description])
 

data/test/test_EC2_snapshots.rb

@@ -32,6 +32,7 @@ context "EC2 snaphots " do
       <status>pending</status>
       <startTime>2008-05-07T12:51:50.000Z</startTime>
       <progress></progress>
+      <description>Daily Backup</description>
     </CreateSnapshotResponse>
     RESPONSE
 
@@ -70,6 +71,20 @@ context "EC2 snaphots " do
     response.progress.should.equal nil
   end
 
+  specify "should be able to be created with a volume_id and description" do
+    @ec2.stubs(:make_request).with('CreateSnapshot', {"VolumeId" => "vol-4d826724", "Description" => "Daily Backup"}).
+      returns stub(:body => @create_snapshot_response_body, :is_a? => true)
+
+    @ec2.create_snapshot( :volume_id => "vol-4d826724", :description => "Daily Backup" ).should.be.an.instance_of Hash
+
+    response = @ec2.create_snapshot( :volume_id => "vol-4d826724", :description => "Daily Backup")
+    response.snapshotId.should.equal "snap-78a54011"
+    response.volumeId.should.equal "vol-4d826724"
+    response.status.should.equal "pending"
+    response.progress.should.equal nil
+    response.description.should.equal "Daily Backup"
+  end
+
   specify "should be able to be deleted with a snapsot_id" do
     @ec2.stubs(:make_request).with('DeleteSnapshot', {"SnapshotId" => "snap-78a54011"}).
       returns stub(:body => @delete_snapshot_response_body, :is_a? => true)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2010-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency