escobar 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 923902c750e029b0b46ecdda4bff5eb2960846b0
-  data.tar.gz: 4a95e5cc637b28ed6f0b38e19edca6e6cddd595c
+  metadata.gz: 43c11ea0237775c7cc976d2e875e1c65d7529e38
+  data.tar.gz: 84133f99aa2ec696eeb4a1c407972894b721f2a1
 SHA512:
-  metadata.gz: b28917db0f1ef6ca05efb1d53a3f135fdd6b6e3ac04741a129e963d8d0f4f131bf7a5f5c5202eb07254f0d6bbdb63ebba299373239bfe3ccf828b3efa3c311ea
-  data.tar.gz: 2b370d85d2f1137566dd50c7b5131c56a9f47ccbeaeddda04ec8a20b3dcb55647b91091ea40dc144646b0e53e23b1904f9a81cd39950f15b970d07c51986f483
+  metadata.gz: 3186ae4bc9555ff17682e04442b02a93d514f557d22b5e41a1880a935aec31812232cafadf0277b51123811439024ac3cb91beac10feb31373ec5221f415cc0e
+  data.tar.gz: 3db647aee08e12fcb1a48b5ffc8f28d0b64fcde32b99b270245dbe1160b76168fbcb2298f917efce219a9b187d69f95d906f83fd4c5538ffec49ae043ead371e

data/lib/escobar.rb

@@ -50,6 +50,7 @@ require_relative "./escobar/client"
 require_relative "./escobar/github/client"
 require_relative "./escobar/heroku/app"
 require_relative "./escobar/heroku/build"
+require_relative "./escobar/heroku/build_request"
 require_relative "./escobar/heroku/client"
 require_relative "./escobar/heroku/coupling"
 require_relative "./escobar/heroku/pipeline"

data/lib/escobar/heroku/app.rb

@@ -29,6 +29,10 @@ module Escobar
         response = client.heroku.get("/apps/#{id}/config-vars")
         response["id"] == "two_factor"
       end
+
+      def build_request_for(pipeline)
+        Escobar::Heroku::BuildRequest.new(pipeline, self)
+      end
     end
   end
 end

data/lib/escobar/heroku/build_request.rb

@@ -0,0 +1,154 @@
+module Escobar
+  module Heroku
+    # Class representing a heroku build request
+    class BuildRequest
+      # Class representing some failure when requesting a build
+      class Error < StandardError
+        attr_accessor :build_request
+
+        def self.new_from_build_request(build_request, message)
+          error = new(message)
+          error.build_request = build_request
+          error
+        end
+
+        def dashboard_url
+          "https://dashboard.heroku.com/apps/#{build_request.app.name}"
+        end
+      end
+
+      attr_reader :app, :github_deployment_url, :pipeline, :sha
+
+      attr_accessor :environment, :ref, :forced, :custom_payload
+
+      def initialize(pipeline, app)
+        @app      = app
+        @pipeline = pipeline
+      end
+
+      def error_for(message)
+        Error.new_from_build_request(self, message)
+      end
+
+      def create(task, environment, ref, forced, custom_payload)
+        if app.locked?
+          raise error_for("Application requires second factor: #{app.name}")
+        end
+
+        @environment = environment
+        @ref = ref
+        @forced = forced
+        @custom_payload = custom_payload
+
+        create_in_api(task)
+      end
+
+      def create_in_api(task)
+        create_github_deployment(task)
+
+        build = create_heroku_build
+        if build["id"] =~ Escobar::UUID_REGEX
+          process_heroku_build(build)
+        else
+          raise error_for(
+            "Unable to create heroku build for #{app.name}: #{build['message']}"
+          )
+        end
+      end
+
+      def process_heroku_build(build)
+        heroku_build = Escobar::Heroku::Build.new(
+          app.client, app, build["id"]
+        )
+
+        create_github_pending_deployment_status(heroku_build)
+
+        heroku_build.github_url = github_deployment_url
+        heroku_build.pipeline_name = pipeline.name
+        heroku_build.sha = sha
+
+        heroku_build
+      end
+
+      def create_heroku_build
+        body = {
+          source_blob: {
+            url: github_client.archive_link(sha),
+            version: sha[0..7],
+            version_description: "#{pipeline.github_repository}:#{sha}"
+          }
+        }
+        app.client.heroku.post("/apps/#{app.name}/builds", body)
+      end
+
+      def handle_github_deployment_response(response)
+        unless response["sha"]
+          raise error_for(
+            "Unable to create GitHub deployments for " \
+            "#{pipeline.github_repository}: #{response['message']}"
+          )
+        end
+
+        @sha = response["sha"]
+        @github_deployment_url = response["url"]
+        response
+      end
+
+      def create_github_deployment(task)
+        options = {
+          ref: ref,
+          task: task,
+          auto_merge: !forced,
+          payload: custom_payload.merge(custom_deployment_payload),
+          environment: environment,
+          required_contexts: required_commit_contexts
+        }
+        response = github_client.create_deployment(options)
+        handle_github_deployment_response(response)
+      end
+
+      def create_deployment_status(url, payload)
+        github_client.create_deployment_status(url, payload)
+      end
+
+      def create_github_pending_deployment_status(heroku_build)
+        create_github_deployment_status(
+          github_deployment_url,
+          heroku_build.dashboard_build_output_url,
+          "pending",
+          "Build running.."
+        )
+      end
+
+      def create_github_deployment_status(url, target_url, state, description)
+        payload = {
+          state: state,
+          target_url: target_url,
+          description: description
+        }
+        create_deployment_status(url, payload)
+      end
+
+      def custom_deployment_payload
+        { name: app.name, pipeline: pipeline.to_hash, provider: "slash-heroku" }
+      end
+
+      def required_commit_contexts
+        return [] if forced
+        github_client.required_contexts.map do |context|
+          if context == "continuous-integration/travis-ci"
+            context = "continuous-integration/travis-ci/push"
+          end
+          context
+        end
+      end
+
+      def github_client
+        @github_client ||= Escobar::GitHub::Client.new(
+          app.client.github_token,
+          pipeline.github_repository
+        )
+      end
+    end
+  end
+end

data/lib/escobar/heroku/pipeline.rb

@@ -92,43 +92,20 @@ module Escobar
       end
 
       # rubocop:disable Metrics/LineLength
-      def create_deployment_from(app, github_deployment, sha, build)
-        case build["id"]
-        when "two_factor"
-          description = "A second factor is required. Use your configured authenticator app or yubikey."
-          create_github_deployment_status(github_deployment["url"], nil, "failure", description)
-          raise ArgumentError, build["message"]
-        when Escobar::UUID_REGEX
-          heroku_build = Escobar::Heroku::Build.new(
-            client, app, build["id"]
-          )
-          heroku_build.github_url = github_deployment["url"]
-          heroku_build.pipeline_name = name
-          heroku_build.sha = sha
-
-          create_github_deployment_status(
-            github_deployment["url"],
-            heroku_build.dashboard_build_output_url,
-            "pending",
-            "Build running.."
-          )
-
-          heroku_build
-        else
-          raise ArgumentError, "Unable to create heroku build for #{name}"
-        end
-      end
-
       def create_deployment(ref, environment, force = false, custom_payload = {})
         app = environments[environment] && environments[environment].last
-        return({ error: "No '#{environment}' environment for #{name}." }) unless app
+        unless app
+          raise ArgumentError, "No '#{environment}' environment for #{name}."
+        end
+
+        heroku_app = app.app
 
-        github_deployment = create_github_deployment("deploy", ref, environment, force, custom_payload)
-        return({ error: github_deployment["message"] }) unless github_deployment["sha"]
+        build_request = heroku_app.build_request_for(self)
+        heroku_build = build_request.create(
+          "deploy", environment, ref, force, custom_payload
+        )
 
-        sha   = github_deployment["sha"]
-        build = create_heroku_build(app.name, sha)
-        create_deployment_from(app, github_deployment, sha, build)
+        heroku_build
       end
       # rubocop:enable Metrics/LineLength
 
@@ -160,20 +137,6 @@ module Escobar
         { name: name, pipeline: self.to_hash, provider: "slash-heroku" }
       end
 
-      def create_github_deployment(task, ref, environment, force, extras = {})
-        required_contexts = required_commit_contexts(force)
-
-        options = {
-          ref: ref,
-          task: task,
-          auto_merge: !force,
-          payload: extras.merge(custom_deployment_payload),
-          environment: environment,
-          required_contexts: required_contexts
-        }
-        github_client.create_deployment(options)
-      end
-
       def create_github_deployment_status(url, target_url, state, description)
         payload = {
           state: state,

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -178,6 +178,7 @@ files:
 - lib/escobar/github/client.rb
 - lib/escobar/heroku/app.rb
 - lib/escobar/heroku/build.rb
+- lib/escobar/heroku/build_request.rb
 - lib/escobar/heroku/client.rb
 - lib/escobar/heroku/coupling.rb
 - lib/escobar/heroku/pipeline.rb