dpl 1.7.10.travis.700.4 → 1.7.10.travis.701.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODlhNjBkMzYyNmQyNTBlNGEwY2RhNDUyZjM5ZDRlMzlhMzY2NzYxMQ==
+    NWU1ZjI5ZjZlZTczYzEwMTBlMGI3NDk5NjRlZmRlMTk4MTM2MjUzNg==
   data.tar.gz: !binary |-
-    NDI1YzVkZWQ0Yzg3NmYzZGE2NWUwYjYzNzY4ODdlNDIxYjI0NDUxMQ==
+    MWQ3ZDNjNzkwM2ExYzE1ZmE0NzZhNzdhNjNlYzJmZTBiOWFjMGVkNw==
 SHA512:
   metadata.gz: !binary |-
-    YTIxNWZmYzhiZDg0MDAyNzU0ZDZkZDFiMzI1MTkzNWVlNmE5NTdlNjA2M2Y2
-    YmVmYWQ2MmE5YTI0YTdlYTU4ZDhmZTgyYTMyMThmMGY3ODdmYmVkMTc0M2E5
-    ZmEzYzRmMjMxYzY5YmFlY2QyZTI3MDI4ZjAyZWYxZWVjMTk5OWM=
+    MTMxOGQzY2Y1Yzc1MWE3N2ZiY2Y4YWJkYWM4YWUwZWFiOWQ2ODMxNmQ2Y2Ux
+    YjNlMDVkOTQ1ZWMyYjZjYjIwYjY4MzI2MDVjYThhMDdhNjdlY2Y0MjUxYjUz
+    NDM3MGI4NDQwYWJjODhkZmM5ZjNmNTg1MGIwNGJhOGJhNmVlMmY=
   data.tar.gz: !binary |-
-    YjIxNDNiYzZkOTFiNjI0MTg0NmE4M2M2Mjc4YjNiY2RlMGMxODVmMTYxM2U0
-    ZGM0NzUwMGIxOWQ1OWU3ZDg3MGJhYjAyN2YxYjRhNTMxOGFjMjMwNTBlNzg1
-    ZmQzMDYzZTJiY2RlOGQ0MWI3MjkxZTg0MGNmODQzYzk5OTY5Y2E=
+    ZjVjYThhMWVjMDM4MmRmMzU3ZjEwZTM0YTVmMmEzM2E2OWJiY2FkYzY5MzM2
+    MDBiOTAwZmNhMzRiMmZmYmVlMGI4MDdiNmM2NmJkODE0MmI4NjE3NzEwODky
+    MTIzMjNjZjJkY2MzNzZhMDRjZjBhNTdjODY3MjQ4MzMyYTA3OTY=

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

@@ -5,10 +5,13 @@ module DPL
   class Provider
     module Heroku
       class API < Generic
+        attr_reader :build_id
+
         def push_app
           pack_archive
           upload_archive
           trigger_build
+          verify_build
         end
 
         def archive_file
@@ -28,10 +31,27 @@ module DPL
         def trigger_build
           log "triggering new deployment"
           response   = post(:builds, source_blob: { url: get_url, version: version })
+          @build_id  = response.fetch('id')
           stream_url = response.fetch('stream_url')
           context.shell "curl #{Shellwords.escape(stream_url)}"
         end
 
+        def verify_build
+          loop do
+            response = get("builds/#{build_id}/result")
+            exit_code = response.fetch('exit_code')
+            if exit_code.nil?
+              log "heroku build still pending"
+              sleep 5
+              next
+            elsif exit_code == 0
+              break
+            else
+              error "deploy failed, build exited with code #{exit_code}"
+            end
+          end
+        end
+
         def get_url
           source_blob.fetch("get_url")
         end
@@ -48,6 +68,17 @@ module DPL
           @version ||= options[:version] || context.env['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
         end
 
+        def get(subpath, options = {})
+          options = {
+            method: :get,
+            path: "/apps/#{option(:app)}/#{subpath}",
+            headers: { "Accept" => "application/vnd.heroku+json; version=edge" },
+            expects: [200]
+          }.merge(options)
+
+          api.request(options).body
+        end
+
         def post(subpath, body = nil, options = {})
           options = {
             method: :post,

data/spec/provider/heroku_api_spec.rb

@@ -31,4 +31,67 @@ describe DPL::Provider::Heroku do
       expect(provider.api).to eq(api)
     end
   end
+
+  describe "#trigger_build" do
+    let(:response_body) { {
+      "created_at" => "2012-01-01T12:00:00Z",
+      "id" => "abc",
+      "status" => "pending",
+      "stream_url" => "http://example.com/stream",
+      "updated_at" => "2012-01-01T12:00:00Z",
+      "user" => { "id" => "01234567-89ab-cdef-0123-456789abcdef", "email" => "username@example.com" }
+    } }
+    example do
+      expect(provider).to receive(:log).with('triggering new deployment')
+      expect(provider).to receive(:get_url).and_return 'http://example.com/source.tgz'
+      expect(provider).to receive(:version).and_return 'sha'
+      expect(provider).to receive(:post).with(
+        :builds, source_blob: {url: 'http://example.com/source.tgz', version: 'sha'}
+      ).and_return(response_body)
+      expect(provider.context).to receive(:shell).with('curl http://example.com/stream')
+      provider.trigger_build
+      expect(provider.build_id).to eq('abc')
+    end
+  end
+
+  describe "#verify_build" do
+    def response_body(status, exit_code)
+      {
+        "build" => {
+          "id" => "01234567-89ab-cdef-0123-456789abcdef",
+          "status" => status
+        },
+        "exit_code" => exit_code
+      }
+    end
+
+    before do
+      allow(provider).to receive(:build_id).and_return('abc')
+    end
+
+    context 'when build succeeds' do
+      example do
+        expect(provider).to receive(:get).with('builds/abc/result').and_return(response_body('succeeded', 0))
+        expect{ provider.verify_build }.not_to raise_error
+      end
+    end
+
+    context 'when build fails' do
+      example do
+        expect(provider).to receive(:get).with('builds/abc/result').and_return(response_body('failed', 1))
+        expect{ provider.verify_build }.to raise_error("deploy failed, build exited with code 1")
+      end
+    end
+
+    context 'when build is pending, then succeeds' do
+      example do
+        expect(provider).to receive(:get).with('builds/abc/result').and_return(response_body('pending', nil), response_body('succeeded', 0))
+        expect(provider).to receive(:log).with('heroku build still pending')
+        expect(provider).to receive(:sleep).with(5) # stub sleep
+        expect{ provider.verify_build }.not_to raise_error
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.10.travis.700.4
+  version: 1.7.10.travis.701.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec