health_check 2.5.0 → 2.6.0

data/CHANGELOG

@@ -1,5 +1,7 @@
 = Change Log =
 
+* 2.6.0
+ * Add named custom checks
 * 2.5.0
  * Added whitelist for IP# (Thanks Fernando Alvarez)
  * reworked whitelist PR

data/README.rdoc

@@ -114,6 +114,13 @@ To change the configuration of health_check, create a file `config/initializers/
         CustomHealthCheck.perform_check # any code that returns blank on success and non blank string upon failure
       end
 
+      # Add another custom check with a name, so you can call just specific custom checks. This can also be run using
+      # the standard 'custom' check.
+      # You can define multiple tests under the same name - they will be run one after the other.
+      config.add_custom_check('sometest') do
+        CustomHealthCheck.perform_another_check # any code that returns blank on success and non blank string upon failure
+      end
+
       # max-age of response in seconds
       # cache-control is public when max_age > 1 and basic_auth_username is not set
       # You can force private without authentication for longer max_age by

data/lib/health_check.rb

@@ -53,7 +53,7 @@ module HealthCheck
   mattr_accessor :custom_checks
   mattr_accessor :full_checks
   mattr_accessor :standard_checks
-  self.custom_checks = [ ]
+  self.custom_checks = { }
   self.full_checks = ['database', 'migrations', 'custom', 'email', 'cache', 'redis-if-present', 'sidekiq-redis-if-present', 'resque-redis-if-present', 's3-if-present']
   self.standard_checks = [ 'database', 'migrations', 'custom', 'emailconf' ]
 
@@ -63,8 +63,9 @@ module HealthCheck
 
   mattr_accessor :installed_as_middleware
 
-  def self.add_custom_check(&block)
-    custom_checks << block
+  def self.add_custom_check(name = 'custom', &block)
+    custom_checks[name] ||= [ ]
+    custom_checks[name] << block
   end
 
   def self.setup

data/lib/health_check/utils.rb

@@ -68,13 +68,21 @@ module HealthCheck
           when "middleware"
             errors << "Health check not called from middleware - probably not installed as middleware." unless called_from_middleware
           when "custom"
-            HealthCheck.custom_checks.each do |custom_check|
-              errors << custom_check.call(self)
+            HealthCheck.custom_checks.each do |name, list|
+              list.each do |custom_check|
+                errors << custom_check.call(self)
+              end
             end
           when "all", "full"
             errors << HealthCheck::Utils.process_checks(HealthCheck.full_checks, called_from_middleware)
           else
-            return "invalid argument to health_test."
+            if HealthCheck.custom_checks.include? check
+               HealthCheck.custom_checks[check].each do |custom_check|
+                 errors << custom_check.call(self)
+               end
+            else
+              return "invalid argument to health_test."
+            end
         end
       end
       return errors

data/lib/health_check/version.rb

@@ -1,3 +1,3 @@
 module HealthCheck
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

data/test/setup_railsapp

@@ -175,6 +175,11 @@ HealthCheck.setup do |config|
   config.add_custom_check do
     File.exists?("$custom_file") ? '' : '$custom_file is missing!'
   end
+
+  config.add_custom_check('pass') do
+    ''
+  end
+
 end
 !
 

data/test/test_with_railsapp

@@ -402,6 +402,13 @@ common_tests()
         echo
     fi
 
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING ${route_prefix}/pass should pass ..."
+        $testurl ${host}/${route_prefix}/pass 200 text/plain $success
+        echo
+    fi
+
     test_no=`expr 1 + $test_no`
     if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
         echo "${test_no}: TESTING ${route_prefix}/custom should pass ..."
@@ -440,6 +447,12 @@ common_tests()
         echo
     fi
 
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING ${route_prefix}/pass should pass even if other custom test returns string ..."
+        $testurl ${host}/${route_prefix}/pass 200 text/plain $success
+        echo
+    fi
+
     test_no=`expr 1 + $test_no`
     if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
         echo "${test_no}: TESTING ${route_prefix} (all) should fail when custom check fails ..."

metadata

@@ -1,72 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: health_check
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Ian Heggie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-description: "  \tSimple health check of Rails app for uptime monitoring with Pingdom,
+description: ! "  \tSimple health check of Rails app for uptime monitoring with Pingdom,
   NewRelic, EngineYard or uptime.openacs.org etc.\n"
 email:
 - ian@heggie.biz
@@ -75,9 +84,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".document"
-- ".gitignore"
-- ".travis.yml"
+- .document
+- .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
@@ -114,26 +123,27 @@ files:
 - test/testurl
 homepage: https://github.com/ianheggie/health_check
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple health check of Rails app for uptime monitoring with Pingdom, NewRelic,
   EngineYard or uptime.openacs.org etc.
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4b5a934dfee4618efc3d217163112b251e926879
-  data.tar.gz: 811fdba5dd439ef0016ca94c8c2b0b6dbac19a99
-SHA512:
-  metadata.gz: fd09549905a225cc3c25a02f295335dcb013cb565c52095d4b87e1fb4e74552d4231637d7a4e9b7698c28f896103cf529cd1aefbbf1089dfb1b161c650ca11da
-  data.tar.gz: 44fc64d17c2722c5bd3841d65dabf2bc5f55b0a61b01a862484ea79f4b64ebe29d4300667b5c6f572eb50f5c90c8be59bcb783517721c2de18e3bbdc54929f42