dpl 1.6.7.travis.549.1 → 1.6.7.travis.552.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDE1ODI3OGVjODZiNzE4MGQ3M2I3NmU5NWVlYmUyM2ZhYjc2MWVjZQ==
+    MmE1MzRjYjdjOWVmZmZkZDVkNTM1NGU0Mzk2NDBjZjM3YWZkZDRlMw==
   data.tar.gz: !binary |-
-    ZGM3ODNlNTgyYTVkY2EyOWE3ZTI1Njc3NTA1YzEyYzA1N2NhMjZlMw==
+    OTNmNmY2ZGZkNWE0ZTZjYzMwZWY0YjcyZDkyYzRjZGQ4NGM4ODU4NA==
 SHA512:
   metadata.gz: !binary |-
-    ZTk4MDczMDI1NDhiNjhmNjFhODhlMGU1N2IyNTdhNmMwYzgwNDYzYWJhZjQ5
-    ZmM4OGQyMjAwMGMzMGZiYjc0ZjQxOWI4Y2NhOWMwMjhkMmJjZjA4MjU3NjRm
-    YjY1ZmQ4YWQ4ZGIzN2Y3ODhjZWIzYTRkNjk5NDk5ZmJiNjJkNGU=
+    MDI0Y2ZmYzM3ODg5OGRjYjg3YWIyY2ZhNjQ4NGMxYzU4MTAxMzQxZDQ2OTAy
+    MjUyYzg1YWI4Njk0OWJkYWRjZGE0ZGJiOTU2N2IwOGJmNDhmNjI1NjFkNWM2
+    NzQxYTU4NzVhZDI2Yzc2OTdmYzU5YWUwYWUwMWQ3ZjYxNjMxZDY=
   data.tar.gz: !binary |-
-    ZTkyYzNkNzVkMTFjYmYzNmNlMTE1MTdmNWQ4ZGMxYjRhMDJiMWY3ZjRjNTcw
-    ODExYjYzMzU3YmI5OGQ0MmY1M2U3MGVmODY5YTQzYTYzNzcxNDFjNmY4OTAx
-    ODViNzljMzY2OTQyN2Y1NDBjZjc1ZjMzNWJjMjJiZDk4ZTkyYTI=
+    N2JkNTM2Zjk3ZWE1M2ZiNzQwM2FkMDFmZmNiNjdhMTI2MGE5YTU1YmM4MjFi
+    MjZkMWVhZDNhNDc0Y2MwM2QzOGExMGIyMzVlYWI5MDA0ZGU3MjAyZDFkMjc3
+    ZTdjZjM1ZDJkOTdiZmQ1NGQwNTU3YzdhOWVhN2I2MzFmZDlkY2E=

data/lib/dpl/provider/heroku.rb

@@ -1,9 +1,10 @@
 module DPL
   class Provider
     module Heroku
-      autoload :Anvil, 'dpl/provider/heroku/anvil'
-      autoload :Git,   'dpl/provider/heroku/git'
-      autoload :GitDeployKey,   'dpl/provider/heroku/git_deploy_key'
+      autoload :Anvil,        'dpl/provider/heroku/anvil'
+      autoload :API,          'dpl/provider/heroku/api'
+      autoload :Git,          'dpl/provider/heroku/git'
+      autoload :GitDeployKey, 'dpl/provider/heroku/git_deploy_key'
 
       extend self
 

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

@@ -0,0 +1,84 @@
+require 'json'
+require 'shellwords'
+
+module DPL
+  class Provider
+    module Heroku
+      class API < Git
+        def needs_key?
+          false
+        end
+
+        def user
+          @user ||= api.get_user.body["email"]
+        end
+
+        def push_app
+          pack_archive
+          upload_archive
+          trigger_build
+        end
+
+        def archive_file
+          Shellwords.escape("#{ENV['HOME']}/.dpl.#{option(:app)}.tgz")
+        end
+
+        def pack_archive
+          log "creating application archive"
+          context.shell "tar -zcf #{archive_file} ."
+        end
+
+        def upload_archive
+          log "uploading application archive"
+          context.shell "curl #{Shellwords.escape(put_url)} -X PUT -H 'Content-Type:' --data-binary @#{archive_file}"
+        end
+
+        def trigger_build
+          log "triggering new deployment"
+          response   = post(:builds, source_blob: { url: get_url, version: version })
+          stream_url = response.fetch('stream_url')
+          context.shell "curl #{Shellwords.escape(stream_url)}"
+        end
+
+        def get_url
+          source_blob.fetch("get_url")
+        end
+
+        def put_url
+          source_blob.fetch("put_url")
+        end
+
+        def source_blob
+          @source_blog ||= post(:sources).fetch("source_blob")
+        end
+
+        def version
+          @version ||= begin
+            sha = ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
+            if ENV['TRAVIS_JOB_NUMBER']
+              "Travis Build ##{ENV['TRAVIS_JOB_NUMBER']} (#{sha})"
+            else
+              sha
+            end
+          end
+        end
+
+        def post(subpath, body = nil, options = {})
+          options = {
+            method: :post,
+            path: "/apps/#{option(:app)}/#{subpath}",
+            headers: { "Accept" => "application/vnd.heroku+json; version=edge" },
+            expects: [200, 201]
+          }.merge(options)
+
+          if body
+            options[:body]                    = JSON.dump(body)
+            options[:headers]['Content-Type'] = 'application/json'
+          end
+
+          api.request(options).body
+        end
+      end
+    end
+  end
+end

data/spec/provider/heroku_api_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'heroku-api'
+require 'dpl/provider/heroku'
+
+describe DPL::Provider::Heroku do
+  subject(:provider) do
+    described_class.new(DummyContext.new, :app => 'example', :key_name => 'key', :api_key => "foo", :strategy => "api")
+  end
+
+  describe "#ssh" do
+    it "doesn't require an ssh key" do
+      expect(provider.needs_key?).to eq(false)
+    end
+  end
+
+  describe "#api" do
+    it 'accepts an api key' do
+      api = double(:api)
+      expect(::Heroku::API).to receive(:new).with(:api_key => "foo").and_return(api)
+      expect(provider.api).to eq(api)
+    end
+
+    it 'accepts a user and a password' do
+      api = double(:api)
+      provider.options.update(:user => "foo", :password => "bar")
+      expect(::Heroku::API).to receive(:new).with(:user => "foo", :password => "bar").and_return(api)
+      expect(provider.api).to eq(api)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.6.7.travis.549.1
+  version: 1.6.7.travis.552.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -115,6 +115,7 @@ files:
 - lib/dpl/provider/hackage.rb
 - lib/dpl/provider/heroku.rb
 - lib/dpl/provider/heroku/anvil.rb
+- lib/dpl/provider/heroku/api.rb
 - lib/dpl/provider/heroku/git.rb
 - lib/dpl/provider/heroku/git_deploy_key.rb
 - lib/dpl/provider/modulus.rb
@@ -146,6 +147,7 @@ files:
 - spec/provider/gcs_spec.rb
 - spec/provider/hackage_spec.rb
 - spec/provider/heroku_anvil_spec.rb
+- spec/provider/heroku_api_spec.rb
 - spec/provider/heroku_git_deploy_key_spec.rb
 - spec/provider/heroku_git_spec.rb
 - spec/provider/modulus_spec.rb