okcomputer 1.17.4 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3e1e1a02dc10cd50d4c49bce44af5b1671fbfb52362862be5b0b10541890eb8
-  data.tar.gz: f0f153059d6da383f1abdc33bfe9cfdfadd38db34d2318f8aff2438280a4e677
+  metadata.gz: 964bccbd2510184da0f52827f5558f8745076a8c8725745a9c7659b04779c6db
+  data.tar.gz: 4525ecd9968072a9f2be2da58dbbe63d238e55800168e3e3b3b26006335f79a7
 SHA512:
-  metadata.gz: 5af9d11e510cabbd401e9c0623d598bf0b9269d891aeb1d919584a2391de6245c3370d841402e58f40a8ae520cad9e1fc748c8b2952af163a56d6b451ce718f8
-  data.tar.gz: 2fa2f6ddd543119e9747239bace7628233ad114bde1746c46d30b31a90faf72b4160a5ad3feae5b7ecb11d5a46fbec03d6431bdb69d15f35242acd34bb4c7faf
+  metadata.gz: 76d6c635b55919898267bcbdb48e4a2da3342c52316038427d6771d2f277890ddd88f9389a9016a41ee2c2c0e7cb28f7a1a1b2cf5a3535ba9122724fac8eb961
+  data.tar.gz: 4be31489a2a1bf21d5e91aff93f675cbbe75e30c2cfbeea3687faed27ab204965e1e75765fb7c02e0b57eb6620b8ae07824e596eff3520c607009608a9405443

data/README.markdown

@@ -17,6 +17,8 @@ OK Computer][blog].
 
 OkComputer currently supports the following Rails versions:
 
+* 6.1
+* 6.0
 * 5.2
 * 5.1
 * 4.2

data/app/controllers/ok_computer/ok_computer_controller.rb

@@ -42,7 +42,7 @@ module OkComputer
     end
 
     def status_code(check)
-      check.success? ? :ok : :error
+      check.success? ? :ok : :internal_server_error
     end
 
     def authenticate

data/lib/ok_computer/built_in_checks/app_version_check.rb

@@ -5,6 +5,21 @@ module OkComputer
   # * Otherwise, checks for Capistrano's REVISION file in the app root.
   # * Failing these, the check fails
   class AppVersionCheck < Check
+    attr_accessor :file
+    attr_accessor :env
+    attr_accessor :transform
+
+    # Public: Initialize a check for a backed-up Sidekiq queue
+    #
+    # file - The path of the version file to check
+    # env - The key in ENV to check for a revision SHA
+    # transform - The block to optionally transform the version string
+    def initialize(file: "REVISION", env: "SHA", &transform)
+      self.file = file
+      self.env = env
+      self.transform = transform || proc { |v| v }
+    end
+
     # Public: Return the application version
     def check
       mark_message "Version: #{version}"
@@ -17,21 +32,20 @@ module OkComputer
     #
     # Returns a String
     def version
-      version_from_env || version_from_file || raise(UnknownRevision)
+      transform.call(version_from_env || version_from_file || raise(UnknownRevision))
     end
 
     private
 
     # Private: Version stored in environment variable
     def version_from_env
-      ENV["SHA"]
+      ENV[env]
     end
 
     # Private: Version stored in Capistrano revision file
     def version_from_file
-      if File.exist?(Rails.root.join("REVISION"))
-        File.read(Rails.root.join("REVISION")).chomp
-      end
+      path = Rails.root.join(file)
+      File.read(path).chomp if File.exist?(path)
     end
 
     UnknownRevision = Class.new(StandardError)

data/lib/ok_computer/built_in_checks/neo4j_check.rb

@@ -6,7 +6,7 @@ module OkComputer
         connected = Neo4j::Session.current.connection.head.success?
         url = Neo4j::Session.current.connection.url_prefix.to_s
         mark_message "Connected to neo4j on #{url}" if connected
-      rescue Faraday::Error::ConnectionFailed => e
+      rescue Faraday::ConnectionFailed => e
         mark_failure
         mark_message "Error: #{e.message}"
       end

data/lib/ok_computer/version.rb

@@ -1,3 +1,3 @@
 module OkComputer
-  VERSION = '1.17.4'
+  VERSION = '1.18.4'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: okcomputer
 version: !ruby/object:Gem::Version
-  version: 1.17.4
+  version: 1.18.4
 platform: ruby
 authors:
 - Patrick Byrne
 - Andy Fleener
 - Chris Arcand
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ homepage: https://github.com/sportngin/okcomputer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,9 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A simple, extensible health-check monitor
 test_files: []