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/rackspace/models/files/file.rb CHANGED
@@ -1,6 +1,8 @@
1
+ require 'fog/model'
2
+
1
3
  module Fog
2
4
  module Rackspace
3
- class Files
5
+ module Files
4
6
 
5
7
  class File < Fog::Model
6
8
 
data/lib/fog/rackspace/models/files/files.rb CHANGED
@@ -1,6 +1,9 @@
1
+ require 'fog/collection'
2
+ require 'fog/rackspace/models/files/file'
3
+
1
4
  module Fog
2
5
  module Rackspace
3
- class Files
6
+ module Files
4
7
 
5
8
  class Files < Fog::Collection
6
9
 
data/lib/fog/rackspace/models/servers/flavor.rb CHANGED
@@ -1,6 +1,8 @@
1
+ require 'fog/model'
2
+
1
3
  module Fog
2
4
  module Rackspace
3
- class Servers
5
+ module Servers
4
6
 
5
7
  class Flavor < Fog::Model
6
8
 
data/lib/fog/rackspace/models/servers/flavors.rb CHANGED
@@ -1,9 +1,20 @@
1
+ require 'fog/collection'
2
+ require 'fog/rackspace/models/servers/flavor'
3
+
1
4
  module Fog
2
5
  module Rackspace
3
- class Servers
6
+ module Servers
4
7
 
5
- def flavors
6
- Fog::Rackspace::Servers::Flavors.new(:connection => self)
8
+ class Real
9
+ def flavors
10
+ Fog::Rackspace::Servers::Flavors.new(:connection => self)
11
+ end
12
+ end
13
+
14
+ class Mock
15
+ def flavors
16
+ Fog::Rackspace::Servers::Flavors.new(:connection => self)
17
+ end
7
18
  end
8
19
 
9
20
  class Flavors < Fog::Collection
@@ -16,7 +27,8 @@ module Fog
16
27
  end
17
28
 
18
29
  def get(flavor_id)
19
- connection.get_flavor_details(flavor_id)
30
+ data = connection.get_flavor_details(flavor_id).body['flavor']
31
+ new(data)
20
32
  rescue Excon::Errors::NotFound
21
33
  nil
22
34
  end
data/lib/fog/rackspace/models/servers/image.rb CHANGED
@@ -1,6 +1,8 @@
1
+ require 'fog/model'
2
+
1
3
  module Fog
2
4
  module Rackspace
3
- class Servers
5
+ module Servers
4
6
 
5
7
  class Image < Fog::Model
6
8
 
data/lib/fog/rackspace/models/servers/images.rb CHANGED
@@ -1,11 +1,24 @@
1
+ require 'fog/collection'
2
+ require 'fog/rackspace/models/servers/image'
3
+
1
4
  module Fog
2
5
  module Rackspace
3
- class Servers
6
+ module Servers
4
7
 
5
- def images(attributes = {})
6
- Fog::Rackspace::Servers::Images.new({
7
- :connection => self
8
- }.merge!(attributes))
8
+ class Real
9
+ def images(attributes = {})
10
+ Fog::Rackspace::Servers::Images.new({
11
+ :connection => self
12
+ }.merge!(attributes))
13
+ end
14
+ end
15
+
16
+ class Mock
17
+ def images(attributes = {})
18
+ Fog::Rackspace::Servers::Images.new({
19
+ :connection => self
20
+ }.merge!(attributes))
21
+ end
9
22
  end
10
23
 
11
24
  class Images < Fog::Collection
data/lib/fog/rackspace/models/servers/server.rb CHANGED
@@ -1,6 +1,8 @@
1
+ require 'fog/model'
2
+
1
3
  module Fog
2
4
  module Rackspace
3
- class Servers
5
+ module Servers
4
6
 
5
7
  class Server < Fog::Model
6
8
 
data/lib/fog/rackspace/models/servers/servers.rb CHANGED
@@ -1,9 +1,20 @@
1
+ require 'fog/collection'
2
+ require 'fog/rackspace/models/servers/server'
3
+
1
4
  module Fog
2
5
  module Rackspace
3
- class Servers
6
+ module Servers
4
7
 
5
- def servers
6
- Fog::Rackspace::Servers::Servers.new(:connection => self)
8
+ class Mock
9
+ def servers
10
+ Fog::Rackspace::Servers::Servers.new(:connection => self)
11
+ end
12
+ end
13
+
14
+ class Real
15
+ def servers
16
+ Fog::Rackspace::Servers::Servers.new(:connection => self)
17
+ end
7
18
  end
8
19
 
9
20
  class Servers < Fog::Collection
data/lib/fog/rackspace/requests/files/delete_container.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # Delete an existing container
8
7
  #
@@ -19,14 +18,8 @@ unless Fog.mocking?
19
18
  end
20
19
 
21
20
  end
22
- end
23
- end
24
21
 
25
- else
26
-
27
- module Fog
28
- module Rackspace
29
- class Servers
22
+ class Mock
30
23
 
31
24
  def delete_container(name)
32
25
  raise MockNotImplemented.new("Contributions welcome!")
@@ -35,5 +28,4 @@ else
35
28
  end
36
29
  end
37
30
  end
38
-
39
31
  end
data/lib/fog/rackspace/requests/files/delete_object.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # Delete an existing container
8
7
  #
@@ -20,14 +19,8 @@ unless Fog.mocking?
20
19
  end
21
20
 
22
21
  end
23
- end
24
- end
25
22
 
26
- else
27
-
28
- module Fog
29
- module Rackspace
30
- class Servers
23
+ class Mock
31
24
 
32
25
  def delete_object(container, object)
33
26
  raise MockNotImplemented.new("Contributions welcome!")
@@ -36,5 +29,4 @@ else
36
29
  end
37
30
  end
38
31
  end
39
-
40
32
  end
data/lib/fog/rackspace/requests/files/get_container.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # Get details for container and total bytes stored
8
7
  #
@@ -45,14 +44,8 @@ unless Fog.mocking?
45
44
  end
46
45
 
47
46
  end
48
- end
49
- end
50
47
 
51
- else
52
-
53
- module Fog
54
- module Rackspace
55
- class Servers
48
+ class Mock
56
49
 
57
50
  def get_container(container, options = {})
58
51
  raise MockNotImplemented.new("Contributions welcome!")
@@ -61,5 +54,4 @@ else
61
54
  end
62
55
  end
63
56
  end
64
-
65
57
  end
data/lib/fog/rackspace/requests/files/get_containers.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # List existing storage containers
8
7
  #
@@ -35,14 +34,8 @@ unless Fog.mocking?
35
34
  end
36
35
 
37
36
  end
38
- end
39
- end
40
37
 
41
- else
42
-
43
- module Fog
44
- module Rackspace
45
- class Servers
38
+ class Mock
46
39
 
47
40
  def get_containers(options = {})
48
41
  raise MockNotImplemented.new("Contributions welcome!")
@@ -51,5 +44,4 @@ else
51
44
  end
52
45
  end
53
46
  end
54
-
55
47
  end
data/lib/fog/rackspace/requests/files/get_object.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # Get details for object
8
7
  #
@@ -21,14 +20,8 @@ unless Fog.mocking?
21
20
  end
22
21
 
23
22
  end
24
- end
25
- end
26
23
 
27
- else
28
-
29
- module Fog
30
- module Rackspace
31
- class Servers
24
+ class Mock
32
25
 
33
26
  def get_object(container, object)
34
27
  raise MockNotImplemented.new("Contributions welcome!")
@@ -37,5 +30,4 @@ else
37
30
  end
38
31
  end
39
32
  end
40
-
41
33
  end
data/lib/fog/rackspace/requests/files/head_container.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # List number of objects and total bytes stored
8
7
  #
@@ -25,14 +24,8 @@ unless Fog.mocking?
25
24
  end
26
25
 
27
26
  end
28
- end
29
- end
30
27
 
31
- else
32
-
33
- module Fog
34
- module Rackspace
35
- class Servers
28
+ class Mock
36
29
 
37
30
  def head_container(container)
38
31
  raise MockNotImplemented.new("Contributions welcome!")
@@ -41,5 +34,4 @@ else
41
34
  end
42
35
  end
43
36
  end
44
-
45
37
  end
data/lib/fog/rackspace/requests/files/head_containers.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # List number of containers and total bytes stored
8
7
  #
@@ -22,14 +21,8 @@ unless Fog.mocking?
22
21
  end
23
22
 
24
23
  end
25
- end
26
- end
27
24
 
28
- else
29
-
30
- module Fog
31
- module Rackspace
32
- class Servers
25
+ class Mock
33
26
 
34
27
  def head_containers
35
28
  raise MockNotImplemented.new("Contributions welcome!")
@@ -38,5 +31,4 @@ else
38
31
  end
39
32
  end
40
33
  end
41
-
42
34
  end
data/lib/fog/rackspace/requests/files/head_object.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # Get headers for object
8
7
  #
@@ -20,14 +19,8 @@ unless Fog.mocking?
20
19
  end
21
20
 
22
21
  end
23
- end
24
- end
25
22
 
26
- else
27
-
28
- module Fog
29
- module Rackspace
30
- class Servers
23
+ class Mock
31
24
 
32
25
  def head_object(container, object)
33
26
  raise MockNotImplemented.new("Contributions welcome!")
@@ -36,5 +29,4 @@ else
36
29
  end
37
30
  end
38
31
  end
39
-
40
32
  end
data/lib/fog/rackspace/requests/files/put_container.rb CHANGED
@@ -1,8 +1,7 @@
1
- unless Fog.mocking?
2
-
3
- module Fog
4
- module Rackspace
5
- class Files
1
+ module Fog
2
+ module Rackspace
3
+ module Files
4
+ class Real
6
5
 
7
6
  # Create a new container
8
7
  #
@@ -19,14 +18,8 @@ unless Fog.mocking?
19
18
  end
20
19
 
21
20
  end
22
- end
23
- end
24
21
 
25
- else
26
-
27
- module Fog
28
- module Rackspace
29
- class Servers
22
+ class Mock
30
23
 
31
24
  def put_container(name)
32
25
  raise MockNotImplemented.new("Contributions welcome!")
@@ -35,5 +28,4 @@ else
35
28
  end
36
29
  end
37
30
  end
38
-
39
31
  end