escobar 0.2.2.pre3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2a510f255cf7e5e1d3979586716960d5dd9bc3f
-  data.tar.gz: 599a9088845f54d822d58cfdf351cb7942b049ac
+  metadata.gz: 923902c750e029b0b46ecdda4bff5eb2960846b0
+  data.tar.gz: 4a95e5cc637b28ed6f0b38e19edca6e6cddd595c
 SHA512:
-  metadata.gz: 78a531be9e75d38d2f56f49291809c2b6f90b4cf9f5105ca6b42f39a74457f405e6f17cdd49d7a3da8c205a6f898a7575e0babcd436e75c3a202964f8eb8caad
-  data.tar.gz: 7e768592916a29b1de3148ec4a08661d7fca3aed3216c70955f9570c1df5ff0e9dd62497ec9cacf4aac1018879cda46d15eb23087e98758e3e6a5764283ce5fb
+  metadata.gz: b28917db0f1ef6ca05efb1d53a3f135fdd6b6e3ac04741a129e963d8d0f4f131bf7a5f5c5202eb07254f0d6bbdb63ebba299373239bfe3ccf828b3efa3c311ea
+  data.tar.gz: 2b370d85d2f1137566dd50c7b5131c56a9f47ccbeaeddda04ec8a20b3dcb55647b91091ea40dc144646b0e53e23b1904f9a81cd39950f15b970d07c51986f483

data/.gitignore

@@ -12,3 +12,4 @@ tmp/.netrc
 .irb.history
 .env
 .ruby-version
+.byebug_history

data/.rubocop.yml

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

data/escobar.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "netrc", "~> 0.11"
 
   spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "guard-rspec", "~> 4.6.2"
-  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.5.0.beta2"
   spec.add_development_dependency "rubocop", "~> 0.38"

data/lib/escobar.rb

@@ -44,14 +44,12 @@ 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"
 require_relative "./escobar/github/client"
 require_relative "./escobar/heroku/app"
+require_relative "./escobar/heroku/build"
 require_relative "./escobar/heroku/client"
 require_relative "./escobar/heroku/coupling"
 require_relative "./escobar/heroku/pipeline"

data/lib/escobar/heroku/app.rb

@@ -20,94 +20,14 @@ module Escobar
         "https://dashboard.heroku.com/apps/#{name}"
       end
 
-      def locked?
-        response = client.heroku.get("/apps/#{id}/config-vars")
-        response["id"] == "two_factor"
-      end
-
       # Accepts either google authenticator or yubikey second_factor formatting
       def preauth(second_factor)
         !client.heroku.put("/apps/#{id}/pre-authorizations", second_factor).any?
       end
 
-      def create_build(ref, environment, force, custom_payload)
-        deployment = create_github_deployment("deploy", ref, environment,
-                                              force, custom_payload)
-
-        return({ error: deployment["message"] }) unless deployment["sha"]
-
-        sha   = github_deployment["sha"]
-        build = create_heroku_build(app.name, sha)
-        create_deployment_from(app, deployment, sha, build)
-      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)
-          { error: build["message"] }
-        when Escobar::Heroku::BuildRequestSuccess
-          target_url = "https://dashboard.heroku.com/apps/#{app.name}/" \
-                       "activity/builds/#{build['id']}"
-
-          create_github_deployment_status(github_deployment["url"],
-                                          target_url,
-                                          "pending",
-                                          "Build running..")
-          {
-            sha: sha,
-            name: name,
-            repo: github_repository,
-            app_id: app.name,
-            build_id: build["id"],
-            target_url: target_url,
-            deployment_url: github_deployment["url"]
-          }
-        else
-          { error: "Unable to create heroku build for #{name}" }
-        end
-      end
-      # rubocop:enable Metrics/LineLength
-
-      def create_heroku_build(app_name, sha)
-        body = {
-          source_blob: {
-            url: github_client.archive_link(sha),
-            version: sha[0..7],
-            version_description: "#{github_repository}:#{sha}"
-          }
-        }
-        client.heroku.post("/apps/#{app_name}/builds", body)
-      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,
-          target_url: target_url,
-          description: description
-        }
-        create_deployment_status(url, payload)
-      end
-
-      def create_deployment_status(url, payload)
-        github_client.create_deployment_status(url, payload)
+      def locked?
+        response = client.heroku.get("/apps/#{id}/config-vars")
+        response["id"] == "two_factor"
       end
     end
   end

data/lib/escobar/heroku/build.rb

@@ -0,0 +1,50 @@
+module Escobar
+  module Heroku
+    # Class representing a heroku build
+    class Build
+      attr_reader :app_id, :app_name, :client, :id
+
+      attr_accessor :command_id
+      attr_accessor :github_url
+      attr_accessor :pipeline_name
+      attr_accessor :sha
+
+      def initialize(client, app, id)
+        @id            = id
+        @app_id        = app.id
+        @app_name      = app.name
+        @client        = client
+      end
+
+      def info
+        @info ||= client.heroku.get("/apps/#{app_id}/builds/#{id}")
+      end
+
+      def dashboard_build_output_url
+        "https://dashboard.heroku.com/apps/#{app_name}/activity/builds/#{id}"
+      end
+
+      def repository_regex
+        %r{https:\/\/api\.github\.com\/repos\/([-_\.0-9a-z]+\/[-_\.0-9a-z]+)}
+      end
+
+      def repository
+        github_url.match(repository_regex)[1]
+      end
+
+      def to_job_json
+        {
+          sha: sha,
+          name: pipeline_name,
+          repo: repository,
+          app_id: app_id,
+          app_name: app_name,
+          build_id: id,
+          command_id: command_id,
+          target_url: dashboard_build_output_url,
+          deployment_url: github_url
+        }
+      end
+    end
+  end
+end

data/lib/escobar/heroku/pipeline.rb

@@ -91,20 +91,47 @@ module Escobar
         end
       end
 
-      def create_deployment(ref, environment, force = false, payload = {})
-        app = environments[environment] && environments[environment].last.app
-        if app
-          if !app.locked?
-            app.create_build(ref, environment, force, payload)
-          else
-            { error: "Application #{name} is locked by a second factor",
-              url: app.dashboard_url }
-          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
-          { error: "No '#{environment}' environment for #{name}." }
+          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
+
+        github_deployment = create_github_deployment("deploy", ref, environment, force, custom_payload)
+        return({ error: github_deployment["message"] }) unless github_deployment["sha"]
+
+        sha   = github_deployment["sha"]
+        build = create_heroku_build(app.name, sha)
+        create_deployment_from(app, github_deployment, sha, build)
+      end
+      # rubocop:enable Metrics/LineLength
+
       def get(path)
         response = kolkrabbi_client.get do |request|
           request.url path
@@ -119,6 +146,10 @@ module Escobar
         @kolkrabbi ||= Faraday.new(url: "https://#{ENV['KOLKRABBI_HOSTNAME']}")
       end
 
+      def create_deployment_status(url, payload)
+        github_client.create_deployment_status(url, payload)
+      end
+
       private
 
       def remote_repository
@@ -129,6 +160,40 @@ 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,
+          target_url: target_url,
+          description: description
+        }
+        create_deployment_status(url, payload)
+      end
+
+      def create_heroku_build(app_name, sha)
+        body = {
+          source_blob: {
+            url: github_client.archive_link(sha),
+            version: sha[0..7],
+            version_description: "#{github_repository}:#{sha}"
+          }
+        }
+        client.heroku.post("/apps/#{app_name}/builds", body)
+      end
+
       def github_client
         @github_client ||= Escobar::GitHub::Client.new(client.github_token,
                                                        github_repository)

data/lib/escobar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre3
+  version: 0.3.1
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - lib/escobar/client.rb
 - lib/escobar/github/client.rb
 - lib/escobar/heroku/app.rb
+- lib/escobar/heroku/build.rb
 - lib/escobar/heroku/client.rb
 - lib/escobar/heroku/coupling.rb
 - lib/escobar/heroku/pipeline.rb
@@ -196,9 +197,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1