fog 0.3.7 → 0.3.8

data/tests/slicehost/requests/compute/slice_tests.rb

@@ -17,28 +17,37 @@ Shindo.tests('Slicehost::Compute | slice requests', ['slicehost']) do
     @slice_id = nil
 
     tests("#create_slice(1, 19, 'fogcreateslice')").formats(@slice_format.merge('root-password' => String)) do
+      pending if Fog.mocking?
       data = Slicehost[:compute].create_slice(1, 19, 'fogcreateslice').body
       @slice_id = data['id']
       data
     end
 
-    Slicehost[:compute].servers.get(@slice_id).wait_for { ready? }
+    unless Fog.mocking?
+      Slicehost[:compute].servers.get(@slice_id).wait_for { ready? }
+    end
 
     tests("#get_slice(#{@slice_id})").formats(@slice_format) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_slice(@slice_id).body
     end
 
     tests("#get_slices").formats({'slices' => [@slice_format]}) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_slices.body
     end
 
     tests("#reboot_slice(#{@slice_id})").formats(@slice_format) do
+      pending if Fog.mocking?
       Slicehost[:compute].reboot_slice(@slice_id).body
     end
 
-    Slicehost[:compute].servers.get(@slice_id).wait_for { ready? }
+    unless Fog.mocking?
+      Slicehost[:compute].servers.get(@slice_id).wait_for { ready? }
+    end
 
     tests("#delete_slice(#{@slice_id})").succeeds do
+      pending if Fog.mocking?
       Slicehost[:compute].delete_slice(@slice_id)
     end
 
@@ -47,14 +56,17 @@ Shindo.tests('Slicehost::Compute | slice requests', ['slicehost']) do
   tests('failure') do
 
     tests('#get_slice(0)').raises(Excon::Errors::Forbidden) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_slice(0)
     end
 
     tests('#reboot_slice(0)').raises(Excon::Errors::Forbidden) do
+      pending if Fog.mocking?
       Slicehost[:compute].reboot_slice(0)
     end
 
     tests('#delete_slice(0)').raises(Fog::Slicehost::Compute::NotFound) do
+      pending if Fog.mocking?
       Slicehost[:compute].delete_slice(0)
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 -07:00
+date: 2010-10-14 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,8 +39,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 4
+        version: 0.2.4
   requirement: *id002
   name: excon
 - !ruby/object:Gem::Dependency 
@@ -156,8 +156,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 6
-        version: 0.1.6
+        - 7
+        version: 0.1.7
   requirement: *id011
   name: shindo
 description: The Ruby cloud computing library.
@@ -180,7 +180,6 @@ files:
 - examples/bluebox_create.rb
 - fog.gemspec
 - lib/fog.rb
-- lib/fog/attributes.rb
 - lib/fog/aws.rb
 - lib/fog/aws/bin.rb
 - lib/fog/aws/compute.rb
@@ -200,6 +199,8 @@ files:
 - lib/fog/aws/models/compute/servers.rb
 - lib/fog/aws/models/compute/snapshot.rb
 - lib/fog/aws/models/compute/snapshots.rb
+- lib/fog/aws/models/compute/tag.rb
+- lib/fog/aws/models/compute/tags.rb
 - lib/fog/aws/models/compute/volume.rb
 - lib/fog/aws/models/compute/volumes.rb
 - lib/fog/aws/models/storage/directories.rb
@@ -223,6 +224,7 @@ files:
 - lib/fog/aws/parsers/compute/describe_reserved_instances.rb
 - lib/fog/aws/parsers/compute/describe_security_groups.rb
 - lib/fog/aws/parsers/compute/describe_snapshots.rb
+- lib/fog/aws/parsers/compute/describe_tags.rb
 - lib/fog/aws/parsers/compute/describe_volumes.rb
 - lib/fog/aws/parsers/compute/detach_volume.rb
 - lib/fog/aws/parsers/compute/get_console_output.rb
@@ -261,10 +263,12 @@ files:
 - lib/fog/aws/requests/compute/create_key_pair.rb
 - lib/fog/aws/requests/compute/create_security_group.rb
 - lib/fog/aws/requests/compute/create_snapshot.rb
+- lib/fog/aws/requests/compute/create_tags.rb
 - lib/fog/aws/requests/compute/create_volume.rb
 - lib/fog/aws/requests/compute/delete_key_pair.rb
 - lib/fog/aws/requests/compute/delete_security_group.rb
 - lib/fog/aws/requests/compute/delete_snapshot.rb
+- lib/fog/aws/requests/compute/delete_tags.rb
 - lib/fog/aws/requests/compute/delete_volume.rb
 - lib/fog/aws/requests/compute/deregister_image.rb
 - lib/fog/aws/requests/compute/describe_addresses.rb
@@ -276,6 +280,7 @@ files:
 - lib/fog/aws/requests/compute/describe_reserved_instances.rb
 - lib/fog/aws/requests/compute/describe_security_groups.rb
 - lib/fog/aws/requests/compute/describe_snapshots.rb
+- lib/fog/aws/requests/compute/describe_tags.rb
 - lib/fog/aws/requests/compute/describe_volumes.rb
 - lib/fog/aws/requests/compute/detach_volume.rb
 - lib/fog/aws/requests/compute/disassociate_address.rb
@@ -334,7 +339,6 @@ files:
 - lib/fog/aws/s3.rb
 - lib/fog/aws/simpledb.rb
 - lib/fog/aws/storage.rb
-- lib/fog/bin.rb
 - lib/fog/bluebox.rb
 - lib/fog/bluebox/bin.rb
 - lib/fog/bluebox/compute.rb
@@ -353,15 +357,29 @@ files:
 - lib/fog/bluebox/requests/compute/get_template.rb
 - lib/fog/bluebox/requests/compute/get_templates.rb
 - lib/fog/bluebox/requests/compute/reboot_block.rb
-- lib/fog/collection.rb
-- lib/fog/connection.rb
-- lib/fog/credentials.rb
-- lib/fog/deprecation.rb
-- lib/fog/errors.rb
+- lib/fog/core.rb
+- lib/fog/core/attributes.rb
+- lib/fog/core/bin.rb
+- lib/fog/core/collection.rb
+- lib/fog/core/connection.rb
+- lib/fog/core/credentials.rb
+- lib/fog/core/deprecation.rb
+- lib/fog/core/errors.rb
+- lib/fog/core/hmac.rb
+- lib/fog/core/model.rb
+- lib/fog/core/parser.rb
+- lib/fog/core/provider.rb
+- lib/fog/core/service.rb
+- lib/fog/core/ssh.rb
 - lib/fog/go_grid.rb
 - lib/fog/go_grid/bin.rb
 - lib/fog/go_grid/compute.rb
+- lib/fog/go_grid/models/compute/image.rb
+- lib/fog/go_grid/models/compute/images.rb
+- lib/fog/go_grid/models/compute/server.rb
+- lib/fog/go_grid/models/compute/servers.rb
 - lib/fog/go_grid/requests/compute/common_lookup_list.rb
+- lib/fog/go_grid/requests/compute/grid_image_get.rb
 - lib/fog/go_grid/requests/compute/grid_image_list.rb
 - lib/fog/go_grid/requests/compute/grid_ip_list.rb
 - lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb
@@ -400,7 +418,6 @@ files:
 - lib/fog/google/requests/storage/put_object.rb
 - lib/fog/google/requests/storage/put_object_url.rb
 - lib/fog/google/storage.rb
-- lib/fog/hmac.rb
 - lib/fog/linode.rb
 - lib/fog/linode/bin.rb
 - lib/fog/linode/compute.rb
@@ -420,7 +437,6 @@ files:
 - lib/fog/local/models/storage/file.rb
 - lib/fog/local/models/storage/files.rb
 - lib/fog/local/storage.rb
-- lib/fog/model.rb
 - lib/fog/new_servers.rb
 - lib/fog/new_servers/bin.rb
 - lib/fog/new_servers/compute.rb
@@ -431,8 +447,6 @@ files:
 - lib/fog/new_servers/requests/compute/list_plans.rb
 - lib/fog/new_servers/requests/compute/list_servers.rb
 - lib/fog/new_servers/requests/compute/reboot_server.rb
-- lib/fog/parser.rb
-- lib/fog/provider.rb
 - lib/fog/rackspace.rb
 - lib/fog/rackspace/bin.rb
 - lib/fog/rackspace/compute.rb
@@ -477,7 +491,6 @@ files:
 - lib/fog/rackspace/requests/storage/put_object.rb
 - lib/fog/rackspace/servers.rb
 - lib/fog/rackspace/storage.rb
-- lib/fog/service.rb
 - lib/fog/slicehost.rb
 - lib/fog/slicehost/bin.rb
 - lib/fog/slicehost/compute.rb
@@ -505,7 +518,6 @@ files:
 - lib/fog/slicehost/requests/compute/get_slice.rb
 - lib/fog/slicehost/requests/compute/get_slices.rb
 - lib/fog/slicehost/requests/compute/reboot_slice.rb
-- lib/fog/ssh.rb
 - lib/fog/terremark.rb
 - lib/fog/terremark/bin.rb
 - lib/fog/terremark/ecloud.rb
@@ -665,16 +677,9 @@ files:
 - spec/aws/requests/simpledb/put_attributes_spec.rb
 - spec/aws/requests/simpledb/select_spec.rb
 - spec/aws/requests/storage/copy_object_spec.rb
-- spec/aws/requests/storage/delete_bucket_spec.rb
-- spec/aws/requests/storage/delete_object_spec.rb
 - spec/aws/requests/storage/get_bucket_location_spec.rb
 - spec/aws/requests/storage/get_bucket_spec.rb
-- spec/aws/requests/storage/get_object_spec.rb
 - spec/aws/requests/storage/get_request_payment_spec.rb
-- spec/aws/requests/storage/get_service_spec.rb
-- spec/aws/requests/storage/head_object_spec.rb
-- spec/aws/requests/storage/put_bucket_spec.rb
-- spec/aws/requests/storage/put_object_spec.rb
 - spec/aws/requests/storage/put_request_payment_spec.rb
 - spec/bluebox/models/compute/flavors_spec.rb
 - spec/bluebox/models/compute/server_spec.rb
@@ -741,6 +746,9 @@ files:
 - spec/vcloud/terremark/ecloud/requests/configure_node_spec.rb
 - spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb
 - spec/vcloud/terremark/ecloud/requests/delete_node_spec.rb
+- spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb
+- spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb
+- spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_network_ip_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb
@@ -750,6 +758,7 @@ files:
 - spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb
 - spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
+- spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb
 - spec/vcloud/terremark/ecloud/requests/login_spec.rb
 - spec/vcloud/vcloud_spec.rb
 - tests/aws/helper.rb
@@ -762,11 +771,16 @@ files:
 - tests/aws/requests/compute/region_tests.rb
 - tests/aws/requests/compute/security_group_tests.rb
 - tests/aws/requests/compute/snapshot_tests.rb
+- tests/aws/requests/compute/tag_tests.rb
 - tests/aws/requests/compute/volume_tests.rb
+- tests/aws/requests/storage/bucket_tests.rb
+- tests/aws/requests/storage/object_tests.rb
 - tests/bluebox/helper.rb
 - tests/bluebox/requests/compute/block_tests.rb
 - tests/bluebox/requests/compute/product_tests.rb
 - tests/bluebox/requests/compute/template_tests.rb
+- tests/go_grid/helper.rb
+- tests/go_grid/requests/compute/image_tests.rb
 - tests/helper.rb
 - tests/helper_tests.rb
 - tests/helpers/model_helper.rb
@@ -775,6 +789,7 @@ files:
 - tests/linode/requests/compute/distribution_tests.rb
 - tests/linode/requests/compute/linode_tests.rb
 - tests/linode/requests/compute/linodeplans_tests.rb
+- tests/lorem.txt
 - tests/rackspace/helper.rb
 - tests/rackspace/requests/compute/address_tests.rb
 - tests/rackspace/requests/compute/flavor_tests.rb

data/spec/aws/requests/storage/delete_bucket_spec.rb

@@ -1,35 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'Storage.delete_bucket' do
-  describe 'success' do
-
-    before(:each) do
-      AWS[:storage].put_bucket('fogdeletebucket')
-    end
-
-    it 'should return proper attributes' do
-      actual = AWS[:storage].delete_bucket('fogdeletebucket')
-      actual.status.should == 204
-    end
-
-  end
-  describe 'failure' do
-
-    it 'should raise a NotFound error if the bucket does not exist' do
-      lambda {
-        AWS[:storage].delete_bucket('fognotabucket')
-      }.should raise_error(Excon::Errors::NotFound)
-    end
-
-    it 'should raise a Conflict error if the bucket is not empty' do
-      AWS[:storage].put_bucket('fogdeletebucket')
-      AWS[:storage].put_object('fogdeletebucket', 'fog_delete_object', lorem_file)
-      lambda {
-        AWS[:storage].delete_bucket('fogdeletebucket')
-      }.should raise_error(Excon::Errors::Conflict)
-      AWS[:storage].delete_object('fogdeletebucket', 'fog_delete_object')
-      AWS[:storage].delete_bucket('fogdeletebucket')
-    end
-
-  end
-end

data/spec/aws/requests/storage/delete_object_spec.rb

@@ -1,36 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'Storage.delete_object' do
-  describe 'success' do
-
-    before(:each) do
-      AWS[:storage].put_bucket('fogdeleteobject')
-      AWS[:storage].put_object('fogdeleteobject', 'fog_delete_object', lorem_file)
-    end
-
-    after(:each) do
-      AWS[:storage].delete_bucket('fogdeleteobject')
-    end
-
-    it 'should return proper attributes' do
-      actual = AWS[:storage].delete_object('fogdeleteobject', 'fog_delete_object')
-      actual.status.should == 204
-    end
-
-  end
-  describe 'failure' do
-
-    it 'should raise a NotFound error if the bucket does not exist' do
-      lambda {
-        AWS[:storage].delete_object('fognotabucket', 'fog_delete_object')
-      }.should raise_error(Excon::Errors::NotFound)
-    end
-
-    it 'should not raise an error if the object does not exist' do
-      AWS[:storage].put_bucket('fogdeleteobject')
-      AWS[:storage].delete_object('fogdeleteobject', 'fog_not_an_object')
-      AWS[:storage].delete_bucket('fogdeleteobject')
-    end
-
-  end
-end

data/spec/aws/requests/storage/get_object_spec.rb

@@ -1,58 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'Storage.get_object' do
-  describe 'success' do
-
-    before(:each) do
-      AWS[:storage].put_bucket('foggetobject')
-      AWS[:storage].put_object('foggetobject', 'fog_get_object', lorem_file)
-    end
-
-    after(:each) do
-      AWS[:storage].delete_object('foggetobject', 'fog_get_object')
-      AWS[:storage].delete_bucket('foggetobject')
-    end
-
-    it 'should return proper attributes' do
-      actual = AWS[:storage].get_object('foggetobject', 'fog_get_object')
-      actual.status.should == 200
-      data = lorem_file.read
-      actual.body.should == data
-      actual.headers['Content-Length'].should == data.length.to_s
-      actual.headers['Content-Type'].should be_a(String)
-      actual.headers['ETag'].should be_a(String)
-      actual.headers['Last-Modified'].should be_a(String)
-    end
-
-    it 'should return chunks with optional block' do
-      data = ''
-      AWS[:storage].get_object('foggetobject', 'fog_get_object') do |chunk|
-        data << chunk
-      end
-      data.should == lorem_file.read
-    end
-
-    it 'should return a signed expiring url' do
-      url = AWS[:storage].get_object_url('foggetobject', 'fog_get_object', Time.now + 60 * 10)
-      unless Fog.mocking?
-        open(url).read.should == lorem_file.read
-      end
-    end
-
-  end
-  describe 'failure' do
-
-    it 'should raise a NotFound error if the bucket does not exist' do
-      lambda {
-        AWS[:storage].get_object('fognotabucket', 'fog_get_object')
-      }.should raise_error(Excon::Errors::NotFound)
-    end
-
-    it 'should raise a NotFound error if the object does not exist' do
-      lambda {
-        AWS[:storage].get_object('foggetobject', 'fog_not_an_object')
-      }.should raise_error(Excon::Errors::NotFound)
-    end
-
-  end
-end

data/spec/aws/requests/storage/get_service_spec.rb

@@ -1,32 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'Storage.get_service' do
-  describe 'success' do
-
-    before(:all) do
-      AWS[:storage].put_bucket('foggetservice')
-      Fog.wait_for { AWS[:storage].directories.get('foggetservice') }
-    end
-
-    after(:all) do
-      AWS[:storage].delete_bucket('foggetservice')
-    end
-
-    it 'should return proper_attributes' do
-      actual = AWS[:storage].get_service
-      actual.body['Buckets'].should be_an(Array)
-      bucket = actual.body['Buckets'].select {|bucket| bucket['Name'] == 'foggetservice'}.first
-      bucket['CreationDate'].should be_a(Time)
-      bucket['Name'].should == 'foggetservice'
-      owner = actual.body['Owner']
-      owner['DisplayName'].should be_a(String)
-      owner['ID'].should be_a(String)
-    end
-
-    it 'should include foggetservice in get_service' do
-      actual = AWS[:storage].get_service
-      actual.body['Buckets'].collect { |bucket| bucket['Name'] }.should include('foggetservice')
-    end
-
-  end
-end

data/spec/aws/requests/storage/head_object_spec.rb

@@ -1,26 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'Storage.head_object' do
-  describe 'success' do
-
-    before(:each) do
-      AWS[:storage].put_bucket('fogheadobject')
-      AWS[:storage].put_object('fogheadobject', 'fog_head_object', lorem_file)
-    end
-
-    after(:each) do
-      AWS[:storage].delete_object('fogheadobject', 'fog_head_object')
-      AWS[:storage].delete_bucket('fogheadobject')
-    end
-
-    it 'should return proper attributes' do
-      actual = AWS[:storage].head_object('fogheadobject', 'fog_head_object')
-      actual.status.should == 200
-      data = lorem_file.read
-      actual.headers['Content-Length'].should == data.length.to_s
-      actual.headers['ETag'].should be_a(String)
-      actual.headers['Last-Modified'].should be_a(String)
-    end
-
-  end
-end