escobar 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 565dac00f0f4e159e17b700aa337db80c05957d0
-  data.tar.gz: d41e2099578502c68ee80ee4b6b3fbcc3f677ba7
+  metadata.gz: 215c4992c7b3c59638fa16b2c086228df83e32b2
+  data.tar.gz: a91f0086d93d2aac3b398b976ee879207d5b0609
 SHA512:
-  metadata.gz: ff14c4e3c5aec1c607bb314037886339692d4cc8f7f0c775083f347b6dc639e34a56343cbb55621e3d6d9a865536b92c1ee6bcdb8b1a1712181f0158449d27eb
-  data.tar.gz: a420c04e6df43198808782f6a06cb03d8ea30231f2ccb6a089c1b5d6e908f651545fb3a2f7c6e11397210242fa155753e4de7c195f53929b4b552b7cffdfb1ec
+  metadata.gz: ab9b5f92213cbac6e4deb86a3ad290781d12fdb8c1e43b0e79d29c5a0ae5729bdb5fc3fb838f4619c8aaab419fe94e6264164addd95fd94ae8c5ed705f26797e
+  data.tar.gz: 618b14a920e91853aaff09c29a92b28d01cd76e26126faf37ba57df84de6d6f28b87e09ca0354743579d2c1436260cb3dd8d3f0fdfbf05a780638e5d693efc8f

data/lib/escobar.rb

@@ -5,6 +5,8 @@ require "escobar/version"
 
 # Top-level module for Escobar code
 module Escobar
+  UUID_REGEX = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+
   def self.netrc
     @netrc ||= begin
                  if env_netrc
@@ -42,6 +44,9 @@ module Escobar
   def self.github_api_token
     netrc["api.github.com"]["password"]
   end
+  module Heroku
+    BuildRequestSuccess = Escobar::UUID_REGEX
+  end
 end
 
 require_relative "./escobar/client"

data/lib/escobar/client.rb

@@ -11,6 +11,13 @@ module Escobar
       @heroku = Escobar::Heroku::Client.new(heroku_token)
     end
 
+    # mask password
+    def inspect
+      inspected = super
+      inspected = inspected.gsub! @github_token, "*******" if @github_token
+      inspected
+    end
+
     def [](key)
       pipelines.find { |pipeline| pipeline.name == key }
     end

data/lib/escobar/github/client.rb

@@ -8,6 +8,13 @@ module Escobar
         @name_with_owner = name_with_owner
       end
 
+      # mask password
+      def inspect
+        inspected = super
+        inspected = inspected.gsub! @token, "*******" if @token
+        inspected
+      end
+
       def whoami
         client.get("/user")
       end

data/lib/escobar/heroku/pipeline.rb

@@ -37,12 +37,9 @@ module Escobar
         }
       end
 
-      def repository
-        @repository ||= get("/pipelines/#{id}/repository")
-      end
-
       def github_repository
-        repository["repository"] && repository["repository"]["name"]
+        remote_repository["repository"] &&
+          remote_repository["repository"]["name"]
       end
 
       def couplings
@@ -55,8 +52,52 @@ module Escobar
         end
       end
 
-      def github_archive_link(ref)
-        github_client.archive_link(ref)
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/LineLength
+      def create_deployment(ref, environment, force = false, custom_payload = {})
+        app = environments[environment] && environments[environment].last
+        return({ error: "No '#{environment}' environment for #{name}." }) unless app
+
+        github_deployment = create_github_deployment("deploy", ref, environment, force, custom_payload)
+        return({ error: github_deployment["message"] }) unless github_deployment["sha"]
+
+        build = create_heroku_build(app.name, github_deployment["sha"])
+        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)
+          return({ error: build["message"] })
+        when Escobar::Heroku::BuildRequestSuccess
+          path = "/apps/#{app.name}/activity/builds/#{build['id']}"
+          target_url = "https://dashboard.heroku.com#{path}"
+
+          create_github_deployment_status(github_deployment["url"], target_url, "pending", "Build running..")
+          { app_id: app.name, build_id: build["id"], deployment_url: github_deployment["url"] }
+        else
+          return({ error: "Unable to create heroku build for #{name}" })
+        end
+      end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/LineLength
+
+      def get(path)
+        response = kolkrabbi.get do |request|
+          request.url path
+          request.headers["Content-Type"]  = "application/json"
+          request.headers["Authorization"] = "Bearer #{client.heroku.token}"
+        end
+
+        JSON.parse(response.body)
+      end
+
+      def kolkrabbi
+        @kolkrabbi ||= Faraday.new(url: "https://#{ENV['KOLKRABBI_HOSTNAME']}")
+      end
+
+      private
+
+      def remote_repository
+        @remote_repository ||= get("/pipelines/#{id}/repository")
       end
 
       def github_client
@@ -68,7 +109,7 @@ module Escobar
         { name: name, pipeline: self.to_hash, provider: "slash-heroku" }
       end
 
-      def create_github_deployment(task, ref, environment, force = false, extras = {})
+      def create_github_deployment(task, ref, environment, force, extras = {})
         options = {
           ref: ref,
           task: task,
@@ -80,56 +121,25 @@ module Escobar
         github_client.create_deployment(options)
       end
 
-      def create_github_deployment_status(deployment_url, name, build_id, state)
-        path    = "/apps/#{name}/activity/builds/#{build_id}"
+      def create_github_deployment_status(url, target_url, state, description)
         payload = {
           state: state,
-          target_url: "https://dashboard.heroku.com#{path}",
-          description: "Deploying from escobar-#{Escobar::VERSION}"
+          target_url: target_url,
+          description: description
         }
-        github_client.create_deployment_status(deployment_url, payload)
+        github_client.create_deployment_status(url, payload)
       end
 
       def create_heroku_build(app_name, sha)
         body = {
           source_blob: {
-            url: github_archive_link(sha),
+            url: github_client.archive_link(sha),
             version: sha[0..7],
             version_description: "#{github_repository}:#{sha}"
           }
         }
         client.heroku.post("/apps/#{app_name}/builds", body)
       end
-
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/LineLength
-      def create_deployment(ref, environment, force)
-        app = environments[environment] && environments[environment].last
-        return({ error: "No '#{environment}' environment for #{name}." }) unless app
-
-        github_deployment = create_github_deployment("deploy", ref, environment, force)
-        return({ error: github_deployment["message"] }) unless github_deployment["sha"]
-
-        build = create_heroku_build(app.name, github_deployment["sha"])
-        return({ error: "Unable to create heroku build for #{name}" }) unless build["id"]
-
-        create_github_deployment_status(github_deployment["url"], app.name, build["id"], "pending")
-        { app_id: app.name, build_id: build["id"], deployment_url: github_deployment["url"] }
-      end
-
-      def get(path)
-        response = kolkrabbi.get do |request|
-          request.url path
-          request.headers["Content-Type"]  = "application/json"
-          request.headers["Authorization"] = "Bearer #{client.heroku.token}"
-        end
-
-        JSON.parse(response.body)
-      end
-
-      def kolkrabbi
-        @kolkrabbi ||= Faraday.new(url: "https://#{ENV['KOLKRABBI_HOSTNAME']}")
-      end
     end
   end
 end

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.1.16".freeze
+  VERSION = "0.1.17".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Corey Donohoe