rails_health_check 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece3b0c5fed38d6c9ccc1e60600284733553b5ae6caa8eaa40f4da34b1cf0339
-  data.tar.gz: 146bc1328a9f22300105500be926fe1d3cb982ae0f7410cfc725fa961e66062c
+  metadata.gz: 4569367e3c910ab49259c4744fff38cc16a741696462f56526db2a20b6e35993
+  data.tar.gz: 28de3529ecc64a42d682d52880597f8e0dd4a7f574543dac40c60955fcfbe3bf
 SHA512:
-  metadata.gz: 8cd5439d276daf70a246f73d17df6fc5768881360018a488b5804149ddee18d384da602aaa99080f7ac715517a86bd83f3425165b1e5bd1c3126ae695d72c3f9
-  data.tar.gz: e7e76f22b9f8a6fe74d8b3fcbb3e4cc072ea2186cfb55d9b8a0d7a3b89b4b9af6b14a588a7266fe6d5146f11e86a07a0e2e8bc037d364da5b5cd8f5cf19d3396
+  metadata.gz: 884d6565824e9e9ae2d57b4fc5e5a6ec7f74a4cdcaed9f00360e220d788c7a13e9a6a2725e05efd41b0ece8397f95f2f2ca27d60d46488d204096eccc959bda6
+  data.tar.gz: 5c15d9b7a2bf2108fdcf64b46a67e15b860e870f25a7b17177675ad6fefaa629e12f4fe2f46f9542fc0741d83fb5a5687111ea3fab7b0423e18eabd82c8749f2

data/.rubocop.yml

@@ -0,0 +1,5 @@
+---
+Metrics/LineLength:
+  Enabled: false
+Style/Documentation:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in health_check.gemspec
@@ -6,8 +8,8 @@ gemspec
 
 group :development, :test do
   if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
     gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'jruby-openssl'
   else
     gem 'sqlite3', '~> 1.3.7'
   end
@@ -16,5 +18,4 @@ group :development, :test do
   # mime-types 2.0 requires Ruby version >= 1.9.2
   # mime-types 3.0 requires Ruby version >= 2.0
   gem 'mime-types', defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' ? '< 3' : '>= 3.0'
-
 end

data/Rakefile

@@ -1,14 +1,16 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
-#require 'rubygems'
+require 'bundler/gem_tasks'
+
+# require 'rubygems'
 require 'rake'
 
-#tests as gem
+# tests as gem
 task :test do
   exec '/bin/bash', './test/test_with_railsapp'
 end
 
-task :default => :test
+task default: :test
 
 begin
   gem 'rdoc'
@@ -25,5 +27,5 @@ begin
     rdoc.rdoc_files.include('lib/**/*.rb')
   end
 rescue Gem::LoadError
-  puts "rdoc (or a dependency) not available. Install it with: gem install rdoc"
+  puts 'rdoc (or a dependency) not available. Install it with: gem install rdoc'
 end

data/Vagrantfile

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
+
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.configure("2") do |config|
+Vagrant.configure('2') do |config|
   # For a complete reference, please see the online documentation at
   # https://docs.vagrantup.com.
 
-  config.vm.box = "ubuntu/xenial64"
+  config.vm.box = 'ubuntu/xenial64'
 
-  # set auto_update to false, if you do NOT want to check the correct 
+  # set auto_update to false, if you do NOT want to check the correct
   # additions version when booting this machine
   config.vbguest.auto_update = false
-    
+
   # do NOT download the iso file from a webserver
   config.vbguest.no_remote = true
 
   # provision with a shell script.
-  config.vm.provision "shell", path: "./test/provision_vagrant"
-
+  config.vm.provision 'shell', path: './test/provision_vagrant'
 end

data/config/routes.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 unless HealthCheck::Engine.routes_explicitly_defined
   Rails.application.routes.draw do
-    add_health_check_routes()
+    add_health_check_routes
   end
 end

data/health_check.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |gem|
   gem.authors       = ['Ian Heggie']
   gem.email         = ['ian@heggie.biz']
   gem.summary = 'Simple health check of Rails app for uptime monitoring with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.'
-  gem.description = <<-EOF
+  gem.description = <<-EOD
   	Fork of https://github.com/ianheggie/health_check.
     Simple health check of Rails app for uptime monitoring with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
-  EOF
+  EOD
   gem.homepage      = 'https://github.com/FinalCAD/health_check'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)

data/init.rb

@@ -1,2 +1,3 @@
-require 'health_check'
+# frozen_string_literal: true
 
+require 'health_check'

data/lib/health_check.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2013 Ian Heggie, released under the MIT license.
 # See MIT-LICENSE for details.
 
 module HealthCheck
-
   class Engine < Rails::Engine
-    cattr_accessor :routes_explicitly_defined 
+    cattr_accessor :routes_explicitly_defined
   end
 
   # Text output upon success
   mattr_accessor :success
-  self.success = "success"
+  self.success = 'success'
 
   # Text output upon failure
   mattr_accessor :failure
-  self.failure = "failure"
+  self.failure = 'failure'
 
   # Timeout in seconds used when checking smtp server
   mattr_accessor :smtp_timeout
@@ -57,13 +58,13 @@ 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' ]
+  self.standard_checks = %w[database migrations custom emailconf]
 
   # Middleware based checks
   mattr_accessor :middleware_checks
-  self.middleware_checks = [ 'middleware' ]
+  self.middleware_checks = ['middleware']
 
   mattr_accessor :installed_as_middleware
 
@@ -77,14 +78,13 @@ module HealthCheck
   self.include_error_in_response_body = true
 
   def self.add_custom_check(name = 'custom', &block)
-    custom_checks[name] ||= [ ]
+    custom_checks[name] ||= []
     custom_checks[name] << block
   end
 
   def self.setup
     yield self
   end
-
 end
 
 require 'health_check/version'

data/lib/health_check/base_health_check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BaseHealthCheck
   def create_error(check_type, error_message)
     "[#{check_type} - #{error_message}] "

data/lib/health_check/health_check_controller.rb

@@ -1,21 +1,20 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2013 Ian Heggie, released under the MIT license.
 # See MIT-LICENSE for details.
 
 module HealthCheck
   class HealthCheckController < ActionController::Base
-
-    layout false if self.respond_to? :layout
+    layout false if respond_to? :layout
     before_action :check_origin_ip
     before_action :authenticate
 
     def index
       last_modified = Time.now.utc
       max_age = HealthCheck.max_age
-      if max_age > 1
-        last_modified = Time.at((last_modified.to_f / max_age).floor * max_age).utc
-      end
-      public = (max_age > 1) && ! HealthCheck.basic_auth_username
-      if stale?(:last_modified => last_modified, :public => public)
+      last_modified = Time.at((last_modified.to_f / max_age).floor * max_age).utc if max_age > 1
+      public = (max_age > 1) && !HealthCheck.basic_auth_username
+      if stale?(last_modified: last_modified, public: public)
         checks = params[:checks] ? params[:checks].split('_') : ['standard']
         checks -= HealthCheck.middleware_checks if HealthCheck.installed_as_middleware
         begin
@@ -30,9 +29,7 @@ module HealthCheck
           msg = HealthCheck.include_error_in_response_body ? "health_check failed: #{errors}" : nil
           send_response false, msg, HealthCheck.http_status_for_error_text, HealthCheck.http_status_for_error_object
           # Log a single line as some uptime checkers only record that it failed, not the text returned
-          if logger
-            logger.info msg
-          end
+          logger&.info msg
         end
       end
     end
@@ -41,17 +38,18 @@ module HealthCheck
 
     def send_response(healthy, msg, text_status, obj_status)
       msg ||= healthy ? HealthCheck.success : HealthCheck.failure
-      obj = { :healthy => healthy, :message => msg}
+      obj = { healthy: healthy, message: msg }
       respond_to do |format|
-        format.html { render :plain => msg, :status => text_status, :content_type => 'text/plain' }
-        format.json { render :json => obj, :status => obj_status }
-        format.xml { render :xml => obj, :status => obj_status }
-        format.any { render :plain => msg, :status => text_status, :content_type => 'text/plain' }
+        format.html { render plain: msg, status: text_status, content_type: 'text/plain' }
+        format.json { render json: obj, status: obj_status }
+        format.xml { render xml: obj, status: obj_status }
+        format.any { render plain: msg, status: text_status, content_type: 'text/plain' }
       end
     end
 
     def authenticate
       return unless HealthCheck.basic_auth_username && HealthCheck.basic_auth_password
+
       authenticate_or_request_with_http_basic('Health Check') do |username, password|
         username == HealthCheck.basic_auth_username && password == HealthCheck.basic_auth_password
       end
@@ -59,10 +57,10 @@ module HealthCheck
 
     def check_origin_ip
       unless HealthCheck.origin_ip_whitelist.blank? ||
-          HealthCheck.origin_ip_whitelist.include?(request.ip)
-        render :plain => 'Health check is not allowed for the requesting IP',
-               :status => HealthCheck.http_status_for_ip_whitelist_error,
-               :content_type => 'text/plain'
+             HealthCheck.origin_ip_whitelist.include?(request.ip)
+        render plain: 'Health check is not allowed for the requesting IP',
+               status: HealthCheck.http_status_for_ip_whitelist_error,
+               content_type: 'text/plain'
       end
     end
 
@@ -70,6 +68,5 @@ module HealthCheck
     def protect_against_forgery?
       false
     end
-
   end
 end

data/lib/health_check/health_check_routes.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module ActionDispatch::Routing
   class Mapper
-
     def health_check_routes(prefix = nil)
       HealthCheck::Engine.routes_explicitly_defined = true
       add_health_check_routes(prefix)
@@ -8,8 +9,7 @@ module ActionDispatch::Routing
 
     def add_health_check_routes(prefix = nil)
       HealthCheck.uri = prefix if prefix
-      match "#{HealthCheck.uri}(/:checks)(.:format)", :to => 'health_check/health_check#index', via: [:get, :post], :defaults => { :format => 'txt' }
+      match "#{HealthCheck.uri}(/:checks)(.:format)", to: 'health_check/health_check#index', via: %i[get post], defaults: { format: 'txt' }
     end
-
   end
 end

data/lib/health_check/middleware_health_check.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module HealthCheck
   class MiddlewareHealthcheck
-
     def initialize(app)
       @app = app
     end
@@ -11,16 +12,15 @@ module HealthCheck
         if error_response = (ip_blocked(env) || not_authenticated(env))
           return error_response
         end
+
         HealthCheck.installed_as_middleware = true
         errors = ''
         begin
           # Process the checks to be run from middleware
           errors = HealthCheck::Utils.process_checks(middleware_checks, true)
           # Process remaining checks through the full stack if there are any
-          unless full_stack_checks.empty?
-            return @app.call(env)
-          end
-        rescue => e
+          return @app.call(env) unless full_stack_checks.empty?
+        rescue StandardError => e
           errors = e.message.blank? ? e.class.to_s : e.message.to_s
         end
         healthy = errors.blank?
@@ -37,7 +37,7 @@ module HealthCheck
           content_type = 'text/plain'
           error_code = HealthCheck.http_status_for_error_text
         end
-        [ (healthy ? 200 : error_code), { 'Content-Type' => content_type }, [msg] ]
+        [(healthy ? 200 : error_code), { 'Content-Type' => content_type }, [msg]]
       else
         @app.call(env)
       end
@@ -47,46 +47,46 @@ module HealthCheck
 
     def parse_env(env)
       uri = env['PATH_INFO']
-      if uri =~ /^\/#{Regexp.escape HealthCheck.uri}(\/([-_0-9a-zA-Z]*))?(\.(\w*))?$/
-        checks = $2.to_s == '' ? ['standard'] : $2.split('_')
-        response_type = $4.to_s
+      if uri =~ %r{^/#{Regexp.escape HealthCheck.uri}(/([-_0-9a-zA-Z]*))?(\.(\w*))?$}
+        checks = Regexp.last_match(2).to_s == '' ? ['standard'] : Regexp.last_match(2).split('_')
+        response_type = Regexp.last_match(4).to_s
         middleware_checks = checks & HealthCheck.middleware_checks
         full_stack_checks = (checks - HealthCheck.middleware_checks) - ['and']
-        [response_type, middleware_checks, full_stack_checks ]
+        [response_type, middleware_checks, full_stack_checks]
       end
     end
 
     def ip_blocked(env)
       return false if HealthCheck.origin_ip_whitelist.blank?
+
       req = Rack::Request.new(env)
       unless HealthCheck.origin_ip_whitelist.include?(req.ip)
-        [ HealthCheck.http_status_for_ip_whitelist_error,
-          { 'Content-Type' => 'text/plain' },
-          [ 'Health check is not allowed for the requesting IP' ]
-        ]
+        [HealthCheck.http_status_for_ip_whitelist_error,
+         { 'Content-Type' => 'text/plain' },
+         ['Health check is not allowed for the requesting IP']]
       end
     end
 
     def not_authenticated(env)
       return false unless HealthCheck.basic_auth_username && HealthCheck.basic_auth_password
+
       auth = MiddlewareHealthcheck::Request.new(env)
       if auth.provided? && auth.basic? && Rack::Utils.secure_compare(HealthCheck.basic_auth_username, auth.username) && Rack::Utils.secure_compare(HealthCheck.basic_auth_password, auth.password)
         env['REMOTE_USER'] = auth.username
         return false
       end
-      [ 401,
-        { 'Content-Type' => 'text/plain', 'WWW-Authenticate' => 'Basic realm="Health Check"' },
-        [ ]
-      ]
+      [401,
+       { 'Content-Type' => 'text/plain', 'WWW-Authenticate' => 'Basic realm="Health Check"' },
+       []]
     end
 
     class Request < Rack::Auth::AbstractRequest
       def basic?
-        "basic" == scheme
+        scheme == 'basic'
       end
 
       def credentials
-        @credentials ||= params.unpack("m*").first.split(/:/, 2)
+        @credentials ||= params.unpack1('m*').split(/:/, 2)
       end
 
       def username
@@ -97,6 +97,5 @@ module HealthCheck
         credentials.last
       end
     end
-
   end
 end

data/lib/health_check/resque_health_check.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 module HealthCheck
-   class ResqueHealthCheck
-     extend BaseHealthCheck
+  class ResqueHealthCheck
+    extend BaseHealthCheck
+
+    def self.check
+      raise "Wrong configuration. Missing 'resque' gem" unless defined?(::Resque)
 
-     def self.check
-       unless defined?(::Resque)
-         raise "Wrong configuration. Missing 'resque' gem"
-       end
       res = ::Resque.redis.ping
       res == 'PONG' ? '' : "Resque.redis.ping returned #{res.inspect} instead of PONG"
-     rescue Exception => e
-       create_error 'resque-redis', e.message
-     end
-   end
+    rescue Exception => e
+      create_error 'resque-redis', e.message
+    end
+  end
 end

data/lib/health_check/s3_health_check.rb

@@ -1,24 +1,21 @@
+# frozen_string_literal: true
+
 module HealthCheck
   class S3HealthCheck
     extend BaseHealthCheck
 
     class << self
       def check
-        unless defined?(::Aws)
-          raise "Wrong configuration. Missing 'aws-sdk' gem"
-        end
+        raise "Wrong configuration. Missing 'aws-sdk' gem" unless defined?(::Aws)
         return create_error 's3', 'Could not connect to aws' if aws_s3_client.nil?
+
         HealthCheck.buckets.each do |bucket_name, permissions|
-          if permissions.nil? # backward compatible
-            permissions = [:R, :W, :D]
-          end
+          permissions = %i[R W D] if permissions.nil? # backward compatible
           permissions.each do |permision|
-            begin
             send(permision, bucket_name)
           rescue Exception => e
             raise "bucket:#{bucket_name}, permission:#{permision} - #{e.message}"
           end
-          end
         end
         ''
       rescue Exception => e

data/lib/health_check/sidekiq_health_check.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module HealthCheck
   class SidekiqHealthCheck
     extend BaseHealthCheck
 
     def self.check
-      unless defined?(::Sidekiq)
-        raise "Wrong configuration. Missing 'sidekiq' gem"
-      end
+      raise "Wrong configuration. Missing 'sidekiq' gem" unless defined?(::Sidekiq)
+
       ::Sidekiq.redis do |r|
         res = r.ping
         res == 'PONG' ? '' : "Sidekiq.redis.ping returned #{res.inspect} instead of PONG"

data/lib/health_check/utils.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2013 Ian Heggie, released under the MIT license.
 # See MIT-LICENSE for details.
 
 module HealthCheck
   class Utils
-
     @@default_smtp_settings =
-        {
-            :address              => "localhost",
-            :port                 => 25,
-            :domain               => 'localhost.localdomain',
-            :user_name            => nil,
-            :password             => nil,
-            :authentication       => nil,
-            :enable_starttls_auto => true,
-        }
+      {
+        address: 'localhost',
+        port: 25,
+        domain: 'localhost.localdomain',
+        user_name: nil,
+        password: nil,
+        authentication: nil,
+        enable_starttls_auto: true
+      }
 
     cattr_accessor :default_smtp_settings
 
@@ -22,77 +23,75 @@ module HealthCheck
       errors = ''
       checks.each do |check|
         case check
-          when 'and', 'site'
-            # do nothing
-          when "database"
-            HealthCheck::Utils.get_database_version
-          when "email"
-            errors << HealthCheck::Utils.check_email
-          when "emailconf"
-            errors << HealthCheck::Utils.check_email if HealthCheck::Utils.mailer_configured?
-          when "migrations", "migration"
-            if defined?(ActiveRecord::Migration) and ActiveRecord::Migration.respond_to?(:check_pending!)
-              # Rails 4+
-              begin
-                ActiveRecord::Migration.check_pending!
-              rescue ActiveRecord::PendingMigrationError => ex
-                  errors << ex.message
-              end
-            else
-              database_version  = HealthCheck::Utils.get_database_version
-              migration_version = HealthCheck::Utils.get_migration_version
-              if database_version.to_i != migration_version.to_i
-                errors << "Current database version (#{database_version}) does not match latest migration (#{migration_version}). "
-              end
-            end
-          when 'cache'
-            errors << HealthCheck::Utils.check_cache
-          when 'resque-redis-if-present'
-            errors << HealthCheck::ResqueHealthCheck.check if defined?(::Resque)
-          when 'sidekiq-redis-if-present'
-            errors << HealthCheck::SidekiqHealthCheck.check if defined?(::Sidekiq)
-          when 'redis-if-present'
-            errors << HealthCheck::RedisHealthCheck.check if defined?(::Redis)
-          when 's3-if-present'
-            errors << HealthCheck::S3HealthCheck.check if defined?(::Aws)
-          when 'resque-redis'
-            errors << HealthCheck::ResqueHealthCheck.check
-          when 'sidekiq-redis'
-            errors << HealthCheck::SidekiqHealthCheck.check
-          when 'redis'
-            errors << HealthCheck::RedisHealthCheck.check
-          when 's3'
-            errors << HealthCheck::S3HealthCheck.check
-          when "standard"
-            errors << HealthCheck::Utils.process_checks(HealthCheck.standard_checks, called_from_middleware)
-          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 |name, list|
-              list.each do |custom_check|
-                errors << custom_check.call(self)
-              end
+        when 'and', 'site'
+        # do nothing
+        when 'database'
+          HealthCheck::Utils.get_database_version
+        when 'email'
+          errors << HealthCheck::Utils.check_email
+        when 'emailconf'
+          errors << HealthCheck::Utils.check_email if HealthCheck::Utils.mailer_configured?
+        when 'migrations', 'migration'
+          if defined?(ActiveRecord::Migration) && ActiveRecord::Migration.respond_to?(:check_pending!)
+            # Rails 4+
+            begin
+              ActiveRecord::Migration.check_pending!
+            rescue ActiveRecord::PendingMigrationError => ex
+              errors << ex.message
             end
-          when "all", "full"
-            errors << HealthCheck::Utils.process_checks(HealthCheck.full_checks, called_from_middleware)
           else
-            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."
+            database_version  = HealthCheck::Utils.get_database_version
+            migration_version = HealthCheck::Utils.get_migration_version
+            errors << "Current database version (#{database_version}) does not match latest migration (#{migration_version}). " if database_version.to_i != migration_version.to_i
+          end
+        when 'cache'
+          errors << HealthCheck::Utils.check_cache
+        when 'resque-redis-if-present'
+          errors << HealthCheck::ResqueHealthCheck.check if defined?(::Resque)
+        when 'sidekiq-redis-if-present'
+          errors << HealthCheck::SidekiqHealthCheck.check if defined?(::Sidekiq)
+        when 'redis-if-present'
+          errors << HealthCheck::RedisHealthCheck.check if defined?(::Redis)
+        when 's3-if-present'
+          errors << HealthCheck::S3HealthCheck.check if defined?(::Aws)
+        when 'resque-redis'
+          errors << HealthCheck::ResqueHealthCheck.check
+        when 'sidekiq-redis'
+          errors << HealthCheck::SidekiqHealthCheck.check
+        when 'redis'
+          errors << HealthCheck::RedisHealthCheck.check
+        when 's3'
+          errors << HealthCheck::S3HealthCheck.check
+        when 'standard'
+          errors << HealthCheck::Utils.process_checks(HealthCheck.standard_checks, called_from_middleware)
+        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 |_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
+          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
-    rescue => e
-      return e.message
+      errors
+    rescue StandardError => e
+      e.message
     end
 
     def self.db_migrate_path
       # Lazy initialisation so Rails.root will be defined
-      @@db_migrate_path ||= File.join(Rails.root, 'db', 'migrate')
+      @@db_migrate_path ||= Rails.root.join('db', 'migrate')
     end
 
     def self.db_migrate_path=(value)
@@ -107,10 +106,14 @@ module HealthCheck
       ActiveRecord::Migrator.current_version if defined?(ActiveRecord)
     end
 
-    def self.get_migration_version(dir = self.db_migrate_path)
+    def self.get_migration_version(dir = db_migrate_path)
       latest_migration = nil
-      Dir[File.join(dir, "[0-9]*_*.rb")].each do |f|
-        l = f.scan(/0*([0-9]+)_[_.a-zA-Z0-9]*.rb/).first.first rescue -1
+      Dir[File.join(dir, '[0-9]*_*.rb')].each do |f|
+        l = begin
+              f.scan(/0*([0-9]+)_[_.a-zA-Z0-9]*.rb/).first.first
+            rescue StandardError
+              -1
+            end
         latest_migration = l if !latest_migration || l.to_i > latest_migration.to_i
       end
       latest_migration
@@ -118,12 +121,12 @@ module HealthCheck
 
     def self.check_email
       case ActionMailer::Base.delivery_method
-        when :smtp
-          HealthCheck::Utils.check_smtp(ActionMailer::Base.smtp_settings, HealthCheck.smtp_timeout)
-        when :sendmail
-          HealthCheck::Utils.check_sendmail(ActionMailer::Base.sendmail_settings)
-        else
-          ''
+      when :smtp
+        HealthCheck::Utils.check_smtp(ActionMailer::Base.smtp_settings, HealthCheck.smtp_timeout)
+      when :sendmail
+        HealthCheck::Utils.check_sendmail(ActionMailer::Base.sendmail_settings)
+      else
+        ''
       end
     end
 
@@ -137,17 +140,13 @@ module HealthCheck
         if @skip_external_checks
           status = '221'
         else
-          Timeout::timeout(timeout) do |timeout_length|
+          Timeout.timeout(timeout) do |_timeout_length|
             t = TCPSocket.new(settings[:address], settings[:port])
             begin
               status = t.gets
-              while status != nil && status !~ /^2/
-                status = t.gets
-              end
+              status = t.gets while !status.nil? && status !~ /^2/
               t.puts "HELO #{settings[:domain]}\r"
-              while status != nil && status !~ /^250/
-                status = t.gets
-              end
+              status = t.gets while !status.nil? && status !~ /^250/
               t.puts "QUIT\r"
               status = t.gets
             ensure
@@ -155,17 +154,16 @@ module HealthCheck
             end
           end
         end
-      rescue Errno::EBADF => ex
-        status = "Unable to connect to service"
+      rescue Errno::EBADF
+        status = 'Unable to connect to service'
       rescue Exception => ex
         status = ex.to_s
       end
-      (status =~ /^221/) ? '' : "SMTP: #{status || 'unexpected EOF on socket'}. "
+      /^221/.match?(status) ? '' : "SMTP: #{status || 'unexpected EOF on socket'}. "
     end
 
     def self.check_cache
-      Rails.cache.write('__health_check_cache_test__', 'ok', :expires_in => 1.second) ? '' : 'Unable to write to cache. '
+      Rails.cache.write('__health_check_cache_test__', 'ok', expires_in: 1.second) ? '' : 'Unable to write to cache. '
     end
-
   end
 end

data/lib/health_check/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HealthCheck
-  VERSION = "3.0.0"
+  VERSION = '3.0.1'
 end

data/test/fake_smtp_server

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'socket'
 
 port = 3555
 
-
 server = TCPServer.new port
 puts "fake_smtp_server: Waiting for one connection to port #{port} ..."
 
@@ -19,20 +19,20 @@ def receive(client)
   line
 end
 
-client = server.accept    # Wait for a client to connect
-send(client, "220 dummy-smtp.example.com SMTP")
+client = server.accept # Wait for a client to connect
+send(client, '220 dummy-smtp.example.com SMTP')
 cmd = receive(client)
 
 while cmd !~ /^QUIT\r/
-  if cmd =~ /^HELO(.*)\r/
-    send(client, "250 Welcome to a dummy smtp server")
+  if /^HELO(.*)\r/.match?(cmd)
+    send(client, '250 Welcome to a dummy smtp server')
   else
-    send(client, "502 I am so dumb I only understand HELO and QUIT")
+    send(client, '502 I am so dumb I only understand HELO and QUIT')
   end
   cmd = receive(client)
 end
-send(client, "221 Bye Bye")
+send(client, '221 Bye Bye')
 
 client.close
-puts "fake_smtp_server: Exiting now the conversation has finished."
+puts 'fake_smtp_server: Exiting now the conversation has finished.'
 exit 0

data/test/migrate/nine/9_create_countries.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateCountries < ActiveRecord::Migration[5.0]
   def self.up
     create_table :countries do |t|

data/test/migrate/twelve/011_create_roles.roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateRoles < ActiveRecord::Migration[5.0]
   def self.up
     create_table :roles do |t|

data/test/migrate/twelve/012_create_users.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class CreateUsers < ActiveRecord::Migration[5.0]
   def self.up
-    create_table "users", :force => true do |t|
+    create_table 'users', force: true do |t|
       t.column :name, :string
     end
   end

data/test/migrate/twelve/9_create_countries.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateCountries < ActiveRecord::Migration[5.0]
   def self.up
     create_table :countries do |t|

data/test/rails_5.1.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Gemfile for health_test testing
 
 source 'https://rubygems.org'
@@ -9,18 +11,17 @@ gem 'rake', '>= 0.8.7'
 
 group :development, :test do
   if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
     gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'jruby-openssl'
   else
-    gem 'sqlite3', "~> 1.3.7"
+    gem 'sqlite3', '~> 1.3.7'
   end
   gem 'shoulda'
-  
+
   # redis based checks
-  gem 'sidekiq', :require => !ENV['SIDEKIQ'].nil?
-  gem 'redis', :require => !ENV['REDIS_URL'].nil?
-  gem 'resque', :require => !ENV['RESQUE'].nil?
+  gem 'redis', require: !ENV['REDIS_URL'].nil?
+  gem 'resque', require: !ENV['RESQUE'].nil?
+  gem 'sidekiq', require: !ENV['SIDEKIQ'].nil?
   # s3 check
-  gem 'aws-sdk', :require => !ENV['AWS_ACCESS_KEY_ID'].nil?
+  gem 'aws-sdk', require: !ENV['AWS_ACCESS_KEY_ID'].nil?
 end
-

data/test/rails_edge.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Gemfile for health_test testing
 
 source 'https://rubygems.org'
@@ -6,27 +8,27 @@ source 'https://rubygems.org'
 
 ruby RUBY_VERSION < '2.2.2' ? '2.2.2' : RUBY_VERSION
 
+gem 'rack'
 gem 'rails'
 gem 'rake'
-gem 'rack'
 
 group :development, :test do
   if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
     gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'jruby-openssl'
   else
     gem 'sqlite3'
   end
   gem 'shoulda'
-  
+
   # redis based checks
-  gem 'sidekiq', :require => !ENV['SIDEKIQ'].nil?
-  gem 'redis', :require => !ENV['REDIS_URL'].nil?
-  gem 'resque', :require => !ENV['RESQUE'].nil?
+  gem 'redis', require: !ENV['REDIS_URL'].nil?
+  gem 'resque', require: !ENV['RESQUE'].nil?
+  gem 'sidekiq', require: !ENV['SIDEKIQ'].nil?
   # s3 check
-  gem 'aws-sdk', :require => !ENV['AWS_ACCESS_KEY_ID'].nil?
+  gem 'aws-sdk', require: !ENV['AWS_ACCESS_KEY_ID'].nil?
 end
 
 # Initial Gemfile has therubyracer commented out
-gem 'therubyrhino', :platform => :jruby # REQUIRED
-gem 'therubyracer', :platform => :ruby # REQUIRED
+gem 'therubyracer', platform: :ruby # REQUIRED
+gem 'therubyrhino', platform: :jruby # REQUIRED

data/test/testurl

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'net/http'
 require 'uri'
 
@@ -10,17 +12,25 @@ def open(url)
   http.request(req)
 end
 
-response = open(ARGV[0]) rescue nil
+response = begin
+             open(ARGV[0])
+           rescue StandardError
+             nil
+           end
 unless response
-  i=0
-  print "waiting.."
-  while i < 120 and not response
-    #puts 'RESPONSE:', response.inspect
-    print "."
+  i = 0
+  print 'waiting..'
+  while (i < 120) && !response
+    # puts 'RESPONSE:', response.inspect
+    print '.'
     STDOUT.flush
     i += 1
     sleep(1)
-    response = open(ARGV[0]) rescue nil
+    response = begin
+                 open(ARGV[0])
+               rescue StandardError
+                 nil
+               end
   end
   unless response
     puts "\nFAIL: timed out after waiting #{i} seconds"
@@ -32,32 +42,32 @@ end
 page_content = response.body
 
 puts "  response code: #{response.code} #{response.message}"
-response.header.each_header {|key,value| puts "  #{key}: #{value}" }
+response.header.each_header { |key, value| puts "  #{key}: #{value}" }
 puts "  body: #{page_content}"
 
-if ARGV[1] and ARGV[1] != ''
+if ARGV[1] && (ARGV[1] != '')
   if ARGV[1].split(',').include?(response.code)
     puts "PASS (response code was #{response.code} which matched #{ARGV[1]})"
   else
-    puts "FAIL (response code was #{response.code}, expected #{ARGV[1]})" 
+    puts "FAIL (response code was #{response.code}, expected #{ARGV[1]})"
     exit 1
   end
 end
 
-if ARGV[2] and ARGV[2] != ''
+if ARGV[2] && (ARGV[2] != '')
   if response.content_type == ARGV[2]
     puts "PASS (content type was #{response.content_type})"
   else
-    puts "FAIL (content type was #{response.content_type}, expected #{ARGV[2]})" 
+    puts "FAIL (content type was #{response.content_type}, expected #{ARGV[2]})"
     exit 2
   end
 end
 
-if ARGV[3] and ARGV[3] != ''
+if ARGV[3] && (ARGV[3] != '')
   if page_content.to_s.include? ARGV[3]
     puts "PASS (found #{ARGV[3]})"
   else
-    puts "FAIL (expected to find #{ARGV[3]}) - page contents:" , page_content.to_s, 'END-OF-CONTENTS'
+    puts "FAIL (expected to find #{ARGV[3]}) - page contents:", page_content.to_s, 'END-OF-CONTENTS'
     exit 3
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_health_check
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Ian Heggie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,6 +106,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG
 - Gemfile