escobar 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 072e5a1bc94a5f953adb447a45e7703f4bfe0467
-  data.tar.gz: b8a9972fe4f9dce4fe5417840b015779c4c88275
+  metadata.gz: 01ad21160912979d47383fb8fb83da53afcae7ff
+  data.tar.gz: 290aaa0bf2c42725dc8367592a0674995f130348
 SHA512:
-  metadata.gz: 5e6ee165a7329ca2afb2993375ace8b53be9366cca8448bc49ede681ab15a33e4be7ec6c329fef0f50c90a44c75c282c3490cc32fbbe7094dab0dac6839ceb29
-  data.tar.gz: 7fb5e12910a483946bc8f209ba7dba6623852aae5922c006f5d59b9679be983f67722d52d9f97ba690bbf3e214460acc8b75f68db53b7d9186f94c70e5daa037
+  metadata.gz: 94f334a512cea6d0a66edbb92736c76f2f731aba2506fc3d537c12c7efaf34823a795f4b3cdb1e4627a2032eae00480a56e8b3163fa1f654b15748f06c7f9003
+  data.tar.gz: f4cb80571cb30c5f9be60e4cfa6e62e8a79cd0b010e83e76c3d14cc320eeaed3296020e0f931bf3dab23acc79edd67eab8d6996ee3a379d6bf8aaf7064639a98

data/lib/escobar/client.rb

@@ -21,67 +21,17 @@ module Escobar
 
     def pipelines
       @pipelines ||= heroku.get("/pipelines").map do |pipe|
-        Escobar::Heroku::Pipeline.new(heroku, pipe["id"], pipe["name"])
+        Escobar::Heroku::Pipeline.new(self, pipe["id"], pipe["name"])
       end
     end
 
-    def dashboard_url(name)
-      "https://dashboard.heroku.com/apps/#{name}"
-    end
-
     def reap_deployment(heroku_app_id, heroku_build_id)
       info = heroku.get("/apps/#{heroku_app_id}/builds/#{heroku_build_id}")
       case info["status"]
       when "succeeded", "failed"
         info
       else
-        false
-      end
-    end
-
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/LineLength
-    # rubocop:disable Metrics/MethodLength
-    def create_deployment(name, repo, ref, environment, force)
-      deployment             = Escobar::GitHub::Deployment.new(github.client)
-      deployment.ref         = ref
-      deployment.repo        = repo
-      deployment.force       = force
-      deployment.environment = environment
-
-      archive_link = deployment.archive_link
-
-      pipeline = self[name]
-      if pipeline
-        payload = pipeline.to_hash
-        payload[:name] = name
-        payload[:provider] = "slash-heroku"
-
-        github_deployment = deployment.create(payload)
-
-        body = {
-          source_blob: {
-            url: archive_link,
-            version: github_deployment.sha[0..7],
-            version_description: "#{deployment.repo}:#{github_deployment.sha}"
-          }
-        }
-
-        app = pipeline.environments[environment].last
-
-        build = heroku.post("/apps/#{app.name}/builds", body)
-        if build["id"]
-          status_payload = {
-            target_url: "#{dashboard_url(app.name)}/activity/builds/#{build['id']}",
-            description: "Deploying from slash-heroku"
-          }
-
-          deployment.create_status(github_deployment.url, "pending", status_payload)
-          {
-            app_id: app.name, build_id: build["id"],
-            deployment_url: github_deployment.url
-          }
-        end
+        nil
       end
     end
   end

data/lib/escobar/heroku/app.rb

@@ -13,7 +13,11 @@ module Escobar
       end
 
       def info
-        @info ||= client.get("/apps/#{id}")
+        @info ||= client.heroku.get("/apps/#{id}")
+      end
+
+      def dashboard_url
+        "https://dashboard.heroku.com/apps/#{name}"
       end
     end
   end

data/lib/escobar/heroku/pipeline.rb

@@ -49,8 +49,48 @@ module Escobar
       end
 
       def couplings!
-        client.get("/pipelines/#{id}/pipeline-couplings").map do |coupling|
-          Escobar::Heroku::Coupling.new(client, coupling)
+        client.heroku.get("/pipelines/#{id}/pipeline-couplings").map do |pc|
+          Escobar::Heroku::Coupling.new(client, pc)
+        end
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Metrics/MethodLength
+      def create_deployment(ref, environment, force)
+        deployment             = Escobar::GitHub::Deployment.new(client.github.client)
+        deployment.ref         = ref
+        deployment.repo        = github_repository
+        deployment.force       = force
+        deployment.environment = environment
+
+        archive_link = deployment.archive_link
+
+        payload = self.to_hash
+        payload[:name] = name
+        payload[:provider] = "slash-heroku"
+
+        github_deployment = deployment.create(payload)
+        body = {
+          source_blob: {
+            url: archive_link,
+            version: github_deployment.sha[0..7],
+            version_description: "#{deployment.repo}:#{github_deployment.sha}"
+          }
+        }
+        app = environments[environment].last
+        build = client.heroku.post("/apps/#{app.name}/builds", body)
+        if build["id"]
+          status_payload = {
+            target_url: "#{app.app.dashboard_url}/activity/builds/#{build['id']}",
+            description: "Deploying from slash-heroku"
+          }
+
+          deployment.create_status(github_deployment.url, "pending", status_payload)
+          {
+            app_id: app.name, build_id: build["id"],
+            deployment_url: github_deployment.url
+          }
         end
       end
 
@@ -58,7 +98,7 @@ module Escobar
         response = kolkrabbi.get do |request|
           request.url path
           request.headers["Content-Type"]  = "application/json"
-          request.headers["Authorization"] = "Bearer #{client.token}"
+          request.headers["Authorization"] = "Bearer #{client.heroku.token}"
         end
 
         JSON.parse(response.body)

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.1.7".freeze
+  VERSION = "0.1.9".freeze
 end

metadata

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