dpl-heroku 1.10.5.travis.3069.5 → 1.10.5.travis.3089.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40916585a687ab553c1390dae4c61b97410665cee96d7c08ea4d7cf4d4af2553
-  data.tar.gz: b151ed3b5cc7a4bb77f5826f2d5cce1573933a66c40614c1827e11fb2931440b
+  metadata.gz: eefc9cbfca4c0079f6acbb12553ef16ab89027dcb72355a9c165efd569709cde
+  data.tar.gz: 2005407442e84139948b520deb36898d068d42b8b3322e7408e6432086e9dd40
 SHA512:
-  metadata.gz: 47da7ea2133f27834fe6d6d2c51c939fdd6a449628738e546f04c28971cf92edb8d5420ed94110a2144cc3aeb1c7cfbad2a3006e6ad4a5872b4e7989cde61be9
-  data.tar.gz: bbe8f05480af82ed25f064c6a47f686423a65cbf379062763f06275833a6285eafdf8a55a1168662a3b2136edafad90c823a496f89f196b2c1834574494facec
+  metadata.gz: b2fdb8f343b1537cfb6b2be4f184ad026c7ff717d9c70b4080106e6b13d8d9cfa9f61151479911c5edb9f1e45b02545342a4b8a6f1c47cd50383992fd481c65a
+  data.tar.gz: dcdc6a43dc82eec638c7db3700f328d9d4c38a60b39fc756132bc9c5edaac87d589d522d09c77bbb2b14b0201019e42406911842bcb77229993074e371a577af

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

@@ -52,16 +52,18 @@ module DPL
 
         def verify_build
           loop do
-            response = faraday.get("/apps/#{option(:app)}/builds/#{build_id}/result")
-            exit_code = JSON.parse(response.body)['exit_code']
-            if exit_code.nil?
+            response = faraday.get("/apps/#{option(:app)}/builds/#{build_id}")
+            body = JSON.parse(response.body)
+
+            case body['status']
+            when 'pending'
               log "heroku build still pending"
               sleep 5
               next
-            elsif exit_code == 0
+            when 'succeeded'
               break
             else
-              error "deploy failed, build exited with code #{exit_code}"
+              error "deploy failed"
             end
           end
         end

data/spec/provider/heroku_spec.rb

@@ -11,7 +11,7 @@ RSpec.shared_context 'with faraday' do
         stub.get("/account") {|env| [200, response_headers, account_response_body]}
         stub.get("/apps/example") {|env| [200, response_headers, app_response_body]}
         stub.post("/apps/example/builds") {|env| [201, response_headers, builds_response_body]}
-        stub.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef/result") {|env| [200, response_headers, build_result_response_body]}
+        stub.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef") {|env| [200, response_headers, build_response_body]}
         stub.post("/sources") {|env| [201, response_headers, source_response_body] }
         stub.post("/apps/example/dynos") {|env| [201, response_headers, dynos_create_response_body]}
         stub.delete("/apps/example/dynos") {|env| [202, response_headers, '{}'] }
@@ -163,53 +163,27 @@ RSpec.shared_context 'with faraday' do
     }'
   }
 
-  let(:build_result_response_body) {
+  let(:build_response_body) {
   '{
-      "build": {
-      "id": "01234567-89ab-cdef-0123-456789abcdef",
-      "status": "succeeded",
-      "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
-    },
-    "exit_code": 0,
-    "lines": [
-      {
-        "line": "-----> Ruby app detected\n",
-        "stream": "STDOUT"
-      }
-    ]
+    "id": "01234567-89ab-cdef-0123-456789abcdef",
+    "status": "succeeded",
+    "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
   }'
   }
 
-  let(:build_result_response_body_failure) {
+  let(:build_response_body_failure) {
     '{
-        "build": {
-        "id": "01234567-89ab-cdef-0123-456789abcdef",
-        "status": "failed",
-        "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
-      },
-      "exit_code": 1,
-      "lines": [
-        {
-          "line": "-----> Ruby app detected\n",
-          "stream": "STDOUT"
-        }
-      ]
+      "id": "01234567-89ab-cdef-0123-456789abcdef",
+      "status": "failed",
+      "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
     }'
   }
 
-  let(:build_result_response_body_in_progress) {
+  let(:build_response_body_in_progress) {
     '{
-        "build": {
-        "id": "01234567-89ab-cdef-0123-456789abcdef",
-        "status": "failed",
-        "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
-      },
-      "lines": [
-        {
-          "line": "-----> Ruby app detected\n",
-          "stream": "STDOUT"
-        }
-      ]
+      "id": "01234567-89ab-cdef-0123-456789abcdef",
+      "status": "pending",
+      "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
     }'
   }
 end
@@ -298,8 +272,8 @@ describe DPL::Provider::Heroku, :api do
       example do
         expect(provider).to receive(:faraday).at_least(:once).and_return(faraday)
         expect(provider).to receive(:build_id).at_least(:once).and_return('01234567-89ab-cdef-0123-456789abcdef')
-        stubs.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef/result") {|env| [200, response_headers, build_result_response_body_failure]}
-        expect{ provider.verify_build }.to raise_error("deploy failed, build exited with code 1")
+        stubs.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef") {|env| [200, response_headers, build_response_body_failure]}
+        expect{ provider.verify_build }.to raise_error("deploy failed")
       end
     end
 
@@ -307,7 +281,7 @@ describe DPL::Provider::Heroku, :api do
       example do
         expect(provider).to receive(:faraday).at_least(:once).and_return(faraday)
         expect(provider).to receive(:build_id).at_least(:once).and_return('01234567-89ab-cdef-0123-456789abcdef')
-        stubs.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef/result") {|env| [200, response_headers, build_result_response_body_in_progress]}
+        stubs.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef") {|env| [200, response_headers, build_response_body_in_progress]}
         expect(provider).to receive(:sleep).with(5).and_return(true)
         expect{ provider.verify_build }.not_to raise_error
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-heroku
 version: !ruby/object:Gem::Version
-  version: 1.10.5.travis.3069.5
+  version: 1.10.5.travis.3089.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.5.travis.3069.5
+        version: 1.10.5.travis.3089.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.5.travis.3069.5
+        version: 1.10.5.travis.3089.5
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement