fog 0.0.84 → 0.0.85

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.
Files changed (89) hide show
  1. data/Gemfile +1 -0
  2. data/Gemfile.lock +47 -37
  3. data/bin/fog +9 -10
  4. data/fog.gemspec +23 -4
  5. data/lib/fog.rb +19 -1
  6. data/lib/fog/aws.rb +23 -0
  7. data/lib/fog/aws/bin.rb +4 -0
  8. data/lib/fog/aws/ec2.rb +20 -27
  9. data/lib/fog/aws/elb.rb +115 -0
  10. data/lib/fog/aws/models/ec2/server.rb +7 -1
  11. data/lib/fog/aws/models/s3/directories.rb +4 -4
  12. data/lib/fog/aws/models/s3/directory.rb +13 -11
  13. data/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb +26 -0
  14. data/lib/fog/aws/parsers/elb/describe_instance_health.rb +30 -0
  15. data/lib/fog/aws/parsers/elb/describe_load_balancers.rb +101 -0
  16. data/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb +26 -0
  17. data/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb +26 -0
  18. data/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb +26 -0
  19. data/lib/fog/aws/requests/ec2/detach_volume.rb +2 -2
  20. data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb +45 -0
  21. data/lib/fog/aws/requests/elb/describe_instance_health.rb +44 -0
  22. data/lib/fog/aws/requests/elb/describe_load_balancers.rb +57 -0
  23. data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb +44 -0
  24. data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb +44 -0
  25. data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb +45 -0
  26. data/lib/fog/aws/s3.rb +8 -1
  27. data/lib/fog/aws/simpledb.rb +9 -18
  28. data/lib/fog/bin.rb +11 -1
  29. data/lib/fog/credentials.rb +1 -0
  30. data/lib/fog/local.rb +72 -0
  31. data/lib/fog/local/bin.rb +34 -0
  32. data/lib/fog/local/models/directories.rb +43 -0
  33. data/lib/fog/local/models/directory.rb +47 -0
  34. data/lib/fog/local/models/file.rb +58 -0
  35. data/lib/fog/local/models/files.rb +74 -0
  36. data/lib/fog/model.rb +2 -8
  37. data/lib/fog/rackspace/models/files/directories.rb +3 -3
  38. data/lib/fog/rackspace/models/files/directory.rb +8 -5
  39. data/lib/fog/rackspace/models/servers/server.rb +7 -3
  40. data/lib/fog/rackspace/requests/servers/create_server.rb +1 -1
  41. data/lib/fog/ssh.rb +91 -25
  42. data/lib/fog/terremark/bin.rb +1 -8
  43. data/lib/fog/terremark/ecloud.rb +14 -5
  44. data/lib/fog/terremark/models/shared/server.rb +54 -3
  45. data/lib/fog/terremark/parsers/shared/vapp.rb +1 -1
  46. data/lib/fog/terremark/requests/shared/get_network.rb +39 -1
  47. data/lib/fog/terremark/requests/shared/get_organization.rb +45 -1
  48. data/lib/fog/terremark/requests/shared/get_organizations.rb +2 -1
  49. data/lib/fog/terremark/requests/shared/get_public_ips.rb +32 -1
  50. data/lib/fog/terremark/requests/shared/get_vdc.rb +83 -1
  51. data/lib/fog/terremark/requests/shared/{reset.rb → power_reset.rb} +1 -1
  52. data/lib/fog/terremark/requests/shared/power_shutdown.rb +32 -0
  53. data/lib/fog/terremark/shared.rb +139 -18
  54. data/lib/fog/terremark/vcloud.rb +14 -5
  55. data/spec/aws/models/ec2/address_spec.rb +1 -3
  56. data/spec/aws/models/ec2/snapshot_spec.rb +25 -49
  57. data/spec/aws/models/ec2/snapshots_spec.rb +25 -31
  58. data/spec/aws/models/ec2/volume_spec.rb +9 -3
  59. data/spec/aws/models/s3/directory_spec.rb +14 -14
  60. data/spec/aws/requests/ec2/associate_address_spec.rb +4 -5
  61. data/spec/aws/requests/ec2/attach_volume_spec.rb +14 -16
  62. data/spec/aws/requests/ec2/create_snapshot_spec.rb +2 -3
  63. data/spec/aws/requests/ec2/delete_snapshot_spec.rb +5 -6
  64. data/spec/aws/requests/ec2/describe_instances_spec.rb +3 -2
  65. data/spec/aws/requests/ec2/describe_snapshots_spec.rb +21 -25
  66. data/spec/aws/requests/ec2/detach_volume_spec.rb +14 -16
  67. data/spec/aws/requests/ec2/disassociate_address_spec.rb +3 -4
  68. data/spec/aws/requests/ec2/get_console_output_spec.rb +1 -0
  69. data/spec/aws/requests/s3/get_service_spec.rb +5 -6
  70. data/spec/spec_helper.rb +0 -20
  71. data/tests/helper.rb +0 -10
  72. data/tests/rackspace/requests/servers/create_image_tests.rb +2 -2
  73. data/tests/rackspace/requests/servers/create_server_tests.rb +3 -2
  74. data/tests/rackspace/requests/servers/delete_image_tests.rb +2 -2
  75. data/tests/rackspace/requests/servers/delete_server_tests.rb +1 -1
  76. data/tests/rackspace/requests/servers/get_server_details_tests.rb +1 -1
  77. data/tests/rackspace/requests/servers/list_addresses_tests.rb +1 -1
  78. data/tests/rackspace/requests/servers/list_private_addresses_tests.rb +1 -1
  79. data/tests/rackspace/requests/servers/list_public_addresses_tests.rb +1 -1
  80. data/tests/rackspace/requests/servers/list_servers_detail_tests.rb +1 -1
  81. data/tests/rackspace/requests/servers/list_servers_tests.rb +1 -1
  82. data/tests/rackspace/requests/servers/reboot_server_tests.rb +3 -3
  83. data/tests/rackspace/requests/servers/update_server_tests.rb +1 -1
  84. data/tests/slicehost/requests/create_slice_tests.rb +1 -1
  85. data/tests/slicehost/requests/delete_slice_tests.rb +1 -1
  86. data/tests/slicehost/requests/get_slice_tests.rb +1 -1
  87. data/tests/slicehost/requests/reboot_slice_tests.rb +2 -2
  88. metadata +24 -5
  89. data/lib/fog/terremark/requests/shared/shutdown.rb +0 -43
@@ -3,13 +3,14 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
3
3
  describe 'EC2.describe_instances' do
4
4
  describe 'success' do
5
5
 
6
- before(:each) do
6
+ before(:all) do
7
7
  run_instances = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body
8
8
  @instance_id = run_instances['instancesSet'].first['instanceId']
9
9
  @reservation_id = run_instances['reservationId']
10
+ AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
10
11
  end
11
12
 
12
- after(:each) do
13
+ after(:all) do
13
14
  AWS[:ec2].terminate_instances([@instance_id])
14
15
  end
15
16
 
@@ -3,42 +3,38 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
3
3
  describe 'EC2.describe_snapshots' do
4
4
  describe 'success' do
5
5
 
6
- before(:each) do
6
+ before(:all) do
7
7
  @volume_id = AWS[:ec2].create_volume('us-east-1a', 1).body['volumeId']
8
+ AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
8
9
  @snapshot_id = AWS[:ec2].create_snapshot(@volume_id).body['snapshotId']
10
+ AWS[:ec2].snapshots.get(@snapshot_id).wait_for { ready? }
9
11
  end
10
12
 
11
- after(:each) do
13
+ after(:all) do
12
14
  AWS[:ec2].delete_volume(@volume_id)
13
- eventually do
14
- AWS[:ec2].delete_snapshot(@snapshot_id)
15
- end
15
+ AWS[:ec2].delete_snapshot(@snapshot_id)
16
16
  end
17
17
 
18
18
  it "should return proper attributes with no params" do
19
- eventually do
20
- actual = AWS[:ec2].describe_snapshots
21
- actual.body['snapshotSet'].should be_an(Array)
22
- snapshot = actual.body['snapshotSet'].select {|snapshot| snapshot['snapshotId'] == @snapshot_id}.first
23
- snapshot['progress'].should be_a(String)
24
- snapshot['snapshotId'].should be_a(String)
25
- snapshot['startTime'].should be_a(Time)
26
- snapshot['status'].should be_a(String)
27
- snapshot['volumeId'].should be_a(String)
28
- end
19
+ actual = AWS[:ec2].describe_snapshots
20
+ actual.body['snapshotSet'].should be_an(Array)
21
+ snapshot = actual.body['snapshotSet'].select {|snapshot| snapshot['snapshotId'] == @snapshot_id}.first
22
+ snapshot['progress'].should be_a(String)
23
+ snapshot['snapshotId'].should be_a(String)
24
+ snapshot['startTime'].should be_a(Time)
25
+ snapshot['status'].should be_a(String)
26
+ snapshot['volumeId'].should be_a(String)
29
27
  end
30
28
 
31
29
  it "should return proper attributes with params" do
32
- eventually do
33
- actual = AWS[:ec2].describe_snapshots([@snapshot_id])
34
- actual.body['snapshotSet'].should be_an(Array)
35
- snapshot = actual.body['snapshotSet'].select {|snapshot| snapshot['snapshotId'] == @snapshot_id}.first
36
- snapshot['progress'].should be_a(String)
37
- snapshot['snapshotId'].should be_a(String)
38
- snapshot['startTime'].should be_a(Time)
39
- snapshot['status'].should be_a(String)
40
- snapshot['volumeId'].should be_a(String)
41
- end
30
+ actual = AWS[:ec2].describe_snapshots([@snapshot_id])
31
+ actual.body['snapshotSet'].should be_an(Array)
32
+ snapshot = actual.body['snapshotSet'].select {|snapshot| snapshot['snapshotId'] == @snapshot_id}.first
33
+ snapshot['progress'].should be_a(String)
34
+ snapshot['snapshotId'].should be_a(String)
35
+ snapshot['startTime'].should be_a(Time)
36
+ snapshot['status'].should be_a(String)
37
+ snapshot['volumeId'].should be_a(String)
42
38
  end
43
39
 
44
40
  end
@@ -6,28 +6,26 @@ describe 'EC2.detach_volume' do
6
6
  before(:each) do
7
7
  @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1, {'Placement.AvailabilityZone' => 'us-east-1a'}).body['instancesSet'].first['instanceId']
8
8
  @volume_id = AWS[:ec2].create_volume('us-east-1a', 1).body['volumeId']
9
- eventually(128) do
10
- AWS[:ec2].attach_volume(@instance_id, @volume_id, '/dev/sdh')
11
- end
9
+ AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
10
+ AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
11
+ AWS[:ec2].attach_volume(@instance_id, @volume_id, '/dev/sdh')
12
+ AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
12
13
  end
13
14
 
14
15
  after(:each) do
15
- eventually do
16
- AWS[:ec2].delete_volume(@volume_id)
17
- AWS[:ec2].terminate_instances([@instance_id])
18
- end
16
+ AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
17
+ AWS[:ec2].delete_volume(@volume_id)
18
+ AWS[:ec2].terminate_instances([@instance_id])
19
19
  end
20
20
 
21
21
  it "should return proper attributes" do
22
- eventually do
23
- actual = AWS[:ec2].detach_volume(@volume_id)
24
- actual.body['attachTime'].should be_a(Time)
25
- actual.body['device'].should be_a(String)
26
- actual.body['instanceId'].should be_a(String)
27
- actual.body['requestId'].should be_a(String)
28
- actual.body['status'].should be_a(String)
29
- actual.body['volumeId'].should be_a(String)
30
- end
22
+ actual = AWS[:ec2].detach_volume(@volume_id)
23
+ actual.body['attachTime'].should be_a(Time)
24
+ actual.body['device'].should be_a(String)
25
+ actual.body['instanceId'].should be_a(String)
26
+ actual.body['requestId'].should be_a(String)
27
+ actual.body['status'].should be_a(String)
28
+ actual.body['volumeId'].should be_a(String)
31
29
  end
32
30
 
33
31
  end
@@ -5,10 +5,9 @@ describe 'EC2.disassociate_address' do
5
5
 
6
6
  before(:each) do
7
7
  @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
8
- eventually(128) do
9
- @public_ip = AWS[:ec2].allocate_address.body['publicIp']
10
- AWS[:ec2].associate_address(@instance_id, @public_ip)
11
- end
8
+ @public_ip = AWS[:ec2].allocate_address.body['publicIp']
9
+ AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
10
+ AWS[:ec2].associate_address(@instance_id, @public_ip)
12
11
  end
13
12
 
14
13
  after(:each) do
@@ -5,6 +5,7 @@ describe 'EC2.get_console_output' do
5
5
 
6
6
  before(:each) do
7
7
  @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
8
+ AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
8
9
  end
9
10
 
10
11
  after(:each) do
@@ -3,11 +3,12 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
3
3
  describe 'S3.get_service' do
4
4
  describe 'success' do
5
5
 
6
- before(:each) do
6
+ before(:all) do
7
7
  AWS[:s3].put_bucket('foggetservice')
8
+ Fog.wait_for { AWS[:s3].directories.get('foggetservice') }
8
9
  end
9
10
 
10
- after(:each) do
11
+ after(:all) do
11
12
  AWS[:s3].delete_bucket('foggetservice')
12
13
  end
13
14
 
@@ -23,10 +24,8 @@ describe 'S3.get_service' do
23
24
  end
24
25
 
25
26
  it 'should include foggetservice in get_service' do
26
- eventually do
27
- actual = AWS[:s3].get_service
28
- actual.body['Buckets'].collect { |bucket| bucket['Name'] }.should include('foggetservice')
29
- end
27
+ actual = AWS[:s3].get_service
28
+ actual.body['Buckets'].collect { |bucket| bucket['Name'] }.should include('foggetservice')
30
29
  end
31
30
 
32
31
  end
@@ -9,16 +9,6 @@ if ENV["FOG_MOCK"] == "true"
9
9
  Fog.mock!
10
10
  end
11
11
 
12
- unless defined?(LOADED_SPEC_OPTS)
13
- # inlined spec.opts
14
- require "#{current_directory}/compact_progress_bar_formatter"
15
- Spec::Runner.options.parse_format("Spec::Runner::Formatter::CompactProgressBarFormatter")
16
- Spec::Runner.options.loadby = 'mtime'
17
- Spec::Runner.options.reverse = true
18
- LOADED_SPEC_OPTS = true
19
- end
20
-
21
-
22
12
  module AWS
23
13
  class << self
24
14
  def [](service)
@@ -104,16 +94,6 @@ def eventually(max_delay = 16, &block)
104
94
  end
105
95
  end
106
96
 
107
- def wait_for(timeout = 600, &block)
108
- start = Time.now
109
- until instance_eval(&block)
110
- if Time.now - start > timeout
111
- break
112
- end
113
- sleep(1)
114
- end
115
- end
116
-
117
97
  unless defined?(GENTOO_AMI)
118
98
  GENTOO_AMI = 'ami-5ee70037'
119
99
  end
@@ -32,13 +32,3 @@ def validate_format(original_data, format)
32
32
  end
33
33
  valid
34
34
  end
35
-
36
- def wait_for(timeout = 600, &block)
37
- start = Time.now
38
- until instance_eval(&block)
39
- if Time.now - start > timeout
40
- break
41
- end
42
- sleep(1)
43
- end
44
- end
@@ -3,14 +3,14 @@ Shindo.tests('Rackspace::Servers#create_image', 'rackspace') do
3
3
 
4
4
  before do
5
5
  @server_id = Rackspace[:servers].create_server(1, 3, 'fogcreateimage').body['server']['id']
6
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
6
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
7
7
  @data = Rackspace[:servers].create_image(@server_id).body['image']
8
8
  @image_id = @data['id']
9
9
  end
10
10
 
11
11
  after do
12
12
  Rackspace[:servers].delete_server(@server_id)
13
- wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
13
+ Fog.wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
14
14
  Rackspace[:servers].delete_image(@image_id)
15
15
  end
16
16
 
@@ -2,12 +2,13 @@ Shindo.tests('Rackspace::Servers#create_server', 'rackspace') do
2
2
  tests('success') do
3
3
 
4
4
  before do
