fog 0.2.22 → 0.2.23

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.2.22'
-  s.date              = '2010-08-01'
+  s.version           = '0.2.23'
+  s.date              = '2010-08-16'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -41,7 +41,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.22'
+    VERSION = '0.2.23'
   end
 
   module Mock

data/lib/fog/attributes.rb

@@ -55,10 +55,10 @@ module Fog
         when :time
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
-              if !new_#{name}.is_a?(Time)
-                @#{name} = Time.parse(new_#{name})
-              else
+              if new_#{name}.nil? || new_#{name}.is_a?(Time)
                 @#{name} = new_#{name}
+              else
+                @#{name} = Time.parse(new_#{name})
               end
             end
           EOS

data/lib/fog/aws/requests/ec2/delete_volume.rb

@@ -29,6 +29,10 @@ module Fog
         def delete_volume(volume_id)
           response = Excon::Response.new
           if volume = @data[:volumes][volume_id]
+            if volume["attachmentSet"].any?
+              attach = volume["attachmentSet"].first
+              raise Fog::AWS::EC2::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
+            end
             @data[:deleted_at][volume_id] = Time.now
             volume['status'] = 'deleting'
             response.status = 200

data/lib/fog/vcloud/terremark/ecloud/models/task.rb

@@ -14,6 +14,7 @@ module Fog
           attribute :owner, :aliases => :Owner
           attribute :start_time, :aliases => :startTime, :type => :time
           attribute :end_time, :aliases => :endTime, :type => :time
+          attribute :error, :aliases => :Error
 
         end
       end

data/spec/aws/models/ec2/volume_spec.rb

@@ -43,6 +43,14 @@ describe 'Fog::AWS::EC2::Volume' do
       volume.destroy.should be_true
     end
 
+    it 'should fail if the volume is attached to an instance' do
+      server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
+      server.wait_for { ready? }
+      volume = AWS[:ec2].volumes.create(:availability_zone => server.availability_zone, :size => 1, :device => '/dev/sdz1')
+      volume.server = server
+      lambda { volume.destroy }.should raise_error
+    end
+
   end
 
   describe "#server=" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 22
-  version: 0.2.22
+  - 23
+  version: 0.2.23
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 -07:00
+date: 2010-08-16 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency