fog 0.0.40 → 0.0.41

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

@@ -4,23 +4,23 @@ describe 'EC2.attach_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']
     end
 
     after(:each) do
       eventually do
-        ec2.detach_volume(@volume_id)
+        AWS[:ec2].detach_volume(@volume_id)
       end
       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(128) do
-        actual = ec2.attach_volume(@instance_id, @volume_id, '/dev/sdh')
+        actual = AWS[:ec2].attach_volume(@instance_id, @volume_id, '/dev/sdh')
         actual.body['attachTime'].should be_a(Time)
         actual.body['device'].should be_a(String)
         actual.body['instanceId'].should be_a(String)
@@ -34,19 +34,19 @@ describe 'EC2.attach_volume' do
   describe 'failure' do
 
     it "should raise a BadRequest error if the instance does not exist" do
-      @volume_id = ec2.create_volume('us-east-1a', 1).body['volumeId']
+      @volume_id = AWS[:ec2].create_volume('us-east-1a', 1).body['volumeId']
       lambda {
-        ec2.attach_volume('i-00000000', @volume_id, '/dev/sdh')
+        AWS[:ec2].attach_volume('i-00000000', @volume_id, '/dev/sdh')
       }.should raise_error(Excon::Errors::BadRequest)
-      ec2.delete_volume(@volume_id)
+      AWS[:ec2].delete_volume(@volume_id)
     end
 
     it "should raise a BadRequest error if the address does not exist" 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']
       lambda {
-        ec2.attach_volume(@instance_id, 'vol-00000000', '/dev/sdh')
+        AWS[:ec2].attach_volume(@instance_id, 'vol-00000000', '/dev/sdh')
       }.should raise_error(Excon::Errors::BadRequest)
-      ec2.terminate_instances(@instance_id)
+      AWS[:ec2].terminate_instances(@instance_id)
     end
 
   end

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

@@ -4,15 +4,15 @@ describe 'EC2.authorize_security_group_ingress' 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" do
-      actual = ec2.authorize_security_group_ingress({
+      actual = AWS[:ec2].authorize_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'fog_security_group',
         'IpProtocol' => 'tcp',

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

@@ -4,11 +4,11 @@ describe 'EC2.create_key_pair' do
   describe 'success' do
 
     after(:each) do
-      ec2.delete_key_pair('fog_key_pair')
+      AWS[:ec2].delete_key_pair('fog_key_pair')
     end
 
     it "should return proper attributes" do
-      actual = ec2.create_key_pair('fog_key_pair')
+      actual = AWS[:ec2].create_key_pair('fog_key_pair')
       actual.body['keyFingerprint'].should be_a(String)
       actual.body['keyMaterial'].should be_a(String)
       actual.body['keyName'].should be_a(String)
@@ -19,16 +19,16 @@ describe 'EC2.create_key_pair' do
   describe 'failure' do
 
     before(:each) do
-      ec2.create_key_pair('fog_key_pair')
+      AWS[:ec2].create_key_pair('fog_key_pair')
     end
 
     after(:each) do
-      ec2.delete_key_pair('fog_key_pair')
+      AWS[:ec2].delete_key_pair('fog_key_pair')
     end
 
     it "should raise a BadRequest when the key pair already exists" do
       lambda {
-        ec2.create_key_pair('fog_key_pair')
+        AWS[:ec2].create_key_pair('fog_key_pair')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,11 +4,11 @@ describe 'EC2.create_security_group' do
   describe 'success' do
 
     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.create_security_group('fog_security_group', 'a security group for testing fog')
+      actual = AWS[:ec2].create_security_group('fog_security_group', 'a security group for testing fog')
       actual.body['requestId'].should be_a(String)
       [false, true].should include(actual.body['return'])
     end
@@ -17,16 +17,16 @@ describe 'EC2.create_security_group' do
   describe 'failure' 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 raise a BadRequest error when the security group already exists" do
       lambda {
-        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')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,18 +4,18 @@ describe 'EC2.create_snapshot' 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)
       eventually do
-        ec2.delete_snapshot(@snapshot_id)
+        AWS[:ec2].delete_snapshot(@snapshot_id)
       end
     end
 
     it "should return proper attributes" do
-      actual = ec2.create_snapshot(@volume_id)
+      actual = AWS[:ec2].create_snapshot(@volume_id)
       actual.body['progress'].should be_a(String)
       @snapshot_id = actual.body['snapshotId']
       actual.body['snapshotId'].should be_a(String)
@@ -29,7 +29,7 @@ describe 'EC2.create_snapshot' do
 
     it "should raise a BadRequest error if the volume does not exist" do
       lambda {
-        ec2.create_snapshot('vol-00000000')
+        AWS[:ec2].create_snapshot('vol-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,11 +4,11 @@ describe 'EC2.create_volume' do
   describe 'success' do
 
     after(:each) do
-      ec2.delete_volume(@volume_id)
+      AWS[:ec2].delete_volume(@volume_id)
     end
 
     it "should return proper attributes" do
-      actual = ec2.create_volume('us-east-1a', 1)
+      actual = AWS[:ec2].create_volume('us-east-1a', 1)
       actual.body['availabilityZone'].should be_a(String)
       actual.body['createTime'].should be_a(Time)
       actual.body['requestId'].should be_a(String)

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

@@ -4,8 +4,8 @@ describe 'EC2.delete_key_pair' do
   describe 'success' do
 
     before(:each) do
-      ec2.create_key_pair('fog_key_name')
-      @response = ec2.delete_key_pair('fog_key_name')
+      AWS[:ec2].create_key_pair('fog_key_name')
+      @response = AWS[:ec2].delete_key_pair('fog_key_name')
     end
 
     it "should return proper attributes" do
@@ -14,7 +14,7 @@ describe 'EC2.delete_key_pair' do
     end
 
     it "should not raise an error if the key pair does not exist" do
-      ec2.delete_key_pair('not_a_key_name')
+      AWS[:ec2].delete_key_pair('not_a_key_name')
     end
 
   end

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

@@ -4,11 +4,11 @@ describe 'EC2.delete_security_group' 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
 
     it "should return proper attributes" do
-      actual = ec2.delete_security_group('fog_security_group')
+      actual = AWS[:ec2].delete_security_group('fog_security_group')
       actual.body['requestId'].should be_a(String)
       [false, true].should include(actual.body['return'])
     end
@@ -18,7 +18,7 @@ describe 'EC2.delete_security_group' do
 
     it "should raise a BadRequest error if the security group does not exist" do
       lambda {
-        ec2.delete_security_group('fog_not_a_security_group')
+        AWS[:ec2].delete_security_group('fog_not_a_security_group')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,17 +4,17 @@ describe 'EC2.delete_snapshot' 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)
     end
 
     it "should return proper attributes" do
       eventually do
-        actual = ec2.delete_snapshot(@snapshot_id)
+        actual = AWS[:ec2].delete_snapshot(@snapshot_id)
         unless actual.body.empty?
           actual.body['requestId'].should be_a(String)
           [false, true].should include(actual.body['return'])
@@ -27,7 +27,7 @@ describe 'EC2.delete_snapshot' do
 
     it "should raise a BadRequest error if snapshot does not exist" do
       lambda {
-        ec2.release_address('snap-00000000')
+        AWS[:ec2].release_address('snap-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,11 +4,11 @@ describe 'EC2.create_volume' 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
 
     it "should return proper attributes" do
-      actual = ec2.delete_volume(@volume_id)
+      actual = AWS[:ec2].delete_volume(@volume_id)
       actual.body['requestId'].should be_a(String)
       actual.body['return'].should == true
     end
@@ -18,7 +18,7 @@ describe 'EC2.create_volume' do
 
     it "should raise a BadRequest error if volume does not exist" do
       lambda {
-        ec2.delete_volume('vol-00000000')
+        AWS[:ec2].delete_volume('vol-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,22 +4,22 @@ describe 'EC2.describe_addresses' do
   describe 'success' do
 
     before(:each) do
-      @public_ip = ec2.allocate_address.body['publicIp']
+      @public_ip = AWS[:ec2].allocate_address.body['publicIp']
     end
 
     after(:each) do
-      ec2.release_address(@public_ip)
+      AWS[:ec2].release_address(@public_ip)
     end
 
     it "should return proper attributes with no params" do
-      actual = ec2.describe_addresses
+      actual = AWS[:ec2].describe_addresses
       actual.body['requestId'].should be_a(String)
       item = actual.body['addressesSet'].select {|address| address['publicIp'] == @public_ip}
       item.should_not be_nil
     end
 
     it "should return proper attributes for specific ip" do
-      actual = ec2.describe_addresses(@public_ip)
+      actual = AWS[:ec2].describe_addresses(@public_ip)
       actual.body['requestId'].should be_a(String)
       item = actual.body['addressesSet'].select {|address| address['publicIp'] == @public_ip}
       item.should_not be_nil
@@ -30,7 +30,7 @@ describe 'EC2.describe_addresses' do
 
     it "should raise a BadRequest error if ip does not exist" do
       lambda {
-        ec2.describe_addresses('127.0.0.1')
+        AWS[:ec2].describe_addresses('127.0.0.1')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,7 +4,7 @@ describe 'EC2.describe_availability_zones' do
   describe 'success' do
 
     it "should return proper attributes with no params" do
-      actual = ec2.describe_availability_zones
+      actual = AWS[:ec2].describe_availability_zones
       zone = actual.body['availabilityZoneInfo'].first
       zone['regionName'].should be_a(String)
       zone['zoneName'].should be_a(String)
@@ -12,7 +12,7 @@ describe 'EC2.describe_availability_zones' do
     end
 
     it "should return proper attribute with params" do
-      actual = ec2.describe_availability_zones(['us-east-1a'])
+      actual = AWS[:ec2].describe_availability_zones(['us-east-1a'])
       zone = actual.body['availabilityZoneInfo'].first
       zone['regionName'].should be_a(String)
       zone['zoneName'].should be_a(String)

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

@@ -4,7 +4,7 @@ describe 'EC2.describe_images' do
   describe 'success' do
 
     it "should return proper attributes with no params" do
-      actual = ec2.describe_images
+      actual = AWS[:ec2].describe_images
       actual.body['requestId'].should be_a(String)
       image = actual.body['imagesSet'].first
       image['architecture'].should be_a(String)
@@ -20,7 +20,7 @@ describe 'EC2.describe_images' do
     end
   
     it "should return proper attributes with params" do
-      actual = ec2.describe_images('ImageId' => GENTOO_AMI)
+      actual = AWS[:ec2].describe_images('ImageId' => GENTOO_AMI)
       actual.body['requestId'].should be_a(String)
       image = actual.body['imagesSet'].first
       image['architecture'].should be_a(String)

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

@@ -4,17 +4,17 @@ describe 'EC2.describe_instances' do
   describe 'success' do
 
     before(:each) do
-      run_instances = ec2.run_instances(GENTOO_AMI, 1, 1).body
+      run_instances = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body
       @instance_id = run_instances['instancesSet'].first['instanceId']
       @reservation_id = run_instances['reservationId']
     end
 
     after(:each) do
-      ec2.terminate_instances([@instance_id])
+      AWS[:ec2].terminate_instances([@instance_id])
     end
 
     it "should return proper attributes with no params" do
-      actual = ec2.describe_instances
+      actual = AWS[:ec2].describe_instances
       reservation = actual.body['reservationSet'].select {|reservation| reservation['reservationId'] == @reservation_id}.first
       reservation['groupSet'].should be_an(Array)
       reservation['groupSet'].first.should be_a(String)
@@ -44,7 +44,7 @@ describe 'EC2.describe_instances' do
     end
   
     it "should return proper attributes with params" do
-      actual = ec2.describe_instances(@instance_id)
+      actual = AWS[:ec2].describe_instances(@instance_id)
       reservation = actual.body['reservationSet'].select {|reservation| reservation['reservationId'] == @reservation_id}.first
       reservation['groupSet'].should be_an(Array)
       reservation['groupSet'].first.should be_a(String)
@@ -78,7 +78,7 @@ describe 'EC2.describe_instances' do
 
     it 'should raise a BadRequest error if the instance does not exist' do
       lambda {
-        ec2.describe_instances('i-00000000')
+        AWS[:ec2].describe_instances('i-00000000')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,15 +4,15 @@ describe 'EC2.describe_key_pairs' do
   describe 'success' do
 
     before(:each) do
-      ec2.create_key_pair('fog_key_name')
+      AWS[:ec2].create_key_pair('fog_key_name')
     end
 
     after(:each) do
-      ec2.delete_key_pair('fog_key_name')
+      AWS[:ec2].delete_key_pair('fog_key_name')
     end
 
     it "should return proper attributes with no params" do
-      actual = ec2.describe_key_pairs
+      actual = AWS[:ec2].describe_key_pairs
       actual.body['keySet'].should be_an(Array)
       actual.body['requestId'].should be_a(String)
       key_pair = actual.body['keySet'].select {|key| key['keyName'] == 'fog_key_name' }.first
@@ -21,7 +21,7 @@ describe 'EC2.describe_key_pairs' do
     end
   
     it "should return proper attributes with params" do
-      actual = ec2.describe_key_pairs('fog_key_name')
+      actual = AWS[:ec2].describe_key_pairs('fog_key_name')
       actual.body['keySet'].should be_an(Array)
       actual.body['requestId'].should be_a(String)
       key_pair = actual.body['keySet'].select {|key| key['keyName'] == 'fog_key_name' }.first
@@ -34,7 +34,7 @@ describe 'EC2.describe_key_pairs' do
 
     it "should raise a BadRequest error if the key does not exist" do
       lambda {
-        ec2.describe_key_pairs('fog_not_a_key_name')
+        AWS[:ec2].describe_key_pairs('fog_not_a_key_name')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

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

@@ -4,14 +4,14 @@ describe 'EC2.describe_availability_zones' do
   describe 'success' do
 
     it "should return proper attributes with no params" do
-      actual = ec2.describe_regions
+      actual = AWS[:ec2].describe_regions
       zone = actual.body['regionInfo'].first
       zone['regionEndpoint'].should be_a(String)
       zone['regionName'].should be_a(String)
     end
 
     it "should return proper attribute with params" do
-      actual = ec2.describe_regions(['us-east-1'])
+      actual = AWS[:ec2].describe_regions(['us-east-1'])
       zone = actual.body['regionInfo'].first
       zone['regionEndpoint'].should be_a(String)
       zone['regionName'].should be_a(String)