fog 0.0.40 → 0.0.41

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

@@ -4,15 +4,15 @@ describe 'EC2.describe_security_groups' do
   describe 'success' do
 
     before(:each) do
-      ec2.create_security_group('fog_security_group', 'a security group for testing fog')
+      AWS[:ec2].create_security_group('fog_security_group', 'a security group for testing fog')
     end
 
     after(:each) do
-      ec2.delete_security_group('fog_security_group')
+      AWS[:ec2].delete_security_group('fog_security_group')
     end
 
     it "should return proper attributes with no params" do
-      actual = ec2.describe_security_groups
+      actual = AWS[:ec2].describe_security_groups
       actual.body['requestId'].should be_a(String)
       actual.body['securityGroupInfo'].should be_an(Array)
       security_group = actual.body['securityGroupInfo'].select do |security_group| 
@@ -26,7 +26,7 @@ describe 'EC2.describe_security_groups' do
     end
 
     it "should return proper attributes with params" do
-      actual = ec2.describe_security_groups('fog_security_group')
+      actual = AWS[:ec2].describe_security_groups('fog_security_group')
       actual.body['requestId'].should be_a(String)
       actual.body['securityGroupInfo'].should be_an(Array)
       security_group = actual.body['securityGroupInfo'].select do |security_group| 
@@ -43,7 +43,7 @@ describe 'EC2.describe_security_groups' do
 
     it "should raise a BadRequest error if the security group does not exist" do
       lambda {
-        ec2.describe_security_groups('not_a_security_group')
+        AWS[:ec2].describe_security_groups('not_a_security_group')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,20 +4,20 @@ describe 'EC2.describe_snapshots' do
   describe 'success' do
 
     before(:each) do
-      @volume_id = ec2.create_volume('us-east-1a', 1).body['volumeId']
-      @snapshot_id = ec2.create_snapshot(@volume_id).body['snapshotId']
+      @volume_id = AWS[:ec2].create_volume('us-east-1a', 1).body['volumeId']
+      @snapshot_id = AWS[:ec2].create_snapshot(@volume_id).body['snapshotId']
     end
 
     after(:each) do
-      ec2.delete_volume(@volume_id)
+      AWS[:ec2].delete_volume(@volume_id)
       eventually do
-        ec2.delete_snapshot(@snapshot_id)
+        AWS[:ec2].delete_snapshot(@snapshot_id)
       end
     end
 
     it "should return proper attributes with no params" do
       eventually do
-        actual = ec2.describe_snapshots
+        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)
@@ -30,7 +30,7 @@ describe 'EC2.describe_snapshots' do
   
     it "should return proper attributes with params" do
       eventually do
