fog 0.3.17 → 0.3.18

data/spec/vcloud/bin_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/vcloud/spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
 describe Vcloud do
   it { should be_initialized }

data/spec/vcloud/vcloud_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/vcloud/spec_helper.rb'
+require File.dirname(__FILE__) + '/spec_helper'
 
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do

data/tests/aws/models/compute/flavors_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('AWS::Compute | flavors collection', ['aws']) do
+
+  flavors_tests(AWS[:compute])
+
+end

data/tests/aws/models/compute/server_tests.rb

@@ -0,0 +1,6 @@
+Shindo.tests('AWS::Compute | server model', ['aws']) do
+
+  # image ami-1a837773 = Ubuntu
+  server_tests(AWS[:compute], {:image_id => 'ami-1a837773'})
+
+end

data/tests/aws/models/compute/servers_tests.rb

@@ -0,0 +1,6 @@
+Shindo.tests('AWS::Compute | servers collection', ['aws']) do
+
+  # image ami-1a837773 = Ubuntu
+  servers_tests(AWS[:compute], {:image_id => 'ami-1a837773'})
+
+end

data/tests/aws/requests/storage/bucket_tests.rb

@@ -90,7 +90,7 @@ Shindo.tests('AWS::Storage | bucket requests', ['aws']) do
       AWS[:storage].get_bucket_location('fognonbucket')
     end
 
-    tests("#gett_request_payment('fognonbucket')").raises(Excon::Errors::NotFound) do
+    tests("#get_request_payment('fognonbucket')").raises(Excon::Errors::NotFound) do
       AWS[:storage].get_request_payment('fognonbucket')
     end
 

data/tests/aws/requests/storage/multipart_upload_tests.rb

@@ -0,0 +1,135 @@
+Shindo.tests('AWS::Storage | object requests', ['aws']) do
+
+  @directory = AWS[:storage].directories.create(:key => 'fogmultipartuploadtests')
+
+  tests('success') do
+
+    @initiate_multipart_upload_format = {
+      'Bucket'    => String,
+      'Key'       => String,
+      'UploadId'  => String
+    }
+
+    tests("#initiate_multipart_upload('#{@directory.identity}')", 'fog_multipart_upload').formats(@initiate_multipart_upload_format) do
+      pending if Fog.mocking?
+      data = AWS[:storage].initiate_multipart_upload(@directory.identity, 'fog_multipart_upload').body
+      @upload_id = data['UploadId']
+      data
+    end
+
+    @list_multipart_uploads_format = {
+      'Bucket'              => String,
+      'IsTruncated'         => Fog::Boolean,
+      'MaxUploads'          => Integer,
+      'KeyMarker'           => NilClass,
+      'NextKeyMarker'       => String,
+      'NextUploadIdMarker'  => String,
+      'Upload' => [{
+        'Initiated'     => Time,
+        'Initiator' => {
+          'DisplayName' => String,
+          'ID'          => String
+        },
+        'Key'           => String,
+        'Owner' => {
+          'DisplayName' => String,
+          'ID'          => String
+        },
+        'StorageClass'      => String,
+        'UploadId'          => String
+      }],
+      'UploadIdMarker'      => NilClass,
+    }
+
+    tests("#list_multipart_uploads('#{@directory.identity})").formats(@list_multipart_uploads_format) do
+      pending if Fog.mocking?
+      AWS[:storage].list_multipart_uploads(@directory.identity).body
+    end
+
+    @parts = []
+
+    tests("#upload_part('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', 1, ('x' * 6 * 1024 * 1024))").succeeds do
+      pending if Fog.mocking?
+      data = AWS[:storage].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 1, ('x' * 6 * 1024 * 1024))
+      @parts << data.headers['ETag']
+    end
+
+    @list_parts_format = {
+      'Bucket'            => String,
+      'Initiator' => {
+        'DisplayName'     => String,
+        'ID'              => String
+      },
+      'IsTruncated'       => Fog::Boolean,
+      'Key'               => String,
+      'MaxParts'          => Integer,
+      'NextPartNumberMarker' => String,
+      'Part' => [{
+        'ETag'            => String,
+        'LastModified'    => Time,
+        'PartNumber'      => Integer,
+        'Size'            => Integer
+      }],
+      'PartNumberMarker'  => String,
+      'StorageClass'      => String,
+      'UploadId'          => String
+    }
+
+    tests("#list_parts('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}')").formats(@list_parts_format) do
+      pending if Fog.mocking?
+      AWS[:storage].list_parts(@directory.identity, 'fog_multipart_upload', @upload_id).body
+    end
+
+    if !Fog.mocking?
+      @parts << AWS[:storage].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 2, ('x' * 4 * 1024 * 1024)).headers['ETag']
+    end
+
+    @complete_multipart_upload_format = {
+      'Bucket'    => String,
+      'ETag'      => String,
+      'Key'       => String,
+      'Location'  => String
+    }
+
+    tests("#complete_multipart_upload('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', #{@parts.inspect})").formats(@complete_multipart_upload_format) do
+      pending if Fog.mocking?
+      AWS[:storage].complete_multipart_upload(@directory.identity, 'fog_multipart_upload', @upload_id, @parts).body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_multipart_upload').body").succeeds do
+      pending if Fog.mocking?
+      data = AWS[:storage].get_object(@directory.identity, 'fog_multipart_upload').body
+      unless data == ('x' * 10 * 1024 * 1024)
+        raise 'content mismatch'
+      end
+    end
+
+    if !Fog.mocking?
+      @directory.files.new(:key => 'fog_multipart_upload').destroy
+    end
+
+    if !Fog.mocking?
+      @upload_id = AWS[:storage].initiate_multipart_upload(@directory.identity, 'fog_multipart_abort').body['UploadId']
+    end
+
+    tests("#abort_multipart_upload('#{@directory.identity}', 'fog_multipart_abort', '#{@upload_id}')").succeeds do
+      pending if Fog.mocking?
+      AWS[:storage].abort_multipart_upload(@directory.identity, 'fog_multipart_abort', @upload_id)
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("initiate_multipart_upload")
+    tests("list_multipart_uploads")
+    tests("upload_part")
+    tests("list_parts")
+    tests("complete_multipart_upload")
+    tests("abort_multipart_upload")
+
+  end
+
+  @directory.destroy
+
+end

data/tests/bluebox/models/compute/flavors_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('Bluebox::Compute | flavors collection', ['bluebox']) do
+
+  flavors_tests(Bluebox[:compute], {}, false)
+
+end

data/tests/bluebox/models/compute/server_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('Bluebox::Compute | server model', ['bluebox']) do
+
+  server_tests(Bluebox[:compute], {:image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72'}, false)
+
+end

data/tests/bluebox/models/compute/servers_tests.rb

@@ -0,0 +1,6 @@
+Shindo.tests('Bluebox::Compute | servers collection', ['bluebox']) do
+
+  # Ubuntu 9.10 64bit
+  servers_tests(Bluebox[:compute], {:image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72'}, false)
+
+end

data/tests/brightbox/models/compute/flavors_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('Brightbox::Compute | flavors collection', ['brightbox']) do
+
+  flavors_tests(Brightbox[:compute], {}, false)
+
+end

data/tests/brightbox/models/compute/server_tests.rb

@@ -0,0 +1,6 @@
+Shindo.tests('Brightbox::Compute | server model', ['brightbox']) do
+
+  # image img-t4p09 = Ubuntu Maverick 10.10 server
+  server_tests(Brightbox[:compute], {:image_id => 'img-t4p09'}, false)
+
+end

data/tests/brightbox/models/compute/servers_tests.rb

@@ -0,0 +1,6 @@
+Shindo.tests('Brightbox::Compute | servers collection', ['brightbox']) do
+
+  # image img-t4p09 = Ubuntu Maverick 10.10 server
+  servers_tests(Brightbox[:compute], {:image_id => 'img-t4p09'}, false)
+
+end

data/tests/google/requests/storage/bucket_tests.rb

@@ -0,0 +1,78 @@
+Shindo.tests('Google::Storage | bucket requests', ['google']) do
+
+  tests('success') do
+
+    @bucket_format = {
+      'IsTruncated' => Fog::Boolean,
+      'Marker'      => NilClass,
+      'Name'        => String,
+      'Prefix'      => NilClass,
+      'Contents'    => [{
+        'ETag'          => String,
+        'Key'           => String,
+        'LastModified'  => Time,
+        'Owner' => {
+          'DisplayName' => String,
+          'ID'          => String
+        },
+        'Size' => Integer,
+        'StorageClass' => String
+      }]
+    }
+
+    @service_format = {
+      'Buckets' => [{
+        'CreationDate'  => Time,
+        'Name'          => String,
+      }],
+      'Owner'   => {
+        'DisplayName' => String,
+        'ID'          => String
+      }
+    }
+
+    tests("#put_bucket('fogbuckettests')").succeeds do
+      Google[:storage].put_bucket('fogbuckettests')
+    end
+
+    tests("#get_service").formats(@service_format) do
+      Google[:storage].get_service.body
+    end
+
+    file = Google[:storage].directories.get('fogbuckettests').files.create(:body => 'y', :key => 'x')
+
+    tests("#get_bucket('fogbuckettests)").formats(@bucket_format) do
+      Google[:storage].get_bucket('fogbuckettests').body
+    end
+
+    file.destroy
+
+    tests("#delete_bucket('fogbuckettests')").succeeds do
+      Google[:storage].delete_bucket('fogbuckettests')
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#delete_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
+      Google[:storage].delete_bucket('fognonbucket')
+    end
+
+    @bucket = Google[:storage].directories.create(:key => 'fognonempty')
+    @file = @bucket.files.create(:key => 'foo', :body => 'bar')
+
+    tests("#delete_bucket('fognonempty')").raises(Excon::Errors::Conflict) do
+      Google[:storage].delete_bucket('fognonempty')
+    end
+
+    @file.destroy
+    @bucket.destroy
+
+    tests("#get_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
+      Google[:storage].get_bucket('fognonbucket')
+    end
+
+  end
+
+end

data/tests/google/requests/storage/object_tests.rb

@@ -0,0 +1,81 @@
+Shindo.tests('Google::Storage | object requests', ['google']) do
+
+  @directory = Google[:storage].directories.create(:key => 'fogobjecttests')
+
+  tests('success') do
+
+    tests("#put_object('#{@directory.identity}', 'fog_object', lorem_file)").succeeds do
+      Google[:storage].put_object(@directory.identity, 'fog_object', lorem_file)
+    end
+
+    tests("#copy_object('#{@directory.identity}', 'fog_object', '#{@directory.identity}', 'fog_other_object')").succeeds do
+      Google[:storage].copy_object(@directory.identity, 'fog_object', @directory.identity, 'fog_other_object')
+    end
+
+    @directory.files.get('fog_other_object').destroy
+
+    tests("#get_object('#{@directory.identity}', 'fog_object')").returns(lorem_file.read) do
+      Google[:storage].get_object(@directory.identity, 'fog_object').body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', &block)").returns(lorem_file.read) do
+      data = ''
+      Google[:storage].get_object(@directory.identity, 'fog_object') do |chunk|
+        data << chunk
+      end
+      data
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object')").succeeds do
+      Google[:storage].head_object(@directory.identity, 'fog_object')
+    end
+
+    tests("#delete_object('#{@directory.identity}', 'fog_object')").succeeds do
+      Google[:storage].delete_object(@directory.identity, 'fog_object')
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#put_object('fognonbucket', 'fog_non_object', lorem_file)").raises(Excon::Errors::NotFound) do
+      Google[:storage].put_object('fognonbucket', 'fog_non_object', lorem_file)
+    end
+
+    tests("#copy_object('fognonbucket', 'fog_object', '#{@directory.identity}', 'fog_other_object')").raises(Excon::Errors::NotFound) do
+      Google[:storage].copy_object('fognonbucket', 'fog_object', @directory.identity, 'fog_other_object')
+    end
+
+    tests("#copy_object('#{@directory.identity}', 'fog_non_object', '#{@directory.identity}', 'fog_other_object')").raises(Excon::Errors::NotFound) do
+      Google[:storage].copy_object(@directory.identity, 'fog_non_object', @directory.identity, 'fog_other_object')
+    end
+
+    tests("#copy_object('#{@directory.identity}', 'fog_object', 'fognonbucket', 'fog_other_object')").raises(Excon::Errors::NotFound) do
+      Google[:storage].copy_object(@directory.identity, 'fog_object', 'fognonbucket', 'fog_other_object')
+    end
+
+    tests("#get_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Google[:storage].get_object('fognonbucket', 'fog_non_object')
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Google[:storage].get_object(@directory.identity, 'fog_non_object')
+    end
+
+    tests("#head_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Google[:storage].head_object('fognonbucket', 'fog_non_object')
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Google[:storage].head_object(@directory.identity, 'fog_non_object')
+    end
+
+    tests("#delete_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Google[:storage].delete_object('fognonbucket', 'fog_non_object')
+    end
+
+  end
+
+  @directory.destroy
+
+end

data/tests/helper.rb

@@ -8,6 +8,13 @@ $LOAD_PATH.unshift __DIR__ unless
   $LOAD_PATH.include?(__DIR__) ||
   $LOAD_PATH.include?(File.expand_path(__DIR__))
 
+require 'tests/helpers/collection_tests'
+require 'tests/helpers/model_tests'
+
+require 'tests/helpers/compute/flavors_tests'
+require 'tests/helpers/compute/server_tests'
+require 'tests/helpers/compute/servers_tests'
+
 require 'tests/helpers/storage/directory_tests'
 require 'tests/helpers/storage/directories_tests'
 require 'tests/helpers/storage/file_tests'
@@ -32,15 +39,23 @@ end
 module Shindo
   class Tests
 
-    def formats(format, &block)
+    def responds_to(method_names)
+      for method_name in [*method_names]
+        tests("#respond_to?(:#{method_name})").succeeds do
+          @instance.respond_to?(method_name)
+        end
+      end
+    end
+
+    def formats(format)
       test('has proper format') do
-        formats_kernel(instance_eval(&block), format)
+        formats_kernel(instance_eval(&Proc.new), format)
       end
     end
 
-    def succeeds(&block)
+    def succeeds
       test('succeeds') do
-        instance_eval(&block)
+        instance_eval(&Proc.new)
         true
       end
     end

data/tests/helpers/collection_tests.rb

@@ -0,0 +1,51 @@
+def collection_tests(collection, params = {}, mocks_implemented = true)
+
+  tests('success') do
+
+    tests("#new(#{params.inspect})").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      collection.new(params)
+    end
+
+    tests("#create(#{params.inspect})").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @instance = collection.create(params)
+    end
+
+    tests("#all").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      collection.all
+    end
+
+    if !Fog.mocking? || mocks_implemented
+      @identity = @instance.identity
+    end
+
+    tests("#get(#{@identity})").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      collection.get(@identity)
+    end
+
+    if block_given?
+      yield
+    end
+
+    if !Fog.mocking? || mocks_implemented
+      @instance.destroy
+    end
+  end
+
+  tests('failure') do
+
+    if !Fog.mocking? || mocks_implemented
+      @identity = @identity.to_s.gsub(/\w/, '0')
+    end
+
+    tests("#get('#{@identity}')").returns(nil) do
+      pending if Fog.mocking? && !mocks_implemented
+      collection.get(@identity)
+    end
+
+  end
+
+end