health_check 1.5.1 → 1.6.1

data/.gitignore

@@ -16,6 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version
 
 ## PROJECT::SPECIFIC
 bin/

data/.travis.yml

@@ -15,64 +15,19 @@ bundler_args: "--binstubs"
 
 script: ./test/test_with_railsapp
 
-rvm: 
-  - 1.9.3
-
-gemfile:
-  - test/rails_3.2.gemfile
-
 matrix:
   allow_failures:
+    - rvm: 1.8.7
+      gemfile: test/rails_2.3_lts.gemfile
+      env: RUBYGEMS_VERSION=1.8.25 RAILS_VERSION=2.3
 
   include:
-    # 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_SERVER=puma RAILS_VERSION=3.2
-
-    - rvm: 1.9.3
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_SERVER=passenger RAILS_VERSION=3.2
-
-    - 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_3.2.gemfile
-      env: RAILS_ENV2=development RAILS_VERSION=3.2
-
-    - rvm: 1.9.3
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_SERVER=unicorn RAILS_VERSION=3.2
-
-    - rvm: jruby-19mode
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_VERSION=3.2
-
-    - rvm: 2.2.0
-      gemfile: test/rails_3.2.gemfile
-      env: RAILS_VERSION=3.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
-
+    # rails 2.3 march 16 2009 - ruby 1.8.7
+    # railslts.com
     - rvm: 1.8.7
-      gemfile: test/rails_3.0.gemfile
-      env: RAILS_VERSION=3.0
+      gemfile: test/rails_2.3_lts.gemfile
+      env: RUBYGEMS_VERSION=1.8.25 RAILS_VERSION=2.3
 
-    # 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 RAILS_VERSION=2.3

data/CHANGELOG

@@ -1,5 +1,12 @@
 = Change Log =
 
+* rails2.3 branch
+*1.6.1 - rails 2.3 only version
+ * rails 2.3 only version
+*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
@@ -23,264 +30,3 @@
 * 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

@@ -7,6 +7,15 @@ 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'
@@ -20,6 +29,8 @@ 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,8 +1,9 @@
-= health_check gem (pre_rails4 branch)
+= health_check gem (rails2.3 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+
+Use {rails2.3}[https://github.com/ianheggie/health_check/tree/rails2.3] branch or gem versions ~> 1.6.0 for Rails 2.3.
+See {master}[https://github.com/ianheggie/health_check/tree/master] branch for using with later 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)
 
@@ -45,7 +46,7 @@ Specify full or include email in the list of checks to verify the smtp settings
 
 == Installation
 
-=== As a Gem from rubygems (Rails 3.0 and above)
+=== As a Gem from rubygems (if you have modified your rails to use bundler)
 
 Add the following line to Gemfile
 
@@ -111,6 +112,10 @@ 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").

data/health_check.gemspec

@@ -20,8 +20,8 @@ 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.add_dependency(%q<rails>, [">= 2.3.0"])
-  gem.add_development_dependency(%q<rake>, [">= 0.8.3"])
+  gem.add_dependency(%q<rails>, ['~> 2.3.0'])
+  gem.add_development_dependency(%q<rake>, [">= 0.8.3", "< 11.0"])
   gem.add_development_dependency(%q<shoulda>, ["~> 2.11.0"])
   gem.add_development_dependency(%q<bundler>, ["~> 1.2"])
 end

data/lib/health_check/health_check_controller.rb

@@ -5,6 +5,7 @@ module HealthCheck
   class HealthCheckController < ActionController::Base
 
     layout false if self.respond_to? :layout
+    before_filter :authenticate
 
     def index
       checks = params[:checks] || 'standard'
@@ -12,7 +13,7 @@ module HealthCheck
         errors = HealthCheck::Utils.process_checks(checks)
       rescue Exception => e
         errors = e.message
-      end     
+      end
       if errors.blank?
         obj = { :healthy => true, :message => HealthCheck.success }
         respond_to do |format|
@@ -42,6 +43,13 @@ 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

data/lib/health_check/version.rb

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

data/lib/health_check.rb

@@ -25,6 +25,12 @@ 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

data/test/rails_2.3.gemfile

@@ -7,14 +7,19 @@ source 'https://rubygems.org'
 
 ruby "1.8.7"
 
-gem 'rails', "~> 2.3.15"
-# rails requires rake >= 0.8.3 
+gem 'rails', '~>2.3.18'
+
+gem 'rake', ">= 0.8.3", "< 11.0"        # REQUIRED
 
 gem 'rdoc'
 gem 'rdoc-data'
 
 # mime-types 2.0 requires Ruby version >= 1.9.2
-gem "mime-types", "< 2.0"
+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
 
 group :development, :test do
   if defined?(JRUBY_VERSION)

data/test/rails_2.3_lts.gemfile

@@ -0,0 +1,41 @@
+# Gemfile for health_test testing
+
+source 'https://rubygems.org'
+
+# Last rubygems version before 2.0.0 (which breaks rails 2.3)
+#rubygems 1.8.25
+
+ruby "1.8.7"
+
+git 'https://github.com/makandra/rails.git', :branch => '2-3-lts' do
+  gem 'rails', '~>2.3.18'
+  gem 'actionmailer',     :require => false
+  gem 'actionpack',       :require => false
+  gem 'activerecord',     :require => false
+  gem 'activeresource',   :require => false
+  gem 'activesupport',    :require => false
+  gem 'railties',         :require => false
+  gem 'railslts-version', :require => false
+end
+
+gem 'rake', ">= 0.8.3", "< 11.0"        # REQUIRED
+
+gem 'rdoc'
+gem 'rdoc-data'
+
+# 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
+
+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/setup_railsapp

@@ -45,9 +45,13 @@ else
 fi
 
 echo "Running bundle with BUNDLE_GEMFILE=$BUNDLE_GEMFILE ..."
-if ! bundle ; then
+if ! bundle install ; then
     echo "Test aborted (missing required gems)"
     exit 2
+else
+    echo bundle passed - lock file contains:
+    cat $BUNDLE_GEMFILE.lock
+    echo
 fi
 $rehash
 
@@ -74,12 +78,34 @@ 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 ! bundle install ; 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
 
@@ -347,35 +373,18 @@ if [ -s config/routes.rb ]; then
       sed -e '/^end/,$d' config/routes.rb-old
     fi
 
-    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', :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"
-      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
+    # rails 2.3
+    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 "  # ---------------------------------------"
     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

metadata

@@ -1,70 +1,103 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: health_check
-version: !ruby/object:Gem::Version
-  version: 1.5.1
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 1
+  - 6
+  - 1
+  version: 1.6.1
 platform: ruby
-authors:
+authors: 
 - Ian Heggie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 +11:00
+
+date: 2016-09-29 00:00:00 +10:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &17685240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
   type: :runtime
-  prerelease: false
-  version_requirements: *17685240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &17502900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 11
+        - 0
+        version: "11.0"
   type: :development
-  prerelease: false
-  version_requirements: *17502900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &17497480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 11
+        - 0
         version: 2.11.0
   type: :development
-  prerelease: false
-  version_requirements: *17497480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &17496680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :development
-  prerelease: false
-  version_requirements: *17496680
-description: ! "  \tSimple health check of Rails app for uptime monitoring with Pingdom,
-  NewRelic, EngineYard or uptime.openacs.org etc.\n"
-email:
+  version_requirements: *id004
+description: "  \tSimple health check of Rails app for uptime monitoring with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.\n"
+email: 
 - ian@heggie.biz
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - .document
 - .gitignore
 - .travis.yml
@@ -91,9 +124,7 @@ files:
 - test/migrate/twelve/012_create_users.rb
 - test/migrate/twelve/9_create_countries.rb
 - test/rails_2.3.gemfile
-- test/rails_3.0.gemfile
-- test/rails_3.1.gemfile
-- test/rails_3.2.gemfile
+- test/rails_2.3_lts.gemfile
 - test/setup_railsapp
 - test/test_helper.rb
 - test/test_with_railsapp
@@ -103,30 +134,38 @@ files:
 has_rdoc: true
 homepage: https://github.com/ianheggie/health_check
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Simple health check of Rails app for uptime monitoring with Pingdom, NewRelic,
-  EngineYard or uptime.openacs.org etc.
-test_files:
+summary: Simple health check of Rails app for uptime monitoring with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
+test_files: 
 - test/fake_smtp_server
 - test/init_variables
 - test/migrate/empty/do_not_remove.txt
@@ -135,9 +174,7 @@ test_files:
 - test/migrate/twelve/012_create_users.rb
 - test/migrate/twelve/9_create_countries.rb
 - test/rails_2.3.gemfile
-- test/rails_3.0.gemfile
-- test/rails_3.1.gemfile
-- test/rails_3.2.gemfile
+- test/rails_2.3_lts.gemfile
 - test/setup_railsapp
 - test/test_helper.rb
 - test/test_with_railsapp

data/test/rails_3.0.gemfile

@@ -1,16 +0,0 @@
-# Gemfile for health_test testing
-
-source 'https://rubygems.org'
-
-gem 'rails', "~> 3.0.19"
-gem 'rake', '>= 0.8.3'
-
-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,24 +0,0 @@
-# Gemfile for health_test testing
-
-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'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3', "~> 1.3.7"
-  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

@@ -1,23 +0,0 @@
-# Gemfile for health_test testing
-
-source 'https://rubygems.org'
-
-gem 'rails', "~> 3.2.0"
-gem 'rake', '>= 0.8.3'
-
-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
-
-# 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