fog 0.0.65 → 0.0.66

data/Rakefile

@@ -14,8 +14,8 @@ begin
     gem.add_dependency('nokogiri')
     gem.add_dependency('ruby-hmac')
     gem.name = "fog"
-    gem.description = %Q{brings clouds to you}
-    gem.summary = %Q{fog = clouds + you}
+    gem.description = %Q{The Ruby cloud computing library.}
+    gem.summary = %Q{brings clouds to you}
     gem.email = "geemus@gmail.com"
     gem.homepage = "http://github.com/geemus/fog"
     gem.authors = ["geemus (Wesley Beary)"]

data/VERSION.yml

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

data/fog.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.65"
+  s.version = "0.0.66"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
   s.date = %q{2010-04-01}
   s.default_executable = %q{fog}
-  s.description = %q{brings clouds to you}
+  s.description = %q{The Ruby cloud computing library.}
   s.email = %q{geemus@gmail.com}
   s.executables = ["fog"]
   s.extra_rdoc_files = [
@@ -360,7 +360,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fog}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{fog = clouds + you}
+  s.summary = %q{brings clouds to you}
   s.test_files = [
     "spec/aws/models/ec2/address_spec.rb",
     "spec/aws/models/ec2/addresses_spec.rb",

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

@@ -50,6 +50,7 @@ module Fog
                 'volumeId'    => volume_id
               }
               volume['attachmentSet'] = [data]
+              volume['status'] = 'attaching'
               response.status = 200
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id

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

@@ -80,11 +80,11 @@ module Fog
             when 'rebooting'
               instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
             when 'shutting-down'
-              if Time.now - @data[:deleted_at][instance['instanceId']] > 1
-                instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
-              elsif Time.now - @data[:deleted_at][instance['instanceId']] > 2
+              if Time.now - @data[:deleted_at][instance['instanceId']] > 2
                 @data[:deleted_at].delete(instance['instanceId'])
                 @data[:instances].delete(instance['instanceId'])
+              elsif Time.now - @data[:deleted_at][instance['instanceId']] > 1
+                instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
               end
             when 'terminating'
               if Time.now - @data[:deleted_at][instance['instanceId']] > 1
@@ -95,8 +95,8 @@ module Fog
           end
 
           if instance_id.length == 0 || instance_id.length == instance_set.length
+            instance_set = instance_set.reject {|instance| !@data[:instances][instance['instanceId']]}
             response.status = 200
-
             reservation_set = {}
             instance_set.each do |instance|
               reservation_set[instance['reservationId']] ||= {

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

@@ -51,6 +51,7 @@ module Fog
             case volume['status']
             when 'attaching'
               if Time.now - volume['attachmentSet'].first['attachTime'] > 1
+                volume['attachmentSet'].first['status'] = 'attached'
                 volume['status'] = 'attached'
               end
             when 'creating'
@@ -66,6 +67,7 @@ module Fog
           end
 
           if volume_id.length == 0 || volume_id.length == volume_set.length
+            volume_set = volume_set.reject {|volume| !@data[:volumes][volume['volumeId']]}
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,

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

@@ -74,11 +74,10 @@ module Fog
               end
 
               describe_volumes.body['volumeSet'].each do |volume|
-                if volume['instanceId'] == instance_id
+                if volume['attachmentSet'].first && volume['attachmentSet'].first['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
-  - 65
-  version: 0.0.65
+  - 66
+  version: 0.0.66
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -93,7 +93,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
-description: brings clouds to you
+description: The Ruby cloud computing library.
 email: geemus@gmail.com
 executables: 
 - fog
@@ -467,7 +467,7 @@ rubyforge_project: fog
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: fog = clouds + you
+summary: brings clouds to you
 test_files: 
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb