From c53627d7120d500282403b3d8f029d85b549c303 Mon Sep 17 00:00:00 2001 From: Wesley Beary Date: Tue, 11 Aug 2009 21:40:59 -0700 Subject: [PATCH] more explicit creation of test connections --- spec/aws/s3/copy_object_spec.rb | 2 +- spec/aws/s3/delete_bucket_spec.rb | 2 +- spec/aws/s3/delete_object_spec.rb | 2 +- spec/aws/s3/get_bucket_location_spec.rb | 4 +- spec/aws/s3/get_bucket_spec.rb | 2 +- spec/aws/s3/get_object_spec.rb | 2 +- spec/aws/s3/get_request_payment_spec.rb | 2 +- spec/aws/s3/get_service_spec.rb | 2 +- spec/aws/s3/head_object_spec.rb | 2 +- spec/aws/s3/put_bucket_spec.rb | 2 +- spec/aws/s3/put_object_spec.rb | 2 +- spec/aws/s3/put_request_payment_spec.rb | 2 +- spec/spec_helper.rb | 59 +++++++++++++++---------- 13 files changed, 48 insertions(+), 37 deletions(-) diff --git a/spec/aws/s3/copy_object_spec.rb b/spec/aws/s3/copy_object_spec.rb index acfe6f87b..63aad96c9 100644 --- a/spec/aws/s3/copy_object_spec.rb +++ b/spec/aws/s3/copy_object_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.copy_object' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('fogcopyobjectsource') file = File.open(File.dirname(__FILE__) + '/../../lorem.txt', 'r') @s3.put_object('fogcopyobjectsource', 'fog_copy_object_source', file) diff --git a/spec/aws/s3/delete_bucket_spec.rb b/spec/aws/s3/delete_bucket_spec.rb index 7d5fd6abf..8c3c42903 100644 --- a/spec/aws/s3/delete_bucket_spec.rb +++ b/spec/aws/s3/delete_bucket_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.delete_bucket' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('fogdeletebucket') end diff --git a/spec/aws/s3/delete_object_spec.rb b/spec/aws/s3/delete_object_spec.rb index 84cc8b3d3..e5a5f13dd 100644 --- a/spec/aws/s3/delete_object_spec.rb +++ b/spec/aws/s3/delete_object_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.delete_object' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('fogdeleteobject') file = File.open(File.dirname(__FILE__) + '/../../lorem.txt', 'r') @s3.put_object('fogdeleteobject', 'fog_delete_object', file) diff --git a/spec/aws/s3/get_bucket_location_spec.rb b/spec/aws/s3/get_bucket_location_spec.rb index c3b492546..ae1549a55 100644 --- a/spec/aws/s3/get_bucket_location_spec.rb +++ b/spec/aws/s3/get_bucket_location_spec.rb @@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.get_bucket_location' do before(:all) do - @s3 = s3 - @eu_s3 = eu_s3 + @s3 = Fog::AWS::S3.gen + @eu_s3 = Fog::AWS::S3.gen(:eu) @s3.put_bucket('foggetlocation', 'LocationConstraint' => 'EU') end diff --git a/spec/aws/s3/get_bucket_spec.rb b/spec/aws/s3/get_bucket_spec.rb index 721d01245..26ae622bb 100644 --- a/spec/aws/s3/get_bucket_spec.rb +++ b/spec/aws/s3/get_bucket_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.get_bucket' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('foggetbucket') file = File.open(File.dirname(__FILE__) + '/../../lorem.txt', 'r') @s3.put_object('foggetbucket', 'fog_get_bucket', file) diff --git a/spec/aws/s3/get_object_spec.rb b/spec/aws/s3/get_object_spec.rb index 5b3109e83..3f5d05d9b 100644 --- a/spec/aws/s3/get_object_spec.rb +++ b/spec/aws/s3/get_object_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.get_object' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('foggetobject') file = File.open(File.dirname(__FILE__) + '/../../lorem.txt', 'r') @s3.put_object('foggetobject', 'fog_get_object', file) diff --git a/spec/aws/s3/get_request_payment_spec.rb b/spec/aws/s3/get_request_payment_spec.rb index eade904af..916d72ae7 100644 --- a/spec/aws/s3/get_request_payment_spec.rb +++ b/spec/aws/s3/get_request_payment_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.get_request_payment' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('foggetrequestpayment') end diff --git a/spec/aws/s3/get_service_spec.rb b/spec/aws/s3/get_service_spec.rb index d12a6722e..30a3796f4 100644 --- a/spec/aws/s3/get_service_spec.rb +++ b/spec/aws/s3/get_service_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.get_service' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('foggetservice') end diff --git a/spec/aws/s3/head_object_spec.rb b/spec/aws/s3/head_object_spec.rb index 06297a65c..a0b4ee350 100644 --- a/spec/aws/s3/head_object_spec.rb +++ b/spec/aws/s3/head_object_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.head_object' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('fogheadobject') file = File.open(File.dirname(__FILE__) + '/../../lorem.txt', 'r') @s3.put_object('fogheadobject', 'fog_head_object', file) diff --git a/spec/aws/s3/put_bucket_spec.rb b/spec/aws/s3/put_bucket_spec.rb index ce6b13c6f..f18032201 100644 --- a/spec/aws/s3/put_bucket_spec.rb +++ b/spec/aws/s3/put_bucket_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.put_bucket' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen end after(:all) do diff --git a/spec/aws/s3/put_object_spec.rb b/spec/aws/s3/put_object_spec.rb index efdf5ad2c..71689dd07 100644 --- a/spec/aws/s3/put_object_spec.rb +++ b/spec/aws/s3/put_object_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.put_object' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('fogputobject') end diff --git a/spec/aws/s3/put_request_payment_spec.rb b/spec/aws/s3/put_request_payment_spec.rb index a3f1365c8..fb63232f8 100644 --- a/spec/aws/s3/put_request_payment_spec.rb +++ b/spec/aws/s3/put_request_payment_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe 'S3.put_request_payment' do before(:all) do - @s3 = s3 + @s3 = Fog::AWS::S3.gen @s3.put_bucket('fogputrequestpayment') end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5de40ec1e..ca56bccbe 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,30 +12,41 @@ def credentials end end -def ec2 - Fog::AWS::EC2.new( - :aws_access_key_id => credentials['aws_access_key_id'], - :aws_secret_access_key => credentials['aws_secret_access_key'] - ) -end -def sdb - Fog::AWS::SimpleDB.new( - :aws_access_key_id => credentials['aws_access_key_id'], - :aws_secret_access_key => credentials['aws_secret_access_key'] - ) -end -def s3 - Fog::AWS::S3.new( - :aws_access_key_id => credentials['aws_access_key_id'], - :aws_secret_access_key => credentials['aws_secret_access_key'] - ) -end -def eu_s3 - Fog::AWS::S3.new( - :aws_access_key_id => credentials['aws_access_key_id'], - :aws_secret_access_key => credentials['aws_secret_access_key'], - :host => 's3-external-3.amazonaws.com' - ) +module Fog + module AWS + + class EC2 + def self.gen + new( + :aws_access_key_id => credentials['aws_access_key_id'], + :aws_secret_access_key => credentials['aws_secret_access_key'] + ) + end + end + + class S3 + def self.gen(location = nil) + if location == :eu + host = 's3-external-3.amazonaws.com' + end + new( + :aws_access_key_id => credentials['aws_access_key_id'], + :aws_secret_access_key => credentials['aws_secret_access_key'], + :host => host + ) + end + end + + class SimpleDB + def self.gen + new( + :aws_access_key_id => credentials['aws_access_key_id'], + :aws_secret_access_key => credentials['aws_secret_access_key'] + ) + end + end + + end end def eventually(max_delay = 16, &block)