5
- @data = Rackspace[:servers].create_server(1, 3, 'fogcreateserver').body['server']
5
+ # 1 => 256MB, 3 => Gentoo
6
+ @data = Rackspace[:servers].create_server(1, 3).body['server']
6
7
  @server_id = @data['id']
7
8
  end
8
9
 
9
10
  after do
10
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
12
  Rackspace[:servers].delete_server(@server_id)
12
13
  end
13
14
 
@@ -7,12 +7,12 @@ Shindo.tests('Rackspace::Servers#delete_image', 'rackspace') do
7
7
  end
8
8
 
9
9
  after do
10
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
11
  Rackspace[:servers].delete_server(@server_id)
12
12
  end
13
13
 
14
14
  test('has proper output format') do
15
- wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
15
+ Fog.wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
16
16
  Rackspace[:servers].delete_image(@image_id)
17
17
  end
18
18
 
@@ -6,7 +6,7 @@ Shindo.tests('Rackspace::Servers#delete_server', 'rackspace') do
6
6
  end
7
7
 
8
8
  test('has proper output format') do
9
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
9
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
10
  Rackspace[:servers].delete_server(@server_id)
11
11
  end
12
12
 
@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#get_server_details', 'rackspace') do
7
7
  end
8
8
 
9
9
  after do
10
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
11
  Rackspace[:servers].delete_server(@server_id)
12
12
  end
13
13
 
@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_addresses', 'rackspace') do
7
7
  end
8
8
 
9
9
  after do
10
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
11
  Rackspace[:servers].delete_server(@server_id)
12
12
  end
13
13
 
@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_private_addresses', 'rackspace') do
7
7
  end
8
8
 
9
9
  after do
10
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
11
  Rackspace[:servers].delete_server(@server_id)
12
12
  end
13
13
 
@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_public_addresses', 'rackspace') do
7
7
  end
8
8
 
9
9
  after do
10
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
11
  Rackspace[:servers].delete_server(@server_id)
12
12
  end
13
13
 
@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_servers_detail', 'rackspace') do
7
7
  end
8
8
 
9
9
  after do
10
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
11
  Rackspace[:servers].delete_server(@server_id)
12
12
  end
13
13
 
@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_servers', 'rackspace') do
7
7
  end
8
8
 
9
9
  after do
10
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
11
11
  Rackspace[:servers].delete_server(@server_id)
12
12
  end
13
13
 
@@ -6,20 +6,20 @@ Shindo.tests('Rackspace::Servers#reboot_server', 'rackspace') do
6
6
  end
7
7
 
8
8
  after do
9
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
9
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
10
10
  Rackspace[:servers].delete_server(@server_id)
11
11
  end
12
12
 
13
13
  tests('HARD') do
14
14
  test('has proper output format') do
15
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
15
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
16
16
  Rackspace[:servers].reboot_server(@server_id, 'HARD')
17
17
  end
18
18
  end
19
19
 
20
20
  tests('SOFT') do
21
21
  test('has proper output format') do
22
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
22
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
23
23
  Rackspace[:servers].reboot_server(@server_id, 'SOFT')
24
24
  end
25
25
  end
@@ -3,7 +3,7 @@ Shindo.tests('Rackspace::Servers#update_server', 'rackspace') do
3
3
 
4
4
  before do
5
5
  @server_id = Rackspace[:servers].create_server(1, 3, 'fogupdateserver').body['server']['id']
6
- wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
6
+ Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
7
7
  @data = Rackspace[:servers].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
8
8
  end
9
9
 
@@ -7,7 +7,7 @@ Shindo.tests('Slicehost#create_slice', 'slicehost') do
7
7
  end
8
8
 
9
9
  after do
10
- wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
10
+ Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
11
11
  Slicehost[:slices].delete_slice(@id)
12
12
  end
13
13
 
@@ -7,7 +7,7 @@ Shindo.tests('Slicehost#delete_slice', 'slicehost') do
7
7
  end
8
8
 
9
9
  test('has proper output format') do
10
- wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
10
+ Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
11
11
  Slicehost[:slices].delete_slice(@id)
12
12
  end
13
13
 
@@ -8,7 +8,7 @@ Shindo.tests('Slicehost#get_slice', 'slicehost') do
8
8
  end
9
9
 
10
10
  after do
11
- wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
11
+ Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
12
12
  Slicehost[:slices].delete_slice(@id)
13
13
  end
14
14
 
@@ -4,12 +4,12 @@ Shindo.tests('Slicehost#reboot_slice', 'slicehost') do
4
4
  before do
5
5
  @data = Slicehost[:slices].create_slice(1, 3, 'fogrebootslice').body
6
6
  @id = @data['id']
7
- wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
7
+ Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
8
8
  @data = Slicehost[:slices].reboot_slice(@id).body
9
9
  end
10
10
 
11
11
  after do
12
- wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
12
+ Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
13
13
  Slicehost[:slices].delete_slice(@id)
14
14
  end
15
15
 
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 84
9
- version: 0.0.84
8
+ - 85
9
+ version: 0.0.85
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-04-28 00:00:00 -07:00
17
+ date: 2010-05-02 00:00:00 -07:00
18
18
  default_executable: fog
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
@@ -151,6 +151,7 @@ files:
151
151
  - lib/fog/aws.rb
152
152
  - lib/fog/aws/bin.rb
153
153
  - lib/fog/aws/ec2.rb
154
+ - lib/fog/aws/elb.rb
154
155
  - lib/fog/aws/models/ec2/address.rb
155
156
  - lib/fog/aws/models/ec2/addresses.rb
156
157
  - lib/fog/aws/models/ec2/flavor.rb
@@ -191,6 +192,12 @@ files:
191
192
  - lib/fog/aws/parsers/ec2/get_console_output.rb
192
193
  - lib/fog/aws/parsers/ec2/run_instances.rb
193
194
  - lib/fog/aws/parsers/ec2/terminate_instances.rb
195
+ - lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb
196
+ - lib/fog/aws/parsers/elb/describe_instance_health.rb
197
+ - lib/fog/aws/parsers/elb/describe_load_balancers.rb
198
+ - lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb
199
+ - lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb
200
+ - lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
194
201
  - lib/fog/aws/parsers/s3/copy_object.rb
195
202
  - lib/fog/aws/parsers/s3/get_bucket.rb
196
203
  - lib/fog/aws/parsers/s3/get_bucket_location.rb
@@ -231,6 +238,12 @@ files:
231
238
  - lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
232
239
  - lib/fog/aws/requests/ec2/run_instances.rb
233
240
  - lib/fog/aws/requests/ec2/terminate_instances.rb
241
+ - lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb
242
+ - lib/fog/aws/requests/elb/describe_instance_health.rb
243
+ - lib/fog/aws/requests/elb/describe_load_balancers.rb
244
+ - lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb
245
+ - lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb
246
+ - lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb
234
247
  - lib/fog/aws/requests/s3/copy_object.rb
235
248
  - lib/fog/aws/requests/s3/delete_bucket.rb
236
249
  - lib/fog/aws/requests/s3/delete_object.rb
@@ -259,6 +272,12 @@ files:
259
272
  - lib/fog/connection.rb
260
273
  - lib/fog/credentials.rb
261
274
  - lib/fog/deprecation.rb
275
+ - lib/fog/local.rb
276
+ - lib/fog/local/bin.rb
277
+ - lib/fog/local/models/directories.rb
278
+ - lib/fog/local/models/directory.rb
279
+ - lib/fog/local/models/file.rb
280
+ - lib/fog/local/models/files.rb
262
281
  - lib/fog/model.rb
263
282
  - lib/fog/parser.rb
264
283
  - lib/fog/rackspace.rb
@@ -388,8 +407,8 @@ files:
388
407
  - lib/fog/terremark/requests/shared/instantiate_vapp_template.rb
389
408
  - lib/fog/terremark/requests/shared/power_off.rb
390
409
  - lib/fog/terremark/requests/shared/power_on.rb
391
- - lib/fog/terremark/requests/shared/reset.rb
392
- - lib/fog/terremark/requests/shared/shutdown.rb
410
+ - lib/fog/terremark/requests/shared/power_reset.rb
411
+ - lib/fog/terremark/requests/shared/power_shutdown.rb
393
412
  - lib/fog/terremark/shared.rb
394
413
  - lib/fog/terremark/vcloud.rb
395
414
  - spec/aws/models/ec2/address_spec.rb