health_check 1.5.0 → 1.5.1

data/.travis.yml

@@ -16,87 +16,64 @@ bundler_args: "--binstubs"
 script: ./test/test_with_railsapp
 
 rvm: 
-  - 2.1.2
+  - 1.9.3
 
 gemfile:
-  - test/rails_4.1.gemfile
+  - test/rails_3.2.gemfile
 
 matrix:
   allow_failures:
-    - rvm: 2.1.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: 2.1.0
-      gemfile: test/rails_edge.gemfile
-
-    - rvm: ruby-head
-      gemfile: test/rails_edge.gemfile
-
-    - rvm: jruby-head
-      gemfile: test/rails_edge.gemfile
-
-    # rails 4.1  April 8, 2014 
+    # rails 3.2 jan 20, 2012 - ruby 1.8.7 or 1.9.2
     
-    - rvm: 2.1.2
-      gemfile: test/rails_4.1.gemfile
-      env: RAILS_SERVER=puma
+    - rvm: 1.9.3
+      gemfile: test/rails_3.2.gemfile
+      env: RAILS_SERVER=puma RAILS_VERSION=3.2
 
-    - rvm: 2.1.2
-      gemfile: test/rails_4.1.gemfile
-      env: RAILS_SERVER=passenger
+    - rvm: 1.9.3
+      gemfile: test/rails_3.2.gemfile
+      env: RAILS_SERVER=passenger RAILS_VERSION=3.2
 
-    - rvm: 2.1.2
-      gemfile: test/rails_4.1.gemfile
-      env: RAILS_SERVER=thin
+    - rvm: 1.9.3
+      gemfile: test/rails_3.2.gemfile
+      env: RAILS_SERVER=thin RAILS_VERSION=3.2
 
     - rvm: rbx-2.2.6
-      gemfile: test/rails_4.0.gemfile
-      env: RAILS_ENV2=development
-
-    - rvm: 2.1.2
-      gemfile: test/rails_4.1.gemfile
-      env: RAILS_SERVER=unicorn
-
-    - rvm: jruby-19mode
-      gemfile: test/rails_4.1.gemfile
+      gemfile: test/rails_3.2.gemfile
+      env: RAILS_ENV2=development RAILS_VERSION=3.2
 
-    # rails 4.0  June 25, 2013
-    
     - rvm: 1.9.3
-      gemfile: test/rails_4.0.gemfile
+      gemfile: test/rails_3.2.gemfile
+      env: RAILS_SERVER=unicorn RAILS_VERSION=3.2
 
-    - rvm: rbx-2.2.6
-      gemfile: test/rails_4.0.gemfile
-      env: RAILS_ENV2=development
+    - rvm: jruby-19mode
+      gemfile: test/rails_3.2.gemfile
+      env: RAILS_VERSION=3.2
 
-    - rvm: 2.0.0
-      gemfile: test/rails_4.0.gemfile
+    - rvm: 2.2.0
+      gemfile: test/rails_3.2.gemfile
+      env: RAILS_VERSION=3.2
 
-    # rails 3.2 jan 20, 2012 - ruby 1.8.7 or 1.9.2
     - rvm: 1.9.3
       gemfile: test/rails_3.2.gemfile
+      env: RAILS_VERSION=3.2
 
     - rvm: jruby-19mode
       gemfile: test/rails_3.2.gemfile
+      env: RAILS_VERSION=3.2
 
     # rails 3.1 aug 31, 2011 - ruby 1.8.7 or 1.9.2
     - rvm: 1.9.2
       gemfile: test/rails_3.1.gemfile
+      env: RAILS_VERSION=3.1
 
     - rvm: 1.8.7
       gemfile: test/rails_3.0.gemfile
+      env: RAILS_VERSION=3.0
 
     # 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
+      env: RUBYGEMS_VERSION=1.8.25 RAILS_VERSION=2.3
 

data/CHANGELOG

@@ -1,5 +1,10 @@
 = Change Log =
 
+*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
 * 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+)
@@ -17,3 +22,265 @@
 * 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
+
++
+ end
+ 
+diff --git a/README.rdoc b/README.rdoc
+index de48110..cf673e8 100644
+--- a/README.rdoc
++++ b/README.rdoc
+@@ -24,11 +24,11 @@ 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 and logging for its actions to minimise the impact of frequent uptime checks on the session store and the log file.
++The health_check controller disables sessions for versions that eagerly load sessions. Only failures are logged for rails < '4.1'.
+ 
+ == Checks
+ 
+-* standard (default) - site, database and migrations checks are run plus email if settings have been changed
++* standard (default) - site, database and migrations checks are run plus email if ActionMailer is defined and it is not using the default configuration
+ * all / full - all checks are run (can be overriden in config block)
+ * database - checks that the current migration level can be read from the database
+ * email - basic check of email - :test returns true, :sendmail checks file is present and executable, :smtp sends HELO command to server and checks response
+@@ -100,6 +100,9 @@ To change the configuration of health_check, create a file `config/initializers/
+ 
+       config.http_status_for_error_object = 500
+ 
++      # You can customize which checks happen on a standard health check
++      config.standard_checks = [ 'database', 'migrations', 'custom' ]
++
+       # You can set what tests are run with the 'full' or 'all' parameter
+       config.full_checks = ['database', 'migrations', 'custom', 'email', 'cache']
+ 
+@@ -189,11 +192,10 @@ See https://github.com/ianheggie/health_check/wiki/Ajax-Example for an Ajax exam
+ 
+ === Automated testing and other checks
+ 
+-Travis CI runs the tests: {<img src="https://travis-ci.org/ianheggie/health_check.png">}[https://travis-ci.org/ianheggie/health_check]
+-
+-Code Climate monitors code quality: {<img src="https://codeclimate.com/github/ianheggie/health_check.png" />}[https://codeclimate.com/github/ianheggie/health_check]
+-
+-Gemnasium monitors gem dependencies {<img src="https://gemnasium.com/ianheggie/health_check.png">}[https://gemnasium.com/ianheggie/health_check]
++* {<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
+ 
+@@ -230,10 +232,18 @@ The command `rake test` will also launch these tests, except it cannot install t
+ 
+ == Copyright
+ 
+-Copyright (c) 2010-2013 Ian Heggie, released under the MIT license.
++Copyright (c) 2010-2014 Ian Heggie, released under the MIT license.
+ See MIT-LICENSE for details.
+ 
+ == Contributors
+ 
+-Thanks go to the various people who have given feedback and suggestions via the issues list and pull requests
++Thanks go to the various people who have given feedback and suggestions via the issues list and pull requests.
++
++=== Contributing
++
++1. Fork it
++2. Create your feature branch (`git checkout -b my-new-feature`)
++3. Commit your changes (`git commit -am 'Add some feature'`)
++4. Push to the branch (`git push origin my-new-feature`)
++5. Create new Pull Request (Code with BDD tests are favoured)
+ 
+diff --git a/health_check.gemspec b/health_check.gemspec
+index 1b7f8fc..e6b70f5 100644
+--- a/health_check.gemspec
++++ b/health_check.gemspec
+@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
+   gem.description = <<-EOF
+   	Simple health check of Rails app for uptime monitoring with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
+   EOF
+-  gem.homepage      = "http://ianheggie.github.io/health_check/"
++  gem.homepage      = "https://github.com/ianheggie/health_check"
+ 
+   gem.files         = `git ls-files`.split($/)
+   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+@@ -23,6 +23,5 @@ Gem::Specification.new do |gem|
+   gem.add_dependency(%q<rails>, [">= 2.3.0"])
+   gem.add_development_dependency(%q<rake>, [">= 0.8.3"])
+   gem.add_development_dependency(%q<shoulda>, ["~> 2.11.0"])
+-  gem.add_development_dependency(%q<sqlite3>, ["~> 1.3.7"])
+   gem.add_development_dependency(%q<bundler>, ["~> 1.2"])
+ end
+diff --git a/lib/health_check.rb b/lib/health_check.rb
+index 04d6aec..45f8fd2 100644
+--- a/lib/health_check.rb
++++ b/lib/health_check.rb
+@@ -28,8 +28,10 @@ module HealthCheck
+   # 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' ]
+ 
+   def self.add_custom_check(&block)
+     custom_checks << block
+diff --git a/lib/health_check/health_check_controller.rb b/lib/health_check/health_check_controller.rb
+index 4b5fa7a..7d544f7 100644
+--- a/lib/health_check/health_check_controller.rb
++++ b/lib/health_check/health_check_controller.rb
+@@ -4,8 +4,6 @@
+ module HealthCheck
+   class HealthCheckController < ActionController::Base
+ 
+-    session(:off) if Rails.version < '3.0'
+-
+     layout false if self.respond_to? :layout
+ 
+     def index
+@@ -34,9 +32,9 @@ 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
++          silence_level, logger.level = logger.level, @old_logger_level if @old_logger_level
+           logger.info msg
+-          logger.level = silence_level
++          logger.level = silence_level if @old_logger_level
+         end
+       end
+     end
+diff --git a/lib/health_check/utils.rb b/lib/health_check/utils.rb
+index b6da3f8..e7a10f6 100644
+--- a/lib/health_check/utils.rb
++++ b/lib/health_check/utils.rb
+@@ -46,8 +46,8 @@ module HealthCheck
+           when 'cache'
+             errors << HealthCheck::Utils.check_cache
+           when "standard"
+-            errors << HealthCheck::Utils.process_checks("database_migrations_custom")
+-            errors << HealthCheck::Utils.process_checks("email") unless HealthCheck::Utils.default_action_mailer_configuration?
++            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)
+@@ -71,8 +71,8 @@ module HealthCheck
+       @@db_migrate_path = value
+     end
+ 
+-    def self.default_action_mailer_configuration?
+-      ActionMailer::Base.delivery_method == :smtp && HealthCheck::Utils.default_smtp_settings == ActionMailer::Base.smtp_settings
++    def self.mailer_configured?
++      defined?(ActionMailer::Base) && (ActionMailer::Base.delivery_method != :smtp || HealthCheck::Utils.default_smtp_settings != ActionMailer::Base.smtp_settings)
+     end
+ 
+     def self.get_database_version
+@@ -117,11 +117,11 @@ module HealthCheck
+               while status != nil && status !~ /^2/
+                 status = t.gets
+               end
+-              t.puts "HELO #{settings[:domain]}"
++              t.puts "HELO #{settings[:domain]}\r"
+               while status != nil && status !~ /^250/
+                 status = t.gets
+               end
+-              t.puts "QUIT"
++              t.puts "QUIT\r"
+               status = t.gets
+             ensure
+               t.close
+diff --git a/lib/health_check/version.rb b/lib/health_check/version.rb
+index 8264365..0cf2f60 100644
+--- a/lib/health_check/version.rb
++++ b/lib/health_check/version.rb
+@@ -1,4 +1,4 @@
+ module HealthCheck
+-  VERSION = "1.4.1"
++  VERSION = "1.5.0"
+ end
+ 
+diff --git a/test/fake_smtp_server b/test/fake_smtp_server
+index e55ee3a..7f1e645 100755
+--- a/test/fake_smtp_server
++++ b/test/fake_smtp_server
+@@ -23,8 +23,8 @@ client = server.accept    # Wait for a client to connect
+ send(client, "220 dummy-smtp.example.com SMTP")
+ cmd = receive(client)
+ 
+-while cmd !~ /^QUIT/
+-  if cmd =~ /^HELO/
++while cmd !~ /^QUIT\r/
++  if cmd =~ /^HELO(.*)\r/
+     send(client, "250 Welcome to a dummy smtp server")
+   else
+     send(client, "502 I am so dumb I only understand HELO and QUIT")
+diff --git a/test/rails_2.3.gemfile b/test/rails_2.3.gemfile
+index 80aa9fc..e30fa69 100644
+--- a/test/rails_2.3.gemfile
++++ b/test/rails_2.3.gemfile
+@@ -13,6 +13,9 @@ gem 'rails', "~> 2.3.15"
+ gem 'rdoc'
+ gem 'rdoc-data'
+ 
++# mime-types 2.0 requires Ruby version >= 1.9.2
++gem "mime-types", "< 2.0"
++
+ group :development, :test do
+   if defined?(JRUBY_VERSION)
+     gem 'jruby-openssl'
+diff --git a/test/rails_4.1.gemfile b/test/rails_4.1.gemfile
+new file mode 100644
+index 0000000..b199010
+--- /dev/null
++++ b/test/rails_4.1.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.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
+diff --git a/test/setup_railsapp b/test/setup_railsapp
+index 5f414f9..80f6116 100755
+--- a/test/setup_railsapp
++++ b/test/setup_railsapp
+@@ -164,6 +164,9 @@ then
+     echo ================= Gemfile ===================
+     cat Gemfile
+     echo
++    echo ================= Gemfile.lock ===================
++    cat Gemfile.lock
++    echo
+ else
+     dest=$railsapp/vendor/plugins/health_check
+     echo Installing health_check as plugin in $dest ...
+diff --git a/test/test_with_railsapp b/test/test_with_railsapp
+index 2ba4bc4..c866c68 100755
+--- a/test/test_with_railsapp
++++ b/test/test_with_railsapp
+@@ -306,6 +306,10 @@ common_tests()
+     date > $custom_file
+ }
+ 
++
++# required for rails 4.1+ in production mode
++export SECRET_KEY_BASE=cf2f49c38a3fe67416ddf680f4f3187c0fce7dd1b9b117b34d195df75b274e08a04877e23803b2fdf1aa9a655269d94bc4888aa325cf7e721cc47368cfe56a80
++
+ echo ========================================================
+ echo TESTING WITHOUT CATCHALL in test env
+ echo ========================================================

data/Gemfile

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in health_check.gemspec
 
+# TODO: fix shoulda version doesn't work with ruby 2.2
+ruby '1.9.3' if RUBY_VERSION > '1.9.3'
+
 gemspec
 
 group :development, :test do

data/README.rdoc

@@ -1,7 +1,9 @@
-= health_check gem
+= health_check gem (pre_rails4 branch)
 
 Simple health check of Rails app for use with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
 
+Use {master}[https://github.com/ianheggie/health_check/tree/master] branch or gem versions >= 2.0 for Rails 4.0+
+
 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:
@@ -24,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 for rails < '4.1'.
+The health_check controller disables sessions for versions that eagerly load sessions. Only failures are logged.
 
 == Checks
 
@@ -41,8 +43,6 @@ 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
 
 === As a Gem from rubygems (Rails 3.0 and above)
@@ -232,7 +232,7 @@ The command `rake test` will also launch these tests, except it cannot install t
 
 == Copyright
 
-Copyright (c) 2010-2014 Ian Heggie, released under the MIT license.
+Copyright (c) 2010-2015 Ian Heggie, released under the MIT license.
 See MIT-LICENSE for details.
 
 == Contributors

data/lib/health_check/version.rb

@@ -1,4 +1,4 @@
 module HealthCheck
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end
 

data/test/rails_3.1.gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 gem 'rails', "~> 3.1.0"
 gem 'rake', '>= 0.8.3'
 
+
 group :development, :test do
   if defined?(JRUBY_VERSION)
     gem 'jruby-openssl'
@@ -14,3 +15,10 @@ group :development, :test do
   end
   gem 'shoulda', "~> 2.11.0"
 end
+
+# next version requires ruby 1.9.3
+gem 'i18n', '~> 0.6.11' 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

@@ -14,3 +14,10 @@ group :development, :test do
   end
   gem 'shoulda', "~> 2.11.0"
 end
+
+# next version requires ruby 1.9.3
+gem 'i18n', '~> 0.6.11' 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/setup_railsapp

@@ -3,6 +3,11 @@
 # Any failure causes exit
 set -e
 
+case "$1" in
+[0-9]*)
+    export BUNDLE_GEMFILE=$PWD/test/rails_$1.gemfile
+    ;;
+esac
 while :
 do
     case "$BUNDLE_GEMFILE" in
@@ -39,16 +44,32 @@ else
   $rehash
 fi
 
-echo "Running bundle --binstubs with BUNDLE_GEMFILE=$BUNDLE_GEMFILE ..."
-if ! bundle --binstubs ; then
+echo "Running bundle with BUNDLE_GEMFILE=$BUNDLE_GEMFILE ..."
+if ! bundle ; then
     echo "Test aborted (missing required gems)"
     exit 2
 fi
 $rehash
 
 rails="$base_dir/test/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="$base_dir/test/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
+
 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
@@ -130,6 +151,7 @@ end
 !
 
 echo Unsetting BUNDLE_GEMFILE '(so Gemfile for rails application will be used)'
+INITIAL_BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 unset BUNDLE_GEMFILE
 
 if [ -s Gemfile ]
@@ -146,24 +168,38 @@ then
             echo "gem '$RAILS_SERVER'" >> Gemfile
             ;;
     esac
+    echo Adding required Gemfile lines ...
+    egrep REQUIRED $INITIAL_BUNDLE_GEMFILE | tee -a Gemfile
     echo
-    echo running bundle install --binstubs
-    bundle install --binstubs
-    case "$actual_rails_version" in
-    *' '4.*)
-        echo "Running rake rails:update:binstubs to fix up binstubs bundle has overwritten"
-        echo a | rake rails:update:bin
-        ;;
-    esac
+    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"
+
+    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
+
+    $rehash
     # Fix for rvm, otherwise bundle run from rails create fails
     export PATH="`pwd`/bin:$PATH"
-    echo ================= Gemfile ===================
-    cat Gemfile
-    echo
     echo ================= Gemfile.lock ===================
     cat Gemfile.lock
     echo
@@ -313,18 +349,20 @@ if [ -s config/routes.rb ]; then
 
     case "$var" in
     '')
+      # rails 3.0+
       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 "    get '*path', :to => 'example#catchall'"
       echo "  end"
       echo "  # END OF SECTION FOR TESTING HEALTH_CHECK"
       echo "  # ---------------------------------------"
       ;;
     *)
+      # rails 2.3
       echo "  # -----------------------------------------"
       echo "  # START OF SECTION FOR TESTING HEALTH_CHECK"
       echo "  # example controller"

data/test/test_with_railsapp

@@ -3,27 +3,34 @@
 # Any failure causes exit
 set -e
 
-case "$1" in
-redo)
-    . test/init_variables
-    cd $railsapp
+cleanup_db()
+{
     echo Dropping database ...
-    $rake db:drop 
+    $rake db:drop
     echo Removing migrations ...
     rm -f db/migrate/* db/schema.rb
     case `ruby -e 'puts JRUBY_VERSION' 2> /dev/null` in
 	[0-9]*)
         echo 'Jruby requires the database to be created before the server is started: running rake db:migrate'
-        $rake db:migrate 
+        $rake db:migrate
 	;;
     esac
+}
+
+case "$1" in
+redo)
+    . test/init_variables
+    cd $railsapp
+    cleanup_db
     actual_rails_version=`$rails -v`
     ;;
 *)
-    . test/setup_railsapp
+    . test/setup_railsapp $1
     ;;
 esac
 
+run_test=$2
+
 cd $railsapp
 date > $custom_file
 rm -f $catchall_file
@@ -113,6 +120,7 @@ stop_server()
             echo ========================================================
             echo "Killing rails server [pid: $server_pid]"
             kill -1 $server_pid  || true
+            [ ! -x bin/spring ] || bin/spring stop || true
             sleep 2
             kill -9 $server_pid  || true
             ;;
@@ -161,187 +169,289 @@ trap "finish FAILED 1" 0
 common_tests()
 {
 
-    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
-    echo 'TESTING can get a static file ...'
-    $testurl ${host}/static.txt 200 text/plain STATIC-FILE
-    echo
+    test_no=$1
+
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    echo
-    echo 'TESTING can get an example controller ...'
-    $testurl ${host}/example 200 text/html 'example page'
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING can get a static file ..."
+        case "$RAILS_ENV=`egrep serve_static_files config/environments/production.rb`" in
+        production*static*)
+            echo "  SKIPPED (disabled in production)"
+            ;;
+        *)
+            $testurl ${host}/static.txt 200 text/plain STATIC-FILE
+            ;;
+        esac
+        echo
+    fi
 
-    echo
-    echo 'TESTING direct call to catchall method on example controller ...'
-    $testurl ${host}/example/catchall 200 text/html 'catch all route'
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING can get an example controller ..."
+        $testurl ${host}/example 200 text/html 'example page'
+        echo
+    fi
 
-    echo 'TESTING health_check/migration should pass with no database migrations ...'
-    ls db/migrate
-    $testurl ${host}/health_check/migration 200 text/plain $success
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING direct call to catchall method on example controller ..."
+        $testurl ${host}/example/catchall 200 text/html 'catch all route'
+        echo
+    fi
 
-    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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/migration should pass with no database migrations ..."
+        ls db/migrate
+        $testurl ${host}/health_check/migration 200 text/plain $success
+        echo
+    fi
 
-    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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    echo 'TESTING health_check/site should pass ...'
-    $testurl ${host}/health_check/site 200 text/plain $success
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    echo 'TESTING health_check/migration should pass after initial database migration ...'
-    $rake db:migrate 
-    $testurl ${host}/health_check/migration 200 text/plain $success
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/site should pass ..."
+        $testurl ${host}/health_check/site 200 text/plain $success
+        echo
+    fi
 
-    echo 'TESTING health_check/migration should fail without all migrations ...'
-    cp $base_dir/test/migrate/twelve/* db/migrate
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/migration should pass after initial database migration ..."
+        $rake db:migrate
+        $testurl ${host}/health_check/migration 200 text/plain $success
+        echo
+    fi
 
-    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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    echo 'TESTING health_check/migration should pass after both database migrations ...'
-    $rake db:migrate 
-    $testurl ${host}/health_check/migration 200 text/plain $success
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/migration should pass after both database migrations ..."
+        $rake db:migrate
+        $testurl ${host}/health_check/migration 200 text/plain $success
+        echo
+    fi
 
-    echo 'TESTING health_check/migration should pass after both database migrations ...'
-    $rake db:migrate 
-    $testurl ${host}/health_check/migration 200 text/plain $success
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/migration should pass after both database migrations ..."
+        $rake db:migrate
+        $testurl ${host}/health_check/migration 200 text/plain $success
+        echo
+    fi
 
-    echo 'TESTING health_check/email should fail without smtp available ...'
-    $testurl ${host}/health_check/email 550 text/plain failed
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/email should fail without smtp available ..."
+        $testurl ${host}/health_check/email 550 text/plain failed
+        echo
+    fi
 
-    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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    echo 'TESTING health_check (all) should fail without smtp available ...'
-    $testurl ${host}/health_check 550 text/plain failed
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check (all) should fail without smtp available ..."
+        $testurl ${host}/health_check 550 text/plain failed
+        echo
+    fi
 
-    echo 'TESTING health_check/all should fail without smtp available ...'
-    $testurl ${host}/health_check 550 text/plain failed
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/all should fail without smtp available ..."
+        $testurl ${host}/health_check 550 text/plain failed
+        echo
+    fi
 
     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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
     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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    echo 'TESTING health_check/custom should pass ...'
-    $testurl ${host}/health_check/custom 200 text/plain $success
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/custom should pass ..."
+        $testurl ${host}/health_check/custom 200 text/plain $success
+        echo
+    fi
 
-    echo 'TESTING health_check/custom.html should pass (returning plain text) ...'
-    $testurl ${host}/health_check/custom.html 200 text/plain $success
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/custom.html should pass (returning plain text) ..."
+        $testurl ${host}/health_check/custom.html 200 text/plain $success
+        echo
+    fi
 
-    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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    echo 'TESTING health_check/custom should fail when custom returns string ...'
+    test_no=`expr 1 + $test_no`
     rm -f $custom_file
-    $testurl ${host}/health_check/custom 550 text/plain failed
-    echo
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check/custom should fail when custom returns string ..."
+        $testurl ${host}/health_check/custom 550 text/plain failed
+        echo
+    fi
 
-    echo 'TESTING health_check (all) should fail when custom check fails ...'
-    $testurl ${host}/health_check 550 text/plain "$custom_file is missing!"
-    echo
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: TESTING health_check (all) should fail when custom check fails ..."
+        $testurl ${host}/health_check 550 text/plain "$custom_file is missing!"
+        echo
+    fi
 
-    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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
-    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
+    test_no=`expr 1 + $test_no`
+    if [ -z "$run_test" ] || [ $test_no == "$run_test" ]; then
+        echo "${test_no}: 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
+    fi
 
     date > $custom_file
+
 }
 
 
 # required for rails 4.1+ in production mode
 export SECRET_KEY_BASE=cf2f49c38a3fe67416ddf680f4f3187c0fce7dd1b9b117b34d195df75b274e08a04877e23803b2fdf1aa9a655269d94bc4888aa325cf7e721cc47368cfe56a80
 
-echo ========================================================
-echo TESTING WITHOUT CATCHALL in test env
-echo ========================================================
-export RAILS_ENV=test RACK_ENV=test
+case "$run_test" in
+???)
+    ;;
+*)
+    echo ========================================================
+    echo TESTING WITHOUT CATCHALL in test env
+    echo ========================================================
+    export RAILS_ENV=test RACK_ENV=test
+
+    start_server
+
+    # get a static file
 
-start_server
+    echo
+    echo 'TESTING no catchall route active ...'
+    expected_status=404,500,502
+    $testurl ${host}/another/url $expected_status
 
-# get a static file
+    common_tests 1
+    ;;
+esac
 
-echo
-echo 'TESTING no catchall route active ...'
-expected_status=404,500,502
-$testurl ${host}/another/url $expected_status
 
-common_tests
+case "$run_test" in
+''|???)
+    echo ========================================================
+    echo TESTING WITH CATCHALL in ${RAILS_ENV2:-production} env
+    echo ========================================================
+    export RAILS_ENV=${RAILS_ENV2:-production} RACK_ENV=${RAILS_ENV2:-production}
 
-echo ========================================================
-echo TESTING WITH CATCHALL in ${RAILS_ENV2:-production} env
-echo ========================================================
-export RAILS_ENV=${RAILS_ENV2:-production} RACK_ENV=${RAILS_ENV2:-production}
+    case "$run_trest" in
+     '')
+        stop_server
+        cleanup_db
+        ;;
+    esac
 
-date > $catchall_file
+    date > $catchall_file
 
-stop_server
-start_server
+    start_server
 
-echo
-echo 'TESTING catchall route active ...'
-$testurl ${host}/another/url 200 text/html 'catch all route'
-echo
+    echo
+    echo 'TESTING catchall route active ...'
+    $testurl ${host}/another/url 200 text/html 'catch all route'
+    echo
 
-common_tests
+    common_tests 101
+    ;;
+esac
 
 rm -f $catchall_file
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_check
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 +11:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17685240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +22,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
+  version_requirements: *17685240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17502900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +33,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.3
+  version_requirements: *17502900
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17497480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +44,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+  version_requirements: *17497480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17496680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,12 +55,7 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+  version_requirements: *17496680
 description: ! "  \tSimple health check of Rails app for uptime monitoring with Pingdom,
   NewRelic, EngineYard or uptime.openacs.org etc.\n"
 email:
@@ -113,15 +94,13 @@ files:
 - 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_edge.gemfile
 - test/setup_railsapp
 - test/test_helper.rb
 - test/test_with_railsapp
 - test/testurl
 - test/unit/health_check_controller_test.rb
 - test/unit/routes_test.rb
+has_rdoc: true
 homepage: https://github.com/ianheggie/health_check
 licenses: []
 post_install_message: 
@@ -142,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 1.3.9.5
 signing_key: 
 specification_version: 3
 summary: Simple health check of Rails app for uptime monitoring with Pingdom, NewRelic,
@@ -159,9 +138,6 @@ test_files:
 - 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_edge.gemfile
 - test/setup_railsapp
 - test/test_helper.rb
 - test/test_with_railsapp

data/test/rails_4.0.gemfile

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

data/test/rails_4.1.gemfile

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

data/test/rails_edge.gemfile

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