okcomputer 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: eb0679c9b6364591f99fe66df0aae3976c423e6c
-  data.tar.gz: 5ace0ae36c733a321144cc3d6c4b59a9ce76ce72
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmUyZWZjYmIwYmMxYzYwMzg5ODVmZTU4NzFjNzBjNTY4ZGRmMWQyYQ==
+  data.tar.gz: !binary |-
+    M2ZmNjZmZTE2NTFjM2I1MTEwY2IxNTUxN2ExYzg2ZjY3OGI2MjE3Yg==
 SHA512:
-  metadata.gz: c5d670dfbecd8bce26f4a3d5689e45edb6c326bf3c7322b80131d67ce023f93b212fee219ded1482e790dc724e5a42fd0fbf7618eba8fea251275230bc2147c9
-  data.tar.gz: a6a3ab0895dda2a6decbee0f7559a20114df7503a81af5597a2773484c777b3f59f3c1825f1a81c0f196db66f8bb932e5d3b8b43495d4872072f9e62f2a9ac13
+  metadata.gz: !binary |-
+    YTBjMDFiMmI3OGU1MjhmNDhhZWM2ODVmMjJkYmRhNzA4ZTE3MzNkZTliNDIy
+    Y2ZmYTY1OTYxZmEwZGNmYzI3MjA2OTZlMDI5NDAzMjU3NzUzYzg4NWY5NTY2
+    ZDhmMzk2OTA5MmVlOTBhN2RlZjM3YzQ1MmNiNWVhMzQ2NWMwNjU=
+  data.tar.gz: !binary |-
+    MjNhMGVlM2M4ODYyOWY0ODczMmU3NDQ1OGYxN2MwNzdmOTA5NzAzNDQ1MjY0
+    Y2U1ZmJkMzRlMmQ0YzAzOTBhZDk3ZjRjNTU5MDg1NDhhYzU2NWVlODUxNmMz
+    NTNjZTMyYWU1YWFhMTZjZjQwMjQ5OWE5M2MxOGNmYWM0ZTdlNzQ=

data/lib/ok_computer/built_in_checks/elasticsearch_check.rb

@@ -1,7 +1,7 @@
 module OkComputer
   # This class performs a health check on an elasticsearch cluster using the
   # {cluster health API}[http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-health.html].
-  # 
+  #
   # It reports the cluster's name, number of nodes, and status (green, yellow,
   # or red). A cluster status of red is reported as a failure, since this means
   # one or more primary shards are unavailable. Note that the app may still
@@ -15,8 +15,7 @@ module OkComputer
     # request_timeout - How long to wait to connect before timing out. Defaults to 5 seconds.
     def initialize(host, request_timeout = 5)
       @host = URI(host)
-      health_url = URI("#{host}/_cluster/health")
-      super(health_url, request_timeout)
+      super("#{host}/_cluster/health", request_timeout)
     end
 
     # Public: Return the status of the elasticsearch cluster

data/lib/ok_computer/built_in_checks/http_check.rb

@@ -9,15 +9,14 @@ module OkComputer
   class HttpCheck < Check
     ConnectionFailed = Class.new(StandardError)
 
-    attr_accessor :url
-    attr_accessor :request_timeout
+    attr_accessor :url, :request_timeout, :basic_auth_username, :basic_auth_password
 
     # Public: Initialize a new HTTP check.
     #
     # url - The URL to check
     # request_timeout - How long to wait to connect before timing out. Defaults to 5 seconds.
     def initialize(url, request_timeout = 5)
-      self.url = URI(url)
+      parse_url(url)
       self.request_timeout = request_timeout.to_i
     end
 
@@ -36,10 +35,25 @@ module OkComputer
     # Otherwise raises a HttpCheck::ConnectionFailed error.
     def perform_request
       timeout(request_timeout) do
-        url.read(read_timeout: request_timeout)
+        url.read(
+          read_timeout: request_timeout,
+          http_basic_authentication: basic_auth_options
+        )
       end
     rescue => e
       raise ConnectionFailed, e
     end
+
+    def parse_url(url)
+      self.url = URI.parse(url)
+      if self.url.userinfo
+        self.basic_auth_username, self.basic_auth_password = self.url.userinfo.split(':')
+        self.url.userinfo = ''
+      end
+    end
+
+    def basic_auth_options
+      [self.basic_auth_username, self.basic_auth_password]
+    end
   end
 end

data/lib/ok_computer/built_in_checks/solr_check.rb

@@ -10,8 +10,7 @@ module OkComputer
     # request_timeout - How long to wait to connect before timing out. Defaults to 5 seconds.
     def initialize(host, request_timeout = 5)
       @host = URI(host)
-      ping_url ||= URI("#{host}/admin/ping")
-      super(ping_url, request_timeout)
+      super("#{host}/admin/ping", request_timeout)
     end
 
     # Public: Return the status of Solr

data/lib/ok_computer/version.rb

@@ -1,3 +1,3 @@
 module OkComputer
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

metadata

@@ -1,61 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: okcomputer
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Patrick Byrne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: "\n    Inspired by the simplicity of Fitter Happier, but frustrated by
-  its lack of\n    flexibility, we built OK Computer. Create and register your own
-  custom\n    health checks, or choose from the built-in library of checks to ensure
-  your\n    app is working as intended.\n  "
+description: ! "\n    Inspired by the simplicity of Fitter Happier, but frustrated
+  by its lack of\n    flexibility, we built OK Computer. Create and register your
+  own custom\n    health checks, or choose from the built-in library of checks to
+  ensure your\n    app is working as intended.\n  "
 email:
 - patrick.byrne@tstmedia.com
 executables: []
@@ -103,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple, extensible health-check monitor