escobar 0.2.1 → 0.2.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4504457f5bf33b345fdb8250cff7d246a07c1102
-  data.tar.gz: 8780426f0b46903792a101954476e1781c9128f9
+  metadata.gz: 4dcb8494c5d1b49c14b50e2abb945e09dd9897f1
+  data.tar.gz: 3f7324892b8260c505f8384a6b381ab25711a4e6
 SHA512:
-  metadata.gz: afd9fbe836337dcdd8eaee118bb8e246a500ca1b65bd3a92acafd85b4a217383ec3426b9b744ea67bf9aaf70ec9b4cedb9b6c91c8be1987fc1883fdb67e432d8
-  data.tar.gz: 953d97c4041b6669c3caa9fb485e2c93a83b7db63a37f0e6daef3bf0a72e2278874072fd3d704b06e15759e50ffadae59c79472d84b9ee012c212b8a1df1e2e2
+  metadata.gz: 439e7e9ada1b84086594df5e4f65c2aae7772c63607dc3030ecbbfb27ed5f54a7b400136e112d186fd637180c86318d35978d6e5c17854c694e56aed52e051d6
+  data.tar.gz: 5c5c03b3acb0ab6e8ba30808d4f18744e6f24021c6b6fa78c31666e220dd8a6fdbd9504213cfceb09c714da71722b87a060cfd1e3c42ee662bbad11380375c0d

data/.gitignore

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

data/.rubocop.yml

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

data/lib/escobar/heroku/app.rb

@@ -20,10 +20,95 @@ 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)
+      end
     end
   end
 end

data/lib/escobar/heroku/pipeline.rb

@@ -91,44 +91,20 @@ module Escobar
         end
       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"]
-          }
+      def create_deployment(ref, environment, force = false, payload = {})
+        app = environments[environment] && environments[environment].last
+        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
         else
-          { error: "Unable to create heroku build for #{name}" }
+          { error: "No '#{environment}' environment 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
@@ -143,10 +119,6 @@ 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
@@ -157,40 +129,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,
-          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.1".freeze
+  VERSION = "0.2.2.pre1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2.pre1
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -196,9 +196,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1