escobar 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1813560ce76a2e6208a211818ed41cc6af48341
-  data.tar.gz: 065abff7ca3e49eba20feceec29742f829befe49
+  metadata.gz: bb04d677eebc0ac17e368692988dfd4f96064b7b
+  data.tar.gz: d97b59f78e386147c660c2c1c5890554c6fe096e
 SHA512:
-  metadata.gz: 1b4a44239c4f6642a2b1e78f1d475fbb5d0b1e2f9cfc2e7970dfbb8a939e4b907c34290ad36bf9f3aee3d7e2f392d6fb129213e3cfab031ba07a898a308f646e
-  data.tar.gz: 4806d3d2b1a44f5212a4885bb0b932fcf969f5906d7ff67bdac30cbe73e7552715476f4b5d0a8879fb3e8327dc5469377948ce673f880394f9022d5076fe6521
+  metadata.gz: fddf34ceb60477480a82ac4c4bec70f7cc412f144cbdf9247945a42adc133ee4eec4ddb66903e1cf3dc4e972e94dbc91ba2e98b311b72b537267058da652157f
+  data.tar.gz: 8998e4d80bdaf17c2601bfdc40bd739ca8187b922f796a44298c6a4b78a17d0415be1ad8e0d8614cb5e50659953ae6d82fc8089fc490851cca9370b934e720f5

data/lib/escobar/heroku/app.rb

@@ -36,6 +36,10 @@ module Escobar
         @config_vars ||= Escobar::Heroku::ConfigVars.new(client, id)
       end
 
+      def log_drains
+        @log_drains ||= client.heroku.get("/apps/#{id}/log-drains")
+      end
+
       def dashboard_url
         "https://dashboard.heroku.com/apps/#{name}"
       end
@@ -58,12 +62,11 @@ module Escobar
       end
 
       def direct_to_drain?
-        response = client.heroku.get("/apps/#{id}/log-drains")
-        !response.is_a?(Array)
-      rescue Escobar::Client::HTTPError => e
-        response = JSON.parse(e.response.body)
-        response["id"] == "forbidden" &&
-          response["message"].match(/This Private Space uses direct logging/)
+        !log_drains.is_a?(Array)
+      end
+
+      def drain_token
+        @drain_token ||= drain && drain["token"]
       end
 
       def log_url
@@ -73,6 +76,16 @@ module Escobar
       def build_request_for(pipeline)
         Escobar::Heroku::BuildRequest.new(pipeline, id)
       end
+
+      def drain
+        @drain ||= log_drains.find do |drain|
+          drain["url"].match(heroku_drain_url_pattern)
+        end
+      end
+
+      def heroku_drain_url_pattern
+        %r{forward\.log\.herokai\.com:9999|logs\.herokai\.com\/logs}
+      end
     end
   end
 end

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.3.19".freeze
+  VERSION = "0.3.20".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday