dpl 1.6.5.travis.466.1 → 1.6.5.travis.468.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGY4NGMzOGU1NTUxZWUxYjU0ZjZkOTkxMjZmMDM1NWJkNWEyMDEwZQ==
+    NjY2ZjcwMGE3MWYyMDFkMzYxMjdkMGM4OTgyYTZlMGQzNmE3MmIzMw==
   data.tar.gz: !binary |-
-    YTlkNDhkNzYxMmIzNTY0ZTI3MjI1MWVhZWQ2NmJhNzFjODhmMDRhZg==
+    ODM2N2IwNjhjYTM0NDY1YTFkYjY1NTZjOWY0Y2FiYjM4ZDA2ZTJiMA==
 SHA512:
   metadata.gz: !binary |-
-    YzNiYmIwN2MzMjdlODJjYTA0MWU4MTFkOGJjMzYxOTA0ZTk4NGNiYTgwYWZj
-    Nzg4YzFiNmZjMDg0OTllNzc2ZWI2MmQyNjFlZDA5ZTYwNjAwZTRiZThhYTE0
-    NzNiZThhZWIxNGY0YmRjMGExMTE4YWUzNjZhMTMzYzJiMjhiMGU=
+    NDY2NWI4NzRjYTBhZjBkMGMyMDdmMDU1NGYzMWRjZDcyMjRjYmY2YjU0MDhl
+    YmVhZGY0YjQyMjFkMjg0YWEyMmRkNGJjZTg1MWI2NDk1NzEwNmU0ZTFkYWZl
+    NjQ5MzlmNDE5MjgxYWVjOGY0NTg0NDk1N2VkMDY1ZWEwMmM3NTE=
   data.tar.gz: !binary |-
-    NDk3ZjA4YjVkMGY3M2Q5MjlmYjBjZjMxNzFjNWQ4MWY1M2ZmYjQ5NjlmZDA4
-    OWE2ZWViNWMyYTdkMGI3ZTQwMzZhMjI2Mzc1N2Y0ZjdiMDJiZjVkZjgwMjRm
-    OWMwYmFkZDFhZDkzYjFhZmZhMWQ1OTVjMjY0YmUzMmQ5MjE4ZjQ=
+    ODA4ZGZjNDAwNDEzYzMyMjAxNTdmZmUyMjU0YzNjOTZlMDc3ZDc1ODQxN2Uy
+    NDE1MjNiYzYzYWZmMGI0NDFmMDIwZGQ3ZjE2ZTgzYmY3ZDYyMGNkMGJlOTU1
+    MDE0OThjNDI5ZGU1ZWMyYmIwZWQ0NzU4YTE1MzRmMmNlMmVhODU=

data/README.md

@@ -181,12 +181,14 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 * **endpoint**: S3 Endpoint. Defaults to s3.amazonaws.com.
 * **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.
-* **detect-encoding**: Set HTTP header `Content-Encoding` for files compressed with `gzip` and `compress` utilities.
+* **detect-encoding**: Set HTTP header `Content-Encoding` for files compressed with `gzip` and `compress` utilities. Defaults to not set.
+* **cache_control**: Set HTTP header `Cache-Control` to suggest that the browser cache the file. Defaults to `no-cache`. Valid options are `no-cache`, `no-store`, `max-age=<seconds>`,`s-maxage=<seconds>` `no-transform`, `public`, `private`.
+* **expires**: This sets the date and time that the cached object is no longer cacheable. Defaults to not set. The date must be in the format `YYYY-MM-DD HH:MM:SS -ZONE`.
 
 #### 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> --detect-encoding
+    dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --detect-encoding --cache_control=max-age=99999 --expires="2012-12-21 00:00:00 -0000"
     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

@@ -36,6 +36,8 @@ module DPL
           Dir.glob("**/*") do |filename|
             content_type = MIME::Types.type_for(filename).first.to_s
             opts         = { :content_type => content_type }.merge(encoding_option_for(filename))
+            opts[:cache_control] = options[:cache_control] if options[:cache_control]
+            opts[:expires] = options[:expires] if options[:expires]
             unless File.directory?(filename)
               api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename), opts)
             end

data/spec/provider/s3_spec.rb

@@ -73,6 +73,13 @@ describe DPL::Provider::S3 do
       provider.push_app
     end
 
+    example "Sets Cache and Expiration" do
+      provider.options.update(:cache_control => "max-age=99999999", :expires => "2012-12-21 00:00:00 -0000")
+      expect(Dir).to receive(:glob).and_yield(__FILE__)
+      expect_any_instance_of(AWS::S3::ObjectCollection).to receive(:create).with(anything(), anything(), hash_including(:cache_control => 'max-age=99999999', :expires => '2012-12-21 00:00:00 -0000'))
+      provider.push_app
+    end
+
     example "when detect_encoding is set" do
       path = 'foo.js'
       provider.options.update(:detect_encoding => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.6.5.travis.466.1
+  version: 1.6.5.travis.468.1
 platform: ruby
 authors:
 - Konstantin Haase