health_check 2.7.0 → 2.8.0

data/.travis.yml

@@ -15,6 +15,7 @@ before_install:
   - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - gem install bundler ${BUNDLER_VERSION:+-v} ${BUNDLER_VERSION}
+  - gem install smarter_bundler
   - bundle --version
   - mkdir -p tmp/bundle
 
@@ -25,29 +26,10 @@ script: ./test/test_with_railsapp
 matrix:
   fast_finish: true
 
-  allow_failures:
-    - rvm: 2.3.1
-      gemfile: test/rails_edge.gemfile
-      env: RAILS_VERSION=edge MIDDLEWARE=YES
-
-    - rvm: ruby-head
-      gemfile: test/rails_5.0.gemfile
-      env: RAILS_VERSION=5.0 MIDDLEWARE=YES
-
   include:
     # -------------------------------------
     # Standard
     
-    # ruby 5.0  Jun. 2016
-    
-    - rvm: 2.3.1
-      gemfile: test/rails_5.0.gemfile
-      env: RAILS_VERSION=5.0 MIDDLEWARE=no
-
-    - rvm: 2.2.2
-      gemfile: test/rails_5.0.gemfile
-      env: RAILS_VERSION=5.0 MIDDLEWARE=no
-
     # rails 4.2  Dec, 2014 
     
     - rvm: 2.2.0
@@ -98,26 +80,6 @@ matrix:
     # -------------------------------------
     # INSTALLED AS MIDDLEWARE
     
-    # ruby / rails edge
-    
-    - rvm: 2.3.1
-      gemfile: test/rails_edge.gemfile
-      env: RAILS_VERSION=edge MIDDLEWARE=YES
-
-    # ruby 5.0  Jun. 2016
-    
-    - rvm: 2.3.1
-      gemfile: test/rails_5.0.gemfile
-      env: RAILS_VERSION=5.0 MIDDLEWARE=YES
-
-    - rvm: 2.2.2
-      gemfile: test/rails_5.0.gemfile
-      env: RAILS_VERSION=5.0 MIDDLEWARE=YES
-
-    - rvm: ruby-head
-      gemfile: test/rails_5.0.gemfile
-      env: RAILS_VERSION=5.0 MIDDLEWARE=YES
-
     # rails 4.2  Dec, 2014 
     
     - rvm: 2.2.0

data/CHANGELOG

@@ -1,5 +1,12 @@
 = Change Log =
 
+* 2.8.0
+ * First release on renamed rails4 branch
+ * redis_url now defaults to nil (url determined by redis gem)
+ * Depends on railties rather than rails so it can be used with trimmed down stacks
+ * Cleaned up README, made install instructions version specific
+ * Cleaned up test code, uses smarter_bundler to handle gem ruby version isssues
+
 * 2.7.0
  * Add ability to check health of redis when url is non-standard redis url
 * 2.6.0

data/Gemfile

@@ -18,3 +18,6 @@ group :development, :test do
   gem 'mime-types', defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' ? '< 3' : '>= 3.0'
 
 end
+
+gem 'rake', '< 12.3.0' if RUBY_VERSION < '2.0' # REQUIRED 
+gem 'nokogiri', [">=0", "< 1.7.0"]  if RUBY_VERSION < '2.0' # REQUIRED

data/README.rdoc

@@ -1,14 +1,11 @@
-= health_check gem
+= health_check gem (rails4)
 
-Simple health check of Rails 4.x+ apps 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.x and 5.x;
-* {pre_rails4}[https://github.com/ianheggie/health_check/tree/pre_rails4] branch or gem versions ~> 1.7 for Rails 3.x;
-* {rails2.3}[https://github.com/ianheggie/health_check/tree/rails2.3] branch or gem versions ~> 1.6.1 for Rails 2.3;
+Simple health check of Rails 4.x apps for use with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
 
 The basic goal is to quickly check that rails is up and running and that it has access to correctly configured resources (database, email gateway)
 
+Check the latest README {master}[https://github.com/ianheggie/health_check/tree/master] for other versions
+
 health_check provides various monitoring URIs, for example:
 
     curl localhost:3000/health_check
@@ -54,13 +51,13 @@ The email gateway is not checked unless the smtp settings have been changed.
 Specify full or include email in the list of checks to verify the smtp settings
 (eg use 127.0.0.1 instead of localhost).
 
-Note: rails 4.0 also checks migrations by default in development mode and throws an ActiveRecord::PendingMigrationError exception (http error 500) if there is an error
+Note: rails also checks migrations by default in development mode and throws an ActiveRecord::PendingMigrationError exception (http error 500) if there is an error
 
 == Installation
 
 Add the following line to Gemfile
 
-    gem "health_check"
+    gem "health_check", "~> 2.8"
 
 And then execute
 
@@ -68,7 +65,7 @@ And then execute
 
 Or install it yourself as:
 
-    gem install health_check
+    gem install --version '~> 2.8' health_check
 
 == Configuration
 
@@ -237,16 +234,6 @@ Cache-control is set with
 
 Last-modified is set to the current time (rounded down to a multiple of max_age when max_age > 1)
 
-== Note on Patches/Pull Requests
-
-<em>Feedback welcome! Especially with suggested replacement code and corresponding tests</em>
-
-1. Fork it
-2. Create your feature branch (<tt>git checkout -b my-new-feature</tt>)
-3. Commit your changes (<tt>git commit -am 'Add some feature'</tt>)
-4. Push to the branch (<tt>git push origin my-new-feature</tt>)
-5. Create new Pull Request.
-
 == Known Issues
 
 * No inline documentation for methods
@@ -260,36 +247,46 @@ Last-modified is set to the current time (rounded down to a multiple of max_age
 
 === Automated testing and other checks
 
-* {<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
+* {<img src="https://travis-ci.org/ianheggie/health_check.svg?branch=rails4">}[https://travis-ci.org/ianheggie/health_check.svg?branch=rails4]  - Travis CI 
 
 === Manual testing
 
-The test will package up and install the gem under a temporary path, create a dummy rails app configured for sqlite,
-install the gem, and then run up tests against the server.
-This will require TCP port 3456 to be free.
+The instructions have been changed to using a vagrant virtual box for consistant results.
 
-Using rbenv or rvm, install and set the version of ruby you wish to test against.
-You will need to install the bundler gem if using rbenv.
-See the <tt>.travis.yml</tt> file for the list of ruby versions that we test against.
-
-* rbenv command: <tt>rbenv shell 1.8.7-p371</tt>
-* rvm command: <tt>rvm use 1.9.3</tt>
+Install vagrant 1.9.7 or later and virtual_box or other local virtual machine providor.
 
 Create a temp directory for throw away testing, and clone the health_check gem into it
 
     mkdir -p ~/tmp
     cd ~/tmp
-    git clone https://github.com/ianheggie/health_check.git
+    git clone https://github.com/ianheggie/health_check.git ~/tmp/health_check
+
+The Vagrantfile includes provisioning rules to install chruby (ruby version control),
+ruby-build will also be installed and run to build various rubies under /opt/rubies.
+
+Use <tt>vagrant ssh</tt> to connect to the virtual box and run tests.
+
+The test script will package up and install the gem under a temporary path, create a dummy rails app configured for sqlite,
+install the gem, and then run up tests against the server.
+This will require TCP port 3456 to be free.
 
 Cd to the checked out health_check directory and then run the test as follows:
 
     cd ~/tmp/health_check
 
+    vagrant up   # this will also run vagrant provision and take some time
+                 # chruby and various ruby versions will be installed
+
+    vagrant ssh
+
+    cd /vagrant  # the current directory on your host is mounted here on the virtual machine
+
+    chruby 2.2.2 # or some other ruby version 
+
     test/test_with_railsapp
 
+    exit        # from viretual machine when finished
+
 The script will first call `test/setup_railsapp` to setup a rails app with health_check installed and then
 run up the rails server and perform veraious tests.
 
@@ -300,7 +297,7 @@ The command `rake test` will also launch these tests, except it cannot install t
 
 == Copyright
 
-Copyright (c) 2010-2016 Ian Heggie, released under the MIT license.
+Copyright (c) 2010-2017 Ian Heggie, released under the MIT license.
 See MIT-LICENSE for details.
 
 == Contributors
@@ -314,3 +311,5 @@ Thanks go to the various people who have given feedback and suggestions via the
 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)
+
+<em>Feedback welcome! Especially with suggested replacement code and corresponding tests</em>

data/Vagrantfile

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

data/health_check.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = [ "README.rdoc" ]
   gem.require_paths = ["lib"]
   gem.required_ruby_version = '>= 1.9.3'
-  gem.add_dependency(%q<rails>, [">= 4.0"])
+  gem.add_dependency(%q<railties>, ["~> 4.0"])
+  gem.add_development_dependency(%q<smarter_bundler>, [">= 0.1.0"])
   gem.add_development_dependency(%q<rake>, [">= 0.8.3"])
   gem.add_development_dependency(%q<shoulda>, ["~> 2.11.0"])
   gem.add_development_dependency(%q<bundler>, ["~> 1.2"])

data/lib/health_check.rb

@@ -65,7 +65,7 @@ module HealthCheck
 
   # Allow non-standard redis url
   mattr_accessor :redis_url
-  self.redis_url = 'redis://localhost:6379/0'
+  self.redis_url = nil
 
   def self.add_custom_check(name = 'custom', &block)
     custom_checks[name] ||= [ ]

data/lib/health_check/version.rb

@@ -1,3 +1,3 @@
 module HealthCheck
-  VERSION = "2.7.0"
+  VERSION = "2.8.0"
 end

data/test/provision_vagrant

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+case `id` in
+*root*)
+        ;;
+*)
+        exec echo Must be run as root
+        ;;
+esac
+set -xe
+id
+pwd
+export DEBIAN_FRONTEND=noninteractive
+find /tmp/got-apt-update -mtime -1 || ( apt-get update && touch /tmp/got-apt-update )
+apt install --yes --force-yes -q build-essential ruby ruby-dev sqlite3 libsqlite3-dev nodejs
+
+(
+  echo Install chruby
+  [ -s chruby-0.3.9.tar.gz ] || wget -q -O chruby-0.3.9.tar.gz https://github.com/postmodern/chruby/archive/v0.3.9.tar.gz
+  [ chruby-0.3.9 ] || tar -xzf chruby-0.3.9.tar.gz
+  cd chruby-0.3.9/
+  ./scripts/setup.sh
+  cat > /etc/profile.d/chruby.sh <<'EOF'
+if [ -n "$BASH_VERSION" ] || [ -n "$ZSH_VERSION" ]; then
+  source /usr/local/share/chruby/chruby.sh
+fi
+EOF
+  chmod a+r /etc/profile.d/chruby.sh
+)
+
+(
+  [ -d ruby-build ] || git clone https://github.com/rbenv/ruby-build.git
+  which ruby-build || PREFIX=/usr/local ./ruby-build/install.sh
+
+  mkdir -p /opt/rubies
+  [ -x /opt/rubies/1.9.3-p551/bin/bundle ] || ( ruby-build 1.9.3-p551 /opt/rubies/1.9.3-p551 && /opt/rubies/1.9.3-p551/bin/gem install bundler )
+
+  for v in 2.2.0
+  do
+    [ -x /opt/rubies/$v/bin/bundle ] || ( ruby-build $v /opt/rubies/$v && /opt/rubies/$v/bin/gem install bundler )
+  done
+)
+
+echo Setup system ruby
+which bundle || gem install bundler 
+bundle --version
+set +x
+cat <<EOF
+
+Now test by running the following commands:
+
+  chruby RUBY_VERSION
+  or
+  chruby system # for system version 2.3.1
+
+  vagrant ssh
+  cd /vagrant
+  ./test/test_with_railsapp
+
+EOF
+exit

data/test/rails_4.0.gemfile

@@ -5,8 +5,8 @@ source 'https://rubygems.org'
 ruby RUBY_VERSION < '1.9.3' ? '1.9.3' : RUBY_VERSION
 
 gem 'rails', "~> 4.0.0"
-gem 'rake', '>= 0.8.3'
-gem "rack", '~> 1.5.2'
+gem 'rake', '>= 0.8.3' # REQUIRED
+gem "rack", '~> 1.5.2' # REQUIRED
 
 group :development, :test do
   if defined?(JRUBY_VERSION)
@@ -18,8 +18,8 @@ group :development, :test do
   gem 'shoulda'
 
   # redis based checks
-  gem 'sidekiq', :require => !ENV['SIDEKIQ'].nil?
-  gem 'redis', :require => !ENV['REDIS_URL'].nil?
+  gem 'sidekiq', '< 5.0.4',:require => !ENV['SIDEKIQ'].nil?
+  gem 'redis', '< 4.0', :require => !ENV['REDIS_URL'].nil?
   gem 'resque', :require => !ENV['RESQUE'].nil?
   # s3 check
   gem 'aws-sdk', :require => !ENV['AWS_ACCESS_KEY_ID'].nil?
@@ -31,3 +31,6 @@ gem 'therubyracer', :platform => :ruby # REQUIRED
 # mime-types 2.0 requires Ruby version >= 1.9.2
 # mime-types 3.0 requires Ruby version >= 2.0
 gem 'mime-types', defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' ? '< 3' : '>= 3.0' # REQUIRED
+
+
+gem 'turbolinks', :github => 'turbolinks/turbolinks-classic'  # REQUIRED instead of turbolinks

data/test/rails_4.1.gemfile

@@ -5,8 +5,8 @@ source 'https://rubygems.org'
 ruby RUBY_VERSION < '1.9.3' ? '1.9.3' : RUBY_VERSION
 
 gem 'rails', "~> 4.1.0"
-gem 'rake', '>= 0.8.3'
-gem "rack", '~> 1.5.2'
+gem 'rake', '>= 0.8.3' # REQUIRED
+gem "rack", '~> 1.5.2' # REQUIRED
 
 group :development, :test do
   if defined?(JRUBY_VERSION)
@@ -18,8 +18,8 @@ group :development, :test do
   gem 'shoulda'
 
   # redis based checks
-  gem 'sidekiq', :require => !ENV['SIDEKIQ'].nil?
-  gem 'redis', :require => !ENV['REDIS_URL'].nil?
+  gem 'sidekiq', '< 5.0.4', :require => !ENV['SIDEKIQ'].nil?
+  gem 'redis', '< 4.0', :require => !ENV['REDIS_URL'].nil?
   gem 'resque', :require => !ENV['RESQUE'].nil?
   # s3 check
   gem 'aws-sdk', :require => !ENV['AWS_ACCESS_KEY_ID'].nil?

data/test/rails_4.2.gemfile

@@ -5,9 +5,11 @@ source 'https://rubygems.org'
 ruby RUBY_VERSION < '1.9.3' ? '1.9.3' : RUBY_VERSION
 
 gem 'rails', "~> 4.2.0"
-gem 'rake', '>= 0.8.3'
+gem 'rake', '>= 0.8.3' # REQUIRED
 #gem "rack", '~> 1.6.0'
 
+gem 'sass', '<3.5.0'
+
 group :development, :test do
   if defined?(JRUBY_VERSION)
     gem 'jruby-openssl'
@@ -18,8 +20,8 @@ group :development, :test do
   gem 'shoulda'
 
   # redis based checks
-  gem 'sidekiq', :require => !ENV['SIDEKIQ'].nil?
-  gem 'redis', :require => !ENV['REDIS_URL'].nil?
+  gem 'sidekiq', '< 5.0.4', :require => !ENV['SIDEKIQ'].nil?
+  gem 'redis', '< 4.0', :require => !ENV['REDIS_URL'].nil?
   gem 'resque', :require => !ENV['RESQUE'].nil?
   # s3 check
   gem 'aws-sdk', :require => !ENV['AWS_ACCESS_KEY_ID'].nil?

data/test/setup_railsapp

@@ -59,7 +59,7 @@ else
 fi
 
 echo "Running bundle with BUNDLE_GEMFILE=$BUNDLE_GEMFILE ..."
-if ! bundle install ; then
+if ! smarter_bundle ; then
     echo "Test aborted (missing required gems)"
     exit 2
 fi
@@ -123,24 +123,8 @@ case `ruby -e 'puts JRUBY_VERSION' 2> /dev/null` in
 esac
 
 echo "Creating $actual_rails_version app in $tmp_dir/railsapp using adapter $db"
-case "$actual_rails_version" in
-    *' '[12].*)
-        $rails railsapp -d $db
-        ;;
-    *' '[345].*)
-        case "$BUNDLE_GEMFILE" in
-        *rails_edge.gemfile)
-            $rails new railsapp -d $db --edge
-            ;;
-        *)
-            $rails new railsapp -d $db
-            ;;
-        esac
-        ;;
-    *)
-        echo "Unknown rails version"
-        ;;
-esac
+
+$rails new railsapp --skip-bundle -d $db
 
 cd $railsapp
 
@@ -188,71 +172,69 @@ INITIAL_BUNDLE_GEMFILE="$BUNDLE_GEMFILE"
 echo Unsetting BUNDLE_GEMFILE '(so Gemfile for rails application will be used)'
 unset BUNDLE_GEMFILE
 
-if [ -s Gemfile ]
+if [ ! -s Gemfile ]
 then
-    echo Adding health_check as gem to Gemfile...
-    echo "gem 'health_check', :path => '$base_dir'" >> Gemfile
+    echo Missing Gemfile!
+    exit 2
+fi
 
-    case "$RAILS_SERVER" in
-    webrick|'')
-            echo "Using default webrick server"
-            ;;
-    *)
-            echo "Adding $RAILS_SERVER gem to Gemfile (for use as server)"
-            echo "gem '$RAILS_SERVER'" >> Gemfile
-            ;;
-    esac
-    egrep REQUIRED < ${INITIAL_BUNDLE_GEMFILE} >> Gemfile || echo No required gems found...
-    echo
-    echo ================= Gemfile ===================
-    cat Gemfile
-    echo
-    echo running bundle install
-    bundle install
-    $rehash
-    echo "Using binstubs in $railsapp/bin for rails and rake commands"
-    rails="$railsapp/bin/rails"
-    rake="$railsapp/bin/rake"
-
-    echo Checking $rails is present ...
-    [ -f $rails -a -f $rake ] || bundle exec rake rails:update:bin || echo '(ignored rake rails:update:bin exit status)'
-    [ -f $rails ] || bundle binstubs railties || echo '(ignored bundle exit status)'
-    [ -f $rails ] || bundle binstubs rails || echo '(ignored bundle exit status)'
-    if [ ! -f $rails ]; then
-        echo "Test aborted (unable to create $rails)"
-        exit 2
-    fi
+rm -f Gemfile.lock
 
-    echo Checking $rake is present ...
-    [ -f $rake ] || bundle binstubs rake || echo '(ignored bundle exit status)'
-    if [ ! -f $rake ]; then
-        echo "Test aborted (unable to create $rake)"
-        exit 2
-    fi
+echo Adding health_check as gem to Gemfile...
+echo "gem 'health_check', :path => '$base_dir'" >> Gemfile
 
-    $rehash
-    # Fix for rvm, otherwise bundle run from rails create fails
-    export PATH="`pwd`/bin:$PATH"
-    echo ================= Gemfile.lock ===================
-    cat Gemfile.lock
-    echo
-else
-    dest=$railsapp/vendor/plugins/health_check
-    echo Installing health_check as plugin in $dest ...
-    mkdir -p $dest
-    (
-	cd $base_dir
+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
 
-        git ls-files | cpio -pdl $dest
-        
-	cd $dest
+case "$INITIAL_BUNDLE_GEMFILE" in
+*/test/rails_4.0.gemfile)
+        sed -i.bak -e '/turbolinks/s/^/#Broken with ruby 1.9.3 # /' Gemfile
+        ;;
+esac
+
+egrep REQUIRED < ${INITIAL_BUNDLE_GEMFILE} >> Gemfile || echo No required gems found...
+
+echo
+echo ================= Gemfile ===================
+cat Gemfile
+echo
+echo running bundle install
+smarter_bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} install
+$rehash
+echo "Using binstubs in $railsapp/bin for rails and rake commands"
+rails="$railsapp/bin/rails"
+rake="$railsapp/bin/rake"
 
-        echo Files installed as plugin:
-        find . -type f
-        echo
-    )
+echo Checking $rails is present ...
+[ -f $rails -a -f $rake ] || bundle exec rake rails:update:bin || echo '(ignored rake rails:update:bin exit status)'
+[ -f $rails ] || bundle binstubs railties || echo '(ignored bundle exit status)'
+[ -f $rails ] || bundle binstubs rails || echo '(ignored bundle exit status)'
+if [ ! -f $rails ]; then
+    echo "Test aborted (unable to create $rails)"
+    exit 2
+fi
+
+echo Checking $rake is present ...
+[ -f $rake ] || bundle binstubs 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.lock ===================
+cat Gemfile.lock
+echo
+
 for e in test ${RAILS_ENV2:-production}
 do
     if [ -f config/environments/$e.rb ]; then
@@ -359,13 +341,20 @@ cat > app/controllers/example_controller.rb <<'EOF'
 class ExampleController < ApplicationController
 
   def index
-    render :text => 'example page'
+    render plain_key => 'example page'
   end
   
   def catchall
-    render :text => 'catch all route'
+    render plain_key => 'catch all route'
   end
   
+  private 
+
+  def plain_key
+    # Rails 4.0 doesn't have :plain, but it is deprecated later on
+    Rails.version < '4.1' ? :text : :plain
+  end
+
 end
 
 EOF

data/test/test_with_railsapp

@@ -39,6 +39,15 @@ redo)
     ;;
 esac
 
+case "$actual_rails_version" in
+'4.0.'*|*' 4.0.'*)
+        example_mime_type=text/html
+        ;;
+*)
+        example_mime_type=text/plain
+        ;;
+esac
+
 run_test=$2
 
 cd $railsapp
@@ -241,14 +250,14 @@ common_tests()
     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'
+        $testurl ${host}/example 200 $example_mime_type 'example page'
         echo
     fi
 
     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'
+        $testurl ${host}/example/catchall 200 $example_mime_type 'catch all route'
         echo
     fi
 
@@ -649,7 +658,7 @@ case "$run_test" in
 
     echo
     echo 'TESTING catchall route active ...'
-    $testurl ${host}/another/url 200 text/html 'catch all route'
+    $testurl ${host}/another/url 200 $example_mime_type 'catch all route'
     echo
 
     common_tests 200
@@ -661,4 +670,4 @@ rm -f $catchall_file
 finish PASSED 0
 exit 0
 
-# vi: sw=4 ai sm:
+# vi: sw=4 ai sm:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_check
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
@@ -24,9 +24,25 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: smarter_bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +108,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- Vagrantfile
 - config/routes.rb
 - health_check.gemspec
 - init.rb
@@ -113,11 +130,10 @@ files:
 - test/migrate/twelve/011_create_roles.roles.rb
 - test/migrate/twelve/012_create_users.rb
 - test/migrate/twelve/9_create_countries.rb
+- test/provision_vagrant
 - test/rails_4.0.gemfile
 - test/rails_4.1.gemfile
 - test/rails_4.2.gemfile
-- test/rails_5.0.gemfile
-- test/rails_edge.gemfile
 - test/setup_railsapp
 - test/test_with_railsapp
 - test/testurl
@@ -154,11 +170,10 @@ test_files:
 - test/migrate/twelve/011_create_roles.roles.rb
 - test/migrate/twelve/012_create_users.rb
 - test/migrate/twelve/9_create_countries.rb
+- test/provision_vagrant
 - test/rails_4.0.gemfile
 - test/rails_4.1.gemfile
 - test/rails_4.2.gemfile
-- test/rails_5.0.gemfile
-- test/rails_edge.gemfile
 - test/setup_railsapp
 - test/test_with_railsapp
 - test/testurl

data/test/rails_5.0.gemfile

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

data/test/rails_edge.gemfile

@@ -1,32 +0,0 @@
-# Gemfile for health_test testing
-
-source 'https://rubygems.org'
-
-# Bundle edge Rails instead:
-
-ruby RUBY_VERSION < '2.2.2' ? '2.2.2' : RUBY_VERSION
-
-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'
-  
-  # redis based checks
-  gem 'sidekiq', :require => !ENV['SIDEKIQ'].nil?
-  gem 'redis', :require => !ENV['REDIS_URL'].nil?
-  gem 'resque', :require => !ENV['RESQUE'].nil?
-  # s3 check
-  gem 'aws-sdk', :require => !ENV['AWS_ACCESS_KEY_ID'].nil?
-end
-
-# Initial Gemfile has therubyracer commented out
-gem 'therubyrhino', :platform => :jruby # REQUIRED
-gem 'therubyracer', :platform => :ruby # REQUIRED