dpl 1.6.6.travis.492.1 → 1.6.6.travis.496.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQ0YTE0MDUyYzU4OGRjNGQzNTU1NzY1NjUzOTFmMmI0MmUxNjExZQ==
+    NmVkYmQ0NTM5ZjkxNzBiMWUwMGQyZGU1Y2JlYTA3YjQzNTNmYmFmMQ==
   data.tar.gz: !binary |-
-    NDQ1M2NlZTNiZGU3ODMyZjE5MWRjZWMwZWUyOTgzNzk5NTQyYThjMQ==
+    MTUxZTNjNWFlMzY1ZjRkZTI4YTFmMTYzZDA1OWY4N2Q0MmY3YTM1Zg==
 SHA512:
   metadata.gz: !binary |-
-    YjFkNzc1NWVhMDE0NWRiYmQ2ODQ2YjQ5ODQ1ODI5ZGJmZjAwN2I4MGNiZWIx
-    MzQ3Y2IwMWMzY2U3OTZmZGIxYzg1YjZjZDIwMGY4NGU2Y2E0YmRlOTEzMTM3
-    YzY3ODFiM2M5ZTc0ZjcyNDMwYzQ5YzlmZGZlZmJkMWVlNGM1YmI=
+    YWE4NjZlNDM3MzVhMGRlNDRlZTc3NDdjY2NlYjUyZjU5YmQzMzI5NTk2YzQ0
+    NjczOTRhMWM3YmIyN2ZiNzQ2ZTYwMWNmZGYwMmM3YTJjYmUyMTE1YjEzZjk1
+    NWE5MjJlODAyYzFiYjNkMzFlZmJkNjMwNTg3ODI5Nzc5YWQ2MWY=
   data.tar.gz: !binary |-
-    MzFmNzFkODI5NzAwNDNkODE4ZmQ2NTM0OTU5NWEyZGU4NDliMzE1Yjg4Zjk0
-    NmNmOGVmODA4NmZlYjc1OGJlZTYxNWY2MjViYmZmYmNlYjE4OGUxZTliMTY1
-    YzQ4ODVlYWMxNzk2M2FlZTA3NTIzYjcwMzE4OTFmNTI1ZjViMzc=
+    MDE2NTYyMDg5ZTJlYzY3ZDFkZWM2N2ZlZTNhNzE5MDc4YWEwZTQzNmQwMWZk
+    NjJiY2M4NDlmYTRlN2JlYjIwNjZlYTNiMmQ2N2NlYjNjNTUxZWJlMDBiYTVm
+    MDQ3Yzk3ZWNlNDczNzkwN2RmYzJlNWRhOTExNzkxMGM2Mjk5OTg=

data/Gemfile

@@ -39,6 +39,7 @@ end
 
 group :gcs do
   gem 'gstore'
+  gem 'mime-types'
 end
 
 group :gae do

data/README.md

@@ -343,10 +343,17 @@ For accounts using two factor authentication, you have to use an oauth token as
 * **access-key-id**: GCS Interoperable Access Key ID. Info about Interoperable Access Key from [here](https://developers.google.com/storage/docs/migrating).
 * **secret-access-key**: GCS Interoperable Access Secret.
 * **bucket**: GCS Bucket.
+* **upload-dir**: GCS 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.
 * **dot_match**: When set to `true`, upload files starting a `.`.
+* **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 not set. Info is [here](https://developers.google.com/storage/docs/reference-headers#cachecontrol)
+* **acl**: Sets the access control for the uploaded objects. Defaults to not set. Info is [here](https://developers.google.com/storage/docs/reference-headers#xgoogacl)
 
 #### Examples:
 
     dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket>
     dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --local-dir= BUILD
+    dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --acl=public-read
+    dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --detect-encoding --cache_control=max-age=99999
+    dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --local-dir=BUILD --upload-dir=BUILDS

data/lib/dpl/provider.rb

@@ -165,6 +165,20 @@ module DPL
       ENV['GIT_SSH'] = path
     end
 
+    def detect_encoding?
+      options[:detect_encoding]
+    end
+
+    def encoding_for(path)
+      file_cmd_output = `file #{path}`
+      case file_cmd_output
+      when /gzip compressed/
+        'gzip'
+      when /compress'd/
+        'compress'
+      end
+    end
+
     def log(message)
       $stderr.puts(message)
     end

data/lib/dpl/provider/gcs.rb

@@ -4,7 +4,7 @@ module DPL
   class Provider
     class GCS < Provider
       requires 'gstore'
-      experimental 'Google Cloud Storage'
+      requires 'mime-types'
 
       def needs_key?
         false
@@ -21,24 +21,39 @@ 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
         glob_args = ["**/*"]
         glob_args << File::FNM_DOTMATCH if options[:dot_match]
         Dir.chdir(options.fetch(:local_dir, Dir.pwd)) do
           Dir.glob(*glob_args) do |filename|
             next if File.directory?(filename)
-
-            log "Push: #{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["x-goog-acl"]    = options[:acl] if options[:acl]
 
             client.put_object(
               option(:bucket),
-              filename,
-              :data => File.read(filename)
+              upload_path(filename),
+              { :data => File.read(filename), :headers => opts }
             )
           end
         end
       end
 
+      private
+      def encoding_option_for(path)
+        if detect_encoding? && encoding_for(path)
+          {"Content-Encoding" => encoding_for(path)}
+        else
+          {}
+        end
+      end
+
     end
   end
 end

data/lib/dpl/provider/s3.rb

@@ -59,20 +59,6 @@ module DPL
       end
 
       private
-      def detect_encoding?
-        options[:detect_encoding]
-      end
-
-      def encoding_for(path)
-        file_cmd_output = `file #{path}`
-        case file_cmd_output
-        when /gzip compressed/
-          'gzip'
-        when /compress'd/
-          'compress'
-        end
-      end
-
       def encoding_option_for(path)
         if detect_encoding? && encoding_for(path)
           {:content_encoding => encoding_for(path)}

data/spec/provider/gcs_spec.rb

@@ -20,6 +20,21 @@ describe DPL::Provider::GCS do
     end
   end
 
+  describe "#upload_path" do
+    example "Without: :upload_dir" do
+      filename = "testfile.file"
+
+      expect(provider.upload_path(filename)).to eq("testfile.file")
+    end
+
+    example "With :upload_dir" do
+      provider.options.update(:upload_dir => 'BUILD3')
+      filename = "testfile.file"
+
+      expect(provider.upload_path(filename)).to eq("BUILD3/testfile.file")
+    end
+  end
+
   describe "#push_app" do
     example "Without local_dir" do
       expect(Dir).to receive(:chdir).with(Dir.pwd)
@@ -33,12 +48,59 @@ describe DPL::Provider::GCS do
       provider.push_app
     end
 
+    example "Sends MIME type" do
+      expect(Dir).to receive(:glob).and_yield(__FILE__)
+      expect_any_instance_of(GStore::Client).to receive(:put_object).with(
+        anything(),
+        anything(),
+        hash_including(:headers => {:"Content-Type" => 'application/x-ruby'})
+      )
+      provider.push_app
+    end
+
+    example "Sets Cache" do
+      provider.options.update(:cache_control => "max-age=99999999")
+      expect(Dir).to receive(:glob).and_yield(__FILE__)
+      expect_any_instance_of(GStore::Client).to receive(:put_object).with(
+        anything(),
+        anything(),
+        hash_including(:headers => hash_including("Cache-Control" => 'max-age=99999999'))
+      )
+      provider.push_app
+    end
+
+    example "Sets ACL" do
+      provider.options.update(:acl => "public-read")
+      expect(Dir).to receive(:glob).and_yield(__FILE__)
+      expect_any_instance_of(GStore::Client).to receive(:put_object).with(
+        anything(),
+        anything(),
+        hash_including(:headers => hash_including("x-goog-acl" => 'public-read'))
+      )
+      provider.push_app
+    end
+
+    example "when detect_encoding is set" do
+      path = 'foo.js'
+      provider.options.update(:detect_encoding => true)
+      expect(Dir).to receive(:glob).and_yield(path)
+      expect(provider).to receive(:`).at_least(1).times.with("file #{path}").and_return('gzip compressed')
+      expect(File).to receive(:read).with(path).and_return("")
+      expect_any_instance_of(GStore::Client).to receive(:put_object).with(
+        anything(),
+        anything(),
+        hash_including(:headers => hash_including("Content-Encoding" => 'gzip'))
+      )
+      provider.push_app
+    end
+
     example "With dot_match" do
       provider.options.update(:dot_match => true)
 
       expect(Dir).to receive(:glob).with('**/*', File::FNM_DOTMATCH)
       provider.push_app
     end
+
   end
 
   describe '#client' do

data/spec/provider_spec.rb

@@ -126,6 +126,21 @@ describe DPL::Provider do
     end
   end
 
+  describe "#detect_encoding?" do
+    example do
+      provider.options.update(:detect_encoding => true)
+      expect(provider.detect_encoding?).to eq(true)
+    end
+  end
+
+  describe "#encoding_for" do
+    example do
+      path = 'foo.js'
+      expect(provider).to receive(:`).at_least(1).times.with("file #{path}").and_return('gzip compressed')
+      expect(provider.encoding_for(path)).to eq('gzip')
+    end
+  end
+
   describe "#log" do
     example do
       expect($stderr).to receive(:puts).with("foo")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.6.6.travis.492.1
+  version: 1.6.6.travis.496.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec