fog 0.0.84 → 0.0.85

data/spec/aws/requests/ec2/describe_instances_spec.rb

@@ -3,13 +3,14 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'EC2.describe_instances' do
   describe 'success' do
 
-    before(:each) do
+    before(:all) do
       run_instances = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body
       @instance_id = run_instances['instancesSet'].first['instanceId']
       @reservation_id = run_instances['reservationId']
+      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
     end
 
-    after(:each) do
+    after(:all) do
       AWS[:ec2].terminate_instances([@instance_id])
     end
 

data/spec/aws/requests/ec2/describe_snapshots_spec.rb

@@ -3,42 +3,38 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'EC2.describe_snapshots' do
   describe 'success' do
 
-    before(:each) do
+    before(:all) do
       @volume_id = AWS[:ec2].create_volume('us-east-1a', 1).body['volumeId']
+      AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
       @snapshot_id = AWS[:ec2].create_snapshot(@volume_id).body['snapshotId']
+      AWS[:ec2].snapshots.get(@snapshot_id).wait_for { ready? }
     end
 
-    after(:each) do
+    after(:all) do
       AWS[:ec2].delete_volume(@volume_id)
-      eventually do
-        AWS[:ec2].delete_snapshot(@snapshot_id)
-      end
+      AWS[:ec2].delete_snapshot(@snapshot_id)
     end
 
     it "should return proper attributes with no params" do
-      eventually do
-        actual = AWS[:ec2].describe_snapshots
-        actual.body['snapshotSet'].should be_an(Array)
-        snapshot = actual.body['snapshotSet'].select {|snapshot| snapshot['snapshotId'] == @snapshot_id}.first
-        snapshot['progress'].should be_a(String)
-        snapshot['snapshotId'].should be_a(String)
-        snapshot['startTime'].should be_a(Time)
-        snapshot['status'].should be_a(String)
-        snapshot['volumeId'].should be_a(String)
-      end
+      actual = AWS[:ec2].describe_snapshots
+      actual.body['snapshotSet'].should be_an(Array)
+      snapshot = actual.body['snapshotSet'].select {|snapshot| snapshot['snapshotId'] == @snapshot_id}.first
+      snapshot['progress'].should be_a(String)
+      snapshot['snapshotId'].should be_a(String)
+      snapshot['startTime'].should be_a(Time)
+      snapshot['status'].should be_a(String)
+      snapshot['volumeId'].should be_a(String)
     end
   
     it "should return proper attributes with params" do
-      eventually do
-        actual = AWS[:ec2].describe_snapshots([@snapshot_id])
-        actual.body['snapshotSet'].should be_an(Array)
-        snapshot = actual.body['snapshotSet'].select {|snapshot| snapshot['snapshotId'] == @snapshot_id}.first
-        snapshot['progress'].should be_a(String)
-        snapshot['snapshotId'].should be_a(String)
-        snapshot['startTime'].should be_a(Time)
-        snapshot['status'].should be_a(String)
-        snapshot['volumeId'].should be_a(String)
-      end
+      actual = AWS[:ec2].describe_snapshots([@snapshot_id])
+      actual.body['snapshotSet'].should be_an(Array)
+      snapshot = actual.body['snapshotSet'].select {|snapshot| snapshot['snapshotId'] == @snapshot_id}.first
+      snapshot['progress'].should be_a(String)
+      snapshot['snapshotId'].should be_a(String)
+      snapshot['startTime'].should be_a(Time)
+      snapshot['status'].should be_a(String)
+      snapshot['volumeId'].should be_a(String)
     end
 
   end

data/spec/aws/requests/ec2/detach_volume_spec.rb

@@ -6,28 +6,26 @@ describe 'EC2.detach_volume' do
     before(:each) do
       @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1, {'Placement.AvailabilityZone' => 'us-east-1a'}).body['instancesSet'].first['instanceId']
       @volume_id = AWS[:ec2].create_volume('us-east-1a', 1).body['volumeId']
-      eventually(128) do
-        AWS[:ec2].attach_volume(@instance_id, @volume_id, '/dev/sdh')
-      end
+      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
+      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
+      AWS[:ec2].attach_volume(@instance_id, @volume_id, '/dev/sdh')
+      AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
     end
 
     after(:each) do
-      eventually do
-        AWS[:ec2].delete_volume(@volume_id)
-        AWS[:ec2].terminate_instances([@instance_id])
-      end
+      AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
+      AWS[:ec2].delete_volume(@volume_id)
+      AWS[:ec2].terminate_instances([@instance_id])
     end
 
     it "should return proper attributes" do
-      eventually do
-        actual = AWS[:ec2].detach_volume(@volume_id)
-        actual.body['attachTime'].should be_a(Time)
-        actual.body['device'].should be_a(String)
-        actual.body['instanceId'].should be_a(String)
-        actual.body['requestId'].should be_a(String)
-        actual.body['status'].should be_a(String)
-        actual.body['volumeId'].should be_a(String)
-      end
+      actual = AWS[:ec2].detach_volume(@volume_id)
+      actual.body['attachTime'].should be_a(Time)
+      actual.body['device'].should be_a(String)
+      actual.body['instanceId'].should be_a(String)
+      actual.body['requestId'].should be_a(String)
+      actual.body['status'].should be_a(String)
+      actual.body['volumeId'].should be_a(String)
     end
 
   end

data/spec/aws/requests/ec2/disassociate_address_spec.rb

@@ -5,10 +5,9 @@ describe 'EC2.disassociate_address' do
 
     before(:each) do
       @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
-      eventually(128) do
-        @public_ip = AWS[:ec2].allocate_address.body['publicIp']
-        AWS[:ec2].associate_address(@instance_id, @public_ip)
-      end
+      @public_ip = AWS[:ec2].allocate_address.body['publicIp']
+      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
+      AWS[:ec2].associate_address(@instance_id, @public_ip)
     end
 
     after(:each) do

data/spec/aws/requests/ec2/get_console_output_spec.rb

@@ -5,6 +5,7 @@ describe 'EC2.get_console_output' do
 
     before(:each) do
       @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
+      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
     end
 
     after(:each) do

data/spec/aws/requests/s3/get_service_spec.rb

@@ -3,11 +3,12 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'S3.get_service' do
   describe 'success' do
 
-    before(:each) do
+    before(:all) do
       AWS[:s3].put_bucket('foggetservice')
+      Fog.wait_for { AWS[:s3].directories.get('foggetservice') }
     end
 
-    after(:each) do
+    after(:all) do
       AWS[:s3].delete_bucket('foggetservice')
     end
 
@@ -23,10 +24,8 @@ describe 'S3.get_service' do
     end
 
     it 'should include foggetservice in get_service' do
-      eventually do
-        actual = AWS[:s3].get_service
-        actual.body['Buckets'].collect { |bucket| bucket['Name'] }.should include('foggetservice')
-      end
+      actual = AWS[:s3].get_service
+      actual.body['Buckets'].collect { |bucket| bucket['Name'] }.should include('foggetservice')
     end
 
   end

data/spec/spec_helper.rb

@@ -9,16 +9,6 @@ if ENV["FOG_MOCK"] == "true"
   Fog.mock!
 end
 
-unless defined?(LOADED_SPEC_OPTS)
-  # inlined spec.opts
-  require "#{current_directory}/compact_progress_bar_formatter"
-  Spec::Runner.options.parse_format("Spec::Runner::Formatter::CompactProgressBarFormatter")
-  Spec::Runner.options.loadby  = 'mtime'
-  Spec::Runner.options.reverse = true
-  LOADED_SPEC_OPTS = true
-end
-
-
 module AWS
   class << self
     def [](service)
@@ -104,16 +94,6 @@ def eventually(max_delay = 16, &block)
   end
 end
 
-def wait_for(timeout = 600, &block)
-  start = Time.now
-  until instance_eval(&block)
-    if Time.now - start > timeout
-      break
-    end
-    sleep(1)
-  end
-end
-
 unless defined?(GENTOO_AMI)
   GENTOO_AMI = 'ami-5ee70037'
 end

data/tests/helper.rb

@@ -32,13 +32,3 @@ def validate_format(original_data, format)
   end
   valid
 end
-
-def wait_for(timeout = 600, &block)
-  start = Time.now
-  until instance_eval(&block)
-    if Time.now - start > timeout
-      break
-    end
-    sleep(1)
-  end
-end

data/tests/rackspace/requests/servers/create_image_tests.rb

@@ -3,14 +3,14 @@ Shindo.tests('Rackspace::Servers#create_image', 'rackspace') do
 
     before do
       @server_id = Rackspace[:servers].create_server(1, 3, 'fogcreateimage').body['server']['id']
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       @data = Rackspace[:servers].create_image(@server_id).body['image']
       @image_id = @data['id']
     end
 
     after do
       Rackspace[:servers].delete_server(@server_id)
-      wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_image(@image_id)
     end
 

data/tests/rackspace/requests/servers/create_server_tests.rb

@@ -2,12 +2,13 @@ Shindo.tests('Rackspace::Servers#create_server', 'rackspace') do
   tests('success') do
 
     before do
-      @data = Rackspace[:servers].create_server(1, 3, 'fogcreateserver').body['server']
+      # 1 => 256MB, 3 => Gentoo
+      @data = Rackspace[:servers].create_server(1, 3).body['server']
       @server_id = @data['id']
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 

data/tests/rackspace/requests/servers/delete_image_tests.rb

@@ -7,12 +7,12 @@ Shindo.tests('Rackspace::Servers#delete_image', 'rackspace') do
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 
     test('has proper output format') do
-      wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_image(@image_id)
     end
 

data/tests/rackspace/requests/servers/delete_server_tests.rb

@@ -6,7 +6,7 @@ Shindo.tests('Rackspace::Servers#delete_server', 'rackspace') do
     end
 
     test('has proper output format') do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 

data/tests/rackspace/requests/servers/get_server_details_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#get_server_details', 'rackspace') do
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 

data/tests/rackspace/requests/servers/list_addresses_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_addresses', 'rackspace') do
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 

data/tests/rackspace/requests/servers/list_private_addresses_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_private_addresses', 'rackspace') do
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 

data/tests/rackspace/requests/servers/list_public_addresses_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_public_addresses', 'rackspace') do
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 

data/tests/rackspace/requests/servers/list_servers_detail_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_servers_detail', 'rackspace') do
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 

data/tests/rackspace/requests/servers/list_servers_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Rackspace::Servers#list_servers', 'rackspace') do
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 

data/tests/rackspace/requests/servers/reboot_server_tests.rb

@@ -6,20 +6,20 @@ Shindo.tests('Rackspace::Servers#reboot_server', 'rackspace') do
     end
 
     after do
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       Rackspace[:servers].delete_server(@server_id)
     end
 
     tests('HARD') do
       test('has proper output format') do
-        wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+        Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
         Rackspace[:servers].reboot_server(@server_id, 'HARD')
       end
     end
 
     tests('SOFT') do
       test('has proper output format') do
-        wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+        Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
         Rackspace[:servers].reboot_server(@server_id, 'SOFT')
       end
     end

data/tests/rackspace/requests/servers/update_server_tests.rb

@@ -3,7 +3,7 @@ Shindo.tests('Rackspace::Servers#update_server', 'rackspace') do
 
     before do
       @server_id = Rackspace[:servers].create_server(1, 3, 'fogupdateserver').body['server']['id']
-      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       @data = Rackspace[:servers].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 

data/tests/slicehost/requests/create_slice_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Slicehost#create_slice', 'slicehost') do
     end
 
     after do
-      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
       Slicehost[:slices].delete_slice(@id)
     end
 

