fog 0.0.58 → 0.0.59

Sign up to get free protection for your applications and to get access to all the features.
Files changed (78) hide show
  1. data/README.rdoc +56 -72
  2. data/VERSION.yml +1 -1
  3. data/fog.gemspec +2 -2
  4. data/lib/fog.rb +9 -20
  5. data/lib/fog/aws.rb +119 -135
  6. data/lib/fog/aws/ec2.rb +31 -1
  7. data/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb +1 -2
  8. data/lib/fog/aws/requests/ec2/create_security_group.rb +1 -1
  9. data/lib/fog/aws/requests/ec2/run_instances.rb +1 -1
  10. data/lib/fog/connection.rb +14 -32
  11. data/lib/fog/rackspace.rb +21 -51
  12. data/lib/fog/rackspace/files.rb +102 -76
  13. data/lib/fog/rackspace/models/files/directories.rb +14 -3
  14. data/lib/fog/rackspace/models/files/directory.rb +3 -1
  15. data/lib/fog/rackspace/models/files/file.rb +3 -1
  16. data/lib/fog/rackspace/models/files/files.rb +4 -1
  17. data/lib/fog/rackspace/models/servers/flavor.rb +3 -1
  18. data/lib/fog/rackspace/models/servers/flavors.rb +16 -4
  19. data/lib/fog/rackspace/models/servers/image.rb +3 -1
  20. data/lib/fog/rackspace/models/servers/images.rb +18 -5
  21. data/lib/fog/rackspace/models/servers/server.rb +3 -1
  22. data/lib/fog/rackspace/models/servers/servers.rb +14 -3
  23. data/lib/fog/rackspace/requests/files/delete_container.rb +5 -13
  24. data/lib/fog/rackspace/requests/files/delete_object.rb +5 -13
  25. data/lib/fog/rackspace/requests/files/get_container.rb +5 -13
  26. data/lib/fog/rackspace/requests/files/get_containers.rb +5 -13
  27. data/lib/fog/rackspace/requests/files/get_object.rb +5 -13
  28. data/lib/fog/rackspace/requests/files/head_container.rb +5 -13
  29. data/lib/fog/rackspace/requests/files/head_containers.rb +5 -13
  30. data/lib/fog/rackspace/requests/files/head_object.rb +5 -13
  31. data/lib/fog/rackspace/requests/files/put_container.rb +5 -13
  32. data/lib/fog/rackspace/requests/files/put_object.rb +6 -14
  33. data/lib/fog/rackspace/requests/servers/create_image.rb +7 -15
  34. data/lib/fog/rackspace/requests/servers/create_server.rb +7 -15
  35. data/lib/fog/rackspace/requests/servers/delete_image.rb +7 -15
  36. data/lib/fog/rackspace/requests/servers/delete_server.rb +7 -15
  37. data/lib/fog/rackspace/requests/servers/get_flavor_details.rb +5 -13
  38. data/lib/fog/rackspace/requests/servers/get_server_details.rb +5 -13
  39. data/lib/fog/rackspace/requests/servers/list_addresses.rb +5 -13
  40. data/lib/fog/rackspace/requests/servers/list_flavors.rb +5 -13
  41. data/lib/fog/rackspace/requests/servers/list_flavors_detail.rb +5 -13
  42. data/lib/fog/rackspace/requests/servers/list_images.rb +5 -13
  43. data/lib/fog/rackspace/requests/servers/list_images_detail.rb +7 -15
  44. data/lib/fog/rackspace/requests/servers/list_private_addresses.rb +5 -13
  45. data/lib/fog/rackspace/requests/servers/list_public_addresses.rb +5 -13
  46. data/lib/fog/rackspace/requests/servers/list_servers.rb +5 -13
  47. data/lib/fog/rackspace/requests/servers/list_servers_detail.rb +7 -15
  48. data/lib/fog/rackspace/requests/servers/reboot_server.rb +5 -13
  49. data/lib/fog/rackspace/requests/servers/update_server.rb +5 -13
  50. data/lib/fog/rackspace/servers.rb +85 -71
  51. data/lib/fog/slicehost.rb +74 -67
  52. data/lib/fog/slicehost/models/flavor.rb +3 -1
  53. data/lib/fog/slicehost/models/flavors.rb +4 -1
  54. data/lib/fog/slicehost/models/image.rb +3 -1
  55. data/lib/fog/slicehost/models/images.rb +4 -1
  56. data/lib/fog/slicehost/models/server.rb +3 -1
  57. data/lib/fog/slicehost/models/servers.rb +4 -1
  58. data/lib/fog/slicehost/requests/create_slice.rb +5 -9
  59. data/lib/fog/slicehost/requests/delete_slice.rb +4 -10
  60. data/lib/fog/slicehost/requests/get_backups.rb +5 -9
  61. data/lib/fog/slicehost/requests/get_flavor.rb +5 -9
  62. data/lib/fog/slicehost/requests/get_flavors.rb +5 -9
  63. data/lib/fog/slicehost/requests/get_image.rb +5 -9
  64. data/lib/fog/slicehost/requests/get_images.rb +5 -9
  65. data/lib/fog/slicehost/requests/get_slice.rb +5 -9
  66. data/lib/fog/slicehost/requests/get_slices.rb +5 -9
  67. data/lib/fog/slicehost/requests/reboot_slice.rb +4 -10
  68. data/lib/fog/terremark.rb +60 -51
  69. data/lib/fog/terremark/requests/get_catalog.rb +5 -9
  70. data/lib/fog/terremark/requests/get_catalog_item.rb +5 -9
  71. data/lib/fog/terremark/requests/get_organization.rb +5 -9
  72. data/lib/fog/terremark/requests/get_organizations.rb +5 -9
  73. data/lib/fog/terremark/requests/get_vapp_template.rb +5 -9
  74. data/lib/fog/terremark/requests/get_vdc.rb +5 -9
  75. data/spec/rackspace/requests/servers/list_images_detail_spec.rb +0 -1
  76. data/spec/rackspace/requests/servers/reboot_server_spec.rb +3 -1
  77. data/spec/slicehost/requests/create_slice_spec.rb +1 -0
  78. metadata +3 -3
data/lib/fog/terremark/requests/get_catalog.rb CHANGED
@@ -1,7 +1,8 @@
1
- unless Fog.mocking?
1
+ module Fog
2
+ module Terremark
3
+ class Real
2
4
 
3
- module Fog
4
- class Terremark
5
+ require 'fog/terremark/parsers/get_catalog'
5
6
 
6
7
  # Get details of a catalog
7
8
  #
@@ -27,12 +28,8 @@ unless Fog.mocking?
27
28
  end
28
29
 
29
30
  end
30
- end
31
-
32
- else
33
31
 
34
- module Fog
35
- class Terremark
32
+ class Mock
36
33
 
37
34
  def get_catalog(vdc_id)
38
35
  raise MockNotImplemented.new("Contributions welcome!")
@@ -40,5 +37,4 @@ else
40
37
 
41
38
  end
42
39
  end
43
-
44
40
  end
data/lib/fog/terremark/requests/get_catalog_item.rb CHANGED
@@ -1,7 +1,8 @@
1
- unless Fog.mocking?
1
+ module Fog
2
+ module Terremark
3
+ class Real
2
4
 
3
- module Fog
4
- class Terremark
5
+ require 'fog/terremark/parsers/get_catalog_item'
5
6
 
6
7
  # Get details of a catalog item
7
8
  #
@@ -30,12 +31,8 @@ unless Fog.mocking?
30
31
  end
31
32
 
32
33
  end
33
- end
34
-
35
- else
36
34
 
37
- module Fog
38
- class Terremark
35
+ class Mock
39
36
 
40
37
  def get_catalog_item(catalog_item_id)
41
38
  raise MockNotImplemented.new("Contributions welcome!")
@@ -43,5 +40,4 @@ else
43
40
 
44
41
  end
45
42
  end
46
-
47
43
  end
data/lib/fog/terremark/requests/get_organization.rb CHANGED
@@ -1,7 +1,8 @@
1
- unless Fog.mocking?
1
+ module Fog
2
+ module Terremark
3
+ class Real
2
4
 
3
- module Fog
4
- class Terremark
5
+ require 'fog/terremark/parsers/get_organization'
5
6
 
6
7
  # Get details of an organization
7
8
  #
@@ -29,12 +30,8 @@ unless Fog.mocking?
29
30
  end
30
31
 
31
32
  end
32
- end
33
-
34
- else
35
33
 
36
- module Fog
37
- class Terremark
34
+ class Mock
38
35
 
39
36
  def get_organization(organization_id)
40
37
  raise MockNotImplemented.new("Contributions welcome!")
@@ -42,5 +39,4 @@ else
42
39
 
43
40
  end
44
41
  end
45
-
46
42
  end
data/lib/fog/terremark/requests/get_organizations.rb CHANGED
@@ -1,7 +1,8 @@
1
- unless Fog.mocking?
1
+ module Fog
2
+ module Terremark
3
+ class Real
2
4
 
3
- module Fog
4
- class Terremark
5
+ require 'fog/terremark/parsers/get_organizations'
5
6
 
6
7
  # Get list of organizations
7
8
  #
@@ -25,12 +26,8 @@ unless Fog.mocking?
25
26
  end
26
27
 
27
28
  end
28
- end
29
-
30
- else
31
29
 
32
- module Fog
33
- class Terremark
30
+ class Mock
34
31
 
35
32
  def get_organizations
36
33
  raise MockNotImplemented.new("Contributions welcome!")
@@ -38,5 +35,4 @@ else
38
35
 
39
36
  end
40
37
  end
41
-
42
38
  end
data/lib/fog/terremark/requests/get_vapp_template.rb CHANGED
@@ -1,7 +1,8 @@
1
- unless Fog.mocking?
1
+ module Fog
2
+ module Terremark
3
+ class Real
2
4
 
3
- module Fog
4
- class Terremark
5
+ require 'fog/terremark/parsers/get_vapp_template'
5
6
 
6
7
  # Get details of a vapp template
7
8
  #
@@ -30,12 +31,8 @@ unless Fog.mocking?
30
31
  end
31
32
 
32
33
  end
33
- end
34
-
35
- else
36
34
 
37
- module Fog
38
- class Terremark
35
+ class Mock
39
36
 
40
37
  def get_vapp_template(vapp_template_id)
41
38
  raise MockNotImplemented.new("Contributions welcome!")
@@ -43,5 +40,4 @@ else
43
40
 
44
41
  end
45
42
  end
46
-
47
43
  end
data/lib/fog/terremark/requests/get_vdc.rb CHANGED
@@ -1,7 +1,8 @@
1
- unless Fog.mocking?
1
+ module Fog
2
+ module Terremark
3
+ class Real
2
4
 
3
- module Fog
4
- class Terremark
5
+ require 'fog/terremark/parsers/get_vdc'
5
6
 
6
7
  # Get details of a vdc
7
8
  #
@@ -30,12 +31,8 @@ unless Fog.mocking?
30
31
  end
31
32
 
32
33
  end
33
- end
34
-
35
- else
36
34
 
37
- module Fog
38
- class Terremark
35
+ class Mock
39
36
 
40
37
  def get_vdc(vdc_id)
41
38
  raise MockNotImplemented.new("Contributions welcome!")
@@ -43,5 +40,4 @@ else
43
40
 
44
41
  end
45
42
  end
46
-
47
43
  end
data/spec/rackspace/requests/servers/list_images_detail_spec.rb CHANGED
@@ -7,7 +7,6 @@ describe 'Rackspace::Servers.list_images_detail' do
7
7
  actual = Rackspace[:servers].list_images_detail.body
8
8
  actual['images'].should be_an(Array)
9
9
  image = actual['images'].first
10
- image['created'].should be_a(String)
11
10
  image['id'].should be_an(Integer)
12
11
  image['name'].should be_a(String)
13
12
  image['status'].should be_a(String)
data/spec/rackspace/requests/servers/reboot_server_spec.rb CHANGED
@@ -15,7 +15,9 @@ describe 'Rackspace::Servers.reboot_server' do
15
15
  end
16
16
 
17
17
  it "should return proper attributes" do
18
- Rackspace[:servers].reboot_server(@server_id, 'HARD')
18
+ eventually(128) do
19
+ Rackspace[:servers].reboot_server(@server_id, 'HARD')
20
+ end
19
21
  end
20
22
 
21
23
  end
data/spec/slicehost/requests/create_slice_spec.rb CHANGED
@@ -18,6 +18,7 @@ describe 'Slicehost.create_slice' do
18
18
  actual['bw-out'].should be_an(Float)
19
19
  actual['flavor-id'].should be_an(Integer)
20
20
  actual['id'].should be_an(Integer)
21
+ @slice_id = actual['id']
21
22
  actual['image-id'].should be_an(Integer)
22
23
  actual['name'].should be_an(String)
23
24
  actual['progress'].should be_an(Integer)
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 58
9
- version: 0.0.58
8
+ - 59
9
+ version: 0.0.59
10
10
  platform: ruby
11
11
  authors:
12
12
  - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-03-17 00:00:00 -07:00
17
+ date: 2010-03-26 00:00:00 -07:00
18
18
  default_executable: fog
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency