fog 0.0.68 → 0.0.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 0
4
- :patch: 68
4
+ :patch: 69
5
5
  :build:
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{fog}
8
- s.version = "0.0.68"
8
+ s.version = "0.0.69"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["geemus (Wesley Beary)"]
data/lib/fog.rb CHANGED
@@ -28,6 +28,10 @@ require 'fog/terremark'
28
28
 
29
29
  module Fog
30
30
 
31
+ module Mock
32
+ DELAY = 1
33
+ end
34
+
31
35
  class MockNotImplemented < StandardError; end
32
36
 
33
37
  def self.mock!
@@ -74,20 +74,20 @@ module Fog
74
74
  instance_set.each do |instance|
75
75
  case instance['instanceState']['name']
76
76
  when 'pending'
77
- if Time.now - instance['launchTime'] > 1
77
+ if Time.now - instance['launchTime'] > Fog::Mock::DELAY
78
78
  instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
79
79
  end
80
80
  when 'rebooting'
81
81
  instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
82
82
  when 'shutting-down'
83
- if Time.now - @data[:deleted_at][instance['instanceId']] > 2
83
+ if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY * 2
84
84
  @data[:deleted_at].delete(instance['instanceId'])
85
85
  @data[:instances].delete(instance['instanceId'])
86
- elsif Time.now - @data[:deleted_at][instance['instanceId']] > 1
86
+ elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY
87
87
  instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
88
88
  end
89
89
  when 'terminating'
90
- if Time.now - @data[:deleted_at][instance['instanceId']] > 1
90
+ if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY
91
91
  @data[:deleted_at].delete(instance['instanceId'])
92
92
  @data[:instances].delete(instance['instanceId'])
93
93
  end
@@ -44,10 +44,10 @@ module Fog
44
44
  snapshot_set.each do |snapshot|
45
45
  case snapshot['status']
46
46
  when 'in progress', 'pending'
47
- if Time.now - snapshot['startTime'] > 2
47
+ if Time.now - snapshot['startTime'] > Fog::Mock::DELAY * 2
48
48
  snapshot['progress'] = '100%'
49
49
  snapshot['status'] = 'completed'
50
- elsif Time.now - snapshot['startTime'] > 1
50
+ elsif Time.now - snapshot['startTime'] > Fog::Mock::DELAY
51
51
  snapshot['progress'] = '50%'
52
52
  snapshot['status'] = 'in progress'
53
53
  end
@@ -50,16 +50,16 @@ module Fog
50
50
  volume_set.each do |volume|
51
51
  case volume['status']
52
52
  when 'attaching'
53
- if Time.now - volume['attachmentSet'].first['attachTime'] > 1
53
+ if Time.now - volume['attachmentSet'].first['attachTime'] > Fog::Mock::DELAY
54
54
  volume['attachmentSet'].first['status'] = 'attached'
55
55
  volume['status'] = 'attached'
56
56
  end
57
57
  when 'creating'
58
- if Time.now - volume['createTime'] > 1
58
+ if Time.now - volume['createTime'] > Fog::Mock::DELAY
59
59
  volume['status'] = 'available'
60
60
  end
61
61
  when 'deleting'
62
- if Time.now - @data[:deleted_at][volume['volumeId']] > 1
62
+ if Time.now - @data[:deleted_at][volume['volumeId']] > Fog::Mock::DELAY
63
63
  @data[:deleted_at].delete(volume['volumeId'])
64
64
  @data[:volumes].delete(volume['volumeId'])
65
65
  end
@@ -36,7 +36,8 @@ module Fog
36
36
  end
37
37
 
38
38
  def get(image_id)
39
- connection.get_image_details(image_id)
39
+ data = connection.get_image_details(image_id).body['image']
40
+ new(data)
40
41
  rescue Excon::Errors::NotFound
41
42
  nil
42
43
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 68
9
- version: 0.0.68
8
+ - 69
9
+ version: 0.0.69
10
10
  platform: ruby
11
11
  authors:
12
12
  - geemus (Wesley Beary)