health_check 1.7.2 → 2.0.0

data/.travis.yml

@@ -7,68 +7,88 @@ notifications:
 before_install:
   - gem update --system $RUBYGEMS_VERSION
   - gem --version
-  - gem install bundler ${BUNDLER_VERSION:+-v} ${BUNDLER_VERSION}
-  - gem install smarter_bundler
+  - gem install bundler
   - bundle --version
-  - bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} --version
   - mkdir -p tmp/bundle
 
 bundler_args: "--binstubs"
 
 script: ./test/test_with_railsapp
 
-rvm: 
-  - 1.9.3
+#rvm: 
+#  - 2.2.0
 
-gemfile:
-  - test/rails_3.2.gemfile
+#gemfile:
+#  - test/rails_4.2.gemfile
 
 matrix:
   allow_failures:
+    - rvm: 2.2.0
+      gemfile: test/rails_edge.gemfile
+      env: RAILS_VERSION=edge
+
+    - rvm: ruby-head
+      gemfile: test/rails_4.2.gemfile
+      env: RAILS_VERSION=4.2
 
   include:
-    # rails 3.2 jan 20, 2012 - ruby 1.8.7 or 1.9.2
+    # ruby / rails edge
     
-    - rvm: 1.9.3
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_SERVER=puma RAILS_VERSION=3.2
+    - rvm: 2.2.0
+      gemfile: test/rails_edge.gemfile
+      env: RAILS_VERSION=edge
 
-    - rvm: 1.9.3
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_SERVER=passenger RAILS_VERSION=3.2
+    - rvm: ruby-head
+      gemfile: test/rails_4.2.gemfile
+      env: RAILS_VERSION=4.2
 
-    - rvm: 1.9.3
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_SERVER=thin RAILS_VERSION=3.2
+    # rails 4.2  Dec, 2014 
+    
+    - rvm: 2.2.0
+      gemfile: test/rails_4.2.gemfile
+      env: RAILS_VERSION=4.2
 
-    - rvm: 1.9.3
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_SERVER=unicorn RAILS_VERSION=3.2
+    - rvm: 2.1.2
+      gemfile: test/rails_4.2.gemfile
+      env: RAILS_SERVER=puma RAILS_VERSION=4.2
 
-    # Excluded since it takes way too long!
-    #- rvm: jruby-19mode
-    #  gemfile: test/rails_3.2.gemfile
-    #  env: BUNDLER_VERSION=1.12.5 RAILS_VERSION=3.2
+    - rvm: 2.1.2
+      gemfile: test/rails_4.2.gemfile
+      env: RAILS_SERVER=passenger RAILS_VERSION=4.2
 
-    - rvm: 2.2.0
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_VERSION=3.2
+    - rvm: 2.1.2
+      gemfile: test/rails_4.2.gemfile
+      env: RAILS_SERVER=thin RAILS_VERSION=4.2
 
-    - rvm: 1.9.3
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_VERSION=3.2
+    - rvm: rbx-2.2.6
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_ENV2=development RAILS_VERSION=4.0
+
+    - rvm: 2.1.2
+      gemfile: test/rails_4.2.gemfile
+      env: RAILS_SERVER=unicorn RAILS_VERSION=4.2
 
-    # Excluded since it takes way too long!
-    #- rvm: jruby-19mode
-    #  gemfile: test/rails_3.2.gemfile
-    #  env: BUNDLER_VERSION=1.12.5 RAILS_VERSION=3.2
+    - rvm: jruby-19mode
+      gemfile: test/rails_4.2.gemfile
+      env: RAILS_VERSION=4.2
 
-    # rails 3.1 aug 31, 2011 - ruby 1.8.7 or 1.9.2
+    # rails 4.1  April 8, 2014 
+    
+    - rvm: 2.1.2
+      gemfile: test/rails_4.1.gemfile
+      env: RAILS_SERVER=puma RAILS_VERSION=4.1
+
+    # rails 4.0  June 25, 2013
+    
     - rvm: 1.9.3
-      gemfile: test/rails_3.1.gemfile
-      env: RAILS_VERSION=3.1
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_VERSION=4.0
+
+    - rvm: rbx-2.2.6
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_ENV2=development RAILS_VERSION=4.0
 
-    - rvm: 1.8.7
-      gemfile: test/rails_3.0.gemfile
-      env: RAILS_VERSION=3.0
+    - rvm: 2.0.0
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_VERSION=4.0
 

data/CHANGELOG

@@ -1,29 +1,6 @@
 = Change Log =
 
-* rails3 branch
-
-*1.7.2
- * Change to using smarter_bundler to improve test robustness and pin gems that have newer versions with imcompatibilities
- * Depends on railties rather than rails so it can be used with trimmed down stacks
- * Cleanup test code
-*1.7.1
- * Restricted sass version for ruby 1.9.7 compatibility
- * Added Vgrantfile for easier testing
- * removed badges that don't work with branches
-*1.7.0 
- * Split away from rails2.3 branch
- * removed rails 2.3 and 4.0 artifacts
- * Fixed route reload issue
-
-*1.6.0
- * Added basic auth support - Thanks Kyle Conarro <kyle.conarro@gmail.com>
- * Explicitly limit rails to < 4.0 for this branch
- * Test against rails 2.3 LTS, updated gemfile's used for testing as the latest version of gems become incompatible
-*1.5.1
-  * Created pre_rails4 branch (versions < 2.0) for rails 2.3 and 3.x; with master branch for rails 4.0+
-*1.5.0
-  * Fixed SMTP test now uses CRNL as per RFC
-  * Check Action
+* 2.0.0 - Removed silence - recommend to use a log filtering gem instead
 * 1.4.1 - Rails 4 and route changes
   * Now handles routes being generated multiple times by some gem / rails / ruby combinations - Previously multiple calls to health_check_routes where ignored, now explicit calls to health_check_route always adds the route but flags that it doesn't have to be added again on the end of the list
   * Uses ActiveRecord::Migration.check_pending! if available and returns the message if an exception is raised (Rails 4.0+)
@@ -41,4 +18,3 @@
 * 1.0.2 - Included travis config and gemfiles used in travis tests in gem and changes to test setup so that gem test 
 * 1.x - Includes Rails 3.x suppprt as an Engine
 * 0.x - Rails 2.3
-

data/Gemfile

@@ -7,15 +7,6 @@ ruby '1.9.3' if RUBY_VERSION > '1.9.3'
 
 gemspec
 
-# mime-types 2.0 requires Ruby version >= 1.9.2
-gem "mime-types", "< 2.0" if RUBY_VERSION < '1.9.2' # REQUIRED
-# 0.7 requires ruby 1.9.3
-gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # REQUIRED
-# rack 2.0 requires ruby 2.2.2, rails 3.2 requires rack ~> 1.4.5
-gem 'rack', "< 1.5" # REQUIRED
-
-gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3'
-
 group :development, :test do
   if defined?(JRUBY_VERSION)
     gem 'jruby-openssl'
@@ -29,8 +20,6 @@ group :development, :test do
     # mime-types 2.0 requires Ruby version >= 1.9.2
     gem "mime-types", "< 2.0"
   end
-  #gem 'rake', ">= 0.8.3", "< 11.0"
-  #gem 'rack', "< 2.0"
 
 end
 

data/README.rdoc

@@ -1,11 +1,10 @@
-= health_check gem (rails3 branch)
+= health_check gem
 
-Simple health check of Rails 3.x apps for use with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
+Simple health check of Rails 4.x+ apps for use with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
 
-The basic goal is to quickly check that rails is up and running and that it has access to correctly configured resources (database, email gateway).
+Use {pre_rails4}[https://github.com/ianheggie/health_check/tree/pre_rails4] branch or gem versions < 2.0 for Rails 2.3 and 3.x 
 
-Check the latest README {master}[https://github.com/ianheggie/health_check/tree/master] for other rails versions.
-Consider using {RAILS LTS 3.2}[https://railslts.com/] rather than the unsupported 3.x versions.
+The basic goal is to quickly check that rails is up and running and that it has access to correctly configured resources (database, email gateway)
 
 health_check provides various monitoring URIs, for example:
 
@@ -27,7 +26,7 @@ On failure a 500 http status is returned with a simple explanation of the failur
     curl localhost:3000/health_check/fail
     health_check failed: invalid argument to health_test.
 
-The health_check controller disables sessions for versions that eagerly load sessions. Only failures are logged.
+The health_check controller disables sessions for versions that eagerly load sessions. Only failures are logged for rails < '4.1'.
 
 == Checks
 
@@ -44,11 +43,13 @@ The email gateway is not checked unless the smtp settings have been changed.
 Specify full or include email in the list of checks to verify the smtp settings
 (eg use 127.0.0.1 instead of localhost).
 
+Note: rails 4.0 also checks migrations by default in development mode and throws an ActiveRecord::PendingMigrationError exception (http error 500) if there is an error
+
 == Installation
 
 Add the following line to Gemfile
 
-    gem "health_check", "~> 1.7"
+    gem "health_check"
 
 And then execute
 
@@ -56,7 +57,7 @@ And then execute
 
 Or install it yourself as:
 
-    gem install --version '~> 1.7' health_check
+    gem install health_check
 
 == Configuration
 
@@ -93,17 +94,16 @@ 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
 
-      # Protect health endpoints with basic auth
-      # These default to nil and the endpoint is not protected
-      config.basic_auth_username = 'my_username'
-      config.basic_auth_password = 'my_password'
     end
 
 You may call add_custom_check multiple times with different tests. These tests will be included in the default list ("standard").
 
-If you have a catchall route in a rails 3.0 or later application then add the following line above the catch all route (in `config/routes.rb`):
+If you have a catchall route then add the following line above the catch all route (in `config/routes.rb`):
    health_check_routes
 
+To change the url prefix (eg to /ping), add the following line in `config/routes.rb`:
+   health_check_routes('ping')
+
 == Uptime Monitoring
 
 Use a website monitoring service to check the url regularly for the word "success" (without the quotes) rather than just a 200 http status so
@@ -155,6 +155,16 @@ Will return a result with Content-Type: application/xml and body like:
 
 See https://github.com/ianheggie/health_check/wiki/Ajax-Example for an Ajax example
 
+== Silencing log output
+
+It is recomended that you use silencer, lograge or one of the other log filtering gems.
+
+For example, with lograge use the following to exclude health_check from being logged:
+
+    config.lograge.ignore_actions = ["health_check/health_check#index"]
+
+Likewise you will probably want to exclude health_check from monitoring systems like newrelic.
+
 == Note on Patches/Pull Requests
 
 <em>Feedback welcome! Especially with suggested replacement code and corresponding tests</em>
@@ -176,50 +186,38 @@ See https://github.com/ianheggie/health_check/wiki/Ajax-Example for an Ajax exam
 
 == Testing
 
-=== Automated testing
+=== Automated testing and other checks
 
-* {<img src="https://travis-ci.org/ianheggie/health_check.svg?branch=rails3">}[https://travis-ci.org/ianheggie/health_check.svg?branch=rails3]  - Travis CI 
+* {<img src="https://badge.fury.io/rb/health_check.png" alt="Gem Version" />}[http://badge.fury.io/rb/health_check] - Latest Gem
+* {<img src="https://travis-ci.org/ianheggie/health_check.png">}[https://travis-ci.org/ianheggie/health_check]  - Travis CI 
+* {<img src="https://codeclimate.com/github/ianheggie/health_check.png" />}[https://codeclimate.com/github/ianheggie/health_check] - Code quality
+* {<img src="https://gemnasium.com/ianheggie/health_check.png">}[https://gemnasium.com/ianheggie/health_check] - Gem dependencies 
 
 === Manual testing
 
-The instructions have been changed to using a vagrant virtual box for consistant results.
+The test will package up and install the gem under a temporary path, create a dummy rails app configured for sqlite,
+install the gem, and then run up tests against the server.
+This will require TCP port 3456 to be free.
+
+Using rbenv or rvm, install and set the version of ruby you wish to test against.
+You will need to install the bundler gem if using rbenv.
+See the <tt>.travis.yml</tt> file for the list of ruby versions that we test against.
 
-Install vagrant 1.9.7 or later and virtual_box or other local virtual machine providor.
+* rbenv command: <tt>rbenv shell 1.8.7-p371</tt>
+* rvm command: <tt>rvm use 1.9.3</tt>
 
 Create a temp directory for throw away testing, and clone the health_check gem into it
 
     mkdir -p ~/tmp
     cd ~/tmp
-    git clone https://github.com/ianheggie/health_check.git ~/tmp/health_check
-
-The Vagrantfile includes provisioning rules to install chruby (ruby version control),
-ruby-build will also be installed and run to build various rubies under /opt/rubies.
-
-Use <tt>vagrant ssh</tt> to connect to the virtual box and run tests.
-
-The test script will package up and install the gem under a temporary path, create a dummy rails app configured for sqlite,
-install the gem, and then run up tests against the server.
-This will require TCP port 3456 to be free.
+    git clone https://github.com/ianheggie/health_check.git
 
 Cd to the checked out health_check directory and then run the test as follows:
 
     cd ~/tmp/health_check
 
-    vagrant up   # this will also run vagrant provision and take some time
-                 # chruby and various ruby versions will be installed
-
-    vagrant ssh
-
-    cd /vagrant  # the current directory on your host is mounted here on the virtual machine
-
-    chruby 1.8.7 
-    # or 
-    chruby 1.9.3
-
     test/test_with_railsapp
 
-    exit        # from viretual machine when finished
-
 The script will first call `test/setup_railsapp` to setup a rails app with health_check installed and then
 run up the rails server and perform veraious tests.
 
@@ -230,7 +228,7 @@ The command `rake test` will also launch these tests, except it cannot install t
 
 == Copyright
 
-Copyright (c) 2010-2017 Ian Heggie, released under the MIT license.
+Copyright (c) 2010-2014 Ian Heggie, released under the MIT license.
 See MIT-LICENSE for details.
 
 == Contributors

data/config/routes.rb

@@ -1,5 +1,8 @@
-unless HealthCheck::Engine.routes_explicitly_defined
-  Rails.application.routes.draw do
-    add_health_check_routes()
+if defined?(HealthCheck::Engine)
+  unless HealthCheck::Engine.routes_already_defined
+    # Ifmountable use: HealthCheck::Engine.routes.draw do
+    Rails.application.routes.draw do
+      health_check_routes()
+    end
   end
 end

data/health_check.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.extra_rdoc_files = [ "README.rdoc" ]
   gem.require_paths = ["lib"]
-  gem.required_ruby_version = '>= 1.8.7'
-  gem.add_dependency(%q<railties>, ['~> 3.0'])
-  gem.add_development_dependency(%q<smarter_bundler>, [">= 0.1.0"])
-  gem.add_development_dependency(%q<rake>, [">= 0.8.3", "< 11.0"])
+  gem.required_ruby_version = '>= 1.9.3'
+  gem.add_dependency(%q<rails>, [">= 4.0"])
+  gem.add_development_dependency(%q<rake>, [">= 0.8.3"])
   gem.add_development_dependency(%q<shoulda>, ["~> 2.11.0"])
   gem.add_development_dependency(%q<bundler>, ["~> 1.2"])
 end

data/lib/health_check.rb

@@ -4,7 +4,7 @@
 module HealthCheck
 
   class Engine < Rails::Engine
-    cattr_accessor :routes_explicitly_defined 
+    cattr_accessor :routes_already_defined
   end
 
   # Text output upon success
@@ -23,24 +23,18 @@ module HealthCheck
   mattr_accessor :http_status_for_error_object
   self.http_status_for_error_object = 500
 
-  #
-  mattr_accessor :basic_auth_username, :basic_auth_password
-  self.basic_auth_username = nil
-  self.basic_auth_password = nil
-
-
   # Array of custom check blocks
   mattr_accessor :custom_checks
   mattr_accessor :full_checks
   mattr_accessor :standard_checks
   self.custom_checks = [ ]
   self.full_checks = ['database', 'migrations', 'custom', 'email', 'cache']
-  self.standard_checks = [ 'database', 'migrations', 'custom' ]
+  self.standard_checks = [ 'database', 'migrations', 'custom', 'emailconf' ]
 
   def self.add_custom_check(&block)
     custom_checks << block
   end
-  
+
   def self.setup
     yield self
   end
@@ -50,11 +44,6 @@ end
 require "health_check/version"
 require 'health_check/utils'
 require 'health_check/health_check_controller'
-
-if defined?(HealthCheck::Engine)
-  require 'health_check/health_check_routes'
-else
-  require 'health_check/add_23_routes'
-end
+require 'health_check/health_check_routes'
 
 # vi: sw=2 sm ai:

data/lib/health_check/health_check_controller.rb

@@ -5,15 +5,14 @@ module HealthCheck
   class HealthCheckController < ActionController::Base
 
     layout false if self.respond_to? :layout
-    before_filter :authenticate
 
     def index
       checks = params[:checks] || 'standard'
       begin
         errors = HealthCheck::Utils.process_checks(checks)
       rescue Exception => e
-        errors = e.message
-      end
+        errors = e.message.blank? ? e.class.to_s : e.message.to_s
+      end     
       if errors.blank?
         obj = { :healthy => true, :message => HealthCheck.success }
         respond_to do |format|
@@ -33,9 +32,7 @@ module HealthCheck
         end
         # Log a single line as some uptime checkers only record that it failed, not the text returned
         if logger
-          silence_level, logger.level = logger.level, @old_logger_level if @old_logger_level
           logger.info msg
-          logger.level = silence_level if @old_logger_level
         end
       end
     end
@@ -43,42 +40,10 @@ module HealthCheck
 
     protected
 
-    def authenticate
-      return unless HealthCheck.basic_auth_username && HealthCheck.basic_auth_password
-      authenticate_or_request_with_http_basic do |username, password|
-        username == HealthCheck.basic_auth_username && password == HealthCheck.basic_auth_password
-      end
-    end
-
     # turn cookies for CSRF off
     def protect_against_forgery?
       false
     end
 
-    # Silence logger as much as we can
-
-    if Rails.version < '4.1'
-
-      def process_with_silent_log(method_name, *args)
-        if logger
-          @old_logger_level = logger.level
-          if Rails.version >= '3.2'
-            silence do
-              process_without_silent_log(method_name, *args)
-            end
-          else
-            logger.silence do
-              process_without_silent_log(method_name, *args)
-            end
-          end
-        else
-          process_without_silent_log(method_name, *args)
-        end
-      end
-
-      alias_method_chain :process, :silent_log
-
-    end
-
   end
 end

data/lib/health_check/health_check_routes.rb

@@ -1,14 +1,12 @@
-module ActionDispatch::Routing
-  class Mapper
+if defined?(HealthCheck::Engine)
 
-    def health_check_routes(prefix = nil)
-      HealthCheck::Engine.routes_explicitly_defined = true
-      add_health_check_routes(prefix)
+  module ActionDispatch::Routing
+    class Mapper
+      def health_check_routes(prefix = nil)
+        HealthCheck::Engine.routes_already_defined ||= true
+        get "#{prefix || 'health_check'}(/:checks)(.:format)", :to => 'health_check/health_check#index'
+      end
     end
-
-    def add_health_check_routes(prefix = nil)
-      get "#{prefix || 'health_check'}(/:checks)(.:format)", :to => 'health_check/health_check#index'
-    end
-
   end
+
 end

data/lib/health_check/utils.rb

@@ -28,6 +28,8 @@ module HealthCheck
             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+
@@ -47,7 +49,6 @@ module HealthCheck
             errors << HealthCheck::Utils.check_cache
           when "standard"
             errors << HealthCheck::Utils.process_checks(HealthCheck.standard_checks.join('_'))
-            errors << HealthCheck::Utils.process_checks("email") if HealthCheck::Utils.mailer_configured?
           when "custom"
             HealthCheck.custom_checks.each do |custom_check|
               errors << custom_check.call(self)

data/lib/health_check/version.rb

@@ -1,4 +1,4 @@
 module HealthCheck
-  VERSION = "1.7.2"
+  VERSION = "2.0.0"
 end
 

data/test/init_variables

@@ -20,8 +20,6 @@ if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
   echo "Detected user installed rvm"
 elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
   echo "Detected root installed rvm"
-elif [[ -s /usr/local/share/chruby/chruby.sh ]] ; then
-  echo "Detected root installed chruby"
 elif [[ -d "$HOME/.rbenv" ]] ; then
   echo "Detected rbenv: `rbenv version`"
   rehash='rbenv rehash'

data/test/rails_4.0.gemfile

@@ -0,0 +1,23 @@
+# Gemfile for health_test testing
+
+source 'https://rubygems.org'
+
+ruby '1.9.3' if RUBY_VERSION < '1.9.3'
+
+gem 'rails', "~> 4.0.0"
+gem 'rake', '>= 0.8.3'
+gem "rack", '~> 1.5.2'
+
+group :development, :test do
+  if defined?(JRUBY_VERSION)
+    gem 'jruby-openssl'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  else
+    gem 'sqlite3', "~> 1.3.7"
+  end
+  gem 'shoulda'
+end
+
+# Initial Gemfile has therubyracer commented out
+gem 'therubyrhino', :platform => :jruby # REQUIRED
+gem 'therubyracer', :platform => :ruby # REQUIRED

data/test/rails_4.1.gemfile

@@ -0,0 +1,23 @@
+# Gemfile for health_test testing
+
+source 'https://rubygems.org'
+
+ruby '1.9.3' if RUBY_VERSION < '1.9.3'
+
+gem 'rails', "~> 4.1.0"
+gem 'rake', '>= 0.8.3'
+gem "rack", '~> 1.5.2'
+
+group :development, :test do
+  if defined?(JRUBY_VERSION)
+    gem 'jruby-openssl'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  else
+    gem 'sqlite3', "~> 1.3.7"
+  end
+  gem 'shoulda'
+end
+
+# Initial Gemfile has therubyracer commented out
+gem 'therubyrhino', :platform => :jruby # REQUIRED
+gem 'therubyracer', :platform => :ruby # REQUIRED

data/test/rails_4.2.gemfile

@@ -0,0 +1,19 @@
+# Gemfile for health_test testing
+
+source 'https://rubygems.org'
+
+ruby '1.9.3' if RUBY_VERSION < '1.9.3'
+
+gem 'rails', "~> 4.2.0"
+gem 'rake', '>= 0.8.3'
+#gem "rack", '~> 1.6.0'
+
+group :development, :test do
+  if defined?(JRUBY_VERSION)
+    gem 'jruby-openssl'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  else
+    gem 'sqlite3', "~> 1.3.7"
+  end
+  gem 'shoulda'
+end

data/test/rails_edge.gemfile

@@ -0,0 +1,25 @@
+# Gemfile for health_test testing
+
+source 'https://rubygems.org'
+
+# Bundle edge Rails instead:
+
+ruby '1.9.3' if RUBY_VERSION < '1.9.3'
+
+gem 'rails'
+gem 'rake'
+gem 'rack'
+
+group :development, :test do
+  if defined?(JRUBY_VERSION)
+    gem 'jruby-openssl'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  else
+    gem 'sqlite3'
+  end
+  gem 'shoulda'
+end
+
+# Initial Gemfile has therubyracer commented out
+gem 'therubyrhino', :platform => :jruby # REQUIRED
+gem 'therubyracer', :platform => :ruby # REQUIRED

data/test/setup_railsapp

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+err_report() {
+    echo "$0: Error on line $1 - aborted"
+    exit 1
+}
+
+trap 'err_report $LINENO' ERR
+
 # Any failure causes exit
 set -e
 
@@ -45,21 +52,17 @@ else
 fi
 
 echo "Running bundle with BUNDLE_GEMFILE=$BUNDLE_GEMFILE ..."
-if ! smarter_bundle ; then
+if ! bundle ; then
     echo "Test aborted (missing required gems)"
     exit 2
-else
-    echo bundle passed - lock file contains:
-    cat $BUNDLE_GEMFILE.lock
-    echo
 fi
 $rehash
 
 rails="$base_dir/test/bin/rails"
 
 echo Checking $rails is present ...
-[ -f $rails ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub railties || echo '(ignored bundle exit status)'
-[ -f $rails ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_}  binstub rails || echo '(ignored bundle exit status)'
+[ -f $rails ] || bundle binstub railties || echo '(ignored bundle exit status)'
+[ -f $rails ] || bundle binstub rails || echo '(ignored bundle exit status)'
 if [ ! -f $rails ]; then
     echo "Test aborted (unable to create $rails)"
     exit 2
@@ -67,45 +70,24 @@ fi
 
 rake="$base_dir/test/bin/rake"
 
-echo Checking $rake is present ...
-[ -f $rake ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub rake || echo '(ignored bundle exit status)'
 if [ ! -f $rake ]; then
-    echo "Test aborted (unable to create $rake)"
-    exit 2
+    echo "Running bundle --binstub rake ..."
+    if ! bundle --binstub rake || [ ! -f $rake ]; then
+        echo "Test aborted (unable to create $rake)"
+        exit 2
+    fi
 fi
 
 actual_rails_version=`$rails -v`
 
 [ -d lib/health_check ] || exec echo setup_railsapp MUST be executed in the base of the health_check gem/clone of git repository
 
+echo Installing health_check as a gem into tmp/gems
+env GEM_HOME=$tmp_dir/gems rake install
+
 export GEM_PATH="$tmp_dir/gems:`gem environment gempath`"
 echo Set GEM_PATH=$GEM_PATH
 
-case "$BUNDLE_GEMFILE" in
-*_lts*)
-    echo "Re-running bundle with changed GEM_PATH (required by git install of rails lts) ..."
-    if ! smarter_bundle ; then
-        echo "Test aborted (missing required gems)"
-        exit 2
-    else
-        echo bundle passed - lock file contains:
-        cat $BUNDLE_GEMFILE.lock
-        echo
-    fi
-    ;;
-esac
-echo Installing health_check as a gem into $tmp_dir/gems
-rm -f pkg/health_check-*.gem
-if env GEM_HOME=$tmp_dir/gems $rake install
-then
-    echo rake install passed
-else
-    echo rake install failed! running gem install pkg/health_check-*.gem manually to see error message:
-    env GEM_HOME=$tmp_dir/gems gem install pkg/health_check-*.gem
-    echo gem install worked, but flagging it as a FAIL anyway since rake install failed!
-    exit 2
-fi
-
 echo Gems in tmp/gems:
 ls tmp/gems
 
@@ -125,13 +107,23 @@ case `ruby -e 'puts JRUBY_VERSION' 2> /dev/null` in
 esac
 
 echo "Creating $actual_rails_version app in $tmp_dir/railsapp using adapter $db"
-case "$BUNDLE_GEMFILE" in
-*rails_edge.gemfile)
-    $rails new railsapp -d $db --edge
-    ;;
-*)
-    $rails new railsapp -d $db
-    ;;
+case "$actual_rails_version" in
+    *' '[12].*)
+        $rails railsapp -d $db
+        ;;
+    *' '[34].*)
+        case "$BUNDLE_GEMFILE" in
+        *rails_edge.gemfile)
+            $rails new railsapp -d $db --edge
+            ;;
+        *)
+            $rails new railsapp -d $db
+            ;;
+        esac
+        ;;
+    *)
+        echo "Unknown rails version"
+        ;;
 esac
 
 cd $railsapp
@@ -166,66 +158,75 @@ HealthCheck.setup do |config|
 end
 !
 
+echo Setting INITIAL_BUNDLE_GEMFILE=$BUNDLE_GEMFILE
+INITIAL_BUNDLE_GEMFILE="$BUNDLE_GEMFILE"
 echo Unsetting BUNDLE_GEMFILE '(so Gemfile for rails application will be used)'
-INITIAL_BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 unset BUNDLE_GEMFILE
 
-if [ ! -s Gemfile ]
+if [ -s Gemfile ]
 then
-    echo Missing Gemfile!
-    exit 2
-fi
-
-rm -f Gemfile.lock
-
-echo Adding health_check as gem to Gemfile...
-echo "gem 'health_check', :path => '$base_dir'" >> Gemfile
+    echo Adding health_check as gem to Gemfile...
+    echo "gem 'health_check', :path => '$base_dir'" >> Gemfile
 
-case "$RAILS_SERVER" in
-webrick|'')
-        echo "Using default webrick server"
-        ;;
-*)
-        echo "Adding $RAILS_SERVER gem to Gemfile (for use as server)"
-        echo "gem '$RAILS_SERVER'" >> Gemfile
-        ;;
-esac
-echo Adding required Gemfile lines ...
-egrep REQUIRED $INITIAL_BUNDLE_GEMFILE | tee -a Gemfile
-echo
-echo ================= Gemfile ===================
-cat Gemfile
-echo
-echo running bundle install
-smarter_bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} install
-$rehash
-echo "Using binstubs in $railsapp/bin for rails and rake commands"
-rails="$railsapp/bin/rails"
-
-echo Checking $rails is present ...
-[ -f $rails ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub railties || echo '(ignored bundle exit status)'
-[ -f $rails ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub rails || echo '(ignored bundle exit status)'
-if [ ! -f $rails ]; then
-    echo "Test aborted (unable to create $rails)"
-    exit 2
-fi
+    case "$RAILS_SERVER" in
+    webrick|'')
+            echo "Using default webrick server"
+            ;;
+    *)
+            echo "Adding $RAILS_SERVER gem to Gemfile (for use as server)"
+            echo "gem '$RAILS_SERVER'" >> Gemfile
+            ;;
+    esac
+    egrep REQUIRED < ${INITIAL_BUNDLE_GEMFILE} >> Gemfile || echo No required gems found...
+    echo
+    echo ================= Gemfile ===================
+    cat Gemfile
+    echo
+    echo running bundle install
+    bundle install
+    $rehash
+    echo "Using binstubs in $railsapp/bin for rails and rake commands"
+    rails="$railsapp/bin/rails"
+
+    echo Checking $rails is present ...
+    [ -f $rails ] || bundle binstub railties || echo '(ignored bundle exit status)'
+    [ -f $rails ] || bundle binstub rails || echo '(ignored bundle exit status)'
+    if [ ! -f $rails ]; then
+        echo "Test aborted (unable to create $rails)"
+        exit 2
+    fi
+    rake="$railsapp/bin/rake"
 
-rake="$railsapp/bin/rake"
+    echo Checking $rake is present ...
+    [ -f $rake ] || bundle binstub rake || echo '(ignored bundle exit status)'
+    if [ ! -f $rake ]; then
+        echo "Test aborted (unable to create $rake)"
+        exit 2
+    fi
 
-echo Checking $rake is present ...
-[ -f $rake ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub rake || echo '(ignored bundle exit status)'
-if [ ! -f $rake ]; then
-    echo "Test aborted (unable to create $rake)"
-    exit 2
+    $rehash
+    # Fix for rvm, otherwise bundle run from rails create fails
+    export PATH="`pwd`/bin:$PATH"
+    echo ================= Gemfile.lock ===================
+    cat Gemfile.lock
+    echo
+else
+    dest=$railsapp/vendor/plugins/health_check
+    echo Installing health_check as plugin in $dest ...
+    mkdir -p $dest
+    (
+	cd $base_dir
+
+        git ls-files | cpio -pdl $dest
+        
+	cd $dest
+
+        echo Files installed as plugin:
+        find . -type f
+        echo
+    )
 fi
 
-$rehash
-# Fix for rvm, otherwise bundle run from rails create fails
-export PATH="`pwd`/bin:$PATH"
-echo ================= Gemfile.lock ===================
-cat Gemfile.lock
-echo
-
 for e in test ${RAILS_ENV2:-production}
 do
     if [ -f config/environments/$e.rb ]; then
@@ -363,7 +364,7 @@ if [ -s config/routes.rb ]; then
     echo "  end"
     echo "  # END OF SECTION FOR TESTING HEALTH_CHECK"
     echo "  # ---------------------------------------"
-    ruby -n -e 'print if /^end/..9999' config/routes.rb-old | tee /tmp/t$$ 
+    ruby -n -e 'print if /^end/..9999' config/routes.rb-old | tee /tmp/t$$
     if [ ! -s /tmp/t$$ ]; then
       echo "WARNING: ruby -n -e failed silently - using sed instead!! (rbx-19mode has that problem)" >&3
       sed -n -e '/^end/,$p' config/routes.rb-old

data/test/test_with_railsapp

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+err_report() {
+    echo "$0: Error on line $1 - aborted"
+    exit 1
+}
+
+trap 'err_report $LINENO' ERR
+
 # Any failure causes exit
 set -e
 
@@ -68,7 +75,7 @@ start_server()
     bundle_prefix=''
     if [ -f Gemfile ]
     then
-        bundle_prefix="bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} exec"
+        bundle_prefix='bundle exec'
     fi
     server_arg=${RAILS_SERVER:-webrick}
     case "$server_arg" in

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_check
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: smarter_bundler
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
+        version: '4.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +35,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
-    - - <
-      - !ruby/object:Gem::Version
-        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,9 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
-    - - <
-      - !ruby/object:Gem::Version
-        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -114,13 +92,10 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
-- Vagrantfile
 - config/routes.rb
 - health_check.gemspec
 - init.rb
 - lib/health_check.rb
-- lib/health_check/add_23_routes.rb
 - lib/health_check/health_check_controller.rb
 - lib/health_check/health_check_routes.rb
 - lib/health_check/utils.rb
@@ -132,10 +107,10 @@ files:
 - test/migrate/twelve/011_create_roles.roles.rb
 - test/migrate/twelve/012_create_users.rb
 - test/migrate/twelve/9_create_countries.rb
-- test/provision_vagrant
-- test/rails_3.0.gemfile
-- test/rails_3.1.gemfile
-- test/rails_3.2.gemfile
+- test/rails_4.0.gemfile
+- test/rails_4.1.gemfile
+- test/rails_4.2.gemfile
+- test/rails_edge.gemfile
 - test/setup_railsapp
 - test/test_helper.rb
 - test/test_with_railsapp
@@ -153,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,10 +150,10 @@ test_files:
 - test/migrate/twelve/011_create_roles.roles.rb
 - test/migrate/twelve/012_create_users.rb
 - test/migrate/twelve/9_create_countries.rb
-- test/provision_vagrant
-- test/rails_3.0.gemfile
-- test/rails_3.1.gemfile
-- test/rails_3.2.gemfile
+- test/rails_4.0.gemfile
+- test/rails_4.1.gemfile
+- test/rails_4.2.gemfile
+- test/rails_edge.gemfile
 - test/setup_railsapp
 - test/test_helper.rb
 - test/test_with_railsapp

data/VERSION

@@ -1 +0,0 @@
-1.1.0

data/Vagrantfile

@@ -1,20 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  config.vm.box = "ubuntu/xenial64"
-
-  # 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"
-
-end

data/lib/health_check/add_23_routes.rb

@@ -1,25 +0,0 @@
-# Copyright (c) 2010-2013 Ian Heggie, released under the MIT license.
-# See MIT-LICENSE for details.
-
-# rails prior to 3.0
-module ActionController
-  module Routing #:nodoc:
-    class RouteSet #:nodoc:
-      alias_method :draw_without_health_check_routes, :draw
-
-      def draw
-        draw_without_health_check_routes do |map|
-          map.connect 'health_check',
-                      :controller => 'health_check/health_check', :action => 'index'
-          map.connect 'health_check.:format',
-                      :controller => 'health_check/health_check', :action => 'index'
-          map.connect 'health_check/:checks',
-                      :controller => 'health_check/health_check', :action => 'index'
-          map.connect 'health_check/:checks.:format',
-                      :controller => 'health_check/health_check', :action => 'index'
-          yield map
-        end
-      end
-    end
-  end
-end

data/test/provision_vagrant

@@ -1,79 +0,0 @@
-#!/bin/bash
-
-case `id` in
-*root*)
-        ;;
-*)
-        exec echo Must be run as root
-        ;;
-esac
-
-chruby_version=0.3.9
-chruby=chruby-${chruby_version}
-
-set -xe
-id
-pwd
-export DEBIAN_FRONTEND=noninteractive
-find /tmp/got-apt-update -mtime -1 || ( apt-get update && touch /tmp/got-apt-update )
-apt install --yes --force-yes -q ruby ruby-dev sqlite3 libsqlite3-dev nodejs subversion git git-core
-# https://github.com/rbenv/ruby-build/wiki#suggested-build-environment
-# using default gcc-5 since xenial doesn't have gcc-6
-apt install --yes --force-yes -q gcc-5 autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev
-
-# The following is not required for testing, install if you are doing manual tests with extra gems
-# apt install --yes --force-yes -q mysql-client mysql-server libmysqlclient-dev
-# apt install --yes --force-yes -q libcurl4-openssl-dev libncurses5-dev libxml2-dev libxslt1-dev
-(
-  echo Install chruby
-  [ -s ${chruby}.tar.gz ] || wget -q -O ${chruby}.tar.gz https://github.com/postmodern/chruby/archive/v${chruby_version}.tar.gz
-  [ -d ${chruby} ] || tar -xzf ${chruby}.tar.gz
-  cd ${chruby}/
-  ./scripts/setup.sh
-  cat > /etc/profile.d/chruby.sh <<'EOF'
-if [ -n "$BASH_VERSION" ] || [ -n "$ZSH_VERSION" ]; then
-  source /usr/local/share/chruby/chruby.sh
-  #source /usr/local/share/chruby/auto
-fi
-EOF
-  chmod a+r /etc/profile.d/chruby.sh
-)
-
-(
-  [ -d ruby-build ] || git clone https://github.com/rbenv/ruby-build.git
-  which ruby-build || PREFIX=/usr/local ./ruby-build/install.sh
-
-  mkdir -p /opt/rubies
-  v=1.8.7-p375
-  [ -x /opt/rubies/${v}/bin/bundle ] || ( ruby-build ${v} /opt/rubies/${v} && /opt/rubies/${v}/bin/gem update --system 1.8.25 && /opt/rubies/${v}/bin/gem install bundler )
-    
-  v=1.9.3-p551
-  [ -x /opt/rubies/${v}/bin/bundle ] || ( ruby-build ${v} /opt/rubies/${v} && /opt/rubies/${v}/bin/gem install bundler )
-
-  for v in 2.2.0
-  do
-    [ -x /opt/rubies/${v}/bin/bundle ] || ( ruby-build ${v} /opt/rubies/${v} && /opt/rubies/${v}/bin/gem install bundler )
-  done
-)
-
-echo Setup system ruby
-which bundle || gem install bundler 
-bundle --version
-set +x
-cat <<EOF
-
-Now test by running the following commands:
-
-  vagrant ssh
-  cd /vagrant
-
-  chruby RUBY_VERSION
-  or
-  chruby system # for system version 2.3.1
-
-  ./test/test_with_railsapp
-
-  exit
-
-EOF
-exit

data/test/rails_3.0.gemfile

@@ -1,23 +0,0 @@
-# Gemfile for health_test testing
-
-source 'https://rubygems.org'
-
-gem 'rails', "~> 3.0.19"
-gem 'rake', '>= 0.8.3', '< 11.0'        # REQUIRED
-
-# mime-types 2.0 requires Ruby version >= 1.9.2
-gem "mime-types", "< 2.0" if RUBY_VERSION < '1.9.2' # REQUIRED
-# 0.7 requires ruby 1.9.3
-gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # REQUIRED
-# rack 2.0 requires ruby 2.2.2
-gem 'rack', "< 2.0"  if RUBY_VERSION < '2.2.2'       # REQUIRED
-
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  end
-  gem 'shoulda', "~> 2.11.0"
-end

data/test/rails_3.1.gemfile

@@ -1,29 +0,0 @@
-# Gemfile for health_test testing
-
-source 'https://rubygems.org'
-
-gem 'rails', "~> 3.1.0"
-gem 'rake', '>= 0.8.3', '< 11.0'        # REQUIRED
-
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  end
-  gem 'shoulda', "~> 2.11.0"
-end
-
-# mime-types 2.0 requires Ruby version >= 1.9.2
-gem "mime-types", "< 2.0" if RUBY_VERSION < '1.9.2' # REQUIRED
-# 0.7 requires ruby 1.9.3
-gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # REQUIRED
-# rack 2.0 requires ruby 2.2.2
-gem 'rack', "< 2.0"  if RUBY_VERSION < '2.2.2'       # REQUIRED
-
-gem 'sass', '< 3.5' if RUBY_VERSION < '1.9.3' # REQUIRED
-
-# Initial Gemfile has therubyracer commented out
-gem 'therubyrhino', :platform => :jruby # REQUIRED
-gem 'therubyracer', :platform => :ruby # REQUIRED

data/test/rails_3.2.gemfile

@@ -1,30 +0,0 @@
-# Gemfile for health_test testing
-
-source 'https://rubygems.org'
-
-gem 'rails', "~> 3.2.0"
-gem 'rake', '>= 0.8.3', '< 11.0' # REQUIRED
-
-group :development, :test do
-  if defined?(JRUBY_VERSION)
-    gem 'jruby-openssl'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  end
-  gem 'shoulda', "~> 2.11.0"
-end
-
-# mime-types 2.0 requires Ruby version >= 1.9.2
-gem "mime-types", "< 2.0" if RUBY_VERSION < '1.9.2' # REQUIRED
-# 0.7 requires ruby 1.9.3
-gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # REQUIRED
-# rack 2.0 requires ruby 2.2.2
-gem 'rack', "< 2.0"  if RUBY_VERSION < '2.2.2'       # REQUIRED
-
-# Initial Gemfile has therubyracer commented out
-gem 'therubyrhino', :platform => :jruby # REQUIRED
-gem 'therubyracer', :platform => :ruby # REQUIRED
-
-# Pin gems to avoid incompatible versions
-gem 'sass', '< 3.5.0'  # REQUIRED