fog 0.0.40 → 0.0.41

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

@@ -5,7 +5,7 @@ describe 'Fog::AWS::EC2::Address' do
   describe "#initialize" do
 
     it "should remap attributes from parser" do
-      address = ec2.addresses.new(
+      address = AWS[:ec2].addresses.new(
         'instanceId'  => 'i-00000000',
         'publicIp'    => '0.0.0.0'
       )
@@ -18,11 +18,11 @@ describe 'Fog::AWS::EC2::Address' do
   describe "#addresses" do
 
     it "should return a Fog::AWS::EC2::Addresses" do
-      ec2.addresses.new.collection.should be_a(Fog::AWS::EC2::Addresses)
+      AWS[:ec2].addresses.new.collection.should be_a(Fog::AWS::EC2::Addresses)
     end
 
     it "should be the addresses the address is related to" do
-      addresses = ec2.addresses
+      addresses = AWS[:ec2].addresses
       addresses.new.collection.should == addresses
     end
 
@@ -31,7 +31,7 @@ describe 'Fog::AWS::EC2::Address' do
   describe "#destroy" do
 
     it "should return true if the address is deleted" do
-      address = ec2.addresses.create
+      address = AWS[:ec2].addresses.create
       address.destroy.should be_true
     end
 
@@ -39,8 +39,8 @@ describe 'Fog::AWS::EC2::Address' do
 
   describe "#server=" do
     before(:each) do
-      @address = ec2.addresses.new
-      @server = ec2.servers.create(:image_id => GENTOO_AMI)
+      @address = AWS[:ec2].addresses.new
+      @server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
     end
 
     after(:each) do
@@ -61,7 +61,7 @@ describe 'Fog::AWS::EC2::Address' do
   describe "#reload" do
 
     before(:each) do
-      @address = ec2.addresses.create
+      @address = AWS[:ec2].addresses.create
       @reloaded = @address.reload
     end
 
@@ -82,7 +82,7 @@ describe 'Fog::AWS::EC2::Address' do
   describe "#save" do
 
     before(:each) do
-      @address = ec2.addresses.new
+      @address = AWS[:ec2].addresses.new
     end
 
     it "should return true when it succeeds" do

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

@@ -5,12 +5,12 @@ describe 'Fog::AWS::EC2::Addresses' do
   describe "#all" do
 
     it "should return a Fog::AWS::EC2::Addresses" do
-      ec2.addresses.all.should be_a(Fog::AWS::EC2::Addresses)
+      AWS[:ec2].addresses.all.should be_a(Fog::AWS::EC2::Addresses)
     end
 
     it "should include persisted addresses" do
-      address = ec2.addresses.create
-      ec2.addresses.get(address.public_ip).should_not be_nil
+      address = AWS[:ec2].addresses.create
+      AWS[:ec2].addresses.get(address.public_ip).should_not be_nil
       address.destroy
     end
 
@@ -19,7 +19,7 @@ describe 'Fog::AWS::EC2::Addresses' do
   describe "#create" do
 
     before(:each) do
-      @address = ec2.addresses.create
+      @address = AWS[:ec2].addresses.create
     end
 
     after(:each) do
@@ -31,7 +31,7 @@ describe 'Fog::AWS::EC2::Addresses' do
     end
 
     it "should exist on ec2" do
-      ec2.addresses.get(@address.public_ip).should_not be_nil
+      AWS[:ec2].addresses.get(@address.public_ip).should_not be_nil
     end
 
   end
@@ -39,14 +39,14 @@ describe 'Fog::AWS::EC2::Addresses' do
   describe "#get" do
 
     it "should return a Fog::AWS::EC2::Address if a matching address exists" do
-      address = ec2.addresses.create
-      get = ec2.addresses.get(address.public_ip)
+      address = AWS[:ec2].addresses.create
+      get = AWS[:ec2].addresses.get(address.public_ip)
       address.attributes.should == get.attributes
       address.destroy
     end
 
     it "should return nil if no matching address exists" do
-      ec2.addresses.get('0.0.0.0').should be_nil
+      AWS[:ec2].addresses.get('0.0.0.0').should be_nil
     end
 
   end
@@ -54,7 +54,7 @@ describe 'Fog::AWS::EC2::Addresses' do
   describe "#new" do
 
     it "should return a Fog::AWS::EC2::Address" do
-      ec2.addresses.new.should be_a(Fog::AWS::EC2::Address)
+      AWS[:ec2].addresses.new.should be_a(Fog::AWS::EC2::Address)
     end
 
   end
@@ -62,7 +62,7 @@ describe 'Fog::AWS::EC2::Addresses' do
   describe "#reload" do
 
     it "should return a Fog::AWS::EC2::Addresses" do
-      ec2.addresses.all.reload.should be_a(Fog::AWS::EC2::Addresses)
+      AWS[:ec2].addresses.all.reload.should be_a(Fog::AWS::EC2::Addresses)
     end
 
   end

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

@@ -5,7 +5,7 @@ describe 'Fog::AWS::EC2::KeyPair' do
   describe "#initialize" do
 
     it "should remap attributes from parser" do
-      key_pair = ec2.key_pairs.new(
+      key_pair = AWS[:ec2].key_pairs.new(
         'keyFingerprint'  => 'fingerprint',
         'keyMaterial'     => 'material',
         'keyName'         => 'name'
@@ -20,11 +20,11 @@ describe 'Fog::AWS::EC2::KeyPair' do
   describe "#collection" do
 
     it "should return a Fog::AWS::EC2::KeyPairs" do
-      ec2.key_pairs.new.collection.should be_a(Fog::AWS::EC2::KeyPairs)
+      AWS[:ec2].key_pairs.new.collection.should be_a(Fog::AWS::EC2::KeyPairs)
     end
 
     it "should be the key_pairs the keypair is related to" do
-      key_pairs = ec2.key_pairs
+      key_pairs = AWS[:ec2].key_pairs
       key_pairs.new.collection.should == key_pairs
     end
 
@@ -33,7 +33,7 @@ describe 'Fog::AWS::EC2::KeyPair' do
   describe "#destroy" do
 
     it "should return true if the key_pair is deleted" do
-      address = ec2.key_pairs.create(:name => 'keyname')
+      address = AWS[:ec2].key_pairs.create(:name => 'keyname')
       address.destroy.should be_true
     end
 
@@ -42,7 +42,7 @@ describe 'Fog::AWS::EC2::KeyPair' do
   describe "#reload" do
 
     before(:each) do
-      @key_pair = ec2.key_pairs.create(:name => 'keyname')
+      @key_pair = AWS[:ec2].key_pairs.create(:name => 'keyname')
       @reloaded = @key_pair.reload
     end
 
@@ -63,7 +63,7 @@ describe 'Fog::AWS::EC2::KeyPair' do
   describe "#save" do
 
     before(:each) do
-      @key_pair = ec2.key_pairs.new(:name => 'keyname')
+      @key_pair = AWS[:ec2].key_pairs.new(:name => 'keyname')
     end
 
     it "should return true when it succeeds" do
@@ -72,12 +72,12 @@ describe 'Fog::AWS::EC2::KeyPair' do
     end
 
     it "should not exist in key_pairs before save" do
-      ec2.key_pairs.get(@key_pair.name).should be_nil
+      AWS[:ec2].key_pairs.get(@key_pair.name).should be_nil
     end
 
     it "should exist in buckets after save" do
       @key_pair.save
-      ec2.key_pairs.get(@key_pair.name).should_not be_nil
+      AWS[:ec2].key_pairs.get(@key_pair.name).should_not be_nil
       @key_pair.destroy
     end
 

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

@@ -5,12 +5,12 @@ describe 'Fog::AWS::EC2::KeyPairs' do
   describe "#all" do
 
     it "should return a Fog::AWS::EC2::KeyPairs" do
-      ec2.key_pairs.all.should be_a(Fog::AWS::EC2::KeyPairs)
+      AWS[:ec2].key_pairs.all.should be_a(Fog::AWS::EC2::KeyPairs)
     end
 
     it "should include persisted key_pairs" do
-      key_pair = ec2.key_pairs.create(:name => 'keyname')
-      ec2.key_pairs.get(key_pair.name).should_not be_nil
+      key_pair = AWS[:ec2].key_pairs.create(:name => 'keyname')
+      AWS[:ec2].key_pairs.get(key_pair.name).should_not be_nil
       key_pair.destroy
     end
 
@@ -19,7 +19,7 @@ describe 'Fog::AWS::EC2::KeyPairs' do
   describe "#create" do
 
     before(:each) do
-      @key_pair = ec2.key_pairs.create(:name => 'keyname')
+      @key_pair = AWS[:ec2].key_pairs.create(:name => 'keyname')
     end
 
     after(:each) do
@@ -31,7 +31,7 @@ describe 'Fog::AWS::EC2::KeyPairs' do
     end
 
     it "should exist on ec2" do
-      ec2.key_pairs.get(@key_pair.name).should_not be_nil
+      AWS[:ec2].key_pairs.get(@key_pair.name).should_not be_nil
     end
 
   end
@@ -39,15 +39,15 @@ describe 'Fog::AWS::EC2::KeyPairs' do
   describe "#get" do
 
     it "should return a Fog::AWS::EC2::KeyPair if a matching key_pair exists" do
-      key_pair = ec2.key_pairs.create(:name => 'keyname')
-      get = ec2.key_pairs.get(key_pair.name)
+      key_pair = AWS[:ec2].key_pairs.create(:name => 'keyname')
+      get = AWS[:ec2].key_pairs.get(key_pair.name)
       key_pair.attributes[:fingerprint].should == get.attributes[:fingerprint]
       key_pair.attributes[:name].should == get.attributes[:name]
       key_pair.destroy
     end
 
     it "should return nil if no matching key_pair exists" do
-      ec2.key_pairs.get('notakeyname').should be_nil
+      AWS[:ec2].key_pairs.get('notakeyname').should be_nil
     end
 
   end
@@ -55,7 +55,7 @@ describe 'Fog::AWS::EC2::KeyPairs' do
   describe "#new" do
 
     it "should return a Fog::AWS::EC2::KeyPair" do
-      ec2.key_pairs.new(:name => 'keyname').should be_a(Fog::AWS::EC2::KeyPair)
+      AWS[:ec2].key_pairs.new(:name => 'keyname').should be_a(Fog::AWS::EC2::KeyPair)
     end
 
   end
@@ -63,7 +63,7 @@ describe 'Fog::AWS::EC2::KeyPairs' do
   describe "#reload" do
 
     it "should return a Fog::AWS::EC2::KeyPairs" do
-      ec2.key_pairs.all.reload.should be_a(Fog::AWS::EC2::KeyPairs)
+      AWS[:ec2].key_pairs.all.reload.should be_a(Fog::AWS::EC2::KeyPairs)
     end
 
   end

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

@@ -5,7 +5,7 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
   describe "#initialize" do
 
     it "should remap attributes from parser" do
-      security_group = ec2.security_groups.new(
+      security_group = AWS[:ec2].security_groups.new(
         'groupDescription' => 'description',
         'groupName'        => 'name',
         'ipPermissions'    => 'permissions',
@@ -22,11 +22,11 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
   describe "#collection" do
 
     it "should return a Fog::AWS::EC2::SecurityGroups" do
-      ec2.security_groups.new.collection.should be_a(Fog::AWS::EC2::SecurityGroups)
+      AWS[:ec2].security_groups.new.collection.should be_a(Fog::AWS::EC2::SecurityGroups)
     end
 
     it "should be the security_groups the keypair is related to" do
-      security_groups = ec2.security_groups
+      security_groups = AWS[:ec2].security_groups
       security_groups.new.collection.should == security_groups
     end
 
@@ -35,7 +35,7 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
   describe "#destroy" do
 
     it "should return true if the security_group is deleted" do
-      address = ec2.security_groups.create(:description => 'groupdescription', :name => 'keyname')
+      address = AWS[:ec2].security_groups.create(:description => 'groupdescription', :name => 'keyname')
       address.destroy.should be_true
     end
 
@@ -44,7 +44,7 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
   describe "#reload" do
 
     before(:each) do
-      @security_group = ec2.security_groups.create(:description => 'groupdescription', :name => 'keyname')
+      @security_group = AWS[:ec2].security_groups.create(:description => 'groupdescription', :name => 'keyname')
       @reloaded = @security_group.reload
     end
 
@@ -65,7 +65,7 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
   describe "#save" do
 
     before(:each) do
-      @security_group = ec2.security_groups.new(:description => 'groupdescription', :name => 'keyname')
+      @security_group = AWS[:ec2].security_groups.new(:description => 'groupdescription', :name => 'keyname')
     end
 
     it "should return true when it succeeds" do
@@ -74,12 +74,12 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
     end
 
     it "should not exist in security_groups before save" do
-      ec2.security_groups.get(@security_group.name).should be_nil
+      AWS[:ec2].security_groups.get(@security_group.name).should be_nil
     end
 
     it "should exist in buckets after save" do
       @security_group.save
-      ec2.security_groups.get(@security_group.name).should_not be_nil
+      AWS[:ec2].security_groups.get(@security_group.name).should_not be_nil
       @security_group.destroy
     end
 

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

@@ -5,12 +5,12 @@ describe 'Fog::AWS::EC2::SecurityGroups' do
   describe "#all" do
 
     it "should return a Fog::AWS::EC2::SecurityGroups" do
-      ec2.security_groups.all.should be_a(Fog::AWS::EC2::SecurityGroups)
+      AWS[:ec2].security_groups.all.should be_a(Fog::AWS::EC2::SecurityGroups)
     end
 
     it "should include persisted security_groups" do
-      security_group = ec2.security_groups.create(:description => 'groupdescription', :name => 'keyname')
-      ec2.security_groups.get(security_group.name).should_not be_nil
+      security_group = AWS[:ec2].security_groups.create(:description => 'groupdescription', :name => 'keyname')
+      AWS[:ec2].security_groups.get(security_group.name).should_not be_nil
       security_group.destroy
     end
 
@@ -19,7 +19,7 @@ describe 'Fog::AWS::EC2::SecurityGroups' do
   describe "#create" do
 
     before(:each) do
-      @security_group = ec2.security_groups.create(:description => 'groupdescription', :name => 'keyname')
+      @security_group = AWS[:ec2].security_groups.create(:description => 'groupdescription', :name => 'keyname')
     end
 
     after(:each) do
@@ -31,7 +31,7 @@ describe 'Fog::AWS::EC2::SecurityGroups' do
     end
 
     it "should exist on ec2" do
-      ec2.security_groups.get(@security_group.name).should_not be_nil
+      AWS[:ec2].security_groups.get(@security_group.name).should_not be_nil
     end
 
   end
@@ -39,15 +39,15 @@ describe 'Fog::AWS::EC2::SecurityGroups' do
   describe "#get" do
 
     it "should return a Fog::AWS::EC2::SecurityGroup if a matching security_group exists" do
-      security_group = ec2.security_groups.create(:description => 'groupdescription', :name => 'keyname')
-      get = ec2.security_groups.get(security_group.name)
+      security_group = AWS[:ec2].security_groups.create(:description => 'groupdescription', :name => 'keyname')
+      get = AWS[:ec2].security_groups.get(security_group.name)
       security_group.attributes[:fingerprint].should == get.attributes[:fingerprint]
       security_group.attributes[:name].should == get.attributes[:name]
       security_group.destroy
     end
 
     it "should return nil if no matching security_group exists" do
-      ec2.security_groups.get('notasecuritygroupname').should be_nil
+      AWS[:ec2].security_groups.get('notasecuritygroupname').should be_nil
     end
 
   end
@@ -55,7 +55,7 @@ describe 'Fog::AWS::EC2::SecurityGroups' do
   describe "#new" do
 
     it "should return a Fog::AWS::EC2::SecurityGroup" do
-      ec2.security_groups.new(:description => 'groupdescription', :name => 'keyname').should be_a(Fog::AWS::EC2::SecurityGroup)
+      AWS[:ec2].security_groups.new(:description => 'groupdescription', :name => 'keyname').should be_a(Fog::AWS::EC2::SecurityGroup)
     end
 
   end
@@ -63,7 +63,7 @@ describe 'Fog::AWS::EC2::SecurityGroups' do
   describe "#reload" do
 
     it "should return a Fog::AWS::EC2::SecurityGroups" do
-      ec2.security_groups.all.reload.should be_a(Fog::AWS::EC2::SecurityGroups)
+      AWS[:ec2].security_groups.all.reload.should be_a(Fog::AWS::EC2::SecurityGroups)
     end
 
   end

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

@@ -8,7 +8,7 @@ describe 'Fog::AWS::EC2::Server' do
   subject { @server = @servers.new(:image_id => GENTOO_AMI) }
 
   before(:each) do
-    @servers = ec2.servers
+    @servers = AWS[:ec2].servers
   end
 
   after(:each) do
@@ -24,7 +24,6 @@ describe 'Fog::AWS::EC2::Server' do
       server = @servers.new({
         'amiLaunchIndex'    => 'ami_launch_index',
         'dnsName'           => 'dns_name',
-        'groupId'           => 'group_id',
         'imageId'           => 'image_id',
         'instanceId'        => 'instance_id',
         'instanceType'      => 'instance_type',
@@ -37,10 +36,8 @@ describe 'Fog::AWS::EC2::Server' do
       })
       server.ami_launch_index.should == 'ami_launch_index'
       server.dns_name.should == 'dns_name'
-      server.group_id.should == 'group_id'
       server.image_id.should == 'image_id'
       server.id.should == 'instance_id'
-      server.flavor.should == 'instance_type'
       server.kernel_id.should == 'kernel_id'
       server.key_name.should == 'key_name'
       server.created_at.should == 'launch_time'

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

@@ -5,7 +5,7 @@ describe 'Fog::AWS::EC2::Servers' do
   subject { @server = @servers.create(:image_id => GENTOO_AMI) }
 
   before(:each) do
-    @servers = ec2.servers
+    @servers = AWS[:ec2].servers
   end
 
   after(:each) do

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

@@ -5,7 +5,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#initialize" do
 
     it "should remap attributes from parser" do
-      snapshot = ec2.snapshots.new(
+      snapshot = AWS[:ec2].snapshots.new(
         'snapshotId'  => 'snap-00000000',
         'startTime'   => 'now',
         'volumeId'    => 'vol-00000000'
@@ -20,11 +20,11 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#collection" do
 
     it "should return a Fog::AWS::EC2::Snapshots" do
-      ec2.snapshots.new.collection.should be_a(Fog::AWS::EC2::Snapshots)
+      AWS[:ec2].snapshots.new.collection.should be_a(Fog::AWS::EC2::Snapshots)
     end
 
     it "should be the snapshots the snapshot is related to" do
-      snapshots = ec2.snapshots
+      snapshots = AWS[:ec2].snapshots
       snapshots.new.collection.should == snapshots
     end
 
@@ -33,7 +33,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#destroy" do
 
     it "should return true if the snapshot 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')
       snapshot = volume.snapshots.create
       snapshot.wait_for { status == "completed" }
       snapshot.destroy.should be_true
@@ -45,7 +45,7 @@ describe 'Fog::AWS::EC2::Snapshots' 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')
       @snapshot = @volume.snapshots.create
       @reloaded = @snapshot.reload
     end
@@ -68,7 +68,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#save" 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.new
     end
 
@@ -77,17 +77,19 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should return true when it succeeds" do
-      @snapshot.save.should be_true
-      @snapshot.destroy
+      eventually do
+        @snapshot.save.should be_true
+        @snapshot.destroy
+      end
     end
 
     it "should not exist in addresses before save" do
-      ec2.snapshots.get(@snapshot.id).should be_nil
+      AWS[:ec2].snapshots.get(@snapshot.id).should be_nil
     end
 
     it "should exist in buckets after save" do
       @snapshot.save
-      ec2.snapshots.get(@snapshot.id).should_not be_nil
+      AWS[:ec2].snapshots.get(@snapshot.id).should_not be_nil
       @snapshot.destroy
     end