-        actual = ec2.describe_snapshots([@snapshot_id])
+        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)
@@ -46,7 +46,7 @@ describe 'EC2.describe_snapshots' do
 
     it "should raise a BadRequest error if the snapshot does not exist" do
       lambda {
-        ec2.describe_snapshots('snap-00000000')
+        AWS[:ec2].describe_snapshots('snap-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,15 +4,15 @@ describe 'EC2.describe_volumes' do
   describe 'success' do
 
     before(:each) do
-      @volume_id = ec2.create_volume('us-east-1a', 1).body['volumeId']
+      @volume_id = AWS[:ec2].create_volume('us-east-1a', 1).body['volumeId']
     end
 
     after(:each) do
-      ec2.delete_volume(@volume_id)
+      AWS[:ec2].delete_volume(@volume_id)
     end
 
     it "should return proper attributes with no params" do
-      actual = ec2.describe_volumes
+      actual = AWS[:ec2].describe_volumes
       actual.body['requestId'].should be_a(String)
       volume = actual.body['volumeSet'].select {|volume| volume['volumeId'] == @volume_id}.first
       volume['availabilityZone'].should be_a(String)
@@ -25,7 +25,7 @@ describe 'EC2.describe_volumes' do
     end
 
     it "should return proper attributes for specific volume" do
-      actual = ec2.describe_volumes(@volume_id)
+      actual = AWS[:ec2].describe_volumes(@volume_id)
       actual.body['requestId'].should be_a(String)
       volume = actual.body['volumeSet'].select {|volume| volume['volumeId'] == @volume_id}.first
       volume['availabilityZone'].should be_a(String)
@@ -42,7 +42,7 @@ describe 'EC2.describe_volumes' do
 
     it "should raise a BadRequest error if volume does not exist" do
       lambda {
-        ec2.describe_volumes('vol-00000000')
+        AWS[:ec2].describe_volumes('vol-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,23 +4,23 @@ describe 'EC2.detach_volume' do
   describe 'success' do
 
     before(:each) do
-      @instance_id = ec2.run_instances(GENTOO_AMI, 1, 1, {'Placement.AvailabilityZone' => 'us-east-1a'}).body['instancesSet'].first['instanceId']
-      @volume_id = ec2.create_volume('us-east-1a', 1).body['volumeId']
+      @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
-        ec2.attach_volume(@instance_id, @volume_id, '/dev/sdh')
+        AWS[:ec2].attach_volume(@instance_id, @volume_id, '/dev/sdh')
       end
     end
 
     after(:each) do
       eventually do
-        ec2.delete_volume(@volume_id)
-        ec2.terminate_instances([@instance_id])
+        AWS[:ec2].delete_volume(@volume_id)
+        AWS[:ec2].terminate_instances([@instance_id])
       end
     end
 
     it "should return proper attributes" do
       eventually do
-        actual = ec2.detach_volume(@volume_id)
+        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)
@@ -35,7 +35,7 @@ describe 'EC2.detach_volume' do
 
     it "should raise a BadRequest error if the volume does not exist" do
       lambda {
-        ec2.detach_volume('vol-00000000')
+        AWS[:ec2].detach_volume('vol-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,18 +4,20 @@ describe 'EC2.disassociate_address' do
   describe 'success' do
 
     before(:each) do
-      @instance_id = ec2.run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
-      @public_ip = ec2.allocate_address.body['publicIp']
-      ec2.associate_address(@instance_id, @public_ip)
+      @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
     end
 
     after(:each) do
-      ec2.release_address(@public_ip)
-      ec2.terminate_instances([@instance_id])
+      AWS[:ec2].release_address(@public_ip)
+      AWS[:ec2].terminate_instances([@instance_id])
     end
 
     it "should return proper attributes" do
-      actual = ec2.disassociate_address(@public_ip)
+      actual = AWS[:ec2].disassociate_address(@public_ip)
       actual.body['requestId'].should be_a(String)
       [false, true].should include(actual.body['return'])
     end
@@ -26,7 +28,7 @@ describe 'EC2.disassociate_address' do
 
     it "should raise a BadRequest error if the address does not exist" do
       lambda {
-        ec2.disassociate_address('127.0.0.1')
+        AWS[:ec2].disassociate_address('127.0.0.1')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,15 +4,15 @@ describe 'EC2.get_console_output' do
   describe 'success' do
 
     before(:each) do
-      @instance_id = ec2.run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
+      @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
     end
 
     after(:each) do
-      ec2.terminate_instances([@instance_id])
+      AWS[:ec2].terminate_instances([@instance_id])
     end
 
     it "should return proper attributes" do
-      actual = ec2.get_console_output(@instance_id)
+      actual = AWS[:ec2].get_console_output(@instance_id)
       actual.body['instanceId'].should be_a(String)
       actual.body['output'].should be_a(String)
       actual.body['requestId'].should be_a(String)
@@ -24,7 +24,7 @@ describe 'EC2.get_console_output' do
 
     it "should raise a BadRequest error if the instance does not exist" do
       lambda {
-        ec2.get_console_output('i-00000000')
+        AWS[:ec2].get_console_output('i-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,15 +4,15 @@ describe 'EC2.reboot_instances' do
   describe 'success' do
 
     before(:each) do
-      @instance_id = ec2.run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
+      @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
     end
 
     after(:each) do
-      ec2.terminate_instances(@instance_id)
+      AWS[:ec2].terminate_instances(@instance_id)
     end
 
     it "should return proper attributes" do
-      actual = ec2.reboot_instances(@instance_id)
+      actual = AWS[:ec2].reboot_instances(@instance_id)
       actual.body['requestId'].should be_a(String)
       [false, true].should include(actual.body['return'])
     end
@@ -22,7 +22,7 @@ describe 'EC2.reboot_instances' do
 
     it "should raise a BadRequest error if the instance does not exist" do
       lambda {
-        ec2.reboot_instances('i-00000000')
+        AWS[:ec2].reboot_instances('i-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,11 +4,11 @@ describe 'EC2.release_address' do
   describe 'success' do
 
     before(:each) do
-      @public_ip = ec2.allocate_address.body['publicIp']
+      @public_ip = AWS[:ec2].allocate_address.body['publicIp']
     end
 
     it "should return proper attributes" do
-      actual = ec2.release_address(@public_ip)
+      actual = AWS[:ec2].release_address(@public_ip)
       actual.body['requestId'].should be_a(String)
       actual.body['return'].should == true
     end
@@ -18,7 +18,7 @@ describe 'EC2.release_address' do
 
     it "should raise a BadRequest error if address does not exist" do
       lambda {
-        ec2.release_address('127.0.0.1')
+        AWS[:ec2].release_address('127.0.0.1')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,8 +4,8 @@ describe 'EC2.revoke_security_group_ingress' do
   describe 'success' do
 
     before(:each) do
-      ec2.create_security_group('fog_security_group', 'a security group for testing fog')
-      ec2.authorize_security_group_ingress({
+      AWS[:ec2].create_security_group('fog_security_group', 'a security group for testing fog')
+      AWS[:ec2].authorize_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'fog_security_group',
         'IpProtocol' => 'tcp',
@@ -14,11 +14,11 @@ describe 'EC2.revoke_security_group_ingress' do
     end
 
     after(:each) do
-      ec2.delete_security_group('fog_security_group')
+      AWS[:ec2].delete_security_group('fog_security_group')
     end
 
     it "should return proper attributes" do
-      actual = ec2.revoke_security_group_ingress({
+      actual = AWS[:ec2].revoke_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'fog_security_group',
         'IpProtocol' => 'tcp',

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

@@ -4,12 +4,12 @@ describe 'EC2.run_instances' do
   describe 'success' do
 
     after(:each) do
-      ec2.terminate_instances(@instance_id)
+      AWS[:ec2].terminate_instances(@instance_id)
     end
 
     it "should return proper attributes" do
       # ami-5ee70037 = gentoo
-      actual = ec2.run_instances(GENTOO_AMI, 1, 1)
+      actual = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1)
       @instance_id = actual.body['instancesSet'].first['instanceId']
       actual.body['groupSet'].should be_an(Array)
       actual.body['groupSet'].first.should be_a(String)

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

@@ -4,11 +4,11 @@ describe 'EC2.terminate_instances' do
   describe 'success' do
 
     before(:each) do
-      @instance_id = ec2.run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
+      @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
     end
 
     it "should return proper attributes" do
-      actual = ec2.terminate_instances(@instance_id)
+      actual = AWS[:ec2].terminate_instances(@instance_id)
       actual.body['requestId'].should be_a(String)
       actual.body['instancesSet'].should be_an(Array)
       instance = actual.body['instancesSet'].select {|instance| instance['instanceId'] == @instance_id}.first
@@ -16,10 +16,10 @@ describe 'EC2.terminate_instances' do
       previous_state = instance['previousState']
       previous_state['code'].should be_a(Integer)
       previous_state['name'].should be_a(String)
-      instance['shutdownState'].should be_a(Hash)
-      shutdown_state = instance['shutdownState']
-      shutdown_state['code'].should be_a(Integer)
-      shutdown_state['name'].should be_a(String)
+      instance['currentState'].should be_a(Hash)
+      current_state = instance['currentState']
+      current_state['code'].should be_a(Integer)
+      current_state['name'].should be_a(String)
     end
 
   end
@@ -27,7 +27,7 @@ describe 'EC2.terminate_instances' do
 
     it 'should raise a BadRequest error if the instance does not exist' do
       lambda {
-        ec2.terminate_instances('i-00000000')
+        AWS[:ec2].terminate_instances('i-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,20 +4,20 @@ describe 'S3.copy_object' do
   describe 'success' do
 
     before(:each) do
-      s3.put_bucket('fogcopyobjectsource')
-      s3.put_object('fogcopyobjectsource', 'fog_copy_object_source', lorem_file)
-      s3.put_bucket('fogcopyobjectdestination')
+      AWS[:s3].put_bucket('fogcopyobjectsource')
+      AWS[:s3].put_object('fogcopyobjectsource', 'fog_copy_object_source', lorem_file)
+      AWS[:s3].put_bucket('fogcopyobjectdestination')
     end
 
     after(:each) do
-      s3.delete_object('fogcopyobjectdestination', 'fog_copy_object_destination')
-      s3.delete_bucket('fogcopyobjectdestination')
-      s3.delete_object('fogcopyobjectsource', 'fog_copy_object_source')
-      s3.delete_bucket('fogcopyobjectsource')
+      AWS[:s3].delete_object('fogcopyobjectdestination', 'fog_copy_object_destination')
+      AWS[:s3].delete_bucket('fogcopyobjectdestination')
+      AWS[:s3].delete_object('fogcopyobjectsource', 'fog_copy_object_source')
+      AWS[:s3].delete_bucket('fogcopyobjectsource')
     end
 
     it 'should return proper attributes' do
-      actual = s3.copy_object(
+      actual = AWS[:s3].copy_object(
         'fogcopyobjectsource', 'fog_copy_object_source',
         'fogcopyobjectdestination', 'fog_copy_object_destination'
       )
@@ -31,7 +31,7 @@ describe 'S3.copy_object' do
 
     it 'should raise a NotFound error if the source_bucket does not exist' do
       lambda {
-        s3.copy_object(
+        AWS[:s3].copy_object(
           'fognotabucket', 'fog_copy_object_source',
           'fogcopyobjectdestination', 'fog_copy_object_destination'
         )
@@ -40,7 +40,7 @@ describe 'S3.copy_object' do
 
     it 'should raise a NotFound error if the source_object does not exist' do
       lambda {
-        s3.copy_object(
+        AWS[:s3].copy_object(
           'fogcopyobjectsource', 'fog_not_an_object',
           'fogcopyobjectdestination', 'fog_copy_object_destination'
         )
@@ -49,7 +49,7 @@ describe 'S3.copy_object' do
 
     it 'should raise a NotFound error if the target_bucket does not exist' do
       lambda {
-        s3.copy_object(
+        AWS[:s3].copy_object(
           'fogcopyobjectsource', 'fog_copy_object_source',
           'fognotabucket', 'fog_copy_object_destination'
         )

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

@@ -4,11 +4,11 @@ describe 'S3.delete_bucket' do
   describe 'success' do
 
     before(:each) do
-      s3.put_bucket('fogdeletebucket')
+      AWS[:s3].put_bucket('fogdeletebucket')
     end
 
     it 'should return proper attributes' do
-      actual = s3.delete_bucket('fogdeletebucket')
+      actual = AWS[:s3].delete_bucket('fogdeletebucket')
       actual.status.should == 204
     end
 
@@ -17,18 +17,18 @@ describe 'S3.delete_bucket' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        s3.delete_bucket('fognotabucket')
+        AWS[:s3].delete_bucket('fognotabucket')
       }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should raise a Conflict error if the bucket is not empty' do
-      s3.put_bucket('fogdeletebucket')
-      s3.put_object('fogdeletebucket', 'fog_delete_object', lorem_file)
+      AWS[:s3].put_bucket('fogdeletebucket')
+      AWS[:s3].put_object('fogdeletebucket', 'fog_delete_object', lorem_file)
       lambda {
-        s3.delete_bucket('fogdeletebucket')
+        AWS[:s3].delete_bucket('fogdeletebucket')
       }.should raise_error(Excon::Errors::Conflict)
-      s3.delete_object('fogdeletebucket', 'fog_delete_object')
-      s3.delete_bucket('fogdeletebucket')
+      AWS[:s3].delete_object('fogdeletebucket', 'fog_delete_object')
+      AWS[:s3].delete_bucket('fogdeletebucket')
     end
 
   end

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

@@ -4,16 +4,16 @@ describe 'S3.delete_object' do
   describe 'success' do
 
     before(:each) do
-      s3.put_bucket('fogdeleteobject')
-      s3.put_object('fogdeleteobject', 'fog_delete_object', lorem_file)
+      AWS[:s3].put_bucket('fogdeleteobject')
+      AWS[:s3].put_object('fogdeleteobject', 'fog_delete_object', lorem_file)
     end
 
     after(:each) do
-      s3.delete_bucket('fogdeleteobject')
+      AWS[:s3].delete_bucket('fogdeleteobject')
     end
 
     it 'should return proper attributes' do
-      actual = s3.delete_object('fogdeleteobject', 'fog_delete_object')
+      actual = AWS[:s3].delete_object('fogdeleteobject', 'fog_delete_object')
       actual.status.should == 204
     end
 
@@ -22,14 +22,14 @@ describe 'S3.delete_object' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        s3.delete_object('fognotabucket', 'fog_delete_object')
+        AWS[:s3].delete_object('fognotabucket', 'fog_delete_object')
       }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should not raise an error if the object does not exist' do
-      s3.put_bucket('fogdeleteobject')
-      s3.delete_object('fogdeleteobject', 'fog_not_an_object')
-      s3.delete_bucket('fogdeleteobject')
+      AWS[:s3].put_bucket('fogdeleteobject')
+      AWS[:s3].delete_object('fogdeleteobject', 'fog_not_an_object')
+      AWS[:s3].delete_bucket('fogdeleteobject')
     end
 
   end