fog 0.0.40 → 0.0.41

data/spec/aws/models/ec2/snapshots_spec.rb

@@ -5,25 +5,25 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#all" do
 
     it "should return a Fog::AWS::EC2::Snapshots" do
-      ec2.snapshots.all.should be_a(Fog::AWS::EC2::Snapshots)
+      AWS[:ec2].snapshots.all.should be_a(Fog::AWS::EC2::Snapshots)
     end
 
     it "should include persisted snapshots" do
-      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      snapshot = volume.snapshots.create
-      ec2.snapshots.all.map {|snapshot| snapshot.id}.should include(snapshot.id)
-      snapshot.destroy
-      volume.destroy
+      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      eventually { @snapshot = @volume.snapshots.create }
+      AWS[:ec2].snapshots.all.map {|snapshot| snapshot.id}.should include(@snapshot.id)
+      @snapshot.destroy
+      @volume.destroy
     end
 
     it "should limit snapshots by volume if present" do
-      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      other_volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      snapshot = volume.snapshots.create
-      other_volume.snapshots.all.map {|snapshot| snapshot.id}.should_not include(snapshot.id)
-      snapshot.destroy
-      other_volume.destroy
-      volume.destroy
+      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      @other_volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      eventually { @snapshot = @volume.snapshots.create }
+      @other_volume.snapshots.all.map {|snapshot| snapshot.id}.should_not include(@snapshot.id)
+      @snapshot.destroy
+      @other_volume.destroy
+      @volume.destroy
     end
 
   end
@@ -31,7 +31,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#create" do
 
     before(:each) do
-      @volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       @snapshot = @volume.snapshots.create
     end
 
@@ -45,7 +45,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should exist on ec2" do
-      ec2.snapshots.get(@snapshot.id).should_not be_nil
+      AWS[:ec2].snapshots.get(@snapshot.id).should_not be_nil
     end
 
   end
@@ -53,15 +53,15 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#get" do
 
     it "should return a Fog::AWS::EC2::Snapshot if a matching snapshot exists" do
-      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       snapshot = volume.snapshots.create
-      get = ec2.snapshots.get(snapshot.id)
+      get = AWS[:ec2].snapshots.get(snapshot.id)
       snapshot.attributes.reject {|key, value| [:progress, :status].include?(key)}.should == get.attributes.reject {|key, value| [:progress, :status].include?(key)}
       snapshot.destroy
     end
 
     it "should return nil if no matching address exists" do
-      ec2.snapshots.get('vol-00000000').should be_nil
+      AWS[:ec2].snapshots.get('vol-00000000').should be_nil
     end
 
   end
@@ -69,7 +69,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#new" do
 
     it "should return a Fog::AWS::EC2::Snapshot" do
-      ec2.snapshots.new.should be_a(Fog::AWS::EC2::Snapshot)
+      AWS[:ec2].snapshots.new.should be_a(Fog::AWS::EC2::Snapshot)
     end
 
   end
@@ -77,7 +77,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#reload" do
 
     it "should return a Fog::AWS::EC2::Snapshots" do
-      ec2.snapshots.all.reload.should be_a(Fog::AWS::EC2::Snapshots)
+      AWS[:ec2].snapshots.all.reload.should be_a(Fog::AWS::EC2::Snapshots)
     end
 
   end

data/spec/aws/models/ec2/volume_spec.rb

@@ -5,7 +5,7 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#initialize" do
 
     it "should remap attributes from parser" do
-      volume = ec2.volumes.new(
+      volume = AWS[:ec2].volumes.new(
         'attachTime'        => 'now',
         'availabilityZone'  => 'us-east-1a',
         'createTime'        => 'recently',
@@ -26,11 +26,11 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#collection" do
 
     it "should return a Fog::AWS::EC2::Volumes" do
-      ec2.volumes.new.collection.should be_a(Fog::AWS::EC2::Volumes)
+      AWS[:ec2].volumes.new.collection.should be_a(Fog::AWS::EC2::Volumes)
     end
 
     it "should be the volumes the volume is related to" do
-      volumes = ec2.volumes
+      volumes = AWS[:ec2].volumes
       volumes.new.collection.should == volumes
     end
 
@@ -39,7 +39,7 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#destroy" do
 
     it "should return true if the volume is deleted" do
-      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
+      volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
       volume.destroy.should be_true
     end
 
@@ -47,8 +47,8 @@ describe 'Fog::AWS::EC2::Volume' do
 
   describe "#server=" do
     before(:each) do
-      @server = ec2.servers.create(:image_id => GENTOO_AMI)
-      @volume = ec2.volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
+      @server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
+      @volume = AWS[:ec2].volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
       @server.wait_for { state == 'running' }
     end
 
@@ -94,7 +94,7 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#reload" do
 
     before(:each) do
-      @volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
+      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
       @reloaded = @volume.reload
     end
 
@@ -115,7 +115,7 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#save" do
 
     before(:each) do
-      @volume = ec2.volumes.new(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
+      @volume = AWS[:ec2].volumes.new(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
     end
 
     it "should return true when it succeeds" do
@@ -124,12 +124,12 @@ describe 'Fog::AWS::EC2::Volume' do
     end
 
     it "should not exist in volumes before save" do
-      ec2.volumes.get(@volume.id).should be_nil
+      AWS[:ec2].volumes.get(@volume.id).should be_nil
     end
 
     it "should exist in buckets after save" do
       @volume.save
-      ec2.volumes.get(@volume.id).should_not be_nil
+      AWS[:ec2].volumes.get(@volume.id).should_not be_nil
       @volume.destroy
     end
 

data/spec/aws/models/ec2/volumes_spec.rb

@@ -5,12 +5,12 @@ describe 'Fog::AWS::EC2::Volumes' do
   describe "#all" do
 
     it "should return a Fog::AWS::EC2::Volumes" do
-      ec2.volumes.all.should be_a(Fog::AWS::EC2::Volumes)
+      AWS[:ec2].volumes.all.should be_a(Fog::AWS::EC2::Volumes)
     end
 
     it "should include persisted volumes" do
-      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      ec2.volumes.get(volume.id).should_not be_nil
+      volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      AWS[:ec2].volumes.get(volume.id).should_not be_nil
       volume.destroy
     end
 
@@ -19,7 +19,7 @@ describe 'Fog::AWS::EC2::Volumes' do
   describe "#create" do
 
     before(:each) do
-      @volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
     end
 
     after(:each) do
@@ -31,7 +31,7 @@ describe 'Fog::AWS::EC2::Volumes' do
     end
 
     it "should exist on ec2" do
-      ec2.volumes.get(@volume.id).should_not be_nil
+      AWS[:ec2].volumes.get(@volume.id).should_not be_nil
     end
 
   end
@@ -39,14 +39,14 @@ describe 'Fog::AWS::EC2::Volumes' do
   describe "#get" do
 
     it "should return a Fog::AWS::EC2::Volume if a matching volume exists" do
-      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      get = ec2.volumes.get(volume.id)
+      volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      get = AWS[:ec2].volumes.get(volume.id)
       volume.attributes.reject { |key, value| [:device, :status].include?(key) }.should == get.attributes.reject { |key, value| [:device, :status].include?(key) }
       volume.destroy
     end
 
     it "should return nil if no matching address exists" do
-      ec2.volumes.get('vol-00000000').should be_nil
+      AWS[:ec2].volumes.get('vol-00000000').should be_nil
     end
 
   end
@@ -54,7 +54,7 @@ describe 'Fog::AWS::EC2::Volumes' do
   describe "#new" do
 
     it "should return a Fog::AWS::EC2::Volume" do
-      ec2.volumes.new.should be_a(Fog::AWS::EC2::Volume)
+      AWS[:ec2].volumes.new.should be_a(Fog::AWS::EC2::Volume)
     end
 
   end
@@ -62,7 +62,7 @@ describe 'Fog::AWS::EC2::Volumes' do
   describe "#reload" do
 
     it "should return a Fog::AWS::EC2::Volumes" do
-      ec2.volumes.all.reload.should be_a(Fog::AWS::EC2::Volumes)
+      AWS[:ec2].volumes.all.reload.should be_a(Fog::AWS::EC2::Volumes)
     end
 
   end

data/spec/aws/models/s3/directories_spec.rb

@@ -5,8 +5,8 @@ describe 'Fog::AWS::S3::Directories' do
   describe "#all" do
 
     it "should include persisted directories" do
-      @directory = s3.directories.create(:name => 'fogdirectoryname')
-      s3.directories.all.map {|directory| @directory.name}.should include('fogdirectoryname')
+      @directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
+      AWS[:s3].directories.all.map {|directory| @directory.name}.should include('fogdirectoryname')
       @directory.destroy
     end
 
@@ -15,8 +15,8 @@ describe 'Fog::AWS::S3::Directories' do
   describe "#create" do
 
     it "should exist on s3" do
-      directory = s3.directories.create(:name => 'fogdirectoryname')
-      s3.directories.get(directory.name).should_not be_nil
+      directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
+      AWS[:s3].directories.get(directory.name).should_not be_nil
       directory.destroy
     end
 
@@ -25,14 +25,14 @@ describe 'Fog::AWS::S3::Directories' do
   describe "#get" do
 
     it "should return a Fog::AWS::S3::Directory if a matching directory exists" do
-      directory = s3.directories.create(:name => 'fogdirectoryname')
-      get = s3.directories.get('fogdirectoryname')
+      directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
+      get = AWS[:s3].directories.get('fogdirectoryname')
       directory.attributes.should == get.attributes
       directory.destroy
     end
 
     it "should return nil if no matching directory exists" do
-      s3.directories.get('fogdirectoryname').should be_nil
+      AWS[:s3].directories.get('fogdirectoryname').should be_nil
     end
 
   end
@@ -40,7 +40,7 @@ describe 'Fog::AWS::S3::Directories' do
   describe "#reload" do
 
     it "should reload data" do
-      directories = s3.directories
+      directories = AWS[:s3].directories
       directories.should == directories.reload
     end
 

data/spec/aws/models/s3/directory_spec.rb

@@ -19,7 +19,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#collection" do
 
     it "should be the directories the directory is related to" do
-      directories = s3.directories
+      directories = AWS[:s3].directories
       directories.new.collection.should == directories
     end
 
@@ -28,12 +28,12 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#destroy" do
 
     it "should return true if the directory is deleted" do
-      directory = s3.directories.create(:name => 'fogmodeldirectory')
+      directory = AWS[:s3].directories.create(:name => 'fogmodeldirectory')
       directory.destroy.should be_true
     end
 
     it "should return false if the directory does not exist" do
-      directory = s3.directories.new(:name => 'fogmodeldirectory')
+      directory = AWS[:s3].directories.new(:name => 'fogmodeldirectory')
       directory.destroy.should be_false
     end
 
@@ -42,9 +42,9 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#location" do
 
     it "should return the location constraint" do
-      directory = s3.directories.create(:name => 'fogmodeleudirectory', :location => 'EU')
+      directory = AWS[:s3].directories.create(:name => 'fogmodeleudirectory', :location => 'EU')
       directory.location.should == 'EU'
-      eu_s3.directories.get('fogmodeleudirectory').destroy
+      AWS[:eu_s3].directories.get('fogmodeleudirectory').destroy
     end
 
   end
@@ -52,7 +52,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#payer" do
 
     it "should return the request payment value" do
-      directory = s3.directories.create(:name => 'fogmodeldirectory')
+      directory = AWS[:s3].directories.create(:name => 'fogmodeldirectory')
       directory.payer.should == 'BucketOwner'
       directory.destroy.should be_true
     end
@@ -62,7 +62,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#payer=" do
 
     it "should set the request payment value" do
-      directory = s3.directories.create(:name => 'fogmodeldirectory')
+      directory = AWS[:s3].directories.create(:name => 'fogmodeldirectory')
       (directory.payer = 'Requester').should == 'Requester'
       directory.destroy.should
     end
@@ -72,7 +72,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#reload" do
 
     before(:each) do
-      @directory = s3.directories.create(:name => 'fogmodeldirectory')
+      @directory = AWS[:s3].directories.create(:name => 'fogmodeldirectory')
       @reloaded = @directory.reload
     end
 
@@ -89,7 +89,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#save" do
 
     before(:each) do
-      @directory = s3.directories.new(:name => 'fogmodeldirectory')
+      @directory = AWS[:s3].directories.new(:name => 'fogmodeldirectory')
     end
 
     it "should return true when it succeeds" do
@@ -98,12 +98,12 @@ describe 'Fog::AWS::S3::Directory' do
     end
 
     it "should not exist in directories before save" do
-      s3.directories.all.map {|directory| directory.name}.include?(@directory.name).should be_false
+      AWS[:s3].directories.all.map {|directory| directory.name}.include?(@directory.name).should be_false
     end
 
     it "should exist in directories after save" do
       @directory.save
-      s3.directories.all.map {|directory| directory.name}.include?(@directory.name).should be_true
+      AWS[:s3].directories.all.map {|directory| directory.name}.include?(@directory.name).should be_true
       @directory.destroy
     end
 

data/spec/aws/models/s3/file_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'Fog::AWS::S3::File' do
 
   before(:each) do
-    @directory = s3.directories.create(:name => 'fogdirectoryname')
+    @directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
   end
 
   after(:each) do
@@ -53,7 +53,7 @@ describe 'Fog::AWS::S3::File' do
   describe "#copy" do
 
     it "should return a Fog::AWS::S3::File with matching attributes" do
-      other_directory = s3.directories.create(:name => 'fogotherdirectoryname')
+      other_directory = AWS[:s3].directories.create(:name => 'fogotherdirectoryname')
       data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
       file = @directory.files.create(:key => 'fogfilename', :body => data)
       other_file = file.copy('fogotherdirectoryname', 'fogotherfilename')

data/spec/aws/models/s3/files_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'Fog::AWS::S3::Files' do
 
   before(:each) do
-    @directory = s3.directories.create(:name => 'fogdirectoryname')
+    @directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
   end
 
   after(:each) do
@@ -30,7 +30,7 @@ describe 'Fog::AWS::S3::Files' do
   describe "#all" do
 
     it "should return nil if the directory does not exist" do
-      directory = s3.directories.new(:name => 'notadirectory')
+      directory = AWS[:s3].directories.new(:name => 'notadirectory')
       directory.files.all.should be_nil
     end
 

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

@@ -4,11 +4,11 @@ describe 'EC2.allocate_address' do
   describe 'success' do
 
     after(:each) do
-      ec2.release_address(@public_ip)
+      AWS[:ec2].release_address(@public_ip)
     end
 
     it "should return proper attributes" do
-      actual = ec2.allocate_address
+      actual = AWS[:ec2].allocate_address
       actual.body['requestId'].should be_a(String)
       @public_ip = actual.body['publicIp']
       actual.body['publicIp'].should be_a(String)

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

@@ -4,38 +4,40 @@ describe 'EC2.associate_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']
+      @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
+      @public_ip = AWS[:ec2].allocate_address.body['publicIp']
     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.associate_address(@instance_id, @public_ip)
-      actual.body['requestId'].should be_a(String)
-      [false, true].should include(actual.body['return'])
+      eventually(128) do
+        actual = AWS[:ec2].associate_address(@instance_id, @public_ip)
+        actual.body['requestId'].should be_a(String)
+        [false, true].should include(actual.body['return'])
+      end
     end
 
   end
   describe 'failure' do
 
     it "should raise a BadRequest error if the instance does not exist" do
-      @public_ip = ec2.allocate_address.body['publicIp']
+      @public_ip = AWS[:ec2].allocate_address.body['publicIp']
       lambda {
-        ec2.associate_address('i-00000000', @public_ip)
+        AWS[:ec2].associate_address('i-00000000', @public_ip)
       }.should raise_error(Excon::Errors::BadRequest)
-      ec2.release_address(@public_ip)
+      AWS[:ec2].release_address(@public_ip)
     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.associate_address(@instance_id, '127.0.0.1')
+        AWS[:ec2].associate_address(@instance_id, '127.0.0.1')
       }.should raise_error(Excon::Errors::BadRequest)
-      ec2.terminate_instances(@instance_id)
+      AWS[:ec2].terminate_instances(@instance_id)
     end
 
   end