data/tests/slicehost/requests/delete_slice_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Slicehost#delete_slice', 'slicehost') do
     end
 
     test('has proper output format') do
-      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
       Slicehost[:slices].delete_slice(@id)
     end
 

data/tests/slicehost/requests/get_slice_tests.rb

@@ -8,7 +8,7 @@ Shindo.tests('Slicehost#get_slice', 'slicehost') do
     end
 
     after do
-      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
       Slicehost[:slices].delete_slice(@id)
     end
 

data/tests/slicehost/requests/reboot_slice_tests.rb

@@ -4,12 +4,12 @@ Shindo.tests('Slicehost#reboot_slice', 'slicehost') do
     before do
       @data = Slicehost[:slices].create_slice(1, 3, 'fogrebootslice').body
       @id = @data['id']
-      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
       @data = Slicehost[:slices].reboot_slice(@id).body
     end
 
     after do
-      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
       Slicehost[:slices].delete_slice(@id)
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 84
-  version: 0.0.84
+  - 85
+  version: 0.0.85
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -07:00
+date: 2010-05-02 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,6 +151,7 @@ files:
 - lib/fog/aws.rb
 - lib/fog/aws/bin.rb
 - lib/fog/aws/ec2.rb
+- lib/fog/aws/elb.rb
 - lib/fog/aws/models/ec2/address.rb
 - lib/fog/aws/models/ec2/addresses.rb
 - lib/fog/aws/models/ec2/flavor.rb
@@ -191,6 +192,12 @@ files:
 - lib/fog/aws/parsers/ec2/get_console_output.rb
 - lib/fog/aws/parsers/ec2/run_instances.rb
 - lib/fog/aws/parsers/ec2/terminate_instances.rb
+- lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb
+- lib/fog/aws/parsers/elb/describe_instance_health.rb
+- lib/fog/aws/parsers/elb/describe_load_balancers.rb
+- lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb
+- lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb
+- lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
 - lib/fog/aws/parsers/s3/copy_object.rb
 - lib/fog/aws/parsers/s3/get_bucket.rb
 - lib/fog/aws/parsers/s3/get_bucket_location.rb
@@ -231,6 +238,12 @@ files:
 - lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
 - lib/fog/aws/requests/ec2/run_instances.rb
 - lib/fog/aws/requests/ec2/terminate_instances.rb
+- lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb
+- lib/fog/aws/requests/elb/describe_instance_health.rb
+- lib/fog/aws/requests/elb/describe_load_balancers.rb
+- lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb
+- lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb
+- lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb
 - lib/fog/aws/requests/s3/copy_object.rb
 - lib/fog/aws/requests/s3/delete_bucket.rb
 - lib/fog/aws/requests/s3/delete_object.rb
@@ -259,6 +272,12 @@ files:
 - lib/fog/connection.rb
 - lib/fog/credentials.rb
 - lib/fog/deprecation.rb
+- lib/fog/local.rb
+- lib/fog/local/bin.rb
+- lib/fog/local/models/directories.rb
+- lib/fog/local/models/directory.rb
+- lib/fog/local/models/file.rb
+- lib/fog/local/models/files.rb
 - lib/fog/model.rb
 - lib/fog/parser.rb
 - lib/fog/rackspace.rb
@@ -388,8 +407,8 @@ files:
 - lib/fog/terremark/requests/shared/instantiate_vapp_template.rb
 - lib/fog/terremark/requests/shared/power_off.rb
 - lib/fog/terremark/requests/shared/power_on.rb
-- lib/fog/terremark/requests/shared/reset.rb
-- lib/fog/terremark/requests/shared/shutdown.rb
+- lib/fog/terremark/requests/shared/power_reset.rb
+- lib/fog/terremark/requests/shared/power_shutdown.rb
 - lib/fog/terremark/shared.rb
 - lib/fog/terremark/vcloud.rb
 - spec/aws/models/ec2/address_spec.rb