dpl 1.5.8.travis.303.1 → 1.5.8.travis.308.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWE3NzVjZWU5MDNiOWQxYTc4MGI4ZDliYzUwZDU2NzI2ZjZmZjA1ZQ==
+    YzMyNDVkOWQ4NGRlMTdkMmU4ZmViZWU2YmVhN2FmMGZjYTBiMzczOA==
   data.tar.gz: !binary |-
-    MDdiNTA4NTU4ODE5MjRlZGZlMGNjZWI1YWRhOGQyOGNmZmE3ZTc2NQ==
+    ZWE4OWZmMTY4NjlhYjBhNzQyMzg2NWFjYzc3YTYwMDRkOTNmNDIwOA==
 SHA512:
   metadata.gz: !binary |-
-    MTkzODdlMWI2ZTZjZmQzOThiZGQ4NzlmZTFlYzA1OTMxODU5Njc4M2UzNDAy
-    ZjM0YWYyMjFkNTg5MWE1MWVjZmI0MzJkY2M2YTdmNWQ3YjFiZjk4MGE3ZGYw
-    YWEwOWYxOTRmNTNiNWMxYzRjMTFlNThlY2VkMjI0NjI2ZTdkNGU=
+    MTZjNzAzYjY3YTdhMWVmYjcxNWYxMmM2ZmQ3MmZhNDhiOGQ3YzBkMTlmMjJj
+    ZjJiODNkM2ZiYzk2MzhlMzQzZWU4MzY1ZTVmNjVjNGQ1NzVlMjE0ZjRiYjcx
+    OGY5ZmU0NDIxODhlYWVhMmYxMmQ0Nzg5MDlkNWZjNzkxZmFjMDA=
   data.tar.gz: !binary |-
-    YTg1ZWNhYTk4OTYwY2VkMjQ0Yzc4YmU5MzMzMDNiY2I0OGJmZmZiZWJiODIy
-    M2MyODU1MWYzYWVjZDIxZmVhMTAwMWM1MzUwOTc3NDNlY2JlNmU2MDhlYWQx
-    ZTY1OGU4NTVhOTU2M2U3NmFiNmJjZmVmY2U4MTZjNmY3YzFhYzc=
+    NThhNGI1ODgzOWM5YzIyODE3YmU4OTZlYzFiMzI0Y2IyODRlODUyZWYyMjY2
+    Y2ZjNzNmMjEwZmViOTJhMjFiNTg5ZmY0YjA5YjE3OTc1NWNkMTQyMjBmZjFj
+    MDRhMWNhYmNiMzk3ZjczODViYmVkZGFkODZlYWIwZDVjMzNhNDg=

data/README.md

@@ -171,13 +171,14 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 * **access-key-id**: AWS Access Key ID. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
 * **secret-access-key**: AWS Secret Key. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
 * **bucket**: S3 Bucket.
+* **region**: S3 Region. Defaults to us-east-1.
 * **upload-dir**: S3 directory to upload to. Defaults to root directory.
 * **local-dir**: Local directory to upload from. Can be set from a global perspective (~/travis/build) or relative perspective (build) Defaults to project root.
 
 #### Examples:
 
     dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket>
-    dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --local-dir= BUILD --upload-dir=BUILDS
+    dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --region:us-west-2 --local-dir= BUILD --upload-dir=BUILDS 
 
 ### OpsWorks:
 

data/lib/dpl/provider/s3.rb

@@ -19,7 +19,7 @@ module DPL
       end
 
       def setup_auth
-        AWS.config(:access_key_id => option(:access_key_id), :secret_access_key => option(:secret_access_key))
+        AWS.config(:access_key_id => option(:access_key_id), :secret_access_key => option(:secret_access_key), :region => options[:region]||'us-east-1')
       end
 
       def check_auth

data/spec/provider/s3_spec.rb

@@ -36,8 +36,14 @@ describe DPL::Provider::S3 do
   end
 
   describe :setup_auth do
-    example do
-      AWS.should_receive(:config).with(:access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz').once.and_call_original
+    example "Without :region" do
+      AWS.should_receive(:config).with(:access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz', :region => 'us-east-1').once.and_call_original
+      provider.setup_auth
+    end
+    example "With :region" do
+      provider.options.update(:region => 'us-west-2')
+
+      AWS.should_receive(:config).with(:access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz', :region => 'us-west-2').once
       provider.setup_auth
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.8.travis.303.1
+  version: 1.5.8.travis.308.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec