fog 0.1.0 → 0.1.1

data/tests/slicehost/requests/create_slice_tests.rb

@@ -1,19 +1,14 @@
 Shindo.tests('Slicehost#create_slice', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].create_slice(1, 3, 'fogcreateslice').body
-      @id = @data['id']
+    tests("#create_slice(1, 19, 'fogcreateslice')").formats(Slicehost::Formats::SLICE.merge('root-password' => String)) do
+      data = Slicehost[:slices].create_slice(1, 19, 'fogcreateslice').body
+      @id = data['id']
+      data
     end
 
-    after do
-      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
-      Slicehost[:slices].delete_slice(@id)
-    end
-
-    test('has proper output format') do
-      has_format(@data, Slicehost::Formats::SLICE.merge('root-password' => String))
-    end
+    Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+    Slicehost[:slices].delete_slice(@id)
 
   end
 end

data/tests/slicehost/requests/delete_slice_tests.rb

@@ -1,12 +1,9 @@
 Shindo.tests('Slicehost#delete_slice', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].create_slice(1, 3, 'fogdeleteslice').body
-      @id = @data['id']
-    end
+    @id = Slicehost[:slices].create_slice(1, 19, 'fogdeleteslice').body['id']
 
-    test('has proper output format') do
+    tests("#delete_slice(#{@id})").succeeds do
       Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
       Slicehost[:slices].delete_slice(@id)
     end
@@ -15,10 +12,8 @@ Shindo.tests('Slicehost#delete_slice', 'slicehost') do
 
   tests('failure') do
 
-    test('raises NotFound error if slice does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Slicehost[:slices].delete_slice(0)
-      end
+    tests('delete_slice(0)').raises(Excon::Errors::NotFound) do
+      Slicehost[:slices].delete_slice(0)
     end
 
   end

data/tests/slicehost/requests/get_backups_tests.rb

@@ -1,12 +1,8 @@
 Shindo.tests('Slicehost#get_backups', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].get_backups.body
-    end
-
-    test('has proper output format') do
-      has_format(@data, { 'backups' => [Slicehost::Formats::BACKUP] })
+    tests('#get_backups').formats({ 'backups' => [Slicehost::Formats::BACKUP] }) do
+      Slicehost[:slices].get_backups.body
     end
 
   end

data/tests/slicehost/requests/get_flavor_tests.rb

@@ -1,22 +1,16 @@
 Shindo.tests('Slicehost#get_flavor', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].get_flavor(1).body
-    end
-
-    test('has proper output format') do
-      has_format(@data, Slicehost::Formats::FLAVOR)
+    tests('#get_flavor(1)').formats(Slicehost::Formats::FLAVOR) do
+      Slicehost[:slices].get_flavor(1).body
     end
 
   end
 
   tests('failure') do
 
-    test('raises Forbidden error if flavor does not exist') do
-      has_error(Excon::Errors::Forbidden) do
-        Slicehost[:slices].get_flavor(0)
-      end
+    tests('#get_flavor(0)').raises(Excon::Errors::Forbidden) do
+      Slicehost[:slices].get_flavor(0)
     end
 
   end

data/tests/slicehost/requests/get_flavors_tests.rb

@@ -1,12 +1,8 @@
 Shindo.tests('Slicehost#get_flavors', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].get_flavors.body
-    end
-
-    test('has proper output format') do
-      has_format(@data, { 'flavors' => [Slicehost::Formats::FLAVOR] })
+    tests('#get_flavors').formats({ 'flavors' => [Slicehost::Formats::FLAVOR] }) do
+      Slicehost[:slices].get_flavors.body
     end
 
   end

data/tests/slicehost/requests/get_image_tests.rb

@@ -1,22 +1,16 @@
 Shindo.tests('Slicehost#get_image', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].get_image(3).body
-    end
-
-    test('has proper output format') do
-      has_format(@data, Slicehost::Formats::IMAGE)
+    tests('#get_image(19)').formats(Slicehost::Formats::IMAGE) do
+      Slicehost[:slices].get_image(19).body
     end
 
   end
 
   tests('failure') do
 
-    test('raises Forbidden error if flavor does not exist') do
-      has_error(Excon::Errors::Forbidden)
-        Slicehost[:slices].get_image(0)
-      end
+    tests('#get_image(0)').raises(Excon::Errors::Forbidden) do
+      Slicehost[:slices].get_image(0)
     end
 
   end

data/tests/slicehost/requests/get_images_tests.rb

@@ -1,12 +1,8 @@
 Shindo.tests('Slicehost#get_images', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].get_images.body
-    end
-
-    test('has proper output format') do
-      has_format(@data, { 'images' => [Slicehost::Formats::IMAGE] })
+    tests('#get_images').formats({ 'images' => [Slicehost::Formats::IMAGE] }) do
+      Slicehost[:slices].get_images.body
     end
 
   end

data/tests/slicehost/requests/get_slice_tests.rb

@@ -1,29 +1,21 @@
 Shindo.tests('Slicehost#get_slice', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].create_slice(1, 3, 'foggetslice').body
-      @id = @data['id']
-      @data = Slicehost[:slices].get_slice(@id).body
-    end
+    @server = Slicehost[:slices].servers.create(:flavor_id => 1, :image_id => 19, :name => 'fogrebootslice')
 
-    after do
-      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
-      Slicehost[:slices].delete_slice(@id)
+    tests("#get_slice(#{@server.id})").formats(Slicehost::Formats::SLICE) do
+      Slicehost[:slices].get_slice(@server.id).body
     end
 
-    test('has proper output format') do
-      has_format(@data, Slicehost::Formats::SLICE)
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
 
   tests('failure') do
 
-    test('raises Forbidden error if flavor does not exist') do
-      has_error(Excon::Errors::Forbidden)
-        Slicehost[:slices].get_slice(0)
-      end
+    tests('#get_slice(0)').raises(Excon::Errors::Forbidden) do
+      Slicehost[:slices].get_slice(0)
     end
 
   end

data/tests/slicehost/requests/get_slices_tests.rb

@@ -1,12 +1,8 @@
 Shindo.tests('Slicehost#get_slices', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].get_slices.body
-    end
-
-    test('has proper output format') do
-      has_format(@data, { 'slices' => [Slicehost::Formats::SLICE] })
+    formats({'slices' => [Slicehost::Formats::SLICE]}) do
+      Slicehost[:slices].get_slices.body
     end
 
   end

data/tests/slicehost/requests/reboot_slice_tests.rb

@@ -1,30 +1,22 @@
 Shindo.tests('Slicehost#reboot_slice', 'slicehost') do
   tests('success') do
 
-    before do
-      @data = Slicehost[:slices].create_slice(1, 3, 'fogrebootslice').body
-      @id = @data['id']
-      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
-      @data = Slicehost[:slices].reboot_slice(@id).body
-    end
+    @server = Slicehost[:slices].servers.create(:flavor_id => 1, :image_id => 19, :name => 'fogrebootslice')
+    @server.wait_for { ready? }
 
-    after do
-      Fog.wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
-      Slicehost[:slices].delete_slice(@id)
+    tests("#reboot_slice(#{@server.id})").formats(Slicehost::Formats::SLICE) do
+      Slicehost[:slices].reboot_slice(@server.id).body
     end
 
-    test('has proper output format') do
-      has_format(@data, Slicehost::Formats::SLICE)
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
 
   tests('failure') do
 
-    test('raises Forbidden error if flavor does not exist') do
-      has_error(Excon::Errors::Forbidden) do
-        Slicehost[:slices].reboot_slice(0)
-      end
+    tests('#reboot_slice(0)').raises(Excon::Errors::Forbidden) do
+      Slicehost[:slices].reboot_slice(0)
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -07:00
+date: 2010-05-23 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -466,20 +466,10 @@ files:
 - spec/aws/models/s3/directory_spec.rb
 - spec/aws/models/s3/file_spec.rb
 - spec/aws/models/s3/files_spec.rb
-- spec/aws/requests/ec2/authorize_security_group_ingress_spec.rb
-- spec/aws/requests/ec2/create_key_pair_spec.rb
-- spec/aws/requests/ec2/create_security_group_spec.rb
-- spec/aws/requests/ec2/delete_key_pair_spec.rb
-- spec/aws/requests/ec2/delete_security_group_spec.rb
-- spec/aws/requests/ec2/describe_availability_zones_spec.rb
 - spec/aws/requests/ec2/describe_images_spec.rb
 - spec/aws/requests/ec2/describe_instances_spec.rb
-- spec/aws/requests/ec2/describe_key_pairs_spec.rb
-- spec/aws/requests/ec2/describe_regions_spec.rb
-- spec/aws/requests/ec2/describe_security_groups_spec.rb
 - spec/aws/requests/ec2/get_console_output_spec.rb
 - spec/aws/requests/ec2/reboot_instances_spec.rb
-- spec/aws/requests/ec2/revoke_security_group_ingress_spec.rb
 - spec/aws/requests/ec2/run_instances_spec.rb
 - spec/aws/requests/ec2/terminate_instances_spec.rb
 - spec/aws/requests/s3/copy_object_spec.rb
@@ -537,6 +527,10 @@ files:
 - spec/vcloud/vcloud_spec.rb
 - tests/aws/helper.rb
 - tests/aws/requests/ec2/address_tests.rb
+- tests/aws/requests/ec2/availability_zone_tests.rb
+- tests/aws/requests/ec2/key_pair_tests.rb
+- tests/aws/requests/ec2/region_tests.rb
+- tests/aws/requests/ec2/security_group_tests.rb
 - tests/aws/requests/ec2/snapshot_tests.rb
 - tests/aws/requests/ec2/volume_tests.rb
 - tests/helper.rb

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

@@ -1,36 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.authorize_security_group_ingress' do
-  describe 'success' do
-
-    before(:each) do
-      AWS[:ec2].create_security_group('fog_security_group', 'a security group for testing fog')
-    end
-
-    after(:each) do
-      AWS[:ec2].delete_security_group('fog_security_group')
-    end
-
-    it "should return proper attributes for port based ingress" do
-      actual = AWS[:ec2].authorize_security_group_ingress({
-        'FromPort' => 80,
-        'GroupName' => 'fog_security_group',
-        'IpProtocol' => 'tcp',
-        'ToPort' => 80,
-      })
-      actual.body['requestId'].should be_a(String)
-      [false, true].should include(actual.body['return'])
-    end
-
-    it "should return proper attributes for named ingress" do
-      actual = AWS[:ec2].authorize_security_group_ingress({
-        'GroupName'                   => 'fog_security_group',
-        'SourceSecurityGroupName'     => 'fog_security_group',
-        'SourceSecurityGroupOwnerId'  => '254056571511'
-      })
-      actual.body['requestId'].should be_a(String)
-      [false, true].should include(actual.body['return'])
-    end
-
-  end
-end

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

@@ -1,36 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.create_key_pair' do
-  describe 'success' do
-
-    after(:each) do
-      AWS[:ec2].delete_key_pair('fog_key_pair')
-    end
-
-    it "should return proper attributes" do
-      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)
-      actual.body['requestId'].should be_a(String)
-    end
-
-  end
-  describe 'failure' do
-
-    before(:each) do
-      AWS[:ec2].create_key_pair('fog_key_pair')
-    end
-
-    after(:each) do
-      AWS[:ec2].delete_key_pair('fog_key_pair')
-    end
-
-    it "should raise a BadRequest when the key pair already exists" do
-      lambda {
-        AWS[:ec2].create_key_pair('fog_key_pair')
-      }.should raise_error(Excon::Errors::BadRequest)
-    end
-
-  end
-end

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

