dpl-heroku 1.10.4.travis.3053.5 → 1.10.4.travis.3054.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d69596fb58069e3485ef815db5feb038a9b2d5b04094f0a31e421294213b3e8
-  data.tar.gz: 266957fd622aa92e7fbb5cc2cc90315ec1476cc9bc535b65dd0c7634e5e08a77
+  metadata.gz: d966cfd3bc21877703fca2f021e1f1a03bdd9d33b2a67d65b1f256802e7864d4
+  data.tar.gz: 2f46f2fe03940bacece7b433b237202ede8d8e0668dbc14448b78b6597217dfd
 SHA512:
-  metadata.gz: 85035a7b8ddc249d656d6942517eca6776ab652d19eb955f75e1b19c631c7134cbb46b0bb552c0cff9146762a67a8287e48cfc4aa8310ded83fb5ad4bcdf2fa3
-  data.tar.gz: 97cd4a10a91813d8f3c8829b47cbe580621db94d8e99b30ad7e0e1e570a0c5d66a110e639aa4c38bbb5158276a9bba894ec60363a90b3aef72aa4b74627de3bc
+  metadata.gz: 6c7b3c96af43c533441f9f4debb370fe6a0b1bcc53d40349ec098b317b46c9bb711d67b84581f662e193cca71b1ec48b82ee96bfc9253587ae4b3e79b028a7e8
+  data.tar.gz: e39fe108242387da55173ccb27adcf0355d8ff10e9fdf1a11785117e81594762e216fa93f42cd07ab11e66f8bea2f0e92ee57944f15cdae9522f4e37043dfdf5

data/lib/dpl/provider/heroku/api.rb

@@ -26,7 +26,7 @@ module DPL
 
         def upload_archive
           log "uploading application archive"
-          context.shell "curl #{Shellwords.escape(put_url)} -X PUT -H 'Content-Type:' -H 'Accept: application/vnd.heroku+json; version=3' --data-binary @#{archive_file}"
+          context.shell "curl#{curl_options} #{Shellwords.escape(put_url)} -X PUT -H 'Content-Type:' -H 'Accept: application/vnd.heroku+json; version=3' --data-binary @#{archive_file}"
         end
 
         def trigger_build
@@ -44,7 +44,7 @@ module DPL
           if response.success?
             @build_id  = JSON.parse(response.body)['id']
             output_stream_url = JSON.parse(response.body)['output_stream_url']
-            context.shell "curl #{Shellwords.escape(output_stream_url)} -H 'Accept: application/vnd.heroku+json; version=3'"
+            context.shell "curl#{curl_options} #{Shellwords.escape(output_stream_url)} -H 'Accept: application/vnd.heroku+json; version=3'"
           else
             handle_error_response(response)
           end
@@ -90,6 +90,10 @@ module DPL
           @version ||= options[:version] || context.env['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
         end
 
+        def curl_options
+          $stdout.isatty ? '' : ' -sS'
+        end
+
       end
     end
   end

data/spec/provider/heroku_spec.rb

@@ -261,6 +261,28 @@ describe DPL::Provider::Heroku, :api do
       provider.trigger_build
       expect(provider.build_id).to eq('01234567-89ab-cdef-0123-456789abcdef')
     end
+
+    context 'when $stdout is not a TTY' do
+      before do
+        @old_stdout = $stdout
+        $stdout = StringIO.new
+      end
+
+      after do
+        $stdout = @old_stdout
+      end
+
+      example do
+        expect(provider).to receive(:log).with('triggering new deployment')
+        expect(provider).to receive(:faraday).at_least(:once).and_return(faraday)
+        expect(provider).to receive(:get_url).and_return 'http://example.com/source.tgz'
+        expect(provider).to receive(:version).and_return 'v1.3.0'
+        expect(provider.context).to receive(:shell).with("curl -sS https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef -H 'Accept: application/vnd.heroku+json; version=3'")
+        provider.trigger_build
+        expect(provider.build_id).to eq('01234567-89ab-cdef-0123-456789abcdef')
+      end
+
+    end
   end
 
   describe "#verify_build" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl-heroku
 version: !ruby/object:Gem::Version
-  version: 1.10.4.travis.3053.5
+  version: 1.10.4.travis.3054.5
 platform: ruby
 authors:
 - Konstantin Haase
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.4.travis.3053.5
+        version: 1.10.4.travis.3054.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.4.travis.3053.5
+        version: 1.10.4.travis.3054.5
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement