escobar 0.3.14 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 035950776942aaae20ca8e18c5f81c049c33d04f
-  data.tar.gz: 3e02f301fcc4ec2a6073f2add4b751638632d3d5
+  metadata.gz: a382144e7cf43964b7d536c12bae3f213e9f095a
+  data.tar.gz: f8f94fbdfb0520e0e9747d5e63f2385eb6634548
 SHA512:
-  metadata.gz: 83cae7d927fb2c220d90aba09a3686bd0968feb67eac7e873a6ee7bc12148c088c5359aa55a63e91ff4190e77d328169251d4e175fd852bc64f8c7e6ca11ab85
-  data.tar.gz: 00f5a6b7d2317100127c27ccaa5df9d738061d27e417b8d89ba8959fd11e1eefc6245a862c262ab0a2f6bd539a41f4cfd5358f6a4f7094b1d081dc1dcde03476
+  metadata.gz: cea58f14afa944e6cf7076e5fc0b6a9c506075e51ea1d196795de56cf27caf06728d0e995848d67b430ee66e25767f09994b68d793b8f44fa693a38590c17fdd
+  data.tar.gz: c14f2a2fd3b6b86a95ab9d940fe3114ad47dfc9b9482057f131c229261321465f65cc0d5aafc052a3434f7aedb36abfbd8a5dd73dd54843b897f83bfe859e649

data/lib/escobar/heroku/build_request.rb

@@ -17,6 +17,9 @@ module Escobar
         end
       end
 
+      class RequiresTwoFactorError < Error
+      end
+
       attr_reader :app_id, :github_deployment_url, :pipeline, :sha
 
       attr_accessor :environment, :ref, :forced, :custom_payload
@@ -39,9 +42,7 @@ module Escobar
       end
 
       def create(task, environment, ref, forced, custom_payload)
-        if app.locked?
-          raise error_for("Application requires second factor: #{app.name}")
-        end
+        raise_2fa_error if app.locked?
 
         @environment = environment
         @ref = ref
@@ -51,6 +52,11 @@ module Escobar
         create_in_api(task)
       end
 
+      def raise_2fa_error
+        message = "Application requires second factor: #{app.name}"
+        raise RequiresTwoFactorError.new_from_build_request(self, message)
+      end
+
       def create_in_api(task)
         create_github_deployment(task)
 

data/lib/escobar/heroku/dynos.rb

@@ -17,14 +17,18 @@ module Escobar
         @info ||= client.heroku.get("/apps/#{app_id}/dynos")
       end
 
+      def non_one_off
+        info.reject { |dyno| dyno["type"] == "run" }
+      end
+
       def running?(release_id)
-        info.all? do |dyno|
+        non_one_off.all? do |dyno|
           dyno["release"]["id"] == release_id && dyno["state"] == "up"
         end
       end
 
       def newer_than?(epoch)
-        info.all? do |dyno|
+        non_one_off.all? do |dyno|
           epoch < Time.parse(dyno["created_at"]).utc
         end
       end

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.3.14".freeze
+  VERSION = "0.3.16".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.16
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday