fog 0.0.68 → 0.0.69

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 68
+:patch: 69
 :build: 

data/fog.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.68"
+  s.version = "0.0.69"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]

data/lib/fog.rb

@@ -28,6 +28,10 @@ require 'fog/terremark'
 
 module Fog
 
+  module Mock
+    DELAY = 1
+  end
+
   class MockNotImplemented < StandardError; end
 
   def self.mock!

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

@@ -74,20 +74,20 @@ module Fog
           instance_set.each do |instance|
             case instance['instanceState']['name']
             when 'pending'
-              if Time.now - instance['launchTime'] > 1
+              if Time.now - instance['launchTime'] > Fog::Mock::DELAY
                 instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
               end
             when 'rebooting'
               instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
             when 'shutting-down'
-              if Time.now - @data[:deleted_at][instance['instanceId']] > 2
+              if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY * 2
                 @data[:deleted_at].delete(instance['instanceId'])
                 @data[:instances].delete(instance['instanceId'])
-              elsif Time.now - @data[:deleted_at][instance['instanceId']] > 1
+              elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY
                 instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
               end
             when 'terminating'
-              if Time.now - @data[:deleted_at][instance['instanceId']] > 1
+              if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY
                 @data[:deleted_at].delete(instance['instanceId'])
                 @data[:instances].delete(instance['instanceId'])
               end

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

@@ -44,10 +44,10 @@ module Fog
           snapshot_set.each do |snapshot|
             case snapshot['status']
             when 'in progress', 'pending'
-              if Time.now - snapshot['startTime'] > 2
+              if Time.now - snapshot['startTime'] > Fog::Mock::DELAY * 2
                 snapshot['progress']  = '100%'
                 snapshot['status']    = 'completed'
-              elsif Time.now - snapshot['startTime'] > 1
+              elsif Time.now - snapshot['startTime'] > Fog::Mock::DELAY
                 snapshot['progress']  = '50%'
                 snapshot['status']    = 'in progress'
               end

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

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

data/lib/fog/rackspace/models/servers/images.rb

@@ -36,7 +36,8 @@ module Fog
         end
 
         def get(image_id)
-          connection.get_image_details(image_id)
+          data = connection.get_image_details(image_id).body['image']
+          new(data)
         rescue Excon::Errors::NotFound
           nil
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 68
-  version: 0.0.68
+  - 69
+  version: 0.0.69
 platform: ruby
 authors: 
 - geemus (Wesley Beary)