fog 0.1.4 → 0.1.5

data/tests/aws/requests/ec2/key_pair_tests.rb

@@ -48,7 +48,7 @@ Shindo.tests('AWS::EC2 | key pair requests', ['aws']) do
       AWS[:ec2].create_key_pair(@key_pair.name)
     end
 
-    tests("#describe_key_pair('not_a_key_name')").raises(Fog::AWS::EC2::Error) do
+    tests("#describe_key_pair('not_a_key_name')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].describe_key_pairs('not_a_key_name').body
     end
 

data/tests/aws/requests/ec2/region_tests.rb

@@ -22,8 +22,8 @@ Shindo.tests('AWS::EC2 | region requests', ['aws']) do
 
   tests('failure') do
 
-    tests("#describe_regions('not-a-region')").raises(Fog::AWS::EC2::Error) do
-      AWS[:ec2].describe_regions('not-a-region')
+    tests("#describe_regions('us-east-2')").raises(Fog::AWS::EC2::Error) do
+      AWS[:ec2].describe_regions('us-east-2')
     end
   end
 

data/tests/aws/requests/ec2/security_group_tests.rb

@@ -79,7 +79,7 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       AWS[:ec2].create_security_group(@security_group.name, @security_group.description)
     end
 
-    tests("#authorize_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::EC2::Error) do
+    tests("#authorize_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].authorize_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'not_a_group_name',
@@ -88,7 +88,7 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       })
     end
 
-    tests("#authorize_security_group_ingress({'GroupName' => 'not_a_group_name', 'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::EC2::Error) do
+    tests("#authorize_security_group_ingress({'GroupName' => 'not_a_group_name', 'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].authorize_security_group_ingress({
         'GroupName'                   => 'not_a_group_name',
         'SourceSecurityGroupName'     => 'not_a_group_name',
@@ -96,11 +96,11 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       })
     end
 
-    tests("#describe_security_group('not_a_group_name)").raises(Fog::AWS::EC2::Error) do
+    tests("#describe_security_group('not_a_group_name)").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].describe_security_groups('not_a_group_name')
     end
 
-    tests("#revoke_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::EC2::Error) do
+    tests("#revoke_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].revoke_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'not_a_group_name',
@@ -109,7 +109,7 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       })
     end
 
-    tests("#revoke_security_group_ingress({'GroupName' => 'not_a_group_name', 'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::EC2::Error) do
+    tests("#revoke_security_group_ingress({'GroupName' => 'not_a_group_name', 'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].revoke_security_group_ingress({
         'GroupName'                   => 'not_a_group_name',
         'SourceSecurityGroupName'     => 'not_a_group_name',
@@ -117,7 +117,7 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       })
     end
 
-    tests("#delete_security_group('not_a_group_name')").raises(Fog::AWS::EC2::Error) do
+    tests("#delete_security_group('not_a_group_name')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].delete_security_group('not_a_group_name')
     end
 

data/tests/aws/requests/ec2/snapshot_tests.rb

@@ -45,11 +45,11 @@ Shindo.tests('AWS::EC2 | snapshot requests', ['aws']) do
   end
   tests ('failure') do
 
-    tests("#describe_snapshot('snap-00000000')").raises(Fog::AWS::EC2::Error) do
+    tests("#describe_snapshot('snap-00000000')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].describe_snapshots('snap-00000000')
     end
 
-    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::EC2::Error) do
+    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].delete_snapshot('snap-00000000')
     end
 

data/tests/aws/requests/ec2/volume_tests.rb

@@ -76,23 +76,23 @@ Shindo.tests('AWS::EC2 | volume requests', ['aws']) do
 
     @volume = AWS[:ec2].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
 
-    tests("#describe_volume('vol-00000000')").raises(Fog::AWS::EC2::Error) do
+    tests("#describe_volume('vol-00000000')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].describe_volumes('vol-00000000')
     end
 
-    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::AWS::EC2::Error) do
+    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
     end
 
-    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::AWS::EC2::Error) do
+    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
     end
 
-    tests("#detach_volume('vol-00000000')").raises(Fog::AWS::EC2::Error) do
+    tests("#detach_volume('vol-00000000')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].detach_volume('vol-00000000')
     end
 
-    tests("#delete_volume('vol-00000000')").raises(Fog::AWS::EC2::Error) do
+    tests("#delete_volume('vol-00000000')").raises(Fog::AWS::EC2::NotFound) do
       AWS[:ec2].delete_volume('vol-00000000')
     end
 

data/tests/helper.rb

@@ -5,6 +5,14 @@ if ENV["FOG_MOCK"] == "true"
   Fog.mock!
 end
 
+# Boolean hax
+module Fog
+  module Boolean
+  end
+end
+FalseClass.send(:include, Fog::Boolean)
+TrueClass.send(:include, Fog::Boolean)
+
 module Shindo
   class Tests
 
@@ -38,21 +46,26 @@ module Shindo
         case value
         when Array
           valid &&= datum.is_a?(Array)
-          for element in datum
-            type = value.first
-            if type.is_a?(Hash)
-              valid &&= formats_kernel({:element => element}, {:element => type}, false)
-            else
-              valid &&= element.is_a?(type)
+          if datum.is_a?(Array)
+            for element in datum
+              type = value.first
+              if type.is_a?(Hash)
+                valid &&= formats_kernel({:element => element}, {:element => type}, false)
+              else
+                valid &&= element.is_a?(type)
+              end
             end
           end
         when Hash
           valid &&= datum.is_a?(Hash)
           valid &&= formats_kernel(datum, value, false)
         else
+          p "#{key} => #{value}" unless datum.is_a?(value)
           valid &&= datum.is_a?(value)
         end
       end
+      p data unless data.empty?
+      p format unless format.empty?
       valid &&= data.empty? && format.empty?
       if !valid && original
         @message = "#{original_data.inspect} does not match #{original_format.inspect}"

data/tests/rackspace/requests/servers/list_images_detail_tests.rb

@@ -1,7 +1,7 @@
 Shindo.tests('Rackspace::Servers#list_images_detail', 'rackspace') do
   tests('success') do
 
-    tests('#list_images_detail').formats({'images' => [Rackspace::Servers::Formats::IMAGE]})
+    tests('#list_images_detail').formats({'images' => [Rackspace::Servers::Formats::IMAGE]}) do
       Rackspace[:servers].list_images_detail.body
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -432,6 +432,10 @@ files:
 - lib/fog/terremark/vcloud.rb
 - lib/fog/vcloud.rb
 - lib/fog/vcloud/bin.rb
+- lib/fog/vcloud/collection.rb
+- lib/fog/vcloud/model.rb
+- lib/fog/vcloud/models/vdc.rb
+- lib/fog/vcloud/models/vdcs.rb
 - lib/fog/vcloud/parser.rb
 - lib/fog/vcloud/parsers/get_organization.rb
 - lib/fog/vcloud/parsers/get_vdc.rb
@@ -443,6 +447,8 @@ files:
 - lib/fog/vcloud/requests/login.rb
 - lib/fog/vcloud/terremark/all.rb
 - lib/fog/vcloud/terremark/ecloud.rb
+- lib/fog/vcloud/terremark/ecloud/models/vdc.rb
+- lib/fog/vcloud/terremark/ecloud/models/vdcs.rb
 - lib/fog/vcloud/terremark/ecloud/parsers/get_vdc.rb
 - lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb
 - lib/fog/vcloud/terremark/ecloud/requests/login.rb
@@ -467,11 +473,6 @@ files:
 - spec/aws/models/s3/file_spec.rb
 - spec/aws/models/s3/files_spec.rb
 - spec/aws/requests/ec2/describe_images_spec.rb
-- spec/aws/requests/ec2/describe_instances_spec.rb
-- spec/aws/requests/ec2/get_console_output_spec.rb
-- spec/aws/requests/ec2/reboot_instances_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
 - spec/aws/requests/s3/delete_bucket_spec.rb
 - spec/aws/requests/s3/delete_object_spec.rb
@@ -516,11 +517,15 @@ files:
 - spec/slicehost/models/servers_spec.rb
 - spec/spec_helper.rb
 - spec/vcloud/bin_spec.rb
+- spec/vcloud/models/vdc_spec.rb
+- spec/vcloud/models/vdcs_spec.rb
 - spec/vcloud/requests/get_organization_spec.rb
 - spec/vcloud/requests/get_vdc_spec.rb
 - spec/vcloud/requests/get_versions_spec.rb
 - spec/vcloud/requests/login_spec.rb
 - spec/vcloud/spec_helper.rb
+- spec/vcloud/terremark/ecloud/models/vdc_spec.rb
+- spec/vcloud/terremark/ecloud/models/vdcs_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
 - spec/vcloud/terremark/ecloud/requests/login_spec.rb
 - spec/vcloud/terremark/vcloud/requests/get_vdc_spec.rb
@@ -528,6 +533,7 @@ files:
 - tests/aws/helper.rb
 - tests/aws/requests/ec2/address_tests.rb
 - tests/aws/requests/ec2/availability_zone_tests.rb
+- tests/aws/requests/ec2/instance_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

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

@@ -1,104 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.describe_instances' do
-  describe 'success' do
-
-    before(:all) do
-      run_instances = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body
-      @instance_id = run_instances['instancesSet'].first['instanceId']
-      @reservation_id = run_instances['reservationId']
-      Fog.wait_for { AWS[:ec2].servers.get(@instance_id) }
-      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
-    end
-
-    after(:all) do
-      AWS[:ec2].terminate_instances([@instance_id])
-    end
-
-    it "should return proper attributes with no params" do
-      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)
-      reservation['ownerId'].should be_a(String)
-      reservation['reservationId'].should be_a(String)
-      instance = reservation['instancesSet'].select {|instance| instance['instanceId'] == @instance_id}.first
-      instance['amiLaunchIndex'].should be_an(Integer)
-      # instance['architecture'].should be_a(String)
-      instance['blockDeviceMapping'].should be_an(Array)
-      instance['dnsName'].should be_a(String)
-      instance['imageId'].should be_a(String)
-      instance['instanceId'].should be_a(String)
-      instance['instanceState'].should be_a(Hash)
-      instance['instanceState']['code'].should be_a(Integer)
-      instance['instanceState']['name'].should be_a(String)
-      instance['instanceType'].should be_a(String)
-      instance['ipAddress'].should be_a(String)
-      instance['kernelId'].should be_a(String)
-      instance['keyName'].should be_a(String) if instance['keyName']
-      instance['launchTime'].should be_a(Time)
-      instance['monitoring'].should be_a(Hash)
-      [true, false].should include(instance['monitoring']['state'])
-      instance['placement'].should be_a(Hash)
-      instance['placement']['availabilityZone'].should be_a(String)
-      instance['privateDnsName'].should be_a(String)
-      instance['privateIpAddress'].should be_a(String)
-      instance['productCodes'].should be_an(Array)
-      instance['productCodes'].first.should be_a(String) if instance['productCodes'].first
-      instance['ramdiskId'].should be_a(String)
-      if instance['reason']
-        instance['reason'].should be_a(String)
-      end
-      # instance['rootDeviceName'].should be_a(String)
-      instance['rootDeviceType'].should be_a(String)
-    end
-  
-    it "should return proper attributes with params" do
-      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)
-      reservation['ownerId'].should be_a(String)
-      reservation['reservationId'].should be_a(String)
-      instance = reservation['instancesSet'].select {|instance| instance['instanceId'] == @instance_id}.first
-      instance['amiLaunchIndex'].should be_an(Integer)
-      # instance['architecture'].should be_a(String)
-      instance['blockDeviceMapping'].should be_an(Array)
-      instance['dnsName'].should be_a(String)
-      instance['imageId'].should be_a(String)
-      instance['instanceId'].should be_a(String)
-      instance['instanceState'].should be_a(Hash)
-      instance['instanceState']['code'].should be_a(Integer)
-      instance['instanceState']['name'].should be_a(String)
-      instance['instanceType'].should be_a(String)
-      instance['ipAddress'].should be_a(String)
-      instance['kernelId'].should be_a(String)
-      instance['keyName'].should be_a(String) if instance['keyName']
-      instance['launchTime'].should be_a(Time)
-      instance['monitoring'].should be_a(Hash)
-      [true, false].should include(instance['monitoring']['state'])
-      instance['placement'].should be_a(Hash)
-      instance['placement']['availabilityZone'].should be_a(String)
-      instance['privateDnsName'].should be_a(String)
-      instance['privateIpAddress'].should be_a(String)
-      instance['productCodes'].should be_an(Array)
-      instance['productCodes'].first.should be_a(String) if instance['productCodes'].first
-      instance['ramdiskId'].should be_a(String)
-      if instance['reason']
-        instance['reason'].should be_a(String)
-      end
-      # instance['rootDeviceName'].should be_a(String)
-      instance['rootDeviceType'].should be_a(String)
-    end
-
-  end
-  describe 'failure' do
-
-    it 'should raise a Fog::AWS::EC2::Error if the instance does not exist' do
-      lambda {
-        AWS[:ec2].describe_instances('i-00000000')
-      }.should raise_error(Fog::AWS::EC2::Error)
-    end
-
-  end
-end

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

@@ -1,35 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.get_console_output' do
-  describe 'success' do
-
-    before(:each) do
-      @instance = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
-      @instance.wait_for { ready? }
-    end
-
-    after(:each) do
-      @instance.destroy
-    end
-
-    it "should return proper attributes" do
-      actual = AWS[:ec2].get_console_output(@instance.id).body
-      actual['instanceId'].should be_a(String)
-      if actual['output']
-        actual['output'].should be_a(String)
-      end
-      actual['requestId'].should be_a(String)
-      actual['timestamp'].should be_a(Time)
-    end
-
-  end
-  describe 'failure' do
-
-    it "should raise a Fog::AWS::EC2::Error if the instance does not exist" do
-      lambda {
-        AWS[:ec2].get_console_output('i-00000000')
-      }.should raise_error(Fog::AWS::EC2::Error)
-    end
-
-  end
-end

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

@@ -1,30 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.reboot_instances' do
-  describe 'success' do
-
-    before(:each) do
-      @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
-    end
-
-    after(:each) do
-      AWS[:ec2].terminate_instances(@instance_id)
-    end
-
-    it "should return proper attributes" do
-      actual = AWS[:ec2].reboot_instances(@instance_id)
-      actual.body['requestId'].should be_a(String)
-      [false, true].should include(actual.body['return'])
-    end
-
-  end
-  describe 'failure' do
-
-    it "should raise a Fog::AWS::EC2::Error if the instance does not exist" do
-      lambda {
-        AWS[:ec2].reboot_instances('i-00000000')
-      }.should raise_error(Fog::AWS::EC2::Error)
-    end
-
-  end
-end

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

@@ -1,48 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'EC2.run_instances' do
-  describe 'success' do
-
-    after(:each) do
-      AWS[:ec2].terminate_instances(@instance_id)
-    end
-
-    it "should return proper attributes" do
-      # ami-5ee70037 = gentoo
-      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)
-      actual.body['instancesSet'].should be_an(Array)
-      instance = actual.body['instancesSet'].first
-      instance['amiLaunchIndex'].should be_a(Integer)
-      # instance['architecture'].should be_a(String)
-      instance['blockDeviceMapping'].should be_an(Array)
-      instance['dnsName'].should be_nil
-      instance['imageId'].should be_a(String)
-      instance['instanceId'].should be_a(String)
-      instance['instanceState'].should be_an(Hash)
-      instance['instanceState']['code'].should be_an(Integer)
-      instance['instanceState']['name'].should be_an(String)
-      instance['instanceType'].should be_a(String)
-      # instance['ipAddress'].should be_a(String)
-      instance['kernelId'].should be_a(String)
-      instance['keyName'].should be_a(String) if instance['keyName']
-      instance['launchTime'].should be_a(Time)
-      instance['monitoring'].should be_a(Hash)
-      [false, true].should include(instance['monitoring']['state'])
-      instance['placement'].should be_a(Hash)
-      instance['placement']['availabilityZone'].should be_a(String)
-      instance['privateDnsName'].should be_nil
-      # instance['privateIpAddress'].should be_a(String)
-      instance['ramdiskId'].should be_a(String)
-      instance['reason'].should be_nil
-      actual.body['ownerId'].should be_a(String)
-      actual.body['requestId'].should be_a(String)
-      actual.body['reservationId'].should be_a(String)
-      # instance['rootDeviceName'].should be_a(String)
-      instance['rootDeviceType'].should be_a(String)
-    end
-
-  end
-end