dpl 1.5.3.travis.249.2 → 1.5.3.travis.252.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzczYTcxYmRiZDdjNzliODUzNGQzNjdkZDRlMTYwODJkMDA2NzM2OA==
+    MTg4YTU2MzMyZjNmNDQ3MDVkYWVmZWVkMDBiY2Y2ZmE1YTMyOWI1ZA==
   data.tar.gz: !binary |-
-    MjhiYjAwZDExMDg3MjM4Nzk3MTkxOGUxZDFiYjM2MGU5NzU1ZmQ0Ng==
+    OTI3ZmZkODc2MmJmM2FkNTUzYWY4NjRmZjlhZDk0MzMxOTE0M2Y4YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjBlZDRlYjk1N2ZkZDYwYzBhZDY2OTc0YTFmYzBlZjNjMDlhMDNjNDg1YTY3
-    MTEwYzk2NDg4NGJlYzZlYzdjNTZlNDkxYTk1NGZhY2U0ZmU4ZThkNzgwYjEx
-    MmFiNjNkNDI4Nzc5YmMzNzBmYjMxMDQxNDI1ZjY1OGRmN2IwNjQ=
+    YTY4NWQ3ZWU4ZjkxZmJkYzJhMzZjNTIzYjllZWI4NmE1YzVjNzM4NGUxNDMx
+    ZDk5OGZhYzkxMzRkMmRkZWYyNjU3OTQ2NzgxMTRmNWUwMzE0Mzg1NzNlZmY3
+    M2YyMjdhMWRmODE4ZDU2YjYzZjMwNjk3MjBkYThjYzc1MzkyNjA=
   data.tar.gz: !binary |-
-    ZGMzNWVlMDQwNmI0NTE0YmUyYWVkM2JjYmZkNmUyMDcwYTdkMmZkY2QyZjE4
-    ZmU5MDk2Y2U2YjcxMjMwZjhiMTU1OTBkMDA4Yzc1MjU1ODlkOWUwY2QzYzg5
-    NWE3YzkwMzkwYzJkYzVjMTgxODA3N2JkNDU4YzYwOWE4YzU5NWE=
+    MzZlM2Q2M2NiM2M2MDYzNGVjYzM0MzZiYzFkMGFjNDI4MTFjMzY3MmVhNjA0
+    NTE5MzRjNDdiOGQ4ZTBiNmU0NjU1NzYwZWFiZWU1OTA2NDQ3YTAyZTczYjRm
+    OTM1MTQ4M2U4ODhjZTk5ZGFkZGFlZWExNjZjNmJmNDI0MTU1MzA=

data/README.md

@@ -154,11 +154,13 @@ 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.
+* **bucket**: S3 Bucket.
+* **upload-dir**: S3 directory to upload to. Defaults to root directory.
 
 #### 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> --upload-dir=BUILDS
 
 ### Appfog:
 

data/lib/dpl/provider/s3.rb

@@ -24,9 +24,13 @@ module DPL
         log "Logging in with Access Key: #{option(:access_key_id)[-4..-1].rjust(20, '*')}"
       end
 
+      def upload_path(filename)
+        [options[:upload_dir], filename].compact.join("/")
+      end
+
       def push_app
-        Dir.glob("**/*") do |fileName|
-          api.buckets[option(:bucket)].objects.create(fileName, File.read(fileName)) unless File.directory?(fileName)
+        Dir.glob("**/*") do |filename|
+          api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename)) unless File.directory?(filename)
         end
       end
 

data/spec/provider/s3_spec.rb

@@ -20,6 +20,21 @@ describe DPL::Provider::S3 do
     end
   end
 
+  describe :upload_path do
+    example "Without :upload_dir"do
+      filename = "testfile.file"
+
+      provider.upload_path(filename).should == "testfile.file"
+    end
+
+    example "With :upload_dir" do
+      provider.options.update(:upload_dir => 'BUILD3')
+      filename = "testfile.file"
+
+      provider.upload_path(filename).should == "BUILD3/testfile.file"
+    end
+  end
+
   describe :setup_auth do
     example do
       AWS.should_receive(:config).with(:access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz').once.and_call_original

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.3.travis.249.2
+  version: 1.5.3.travis.252.2
 platform: ruby
 authors:
 - Konstantin Haase