@@ -1,34 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.create_security_group' do
-  describe 'success' do
-
-    after(:each) do
-      AWS[:ec2].delete_security_group('fog_security_group')
-    end
-
-    it "should return proper attributes" do
-      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
-
-  end
-  describe 'failure' do
-
-    before(:each) do
-      AWS[:ec2].create_security_group('fog_security_group', 'a security group for testing fog')
-    end
-
-    after(:each) do
-      AWS[:ec2].delete_security_group('fog_security_group')
-    end
-
-    it "should raise a BadRequest error when the security group already exists" do
-      lambda {
-        AWS[:ec2].create_security_group('fog_security_group', 'a security group for testing fog')
-      }.should raise_error(Excon::Errors::BadRequest)
-    end
-
-  end
-end

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

@@ -1,21 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.delete_key_pair' do
-  describe 'success' do
-
-    before(:each) do
-      AWS[:ec2].create_key_pair('fog_key_name')
-      @response = AWS[:ec2].delete_key_pair('fog_key_name')
-    end
-
-    it "should return proper attributes" do
-      @response.body['requestId'].should be_a(String)
-      [false, true].should include(@response.body['return'])
-    end
-
-    it "should not raise an error if the key pair does not exist" do
-      AWS[:ec2].delete_key_pair('not_a_key_name')
-    end
-
-  end
-end

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

@@ -1,26 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.delete_security_group' do
-  describe 'success' do
-
-    before(:each) do
-      AWS[:ec2].create_security_group('fog_security_group', 'a security group for testing fog')
-    end
-
-    it "should return proper attributes" do
-      actual = AWS[:ec2].delete_security_group('fog_security_group')
-      actual.body['requestId'].should be_a(String)
-      [false, true].should include(actual.body['return'])
-    end
-
-  end
-  describe 'failure' do
-
-    it "should raise a BadRequest error if the security group does not exist" do
-      lambda {
-        AWS[:ec2].delete_security_group('fog_not_a_security_group')
-      }.should raise_error(Excon::Errors::BadRequest)
-    end
-
-  end
-end