dpl 1.5.3.travis.252.2 → 1.5.3.travis.254.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTg4YTU2MzMyZjNmNDQ3MDVkYWVmZWVkMDBiY2Y2ZmE1YTMyOWI1ZA==
+    OWI4ZDExOTkyZTE2YzhmZTI3NWVlYmJlMzcwYTZkN2JhMmFiZDFiOA==
   data.tar.gz: !binary |-
-    OTI3ZmZkODc2MmJmM2FkNTUzYWY4NjRmZjlhZDk0MzMxOTE0M2Y4YQ==
+    M2Y3ZmViZWFiZGI4NDI3N2QwOGVjNmVkMTkwM2ZhNzA5NDlkOWM2Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTY4NWQ3ZWU4ZjkxZmJkYzJhMzZjNTIzYjllZWI4NmE1YzVjNzM4NGUxNDMx
-    ZDk5OGZhYzkxMzRkMmRkZWYyNjU3OTQ2NzgxMTRmNWUwMzE0Mzg1NzNlZmY3
-    M2YyMjdhMWRmODE4ZDU2YjYzZjMwNjk3MjBkYThjYzc1MzkyNjA=
+    YWE3ZjMyMmU5MzM2OTYxZGUwOWMwMzVjNjBkZmMzMWJiNTI2MDJhN2Y1Yjhi
+    NGY1ZDQzMjg5Y2QzMmNiOWZmNWY3OTY1MDE4YjdlYWIxODhiMjQzMjkyZjg5
+    ZThhNjgwMDdiOWI1YjA1NTRiNjNmZTliNDlkNGM4ZmNmYzU4Zjc=
   data.tar.gz: !binary |-
-    MzZlM2Q2M2NiM2M2MDYzNGVjYzM0MzZiYzFkMGFjNDI4MTFjMzY3MmVhNjA0
-    NTE5MzRjNDdiOGQ4ZTBiNmU0NjU1NzYwZWFiZWU1OTA2NDQ3YTAyZTczYjRm
-    OTM1MTQ4M2U4ODhjZTk5ZGFkZGFlZWExNjZjNmJmNDI0MTU1MzA=
+    YjhmYWNlZTlmNDQxYjkyMjg4OTQ2ODJhNWY4YTQ3ODJlMzdhOTUxZWZmODJl
+    YjM0OTc0MTc1N2I1NGFlOWVjZjQ0YzYwYmI1OTRkMWMzNTE1OTgyYzdkMTNj
+    YmFiNTdmMjY0Nzc3NzEzMzYwZDI3MzZhNDJhY2EyNDBkZDNhYWU=

data/README.md

@@ -155,12 +155,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.
-* **upload-dir**: S3 directory to upload to. Defaults to root directory.
+* **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> --upload-dir=BUILDS
+    dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --local-dir= BUILD --upload-dir=BUILDS
 
 ### Appfog:
 

data/lib/dpl/provider/s3.rb

@@ -29,8 +29,10 @@ module DPL
       end
 
       def push_app
-        Dir.glob("**/*") do |filename|
-          api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename)) unless File.directory?(filename)
+        Dir.chdir(options.fetch(:local_dir, Dir.pwd)) do
+          Dir.glob("**/*") do |filename|
+            api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename)) unless File.directory?(filename)
+          end
         end
       end
 

data/spec/provider/s3_spec.rb

@@ -49,7 +49,15 @@ describe :needs_key? do
   end
 
   describe :push_app do
-    example do
+    example "Without local_dir" do
+      Dir.should_receive(:chdir).with(Dir.pwd)
+      provider.push_app
+    end
+
+    example "With local_dir" do
+      provider.options.update(:local_dir => 'BUILD')
+      
+      Dir.should_receive(:chdir).with('BUILD')
       provider.push_app
     end
   end

metadata

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