dpl 1.7.9.travis.657.1 → 1.7.9.travis.662.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWEwNTk3Yjk5NThmZGVkM2JkMDI2MGQxN2Y2MDMwNTYzNDQyZDFjMQ==
+    MjlhNDdjMGE4ODg3NDJhMTMwZGVlNGVmYTAxODhjYThkYWJiYmMxZg==
   data.tar.gz: !binary |-
-    MDMzMTliNjBlOGY4YzQ5NTIyYjVlN2ZiODBhNWExOWM3NTNiODljMg==
+    MGM3NmI3NDk5ZjM0YjZlZDE1N2UwODQyYjk1MjM5Y2EzNmY4OTcyNg==
 SHA512:
   metadata.gz: !binary |-
-    ZDUzYWQzZjZhYjMzNGE5OGMyOTIwYWIyNzFhNzRhM2M5Nzc3NWNmZTFkZmYz
-    Y2IzNDdjZTIwMWUzZGQwMzk1NWJkMmEzMjg3OTQ3Mzg0OTY0N2ZhZWFmNjk3
-    Njc3YjE2MWE4MGY5MmM3MGY0NTY1OTIzMDUwNDUxNGIyYTYwYTI=
+    OGYzZTg0YTk3MGQ1YmEzYzgxMmEwNGQyNzRhOWIyMzg2NzU0NjY5NWJjMmQ3
+    NGY1MWFlOWEzNzlmODc0OTBlOTZiNjFhOGM0MGQyNDRjYmRlYmUxYmU2Yjlh
+    NzdhZmQ0OTNmZGE5YzMwOTE3M2U3YTAwYTIwZTNlOTk4YzhhMzg=
   data.tar.gz: !binary |-
-    YTA5NWNmMGZjNzJhODQzYTM1ODAwZTZlZjlkOGRhM2VmZDMwYWI5OTcxZjNi
-    OWIzOGY5ODRjZjI1ZTEzNjM4MzdjMzA0M2VmZjVmOTIyZjJiMjJhMjY0NmE0
-    ZDVjNjZjZGRkYTZkMzAzZDRlMGZhOTVmYThiOTZmMmY0N2UzMjM=
+    YjUwZmI4MDNmZTVhYTFjMGUxNzQ3ZDk5M2E2ODhjNzc4ZTBhZmU1M2MxOTFi
+    OWVkMTkxN2I3NTk2ZTA5MWU3MzAwM2QzZDRhODRhNDdlYjYzZjk3OWI3MzM3
+    NjMxMWY0MzNkZGU3YzRmMmNhYmNhNmE2MzBlNGIyY2M1YTFhNjM=

data/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 gemspec
 
+gem 'slop', '~> 3.6.0'
+
 group :heroku do
   gem 'rendezvous', '~> 0.0.2'
   gem 'heroku-api', '= 0.3.16'

data/README.md

@@ -204,6 +204,15 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 * **dot_match**: When set to `true`, upload files starting a `.`.
 * **index_document_suffix**: Set the index document of a S3 website.
 
+#### File-specific `Cache-Control` and `Expires` headers
+
+It is possible to set file-specific `Cache-Control` and `Expires` headers using `value: file[, file]` format.
+
+##### Example:
+
+    --cache_control="no-cache: index.html"
+    --expires="\"2012-12-21 00:00:00 -0000\": *.css, *.js"
+
 #### Examples:
 
     dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --acl=public_read

data/lib/dpl/provider.rb

@@ -154,6 +154,7 @@ module DPL
 
     def cleanup
       return if options[:skip_cleanup]
+      puts "Performing #{__method__}"
       context.shell "mv .dpl ~/dpl"
       context.shell "git stash --all"
       context.shell "mv ~/dpl .dpl"
@@ -161,6 +162,7 @@ module DPL
 
     def uncleanup
       return if options[:skip_cleanup]
+      puts "Performing #{__method__}"
       context.shell "git stash pop"
     end
 

data/lib/dpl/provider/ops_works.rb

@@ -69,13 +69,17 @@ module DPL
       end
 
       def create_deployment
-        data = client.create_deployment(
+        deployment_config = {
           stack_id: ops_works_app[:stack_id],
           app_id: option(:app_id),
           command: {name: 'deploy'},
           comment: travis_deploy_comment,
           custom_json: custom_json.to_json
-        )
+        }
+        if !options[:instance_ids].nil?
+          deployment_config[:instance_ids] = option(:instance_ids)
+        end
+        data = client.create_deployment(deployment_config)
         log "Deployment created: #{data[:deployment_id]}"
         return unless options[:wait_until_deployed]
         print "Deploying "

data/lib/dpl/provider/s3.rb

@@ -38,9 +38,9 @@ module DPL
           Dir.glob(*glob_args) 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[:cache_control] = get_option_value_by_filename(options[:cache_control], filename) if options[:cache_control]
             opts[:acl]           = options[:acl] if options[:acl]
-            opts[:expires]       = options[:expires] if options[:expires]
+            opts[:expires]       = get_option_value_by_filename(options[:expires], filename) if options[:expires]
             unless File.directory?(filename)
               log "uploading %p" % filename
               api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename), opts)
@@ -73,6 +73,26 @@ module DPL
           {}
         end
       end
+
+      def get_option_value_by_filename(option_values, filename)
+        return option_values if !option_values.kind_of?(Array)
+        preferred_value = nil
+        hashes = option_values.select {|value| value.kind_of?(Hash) }
+        hashes.each do |hash|
+          hash.each do |value, patterns|
+            unless patterns.kind_of?(Array)
+              patterns = [patterns]
+            end
+            patterns.each do |pattern|
+              if File.fnmatch?(pattern, filename)
+                preferred_value = value
+              end
+            end
+          end
+        end
+        preferred_value = option_values.select {|value| value.kind_of?(String) }.last if preferred_value.nil?
+        return preferred_value
+      end
     end
   end
 end

data/spec/provider/ops_works_spec.rb

@@ -71,6 +71,15 @@ describe DPL::Provider::OpsWorks do
       expect(client).to receive(:describe_deployments).with({deployment_ids: ['deployment_id']}).and_return({deployments: [status: 'running']}, {deployments: [status: 'successful']})
       provider.push_app
     end
+
+    example 'with :instance-ids' do
+      provider.options.update(app_id: 'app-id', instance_ids: ['instance-id'])
+      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+      expect(client).to receive(:create_deployment).with(
+        stack_id: 'stack-id', app_id: 'app-id', instance_ids:['instance-id'], command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
+      ).and_return({})
+      provider.push_app
+    end
   end
 
   describe "#api" do

data/spec/provider/s3_spec.rb

@@ -80,6 +80,22 @@ describe DPL::Provider::S3 do
       provider.push_app
     end
 
+    example "Sets different Cache and Expiration" do
+      option_list = []
+      provider.options.update(:cache_control => ["max-age=99999999", "no-cache" => ["foo.html", "bar.txt"], "max-age=9999" => "*.txt"], :expires => ["2012-12-21 00:00:00 -0000", "1970-01-01 00:00:00 -0000" => "*.html"])
+      expect(Dir).to receive(:glob).and_yield("foo.html").and_yield("bar.txt").and_yield("baz.js")
+      expect(File).to receive(:read).exactly(3).times.and_return("")
+      allow_any_instance_of(AWS::S3::ObjectCollection).to receive(:create) do |_instance, key, _data, options|
+        option_list << { key: key, options: options }
+      end
+      provider.push_app
+      expect(option_list).to match_array([
+        { key: "foo.html", options: hash_including(:cache_control => "no-cache", :expires => "1970-01-01 00:00:00 -0000") },
+        { key: "bar.txt", options: hash_including(:cache_control => "max-age=9999", :expires => "2012-12-21 00:00:00 -0000") },
+        { key: "baz.js", options: hash_including(:cache_control => "max-age=99999999", :expires => "2012-12-21 00:00:00 -0000") },
+      ])
+    end
+
     example "Sets ACL" do
       provider.options.update(:acl => "public_read")
       expect(Dir).to receive(:glob).and_yield(__FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.9.travis.657.1
+  version: 1.7.9.travis.662.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec