escobar 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c89c1fd4c830261563b696dbcaf93580e6fe492b
-  data.tar.gz: 9ddd3f3422dd5e909c59801bfe8aec4cb11cc75a
+  metadata.gz: f6c82bbf2a9b06a2b1cf46a6690fa5482d359b71
+  data.tar.gz: 36ebeb8e9e8eb19cdaf4351b048e42280e0823af
 SHA512:
-  metadata.gz: 7ce23af22cf18a5591f5c8de390d916a70cde993e038ca3ead37cb5009aa29e71fd584fddf9632fe289f79aa33c4a116a5f6f18deebbd943630373c104e035ed
-  data.tar.gz: 3a5ce8685f823ac731bb2ac6ddf2431eb1fb3061523fb24ee7afe796f3c492cc1c4724e0182fec205e720324d48ef5c027dd050b27b30754f577c4186d7d393d
+  metadata.gz: f1852e5d8f58f604587b69b5b2ef3818ac6b35f14698e85efbb2d3f59b17e42cba05f42b250405002909ab47122466cc7caf797d42c27b8c73d2177ef1cd5d54
+  data.tar.gz: 832138ca0c62be560ac8ba4bd9761b9cd004bb3e3523ebd85c5dfe91670afaa90e2b20af0e0a00c00a8e4de2e8282a08f9200f4af8bc557f3701227d0bb84d1c

data/.rubocop.yml

@@ -42,7 +42,7 @@ Documentation:
     - !ruby/regexp /spec\/*\/*/
 
 ClassLength:
-  Max: 100
+  Max: 125
   Exclude:
     - !ruby/regexp /spec\/*\/*/
 

data/escobar.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday", "~> 0.9.2"
   spec.add_dependency "netrc", "~> 0.11"
-  spec.add_dependency "octokit", "~> 4.3.0"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "guard-rspec", "~> 4.6.2"

data/lib/escobar/client.rb

@@ -5,9 +5,9 @@ module Escobar
       new(Escobar.github_api_token, Escobar.heroku_api_token)
     end
 
-    attr_reader :github, :heroku
+    attr_reader :github_token, :heroku
     def initialize(github_token, heroku_token)
-      @github = Escobar::GitHub::Client.new(github_token)
+      @github_token = github_token
       @heroku = Escobar::Heroku::Client.new(heroku_token)
     end
 

data/lib/escobar/github/client.rb

@@ -2,17 +2,78 @@ module Escobar
   module GitHub
     # Top-level class for interacting with GitHub API
     class Client
-      attr_reader :client
-      def initialize(token)
-        @client = Octokit::Client.new(access_token: token)
+      attr_reader :name_with_owner, :token
+      def initialize(token, name_with_owner)
+        @token           = token
+        @name_with_owner = name_with_owner
       end
 
       def whoami
         client.get("/user")
       end
 
-      def archive_link(name_with_owner, ref)
-        client.archive_link(name_with_owner, ref: ref)
+      def archive_link(ref)
+        path = "/repos/#{name_with_owner}/tarball/#{ref}"
+        response = http_method(:head, path)
+        response && response.headers && response.headers["Location"]
+      end
+
+      def create_deployment(options)
+        body = {
+          ref: options[:ref] || "master",
+          task: "deploy",
+          auto_merge: false,
+          required_contexts: [],
+          payload: options[:payload] || {},
+          environment: options[:environment] || "staging",
+          description: "Shipped from chat with slash-heroku"
+        }
+        post("/repos/#{name_with_owner}/deployments", body)
+      end
+
+      def create_deployment_status(url, payload)
+        uri = URI.parse(url)
+        post("#{uri.path}/statuses", payload)
+      end
+
+      def head(path)
+        http_method(:head, path)
+      end
+
+      def get(path)
+        response = http_method(:get, path)
+        JSON.parse(response.body)
+      rescue StandardError
+        response && response.body
+      end
+
+      def http_method(verb, path)
+        client.send(verb) do |request|
+          request.url path
+          request.headers["Accept"] = "application/vnd.github+json"
+          request.headers["Content-Type"] = "application/json"
+          request.headers["Authorization"] = "token #{token}"
+        end
+      end
+
+      def post(path, body)
+        response = client.post do |request|
+          request.url path
+          request.headers["Accept"] = "application/vnd.github+json"
+          request.headers["Content-Type"] = "application/json"
+          request.headers["Authorization"] = "token #{token}"
+          request.body = body.to_json
+        end
+
+        JSON.parse(response.body)
+      rescue StandardError
+        response && response.body
+      end
+
+      private
+
+      def client
+        @client ||= Faraday.new(url: "https://api.github.com")
       end
     end
   end

data/lib/escobar/heroku/pipeline.rb

@@ -54,47 +54,66 @@ module Escobar
         end
       end
 
+      def github_archive_link(ref)
+        github_client.archive_link(ref)
+      end
+
+      def github_client
+        @github_client ||= Escobar::GitHub::Client.new(client.github_token,
+                                                       github_repository)
+      end
+
+      def create_github_deployment(task, ref, environment, force)
+        options = {
+          ref: ref,
+          task: task,
+          environment: environment,
+          required_contexts: [],
+          auto_merge: !force,
+          payload: {
+            name: name,
+            provider: "slash-heroku",
+            pipeline: self.to_hash
+          }
+        }
+        github_client.create_deployment(options)
+      end
+
+      def create_github_deployment_status(deployment_url, name, build_id, state)
+        path    = "/apps/#{name}/activity/builds/#{build_id}"
+        payload = {
+          state: state,
+          target_url: "https://dashboard.heroku.com/#{path}",
+          description: "Deploying from escobar-#{Escobar::VERSION}"
+        }
+        github_client.create_deployment_status(deployment_url, payload)
+      end
+
+      def create_heroku_build(app_name, sha)
+        body = {
+          source_blob: {
+            url: github_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
-      # 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
+        app = environments[environment] && environments[environment].last
+        return({ error: "No #{environment} for #{name}." }) unless app
 
-        archive_link = deployment.archive_link
+        github_deployment = create_github_deployment("deploy", ref, environment, force)
+        return({ error: github_deployment["message"] }) unless github_deployment["sha"]
 
-        app = environments[environment] && environments[environment].last
-        if app
-          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}"
-            }
-          }
+        build = create_heroku_build(app.name, github_deployment["sha"])
+        return({ error: "Unable to create heroku build for #{name}" }) unless build["id"]
 
-          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
+        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)

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.1.12".freeze
+  VERSION = "0.1.13".freeze
 end

data/lib/escobar.rb

@@ -1,6 +1,5 @@
 require "netrc"
 require "faraday"
-require "octokit"
 require "json"
 require "escobar/version"
 
@@ -47,7 +46,6 @@ end
 
 require_relative "./escobar/client"
 require_relative "./escobar/github/client"
-require_relative "./escobar/github/deployment"
 require_relative "./escobar/heroku/app"
 require_relative "./escobar/heroku/client"
 require_relative "./escobar/heroku/coupling"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Corey Donohoe
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +176,6 @@ files:
 - lib/escobar.rb
 - lib/escobar/client.rb
 - lib/escobar/github/client.rb
-- lib/escobar/github/deployment.rb
 - lib/escobar/heroku/app.rb
 - lib/escobar/heroku/client.rb
 - lib/escobar/heroku/coupling.rb

data/lib/escobar/github/deployment.rb

@@ -1,34 +0,0 @@
-module Escobar
-  module GitHub
-    # Class to create a Deployment record on GitHub
-    class Deployment
-      attr_accessor :client, :environment, :force, :ref, :repo
-      def initialize(client)
-        @client = client
-      end
-
-      def payload(custom_payload)
-        {
-          task: "deploy",
-          payload: custom_payload,
-          auto_merge: !force,
-          required_contexts: [],
-          environment: "staging",
-          description: "Shipped from chat with slash-heroku"
-        }
-      end
-
-      def archive_link
-        client.archive_link(repo, ref: ref)
-      end
-
-      def create(custom_payload)
-        client.create_deployment(repo, ref, payload(custom_payload))
-      end
-
-      def create_status(url, state, extra_payload)
-        client.create_deployment_status(url, state, extra_payload)
-      end
-    end
-  end
-end