dpl 1.8.16 → 1.8.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02b1ee1bec64c199128af018b51771698ae8a716
-  data.tar.gz: f56cb8ff9c3b4a40d4c1c67ad1e1b73c7c251076
+  metadata.gz: 72fde1a2ab1ae2bf50c0c5e2eb98c087c31395b4
+  data.tar.gz: 26f261efe42bdb31caeb5de0ac8e05fc951d87fd
 SHA512:
-  metadata.gz: 51ab2e3f8c4863daa86589a45a3199bb194df970f61e85e82ae66e4c3d450946df538c946e7493bf144661d98e5b6479dd888029112e92045a736c03223ec95b
-  data.tar.gz: cacfb160bc841f626ae01b430085da2d8c5362550b658466dfd7b8cfef60b22f3517408ff2f67bd5469cb38a24256f85f7fe82dfde1944b32eba92b5dcc0cf75
+  metadata.gz: 486de17ed6f9d995b239480460ee1612cf7a765b8a696621678c95b064baeacea8906765ab91c540a961533953f5d3ed6b803e3e6bae00152b2437de64f06145
+  data.tar.gz: 87acea2989c14e18d6f716c6e36a06e102eee5bf772c5543d3e61dd676b3b2eb32fbcdf890920e61a424a12aff6aa0d0eae812733f971a2175dcc6b42d8fa1c5

data/README.md

@@ -321,6 +321,7 @@ For authentication you can also use Travis CI secure environment variable:
 * **acl**: Sets the access control for the uploaded objects. Defaults to `private`. Valid options are `private`, `public_read`, `public_read_write`, `authenticated_read`, `bucket_owner_read`, `bucket_owner_full_control`.
 * **dot_match**: When set to `true`, upload files starting a `.`.
 * **index_document_suffix**: Set the index document of a S3 website.
+* **default_text_charset**: Set the default character set to append to the content-type of text files you are uploading.
 
 #### File-specific `Cache-Control` and `Expires` headers
 
@@ -796,7 +797,6 @@ In order to use this provider, please make sure you have the [App Engine Admin A
 * **version**: The version of the app that will be created or replaced by this deployment. If you do not specify a version, one will be generated for you. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
 * **no_promote**: Flag to not promote the deployed version. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
 * **verbosity**: Let's you adjust the verbosity when invoking `"gcloud"`. Defaults to `"warning"`. See [`gcloud`](https://cloud.google.com/sdk/gcloud/reference/).
-* **docker_build**: If deploying a Managed VM, specifies where to build your image. Typical values are `"remote"` to build on Google Cloud Engine and `"local"` which requires Docker to be set up properly (to utilize this on Travis CI, read [Using Docker on Travis CI](http://blog.travis-ci.com/2015-08-19-using-docker-on-travis-ci/)). Defaults to `"remote"`.
 * **no_stop_previous_version**: Flag to prevent your deployment from stopping the previously promoted version. This is from the future, so might not work (yet). See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
 
 #### Environment variables:

data/dpl.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'json', '1.8.1'
   s.add_development_dependency 'coveralls'
 

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module DPL
   class Provider
     class ElasticBeanstalk < Provider
@@ -32,6 +34,7 @@ module DPL
       end
 
       def push_app
+        @start_time = Time.now
         create_bucket unless bucket_exists?
 
         if options[:zip_file]
@@ -45,6 +48,7 @@ module DPL
         version = create_app_version(s3_object)
         if !only_create_app_version
           update_app(version)
+          wait_until_deployed if options[:wait_until_deployed]
         end
       end
 
@@ -138,6 +142,40 @@ module DPL
         eb.create_application_version(options)
       end
 
+      # Wait until EB environment update finishes
+      def wait_until_deployed
+        errorEvents = 0 # errors counter, should remain 0 for successful deployment
+        events = []
+
+        loop do
+          environment = eb.describe_environments({
+            :application_name  => app_name,
+            :environment_names => [env_name]
+          })[:environments].first
+
+          eb.describe_events({
+            :environment_name  => env_name,
+            :start_time        => @start_time.utc.iso8601,
+          })[:events].reverse.each do |event|
+            message = "#{event[:event_date]} [#{event[:severity]}] #{event[:message]}"
+            unless events.include?(message)
+              events.push(message)
+              if event[:severity] == "ERROR"
+                errorEvents += 1
+                warn(message)
+              else
+                log(message)
+              end
+            end
+          end
+
+          break if environment[:status] == "Ready"
+          sleep 5
+        end
+
+        if errorEvents > 0 then error("Deployment failed.") end
+      end
+
       def update_app(version)
         options = {
           :environment_name  => env_name,

data/lib/dpl/provider/gae.rb

@@ -58,31 +58,21 @@ module DPL
         options[:no_promote]
       end
 
-      def use_cloud_build
-        options[:use_cloud_build] || 'false'
-      end
-
       def verbosity
         options[:verbosity] || 'warning'
       end
 
-      def docker_build
-        options[:docker_build] || 'remote'
-      end
-
       def no_stop_previous_version
         options[:no_stop_previous_version]
       end
 
       def push_app
-        context.shell "#{GCLOUD} config set app/use_cloud_build #{use_cloud_build}"
         command = GCLOUD
         command << ' --quiet'
         command << " --verbosity \"#{verbosity}\""
         command << " --project \"#{project}\""
         command << " preview app deploy \"#{config}\""
         command << " --version \"#{version}\""
-        command << " --docker-build \"#{docker_build}\""
         command << " --#{no_promote ? 'no-' : ''}promote"
         command << (no_stop_previous_version ? ' --no-stop-previous-version' : '')
         unless context.shell(command)

data/lib/dpl/provider/s3.rb

@@ -46,13 +46,12 @@ module DPL
         glob_args << File::FNM_DOTMATCH if options[:dot_match]
         Dir.chdir(options.fetch(:local_dir, Dir.pwd)) do
           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                 = content_data_for(filename)
             opts[:cache_control] = get_option_value_by_filename(options[:cache_control], filename) if options[:cache_control]
             opts[:acl]           = options[:acl].gsub(/_/, '-') if options[:acl]
             opts[:expires]       = get_option_value_by_filename(options[:expires], filename) if options[:expires]
             unless File.directory?(filename)
-              log "uploading %p" % filename
+              log "uploading #{filename.inspect} with #{opts.inspect}"
               api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
             end
           end
@@ -80,12 +79,21 @@ module DPL
       end
 
       private
-      def encoding_option_for(path)
-        if detect_encoding? && encoding_for(path)
-          {:content_encoding => encoding_for(path)}
-        else
-          {}
+      def content_data_for(path)
+        content_data = {}
+        content_type = MIME::Types.type_for(path).first
+        content_data[:content_type] = content_type.to_s
+
+        encoding = encoding_for(path)
+        if detect_encoding?
+          content_data[:content_encoding] = encoding if encoding
+        end
+
+        if encoding == 'text' && default_text_charset?
+          content_data[:content_type] = "#{content_data[:content_type]}; charset=#{default_text_charset}"
         end
+
+        return content_data
       end
 
       def get_option_value_by_filename(option_values, filename)

data/lib/dpl/provider.rb

@@ -212,6 +212,14 @@ module DPL
       options[:detect_encoding]
     end
 
+    def default_text_charset?
+      options[:default_text_charset]
+    end
+
+    def default_text_charset
+      options[:default_text_charset].downcase
+    end
+
     def encoding_for(path)
       file_cmd_output = `file '#{path}'`
       case file_cmd_output
@@ -219,6 +227,10 @@ module DPL
         'gzip'
       when /compress'd/
         'compress'
+      when /text/
+        'text'
+      when /data/
+        # Shrugs?
       end
     end
 

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.8.16'
+  VERSION = '1.8.17'
 end

data/spec/provider/elastic_beanstalk_spec.rb

@@ -17,6 +17,7 @@ describe DPL::Provider::ElasticBeanstalk do
   let(:bucket_name) { "travis-elasticbeanstalk-test-builds-#{region}" }
   let(:bucket_path) { "some/app"}
   let(:only_create_app_version) { nil }
+  let(:wait_until_deployed) { nil }
 
   let(:bucket_mock) do
     dbl = double("bucket mock", write: nil)
@@ -33,7 +34,8 @@ describe DPL::Provider::ElasticBeanstalk do
     described_class.new(
       DummyContext.new, :access_key_id => access_key_id, :secret_access_key => secret_access_key,
       :region => region, :app => app, :env => env, :bucket_name => bucket_name, :bucket_path => bucket_path,
-      :only_create_app_version => only_create_app_version
+      :only_create_app_version => only_create_app_version,
+      :wait_until_deployed => wait_until_deployed
     )
   end
 
@@ -84,12 +86,12 @@ describe DPL::Provider::ElasticBeanstalk do
 
       provider.push_app
     end
-    
+
     context 'only creates app version' do
       let(:only_create_app_version) { true }
-      
+
       example 'verify the app is not updated' do
-      
+
         expect(provider).to receive(:s3).and_return(s3_mock).twice
         expect(provider).to receive(:create_bucket)
         expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
@@ -121,5 +123,23 @@ describe DPL::Provider::ElasticBeanstalk do
         provider_without_bucket_path.push_app
       end
     end
+
+    context 'When wait_until_deployed option is set' do
+      let(:wait_until_deployed) { true }
+
+      example 'Waits until deployment completes' do
+        expect(provider).to receive(:s3).and_return(s3_mock).twice
+        expect(provider).to receive(:create_bucket)
+        expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
+        expect(provider).to receive(:archive_name).and_return('file.zip')
+        expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
+        expect(provider).to receive(:sleep).with(5)
+        expect(provider).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
+        expect(provider).to receive(:update_app).with(app_version)
+        expect(provider).to receive(:wait_until_deployed)
+
+        provider.push_app
+      end
+    end
   end
 end

data/spec/provider/gae_spec.rb

@@ -8,8 +8,7 @@ describe DPL::Provider::GAE do
 
   describe '#push_app' do
     example 'with defaults' do
-      allow(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::GCLOUD} config set app/use_cloud_build false").and_return(true)
-      allow(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::GCLOUD} --quiet --verbosity \"warning\" --project \"test\" preview app deploy \"app.yaml\" --version \"\" --docker-build \"remote\" --promote").and_return(true)
+      allow(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::GCLOUD} --quiet --verbosity \"warning\" --project \"test\" preview app deploy \"app.yaml\" --version \"\" --promote").and_return(true)
       provider.push_app
     end
   end

data/spec/provider_spec.rb

@@ -159,6 +159,19 @@ describe DPL::Provider do
       expect(provider).to receive(:`).at_least(1).times.with("file '#{path}'").and_return("#{path}: empty")
       expect(provider.encoding_for(path)).to be_nil
     end
+
+    example do
+      path = 'foo.js'
+      expect(provider).to receive(:`).at_least(1).times.with("file '#{path}'").and_return("#{path}: ASCII text, with very long line")
+      expect(provider.encoding_for(path)).to eq('text')
+    end
+
+    example do
+      path = 'foo.js'
+      provider.options.update(:default_text_charset => 'UTF-8')
+      expect(provider).to receive(:`).at_least(1).times.with("file '#{path}'").and_return("#{path}: ASCII text, with very long line")
+      expect(provider.encoding_for(path)).to eq('text')
+    end
   end
 
   describe "#log" do

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'simplecov'
 require 'dpl/error'
 require 'dpl/provider'
 require 'rspec/its'
@@ -6,13 +5,6 @@ require 'coveralls'
 
 Coveralls.wear!
 
-SimpleCov.start do
-  coverage_dir '.coverage'
-
-  add_filter "/spec/"
-  add_group 'Library', 'lib'
-end
-
 class DummyContext
   def shell(command)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.16
+  version: 1.8.17
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement