health_check 1.3.1 → 1.4.1

data/.travis.yml

@@ -16,56 +16,103 @@ bundler_args: "--binstubs"
 script: ./test/test_with_railsapp
 
 rvm: 
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
-  - ree
 
 gemfile:
-  - test/rails_3.2.gemfile
-
-env:
-  - RUBYGEMS_VERSION=
+  - test/rails_4.0.gemfile
 
 matrix:
-  exclude:
+  allow_failures:
+    - rvm: rbx-19mode
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_ENV2=development
+
+    - rvm: 1.9.3
+      gemfile: test/rails_edge.gemfile
+
+    - rvm: 2.0.0
+      gemfile: test/rails_edge.gemfile
+
+    - rvm: ruby-head
+      gemfile: test/rails_edge.gemfile
+
+    - rvm: jruby-head
+      gemfile: test/rails_edge.gemfile
+
+  include:
+    # rails edge
+    
+    - rvm: 1.9.3
+      gemfile: test/rails_edge.gemfile
+    
+    - rvm: 2.0.0
+      gemfile: test/rails_edge.gemfile
+
+    - rvm: ruby-head
+      gemfile: test/rails_edge.gemfile
+
+    - rvm: jruby-head
+      gemfile: test/rails_edge.gemfile
+
+    # rails 4.0  June 25, 2013
+    
+    - rvm: 1.9.3
+      gemfile: test/rails_4.0.gemfile
+
+    - rvm: jruby-19mode
+      gemfile: test/rails_4.0.gemfile
+
+    - rvm: rbx-19mode
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_ENV2=development
+
+    - rvm: 2.0.0
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_SERVER=puma
+
+    - rvm: 2.0.0
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_SERVER=passenger
+
+    - rvm: 2.0.0
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_SERVER=thin
+
+    - rvm: 2.0.0
+      gemfile: test/rails_4.0.gemfile
+      env: RAILS_SERVER=unicorn
+
+    # rails 3.2 jan 20, 2012
     - rvm: 1.8.7
       gemfile: test/rails_3.2.gemfile
-      env: RUBYGEMS_VERSION=
 
-    - rvm: jruby-19mode
+    #- rvm: 1.9.2
+    #  gemfile: test/rails_3.2.gemfile
+
+    - rvm: 1.9.3
       gemfile: test/rails_3.2.gemfile
-      env: RUBYGEMS_VERSION=
 
-  include:
-    # rails 2.3 march 16 2009 - ruby 1.8.7
-    - rvm: 1.8.7
-      gemfile: test/rails_2.3.gemfile
-      env: RUBYGEMS_VERSION=1.8.25
+    - rvm: ree
+      gemfile: test/rails_3.2.gemfile
 
-    # rails 3.0 aug 29 2010 - ruby 1.8.7
-    - rvm: 1.8.7
-      gemfile: test/rails_3.0.gemfile
-      env: RUBYGEMS_VERSION=
+    - rvm: jruby-19mode
+      gemfile: test/rails_3.2.gemfile
+
+    - rvm: rbx-19mode
+      gemfile: test/rails_3.2.gemfile
 
     # rails 3.1 aug 31, 2011 - ruby 1.8.7 or 1.9.2
     - rvm: 1.8.7
       gemfile: test/rails_3.1.gemfile
-      env: RUBYGEMS_VERSION=
 
     - rvm: 1.9.2
       gemfile: test/rails_3.1.gemfile
-      env: RUBYGEMS_VERSION=
 
-    # rails 4.0 - in development as of 5 mar 2013 - ruby 2.0
-    - rvm: 2.0.0
-      gemfile: test/rails_4.0.gemfile
-      env: RUBYGEMS_VERSION=
+    # rails 3.0 aug 29 2010 - ruby 1.8.7
+    - rvm: 1.8.7
+      gemfile: test/rails_3.0.gemfile
 
-    - rvm: jruby-19mode
-      gemfile: test/rails_3.2.gemfile
+    # rails 2.3 march 16 2009 - ruby 1.8.7
+    - rvm: 1.8.7
+      gemfile: test/rails_2.3.gemfile
       env: RUBYGEMS_VERSION=1.8.25
-

data/CHANGELOG

@@ -1,5 +1,13 @@
 = Change Log =
 
+* 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+)
+  * Simplified routing rules down to one rule for Rails 3.0+
+  * Includes some changes for rails 4.1 (edge) - but still a work in progress
+* 1.3.1 - Include changes from contributers:
+  * Migrations with dots are now handled
+  * the list of checks for "full" / "all" can be configured
 * 1.2.0 - The gem can now be configured, including timeouts, status codes and text returned on success
         - Customn checks can be added via initializer like config.add_custom_check { CustomCheckClass.a_custom_check }
 	- You can now request the response to be json or xml (via url or Content-accepted header)

data/README.rdoc

@@ -41,7 +41,7 @@ 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 and throws an ActiveRecord::PendingMigrationError exception (http error 500) if there is an error
+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
 
@@ -101,7 +101,7 @@ To change the configuration of health_check, create a file `config/initializers/
       config.http_status_for_error_object = 500
 
       # You can set what tests are run with the 'full' or 'all' parameter
-      self.full_checks = ['database', 'migrations', 'custom', 'email', 'cache']
+      config.full_checks = ['database', 'migrations', 'custom', 'email', 'cache']
 
       # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
       config.add_custom_check do
@@ -128,7 +128,8 @@ See
 * NewRelic Availability Monitoring - http://newrelic.com/docs/features/availability-monitoring-faq
 * Uptime by OpenACS - http://uptime.openacs.org/uptime/
 * Engine Yard's guide - https://support.cloud.engineyard.com/entries/20996821-monitor-application-uptime (although the guide is based on fitter_happier plugin it will also work with this gem)
-* Any other montoring service that can be set to check for the word success in the test returned from a url
+* Nagios check_http (with -s success) - https://www.nagios-plugins.org/doc/man/check_http.html
+* Any other montoring service that can be set to check for the word success in the text returned from a url
 
 === Requesting Json and XML responses
 

data/config/routes.rb

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

data/lib/health_check/health_check_controller.rb

@@ -6,7 +6,7 @@ module HealthCheck
 
     session(:off) if Rails.version < '3.0'
 
-    layout nil
+    layout false if self.respond_to? :layout
 
     def index
       checks = params[:checks] || 'standard'
@@ -51,24 +51,28 @@ module HealthCheck
 
     # Silence logger as much as we can
 
-    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)
+    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
-          logger.silence do
-            process_without_silent_log(method_name, *args)
-          end
+          process_without_silent_log(method_name, *args)
         end
-      else
-        process_without_silent_log(method_name, *args)
       end
-    end
 
-    alias_method_chain :process, :silent_log
+      alias_method_chain :process, :silent_log
+
+    end
 
   end
 end

data/lib/health_check/health_check_routes.rb

@@ -2,14 +2,9 @@ if defined?(HealthCheck::Engine)
 
   module ActionDispatch::Routing
     class Mapper
-      def health_check_routes
-        unless HealthCheck::Engine.routes_defined
-          HealthCheck::Engine.routes_defined = true
-          get 'health_check', :to => 'health_check/health_check#index'
-          get 'health_check.:format', :to => 'health_check/health_check#index'
-          get 'health_check/:checks', :to => 'health_check/health_check#index'
-          get 'health_check/:checks.:format', :to => 'health_check/health_check#index'
-        end
+      def health_check_routes(routes_manually_defined = true)
+        HealthCheck::Engine.routes_manually_defined ||= routes_manually_defined
+        get 'health_check(/:checks)(.:format)', :to => 'health_check/health_check#index'
       end
     end
   end

data/lib/health_check/utils.rb

@@ -29,10 +29,19 @@ module HealthCheck
           when "email"
             errors << HealthCheck::Utils.check_email
           when "migrations", "migration"
-            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}). "
+            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

data/lib/health_check/version.rb

@@ -1,4 +1,4 @@
 module HealthCheck
-  VERSION = "1.3.1"
+  VERSION = "1.4.1"
 end
 

data/lib/health_check.rb

@@ -5,7 +5,7 @@ module HealthCheck
 
   if Rails.version >= '3.0'
     class Engine < Rails::Engine
-      cattr_accessor :routes_defined
+      cattr_accessor :routes_manually_defined
     end
   end
 

data/test/init_variables

@@ -10,6 +10,7 @@ base_dir=$PWD
 tmp_dir=$base_dir/tmp
 railsapp=$tmp_dir/railsapp
 custom_file="$railsapp/tmp/custom_check.ok"
+catchall_file="$railsapp/tmp/catchall_route.enabled"
 success=successful
 
 rehash=''

data/test/rails_4.0.gemfile

@@ -2,9 +2,7 @@
 
 source 'https://rubygems.org'
 
-# Bundle edge Rails instead:
-
-ruby "1.9.3" if RUBY_VERSION < '1.9'
+ruby '1.9.3' if RUBY_VERSION < '1.9.3'
 
 gem 'rails', "~> 4.0.0"
 gem 'rake', '>= 0.8.3'

data/test/rails_edge.gemfile

@@ -0,0 +1,21 @@
+# 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

data/test/setup_railsapp

@@ -10,7 +10,7 @@ do
         echo "Aborting..."
         exit 2
         ;;
-    */test/rails_[0-9].[0-9]*.gemfile)
+    */test/rails_edge.gemfile|*/test/rails_[0-9].[0-9]*.gemfile)
         if [ -f "$BUNDLE_GEMFILE" ]; then
             break
         fi
@@ -63,7 +63,7 @@ echo Gems in tmp/gems:
 ls tmp/gems
 
 echo Environment:
-env | egrep 'TRAVIS|RAILS|RUBY|_ENV|GEM|BUNDLE'
+env | egrep 'TRAVIS|RAILS|RUBY|_ENV|GEM|BUNDLE' || echo "No relevant variables set"
 
 cd $tmp_dir
 
@@ -83,7 +83,14 @@ case "$actual_rails_version" in
         $rails railsapp -d $db
         ;;
     *' '[34].*)
-        $rails new railsapp -d $db
+        case "$BUNDLE_GEMFILE" in
+        *rails_edge.gemfile)
+            $rails new railsapp -d $db --edge
+            ;;
+        *)
+            $rails new railsapp -d $db
+            ;;
+        esac
         ;;
     *)
         echo "Unknown rails version"
@@ -122,10 +129,6 @@ HealthCheck.setup do |config|
 end
 !
 
-echo "Last ten lines of config/environment.rb:"
-tail -10 config/environment.rb
-echo 
-
 echo Unsetting BUNDLE_GEMFILE '(so Gemfile for rails application will be used)'
 unset BUNDLE_GEMFILE
 
@@ -134,9 +137,15 @@ then
     echo Adding health_check as gem to Gemfile...
     echo "gem 'health_check', :path => '$base_dir'" >> Gemfile
 
-    echo
-    echo Gemfile contents:
-    cat 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
     echo running bundle install --binstubs
     bundle install --binstubs
@@ -152,6 +161,9 @@ then
     rake="$railsapp/bin/rake"
     # Fix for rvm, otherwise bundle run from rails create fails
     export PATH="`pwd`/bin:$PATH"
+    echo ================= Gemfile ===================
+    cat Gemfile
+    echo
 else
     dest=$railsapp/vendor/plugins/health_check
     echo Installing health_check as plugin in $dest ...
@@ -169,18 +181,37 @@ else
     )
 fi
 
-echo Setting RAILS_ENV=test RACK_ENV=test
-export RAILS_ENV=test RACK_ENV=test
+for e in test ${RAILS_ENV2:-production}
+do
+    if [ -f config/environments/$e.rb ]; then
+      echo ======== config/environments/$e.rb ================
+      sed -i.bak -e 's/config.serve_static_assets = false/config.serve_static_assets = true   # NOTE: health_check test: changed to true/'  \
+        -e 's/config.active_record.migration_error = :page_load/# & # NOTE: health_check test: commented out/'  \
+        config/environments/$e.rb 
+      cat config/environments/$e.rb || true
+      echo
+    fi
+done
+echo "============== config/environment.rb ============="
+cat config/environment.rb
+echo 
 
+echo ========================
 case $db in
     jdbcsqlite3)
-        echo
-        echo 'Jruby requires the database to be created before the server is started: running rake db:migrate'
-        $rake db:migrate 
-        echo
-        ;;
+      for e in test ${RAILS_ENV2:-production}
+      do
+            echo
+            export RAILS_ENV=$e RACK_ENV=$e
+            echo "Jruby requires the database to be created before the server is started: running RAILS_ENV=$e rake db:migrate"
+            $rake db:migrate 
+            echo
+      done
+      ;;
 esac
 
+echo STATIC-FILE > public/static.txt
+
 cat > public/ajax_example.html <<'EOF'
     <html>
     <head>
@@ -252,6 +283,74 @@ cat > public/ajax_example.html <<'EOF'
     </html>
 EOF
 
+cat > app/controllers/example_controller.rb <<'EOF'
+class ExampleController < ApplicationController
+
+  def index
+    render :text => 'example page'
+  end
+  
+  def catchall
+    render :text => 'catch all route'
+  end
+  
+end
+
+EOF
+
+if [ -s config/routes.rb ]; then
+  mv -f config/routes.rb config/routes.rb-old
+  var=`ruby -n -e 'print $1 if /^[^#]+ do \|([^\|]+)\|/' config/routes.rb-old`
+  (
+    ruby -n -e 'print if not /^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 -e '/^end/,$d' config/routes.rb-old
+    fi
+
+    case "$var" in
+    '')
+      echo "  # -----------------------------------------"
+      echo "  # START OF SECTION FOR TESTING HEALTH_CHECK"
+      echo "  get 'example(/:action(/:id))(.:format)' => 'example'"
+      echo "  if File.exists?('$catchall_file')"
+      echo "    health_check_routes"
+      echo "    # CATCH ALL ROUTE"
+      echo "    get '*path' => 'example#catchall'"
+      echo "  end"
+      echo "  # END OF SECTION FOR TESTING HEALTH_CHECK"
+      echo "  # ---------------------------------------"
+      ;;
+    *)
+      echo "  # -----------------------------------------"
+      echo "  # START OF SECTION FOR TESTING HEALTH_CHECK"
+      echo "  # example controller"
+      echo "  ${var}.connect 'example(/:action(/:id))(.:format)', :controller => 'example'"
+      echo "  if File.exists?('$catchall_file')"
+      echo "    # health_check routes already at the top in rails 2.3! do not need to call health_check_routes"
+      echo "    # CATCH ALL ROUTE"
+      echo "    ${var}.connect '*path', :controller => 'example', :action => 'catchall'"
+      echo "  end"
+      echo "  # END OF SECTION FOR TESTING HEALTH_CHECK"
+      echo "  # ---------------------------------------"
+      ;;
+    esac
+    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
+    fi
+  ) 3>&1 > config/routes.rb
+
+  #echo =============== config/routes.rb-old ========================
+  #cat config/routes.rb-old
+  echo =============== config/routes.rb ========================
+  cat config/routes.rb
+else
+  echo NO config/routes.rb file!!
+fi
+echo =======================================
+
 echo
 echo "Created $actual_rails_version app in $railsapp using adapter $db"
 echo -n "Using "

data/test/test_with_railsapp

@@ -26,6 +26,7 @@ esac
 
 cd $railsapp
 date > $custom_file
+rm -f $catchall_file
 
 testurl="$base_dir/test/testurl"
 fake_smtp_server="$base_dir/test/fake_smtp_server"
@@ -33,6 +34,104 @@ fake_smtp_server="$base_dir/test/fake_smtp_server"
 server_pid=''
 fake_smtp_pid=''
 
+pick_a_port()
+{
+    while :
+    do
+        port=`expr 10000 + $RANDOM`
+        # Check Tcp ports in Listen mode with No address resolution
+        if (netstat -tln | egrep ":${port} .*:"); then
+            echo "(Skipping used port)"
+        else
+            break
+        fi
+    done
+}
+
+
+start_server()
+{
+    # restart migration list
+    rm -rf db/migrate db/schema.rb
+    mkdir -p db/migrate
+
+    # Increment port each time to make sure we have not trouble with address/port already allocated
+    pick_a_port
+    host=http://127.0.0.1:${port}
+    bundle_prefix=''
+    if [ -f Gemfile ]
+    then
+        bundle_prefix='bundle exec'
+    fi
+    server_arg=${RAILS_SERVER:-webrick}
+    case "$server_arg" in
+    puma) 
+        $bundle_prefix puma -b tcp://127.0.0.1:$port &
+        ;;
+    passenger) 
+        $bundle_prefix passenger start -p $port &
+        ;;
+    thin) 
+        $bundle_prefix thin start -p $port &
+        ;;
+    unicorn) 
+        $bundle_prefix unicorn_rails -l 127.0.0.1:$port &
+        ;;
+    *)
+        if [ -x script/server ]
+        then
+            echo Starting server on port $port using $bundle_prefix ./script/server ...
+            $bundle_prefix ./script/server $server_arg -p $port &
+        else
+            echo Starting server on port $port using $rails s ...
+            $bundle_prefix $rails server $server_arg -p $port &
+        fi
+        ;;
+    esac
+    server_pid=$!
+    sleep 3
+    echo
+    echo 'Checking server is up ...'
+    for i in 1 2 3 4 5 6
+    do
+      if $testurl ${host}/static.txt ; then
+        break
+      fi
+      if kill -0 $server_pid ; then
+        echo "waiting ${i} ..."
+      else
+        echo "ERROR: Server has died!!"
+        exit 3
+      fi
+   done
+}
+
+stop_server()
+{
+    case "$server_pid" in
+        [0-9]*)
+            echo ========================================================
+            echo "Killing rails server [pid: $server_pid]"
+            kill -1 $server_pid  || true
+            sleep 2
+            kill -9 $server_pid  || true
+            ;;
+    esac
+    case "$fake_smtp_pid" in
+        [0-9]*)
+            echo ========================================================
+            echo "Killing fake smtp server [pid: $fake_smtp_pid]"
+            kill -1 $fake_smtp_pid || true
+            sleep 2
+            kill -9 $fake_smtp_pid || true
+            ;;
+    esac
+    server_pid=''
+    fake_smtp_pid=''
+    wait
+    sleep 2
+}
+
 finish()
 {
     set +e
@@ -49,21 +148,7 @@ finish()
         tail -50 $railsapp/log/test.log
     fi
 
-    case "$fake_smtp_pid" in
-        [0-9]*)
-            echo ========================================================
-            echo "Killing fake smtp server [pid: $fake_smtp_pid]"
-            kill -9 $fake_smtp_pid
-            ;;
-    esac
-    case "$server_pid" in
-        [0-9]*)
-            echo ========================================================
-            echo "Killing rails server [pid: $server_pid]"
-            kill -9 $server_pid 
-            ;;
-    esac
-    wait
+    stop_server
     trap "" 0
     echo ========================================================
     echo TEST ${1:-FAILED}
@@ -73,151 +158,188 @@ finish()
 
 trap "finish FAILED 1" 0
 
-port=3456
-
-if [ -x script/server ]
-then
-    if [ -f Gemfile ]
-    then
-	echo Starting server on port $port using bundle exec ./script/server ...
-	bundle exec ./script/server webrick -p $port &
-    else
-	echo Starting server on port $port using ./script/server ...
-	./script/server webrick -p $port &
-    fi
-else
-    echo Starting server on port $port using $rails s ...
-    $rails s webrick -p $port &
-fi
-server_pid=$!
-sleep 17
-
-echo STATIC-FILE > public/static.txt
-
-host=http://localhost:${port}
-
-# get a static file
-echo
-echo 'TESTING can get a static file ...'
-$testurl ${host}/static.txt 200 text/plain STATIC-FILE
-echo
-
-echo 'TESTING health_check/migration should pass with no database migrations ...'
-mkdir -p db/migrate
-ls db/migrate
-$testurl ${host}/health_check/migration 200 text/plain $success
-echo
-
-echo 'TESTING health_check/migration should fail without initial database migration ...'
-cp $base_dir/test/migrate/nine/* db/migrate
-ls db/migrate
-$testurl ${host}/health_check/migration 550 text/plain failed
-echo
-
-echo 'TESTING health_check/database should pass without initial database migration (since it ignores the difference) ...'
-$testurl ${host}/health_check/database 200 text/plain $success
-echo
-
-echo 'TESTING health_check/site should pass ...'
-$testurl ${host}/health_check/site 200 text/plain $success
-echo
-
-echo 'TESTING health_check/migration should pass after initial database migration ...'
-$rake db:migrate 
-$testurl ${host}/health_check/migration 200 text/plain $success
-echo
-
-echo 'TESTING health_check/migration should fail without all migrations ...'
-cp $base_dir/test/migrate/twelve/* db/migrate
-
-case "$actual_rails_version" in
-    *' '[12].*|*' '3.[01]*)
-        echo removing db/migrate/*.*.rb "($actual_rails_version does not support extra dots in migration names)"
-        rm -f db/migrate/*.*.rb
-        ;;
-esac
-ls db/migrate
-$testurl ${host}/health_check/migration 550 text/plain failed
-echo
-
-echo 'TESTING health_check/migration should pass after both database migrations ...'
-$rake db:migrate 
-$testurl ${host}/health_check/migration 200 text/plain $success
-echo
+common_tests()
+{
 
-echo 'TESTING health_check/migration should pass after both database migrations ...'
-$rake db:migrate 
-$testurl ${host}/health_check/migration 200 text/plain $success
-echo
+    echo 'CHECKING routes exist...'
+    $rake routes | tee /tmp/t$$
+    echo
+    case `egrep health_check /tmp/t$$ || true` in
+    '')
+      echo WARNING - routes for health_check not listed!
+      ;;
+    esac
 
-echo 'TESTING health_check/email should fail without smtp available ...'
-$testurl ${host}/health_check/email 550 text/plain failed
-echo
+    echo
+    echo 'TESTING can get a static file ...'
+    $testurl ${host}/static.txt 200 text/plain STATIC-FILE
+    echo
+
+    echo
+    echo 'TESTING can get an example controller ...'
+    $testurl ${host}/example 200 text/html 'example page'
+    echo
+
+    echo
+    echo 'TESTING direct call to catchall method on example controller ...'
+    $testurl ${host}/example/catchall 200 text/html 'catch all route'
+    echo
+
+    echo 'TESTING health_check/migration should pass with no database migrations ...'
+    ls db/migrate
+    $testurl ${host}/health_check/migration 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/migration should fail without initial database migration ...'
+    cp $base_dir/test/migrate/nine/* db/migrate
+    ls db/migrate
+    $testurl ${host}/health_check/migration 550 text/plain failed
+    echo
+
+    echo 'TESTING health_check/database should pass without initial database migration (since it ignores the difference) ...'
+    $testurl ${host}/health_check/database 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/site should pass ...'
+    $testurl ${host}/health_check/site 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/migration should pass after initial database migration ...'
+    $rake db:migrate 
+    $testurl ${host}/health_check/migration 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/migration should fail without all migrations ...'
+    cp $base_dir/test/migrate/twelve/* db/migrate
+
+    case "$actual_rails_version" in
+        *' '[12].*|*' '3.[01]*)
+            echo removing db/migrate/*.*.rb "($actual_rails_version does not support extra dots in migration names)"
+            rm -f db/migrate/*.*.rb
+            ;;
+    esac
+    ls db/migrate
+    $testurl ${host}/health_check/migration 550 text/plain failed
+    echo
+
+    echo 'TESTING health_check/migration should pass after both database migrations ...'
+    $rake db:migrate 
+    $testurl ${host}/health_check/migration 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/migration should pass after both database migrations ...'
+    $rake db:migrate 
+    $testurl ${host}/health_check/migration 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/email should fail without smtp available ...'
+    $testurl ${host}/health_check/email 550 text/plain failed
+    echo
+
+    echo 'TESTING health_check/email should pass with smtp available ...'
+    $fake_smtp_server &
+    fake_smtp_pid=$!
+    sleep 5
+    $testurl ${host}/health_check/email 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check (all) should fail without smtp available ...'
+    $testurl ${host}/health_check 550 text/plain failed
+    echo
+
+    echo 'TESTING health_check/all should fail without smtp available ...'
+    $testurl ${host}/health_check 550 text/plain failed
+    echo
+
+    kill -9 $fake_smtp_pid || echo fake_smtp_server had finished as expected
+    echo 'TESTING health_check (all) should pass with smtp available ...'
+    $fake_smtp_server &
+    fake_smtp_pid=$!
+    sleep 5
+    $testurl ${host}/health_check 200 text/plain $success
+    echo
+
+    kill -9 $fake_smtp_pid || echo fake_smtp_server had finished as expected
+    echo 'TESTING health_check/all should pass with smtp available ...'
+    $fake_smtp_server &
+    fake_smtp_pid=$!
+    sleep 5
+    $testurl ${host}/health_check/all 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/custom should pass ...'
+    $testurl ${host}/health_check/custom 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/custom.html should pass (returning plain text) ...'
+    $testurl ${host}/health_check/custom.html 200 text/plain $success
+    echo
+
+    echo 'TESTING health_check/custom.json should pass ...'
+    $testurl ${host}/health_check/custom.json 200 application/json '"healthy":true'
+    $testurl ${host}/health_check/custom.json 200 application/json "\"message\":\"$success\""
+    echo
+
+    echo 'TESTING health_check/custom.xml should pass ...'
+    $testurl ${host}/health_check/custom.xml 200 application/xml '<healthy type="boolean">true</healthy>'
+    $testurl ${host}/health_check/custom.xml 200 application/xml "<message>$success</message>"
+    echo
+
+    echo 'TESTING health_check/custom should fail when custom returns string ...'
+    rm -f $custom_file
+    $testurl ${host}/health_check/custom 550 text/plain failed
+    echo
+
+    echo 'TESTING health_check (all) should fail when custom check fails ...'
+    $testurl ${host}/health_check 550 text/plain "$custom_file is missing!"
+    echo
+
+    echo 'TESTING health_check.json (all) should fail when custom check fails ...'
+    $testurl ${host}/health_check.json 555 application/json '"healthy":false'
+    $testurl ${host}/health_check.json 555 application/json "$custom_file is missing!"
+    echo
+
+    echo 'TESTING health_check.xml (all) should fail when custom check fails ...'
+    $testurl ${host}/health_check.xml 555 application/xml '<healthy type="boolean">false</healthy>'
+    echo
+
+    date > $custom_file
+}
 
-echo 'TESTING health_check/email should pass with smtp available ...'
-$fake_smtp_server &
-fake_smtp_pid=$!
-sleep 5
-$testurl ${host}/health_check/email 200 text/plain $success
-echo
+echo ========================================================
+echo TESTING WITHOUT CATCHALL in test env
+echo ========================================================
+export RAILS_ENV=test RACK_ENV=test
 
-echo 'TESTING health_check (all) should fail without smtp available ...'
-$testurl ${host}/health_check 550 text/plain failed
-echo
+start_server
 
-echo 'TESTING health_check/all should fail without smtp available ...'
-$testurl ${host}/health_check 550 text/plain failed
-echo
+# get a static file
 
-kill -9 $fake_smtp_pid || echo fake_smtp_server had finished as expected
-echo 'TESTING health_check (all) should pass with smtp available ...'
-$fake_smtp_server &
-fake_smtp_pid=$!
-sleep 5
-$testurl ${host}/health_check 200 text/plain $success
 echo
+echo 'TESTING no catchall route active ...'
+expected_status=404,500,502
+$testurl ${host}/another/url $expected_status
 
-kill -9 $fake_smtp_pid || echo fake_smtp_server had finished as expected
-echo 'TESTING health_check/all should pass with smtp available ...'
-$fake_smtp_server &
-fake_smtp_pid=$!
-sleep 5
-$testurl ${host}/health_check/all 200 text/plain $success
-echo
+common_tests
 
-echo 'TESTING health_check/custom should pass ...'
-$testurl ${host}/health_check/custom 200 text/plain $success
-echo
+echo ========================================================
+echo TESTING WITH CATCHALL in ${RAILS_ENV2:-production} env
+echo ========================================================
+export RAILS_ENV=${RAILS_ENV2:-production} RACK_ENV=${RAILS_ENV2:-production}
 
-echo 'TESTING health_check/custom.json should pass ...'
-$testurl ${host}/health_check/custom.json 200 application/json '"healthy":true'
-$testurl ${host}/health_check/custom.json 200 application/json "\"message\":\"$success\""
-echo
+date > $catchall_file
 
-echo 'TESTING health_check/custom.xml should pass ...'
-$testurl ${host}/health_check/custom.xml 200 application/xml '<healthy type="boolean">true</healthy>'
-$testurl ${host}/health_check/custom.xml 200 application/xml "<message>$success</message>"
-echo
+stop_server
+start_server
 
-echo 'TESTING health_check/custom should fail when custom returns string ...'
-rm -f $custom_file
-$testurl ${host}/health_check/custom 550 text/plain failed
 echo
-
-echo 'TESTING health_check (all) should fail when custom check fails ...'
-$testurl ${host}/health_check 550 text/plain "$custom_file is missing!"
+echo 'TESTING catchall route active ...'
+$testurl ${host}/another/url 200 text/html 'catch all route'
 echo
 
-echo 'TESTING health_check.json (all) should fail when custom check fails ...'
-$testurl ${host}/health_check.json 555 application/json '"healthy":false'
-$testurl ${host}/health_check.json 555 application/json "$custom_file is missing!"
-echo
+common_tests
 
-echo 'TESTING health_check.xml (all) should fail when custom check fails ...'
-$testurl ${host}/health_check.xml 555 application/xml '<healthy type="boolean">false</healthy>'
-echo
-
-date > $custom_file
+rm -f $catchall_file
 
 finish PASSED 0
 exit 0

data/test/testurl

@@ -30,16 +30,16 @@ puts "  response code: #{response.code} #{response.message}"
 puts "  content_type: #{response.content_type}"
 puts "  body: #{page_content}"
 
-if ARGV[1]
-  if response.code == ARGV[1]
-    puts "PASS (response code was #{ARGV[1]})"
+if ARGV[1] and 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]})" 
     exit 1
   end
 end
 
-if ARGV[2]
+if ARGV[2] and ARGV[2] != ''
   if response.content_type == ARGV[2]
     puts "PASS (content type was #{response.content_type})"
   else
@@ -48,7 +48,7 @@ if ARGV[2]
   end
 end
 
-if ARGV[3]
+if ARGV[3] and ARGV[3] != ''
   if page_content.to_s.include? ARGV[3]
     puts "PASS (found #{ARGV[3]})"
   else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: health_check
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 5
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 1
-  version: 1.3.1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Ian Heggie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-25 00:00:00 +10:00
+date: 2013-10-21 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,7 @@ files:
 - test/rails_3.1.gemfile
 - test/rails_3.2.gemfile
 - test/rails_4.0.gemfile
+- test/rails_edge.gemfile
 - test/setup_railsapp
 - test/test_helper.rb
 - test/test_with_railsapp
@@ -190,6 +191,7 @@ test_files:
 - test/rails_3.1.gemfile
 - test/rails_3.2.gemfile
 - test/rails_4.0.gemfile
+- test/rails_edge.gemfile
 - test/setup_railsapp
 - test/test_helper.rb
 - test/test_with_railsapp