fog-maestrodev 1.18.0.20131206115947 → 1.18.0.20131209090811

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI2NDMwZWYwYzY1YmNiMTRlMDIwZWMyNjlhNTJiNjk5NDAwNDljOA==
+    NTM2NWZjZjMyNjcwM2ViMjQyNTg5ZTNmMzQzOTFlMzg4Y2U4YmE0NA==
   data.tar.gz: !binary |-
-    YjM2ZTgyMDA3ZTRmMThmOGVhZjI0MGIwOWNlNWY5Y2M5NGFlNzkxYw==
+    MzZmYWI3MGE2YmFmOTI5ZWRlZjcxZTg2M2Q0ZmUwYmZiNGE2YzA2Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjM2ZGZjZDE5MDY0MTIwMDBkZDZhOWFmMGQ1NTlmMWYwZWNiNDkyNzZjYjA0
-    NjhhMGNjYTVjYmJlY2Q5MDZiMzY4YTk5ZTRlMDg4MjBjYWIyMzNlNDRlMmFk
-    YWE2OTQ1ZjcxZWIyODY2OWIwNGQ2NmM4NzdlN2FiYTNhMWY4MDE=
+    NDczYTVkOTdkNjljOTA4YWQyNWYyZTk5YjZlMWNjMWJmZTFlMjllMDY5ZjAw
+    MGI0MmRiMDhhMTNkYjE5NDUzZjI1Nzc2YjhhOTBjNjI5MDZlYzZkNDQ3YTM1
+    OTY3MDIxZTRkOTNmYTU5NDhhZDJjZjU2YzcwZTViMDc2YzE1YmU=
   data.tar.gz: !binary |-
-    ZWY1ODkyOWEzYjVhZTc3MjEyOGQ5ZjYyMjQ0OGMzZGE2MjNlOWI1ZDY1NDQ2
-    MTg0MmUxZWFjZmE4NjA3NmU3YjJmMDViZTg4MzMxNWRlMDg2NWE4NWI4Yjlh
-    YjQ5M2U1ZDgxODBkNzkwNmRmZWM5NWZkMDU2YzRlYThhY2NiY2I=
+    N2JiODMxMmUxYTYzMDY2MzIyOTFiYTI0ZWY4MWZlMzkyMjhjYWZkMDQyZGQy
+    YTJjMmJiZTgxOTU2NzM4YWUwMzVjMTE2Y2ZiNjY3NTM0ZWE3MGRlZjkxZDkw
+    ZjAyOTEwYWEyMTQzMGFlNjhmZWQ4OWY4MGUyYmY0MDI2OTYyMTc=

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog-maestrodev'
-  s.version           = '1.18.0.20131206115947'
-  s.date              = '2013-12-06'
+  s.version           = '1.18.0.20131209090811'
+  s.date              = '2013-12-09'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog/aws/requests/storage/put_bucket.rb

@@ -62,8 +62,11 @@ DATA
           else
             bucket['LocationConstraint'] = nil
           end
-          unless self.data[:buckets][bucket_name]
+          if !self.data[:buckets][bucket_name] || self.region == 'us-east-1'
             self.data[:buckets][bucket_name] = bucket
+          else
+            response.status = 409
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/ecloud/compute.rb

@@ -291,7 +291,7 @@ module Fog
           @connection_options      = options[:connection_options] || {}
           @host                    = options[:ecloud_host] || API_URL
           @persistent              = options[:persistent] || false
-          @version                 = options[:ecloud_version] || "2012-03-01"
+          @version                 = options[:ecloud_version] || "2013-06-01"
           @authentication_method   = options[:ecloud_authentication_method] || :cloud_api_auth
           @access_key              = options[:ecloud_access_key]
           @private_key             = options[:ecloud_private_key]

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

@@ -48,6 +48,14 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       @aws_owner = Fog::Storage[:aws].get_bucket_acl(Fog::Storage[:aws].directories.first.key).body['Owner']
     end
 
+    tests('put existing bucket - default region') do
+      Fog::Storage[:aws].put_bucket(@aws_bucket_name)
+
+      tests("#put_bucket('#{@aws_bucket_name}') existing").succeeds do
+        Fog::Storage[:aws].put_bucket(@aws_bucket_name)
+      end
+    end    
+
     tests("#get_service").formats(@service_format) do
       Fog::Storage[:aws].get_service.body
     end
@@ -337,6 +345,15 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       Fog::Storage[:aws].put_bucket_website('fognonbucket', 'index.html')
     end
 
+    tests('put existing bucket - non-default region') do
+      storage_eu_endpoint = Fog::Storage[:aws]
+      storage_eu_endpoint.region = "eu-west-1"
+      storage_eu_endpoint.put_bucket(@aws_bucket_name)
+
+      tests("#put_bucket('#{@aws_bucket_name}') existing").raises(Excon::Errors::Conflict) do
+        storage_eu_endpoint.put_bucket(@aws_bucket_name)
+      end
+    end
   end
 
   # don't keep the bucket around

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-maestrodev
 version: !ruby/object:Gem::Version
-  version: 1.18.0.20131206115947
+  version: 1.18.0.20131209090811
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder