fog 0.0.64 → 0.0.65

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 64
+:patch: 65
 :build: 

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.64"
+  s.version = "0.0.65"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-03-31}
+  s.date = %q{2010-04-01}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{geemus@gmail.com}

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

@@ -49,12 +49,16 @@ module Fog
 
           volume_set.each do |volume|
             case volume['status']
+            when 'attaching'
+              if Time.now - volume['attachmentSet'].first['attachTime'] > 1
+                volume['status'] = 'attached'
+              end
             when 'creating'
-              if Time.now - volume['createTime'] > 2
+              if Time.now - volume['createTime'] > 1
                 volume['status'] = 'available'
               end
             when 'deleting'
-              if Time.now - @data[:deleted_at][volume['volumeId']] > 2
+              if Time.now - @data[:deleted_at][volume['volumeId']] > 1
                 @data[:deleted_at].delete(volume['volumeId'])
                 @data[:volumes].delete(volume['volumeId'])
               end

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

@@ -40,6 +40,7 @@ module Fog
           response.status = 200
           if volume = @data[:volumes][volume_id]
             data = volume['attachmentSet'].pop
+            @data[:volumes][volume_id]['status'] = 'available'
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id

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

@@ -66,6 +66,19 @@ module Fog
                 'currentState'  => state
               }
               instance['instanceState'] = state
+
+              describe_addresses.body['addressesSet'].each do |address|
+                if address['instanceId'] == instance_id
+                  disassociate_address(address['publicIp'])
+                end
+              end
+
+              describe_volumes.body['volumeSet'].each do |volume|
+                if volume['instanceId'] == instance_id
+                  detach_volume(volume['volumeId'])
+                end
+              end
+
             end
           else
             response.status = 400

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 64
-  version: 0.0.64
+  - 65
+  version: 0.0.65
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -07:00
+date: 2010-04-01 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency