deimos 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f60324ff8d343c4dfe073ecc44312a7383279b2ce93a2dd518d482ca9159360
-  data.tar.gz: d3c02354039e9a9011f8e5121abc510ad1e562f7ccec7e9d978f4d9dcd53b6ad
+  metadata.gz: 6c5207cb6a1186d4fed8df2a7fba23b39819fbe0474cd7dc5734ed7ab337b161
+  data.tar.gz: d3884e15b4c88383ffc4a8b466eb790911f97285b74acda94e156c93025accbd
 SHA512:
-  metadata.gz: c7f1d3563fdd3fb9ac373ce203abbb58c89f7b4a238d011948ecbcfd27e8b7664fa176fcfc210cc2c67efb43641e940eb7a4ab9f291041ac3191add522fa255a
-  data.tar.gz: '03171858ec6022e602e8b589ac9e337186e1dd4bc63f257a70543b3ca144f754e8d808f2d2873a0fc9b54807e249a4b745d53e0b92c2ef5c2c51ba6d55eb5a78'
+  metadata.gz: 4a7824029d14dfa72b33359743d5a9f7def3cbbaa1a22c08aba38680a0761a68fa4a3905db1e8951982a8dc2081cefa52c7f15e36389c6719ae8885b05c81662
+  data.tar.gz: f06bb8e562a34f4073f5c25c864f0cadabbb0cee51b8e3f9f5fb4df30886200455f23ef8cc69f9f5155ad1c6067d395057579dc4f720ba154e24d0d1ea54512f

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    deimos (0.1.0)
+    deimos (0.2.4)
       activesupport
-      concurrent-ruby
+      concurrent-ruby (~> 1.1.0)
       huyegger
       prometheus-client
       sinatra
@@ -12,14 +12,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     backports (3.12.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     huyegger (0.4.4)
     i18n (1.6.0)
@@ -37,6 +37,8 @@ GEM
     rack (2.0.6)
     rack-protection (2.0.5)
       rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -75,6 +77,7 @@ DEPENDENCIES
   bundler (~> 1.16)
   deimos!
   pry
+  rack-test
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/lib/deimos/endpoints/status.rb

@@ -1,11 +1,16 @@
 module Deimos
   module Endpoints
     class Status < Sinatra::Application
+      def initialize(status:)
+        @status = status
+        super
+      end
+
       disable :logging
       set :logger, Deimos.logger
 
       get "/" do
-        status_runner = Deimos.status.run!
+        status_runner = @status.run!
 
         content_type :json
         status status_runner.status

data/lib/deimos/metrics/manager.rb

@@ -9,7 +9,12 @@ module Deimos
       }
 
       delegate :instrument, to: ActiveSupport::Notifications
-    
+      
+      attr_reader :registry
+      def initialize(registry: Prometheus::Client.registry)
+        @registry = registry
+      end
+
       def subscriptions
         @subscriptions ||= []
       end
@@ -18,10 +23,6 @@ module Deimos
         @collectors ||= {}
       end
 
-      def registry
-        @registry ||= Prometheus::Client.registry
-      end
-
       def subscribe(event_name, type:, label:, **kwargs, &block)
         Deimos.logger.info "Metrics: Subscribed to #{event_name}..."
         subscriptions << ActiveSupport::Notifications.subscribe(event_name) do |*args|
@@ -38,7 +39,7 @@ module Deimos
       private
 
       def register_collector!(event_name, type, about, **kwargs)
-        return collectors[event_name] if collectors[event_name].present?
+        return collectors[event_name] if collectors[event_name]
         name = event_name.gsub(".", "_").to_sym
         collectors[event_name] = TYPES[type].new(name, about, kwargs).tap { |x| registry.register(x) }
       end

data/lib/deimos/version.rb

@@ -1,3 +1,3 @@
 module Deimos
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/deimos.rb

@@ -60,8 +60,8 @@ module Deimos
 
   def applications
     @applications ||= {
-      "/status" => Deimos::Endpoints::Status,
-      "/metrics" => Deimos::Endpoints::Metrics
+      "/status" => Deimos::Endpoints::Status.new(status: status),
+      "/metrics" => Deimos::Endpoints::Metrics.new
     }.merge(config.applications)
   end
 
@@ -76,5 +76,5 @@ module Deimos
   def logger
     @logger ||= Huyegger::Logger.new(::Logger.new(STDOUT).tap {|x| x.level = config.log_level})
   end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Adam Carlile
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra