health_check 2.0.0 → 2.1.0

data/.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+cache: bundler
 language: ruby
 notifications:
   email:
@@ -15,32 +17,40 @@ bundler_args: "--binstubs"
 
 script: ./test/test_with_railsapp
 
-#rvm: 
-#  - 2.2.0
-
-#gemfile:
-#  - test/rails_4.2.gemfile
-
 matrix:
   allow_failures:
-    - rvm: 2.2.0
+    - rvm: 2.3.1
       gemfile: test/rails_edge.gemfile
       env: RAILS_VERSION=edge
 
     - rvm: ruby-head
-      gemfile: test/rails_4.2.gemfile
-      env: RAILS_VERSION=4.2
+      gemfile: test/rails_edge.gemfile
+      env: RAILS_VERSION=edge
+
+    - rvm: ruby-head
+      gemfile: test/rails_5.0.gemfile
+      env: RAILS_VERSION=5.0
 
   include:
     # ruby / rails edge
     
-    - rvm: 2.2.0
+    - rvm: 2.3.1
       gemfile: test/rails_edge.gemfile
       env: RAILS_VERSION=edge
 
     - rvm: ruby-head
-      gemfile: test/rails_4.2.gemfile
-      env: RAILS_VERSION=4.2
+      gemfile: test/rails_edge.gemfile
+      env: RAILS_VERSION=edge
+
+    # ruby 5.0  Jun. 2016
+    
+    - rvm: 2.2.2
+      gemfile: test/rails_5.0.gemfile
+      env: RAILS_VERSION=5.0
+
+    - rvm: ruby-head
+      gemfile: test/rails_5.0.gemfile
+      env: RAILS_VERSION=5.0
 
     # rails 4.2  Dec, 2014 
     
@@ -52,17 +62,19 @@ matrix:
       gemfile: test/rails_4.2.gemfile
       env: RAILS_SERVER=puma RAILS_VERSION=4.2
 
-    - rvm: 2.1.2
-      gemfile: test/rails_4.2.gemfile
-      env: RAILS_SERVER=passenger RAILS_VERSION=4.2
+    # Can't find i18n?? because it can't compile?
+    #- rvm: 2.1.2
+    #  gemfile: test/rails_4.2.gemfile
+    #  env: RAILS_SERVER=passenger RAILS_VERSION=4.2
 
     - rvm: 2.1.2
       gemfile: test/rails_4.2.gemfile
       env: RAILS_SERVER=thin RAILS_VERSION=4.2
 
-    - rvm: rbx-2.2.6
-      gemfile: test/rails_4.0.gemfile
-      env: RAILS_ENV2=development RAILS_VERSION=4.0
+    # No longer supported by travis
+    #- rvm: rbx-2.2.6
+    #  gemfile: test/rails_4.0.gemfile
+    #  env: RAILS_ENV2=development RAILS_VERSION=4.0
 
     - rvm: 2.1.2
       gemfile: test/rails_4.2.gemfile
@@ -76,19 +88,11 @@ matrix:
     
     - rvm: 2.1.2
       gemfile: test/rails_4.1.gemfile
-      env: RAILS_SERVER=puma RAILS_VERSION=4.1
+      env: RAILS_VERSION=4.1
 
-    # rails 4.0  June 25, 2013
+    # rails 4.0
     
     - rvm: 1.9.3
       gemfile: test/rails_4.0.gemfile
       env: RAILS_VERSION=4.0
 
-    - rvm: rbx-2.2.6
-      gemfile: test/rails_4.0.gemfile
-      env: RAILS_ENV2=development RAILS_VERSION=4.0
-
-    - rvm: 2.0.0
-      gemfile: test/rails_4.0.gemfile
-      env: RAILS_VERSION=4.0
-

data/Gemfile

@@ -2,9 +2,6 @@ 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
@@ -12,14 +9,12 @@ group :development, :test do
     gem 'jruby-openssl'
     gem 'activerecord-jdbcsqlite3-adapter'
   else
-    gem 'sqlite3', "~> 1.3.7"
+    gem 'sqlite3', '~> 1.3.7'
   end
   # run travis-lint to check .travis.yml
   gem 'travis-lint'
-  platforms :ruby_18 do
-    # mime-types 2.0 requires Ruby version >= 1.9.2
-    gem "mime-types", "< 2.0"
-  end
+  # mime-types 2.0 requires Ruby version >= 1.9.2
+  # mime-types 3.0 requires Ruby version >= 2.0
+  gem 'mime-types', RUBY_VERSION < '1.9.2' ? '< 2.0' : (defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' ? '< 3.0' : '>= 3.0')
 
 end
-

data/README.rdoc

@@ -2,7 +2,8 @@
 
 Simple health check of Rails 4.x+ apps for use with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
 
-Use {pre_rails4}[https://github.com/ianheggie/health_check/tree/pre_rails4] branch or gem versions < 2.0 for Rails 2.3 and 3.x 
+Use {pre_rails4}[https://github.com/ianheggie/health_check/tree/pre_rails4] branch or gem versions < 2.0 for Rails 2.3 and 3.x;
+Use {master}[https://github.com/ianheggie/health_check/tree/master] branch or gem versions ~> 2.0 for Rails 4.x and 5.x;
 
 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)
 
@@ -32,12 +33,18 @@ The health_check controller disables sessions for versions that eagerly load ses
 
 * 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)
+* cache - checks that a value can be written to the cache
+* custom - runs checks added via config.add_custom_check
 * 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
 * migration - checks that the database migration level matches that in db/migrations
-* cache - checks that a value can be written to the cache
+* redis\[-if-present\] - checks Redis connectivity
+* resque-redis\[-if-present\] - checks Resque connectivity to Redis
+* s3\[-if-present\] - checks proper permissions to s3 buckets
+* sidekiq-redis\[-if-present\] - checks Sidekiq connectivity to Redis
 * site - checks rails is running sufficiently to render text
-* custom - runs checks added via config.add_custom_check
+
+Some checks have a *-if-present form, which only runs the check if the corresponding library has been required.
 
 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
@@ -83,11 +90,17 @@ 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
+      # bucket names to test connectivity - required only if s3 check used, access permissions can be mixed
+      config.buckets = {'bucket_name' => [:R, :W, :D]}
+
+      # You can customize which checks happen on a standard health check, eg to set an explicit list use:
       config.standard_checks = [ 'database', 'migrations', 'custom' ]
 
+      # Or to exclude one check:
+      config.standard_checks -= [ 'emailconf' ]
+
       # You can set what tests are run with the 'full' or 'all' parameter
-      config.full_checks = ['database', 'migrations', 'custom', 'email', 'cache']
+      config.full_checks = ['database', 'migrations', 'custom', 'email', 'cache', 'redis', 'resque-redis', sidekiq-redis', 's3']
 
       # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
       config.add_custom_check do
@@ -129,7 +142,7 @@ The hash contains two keys:
 * healthy - true if requested checks pass (boolean)
 * message - text message ("success" or error message)
 
-The following commands 
+The following commands
 
   curl -v localhost:3000/health_check.json
   curl -v localhost:3000/health_check/email.json
@@ -189,9 +202,9 @@ Likewise you will probably want to exclude health_check from monitoring systems
 === 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://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://gemnasium.com/ianheggie/health_check.png">}[https://gemnasium.com/ianheggie/health_check] - Gem dependencies
 
 === Manual testing
 
@@ -242,4 +255,3 @@ 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)
-

data/lib/health_check.rb

@@ -23,12 +23,16 @@ module HealthCheck
   mattr_accessor :http_status_for_error_object
   self.http_status_for_error_object = 500
 
+  # s3 buckets
+  mattr_accessor :buckets
+  self.buckets = {}
+
   # 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.full_checks = ['database', 'migrations', 'custom', 'email', 'cache', 'redis-if-present', 'sidekiq-redis-if-present', 'resque-redis-if-present', 's3-if-present']
   self.standard_checks = [ 'database', 'migrations', 'custom', 'emailconf' ]
 
   def self.add_custom_check(&block)
@@ -41,7 +45,12 @@ module HealthCheck
 
 end
 
-require "health_check/version"
+require 'health_check/version'
+require 'health_check/base_health_check'
+require 'health_check/resque_health_check'
+require 'health_check/s3_health_check'
+require 'health_check/redis_health_check'
+require 'health_check/sidekiq_health_check'
 require 'health_check/utils'
 require 'health_check/health_check_controller'
 require 'health_check/health_check_routes'

data/lib/health_check/base_health_check.rb

@@ -0,0 +1,5 @@
+module BaseHealthCheck
+  def create_error(check_type, error_message)
+    "[#{check_type} - #{error_message}] "
+  end
+end

data/lib/health_check/health_check_controller.rb

@@ -14,11 +14,12 @@ module HealthCheck
         errors = e.message.blank? ? e.class.to_s : e.message.to_s
       end     
       if errors.blank?
+        response.headers['Last-Modified'] = Time.now.httpdate
         obj = { :healthy => true, :message => HealthCheck.success }
         respond_to do |format|
           format.html { render :text => HealthCheck.success, :content_type => 'text/plain' }
-          format.json { render :xml => obj.to_json }
-          format.xml { render :xml => obj.to_xml }
+          format.json { render :json => obj }
+          format.xml { render :xml => obj }
           format.any { render :text => HealthCheck.success, :content_type => 'text/plain' }
         end
       else
@@ -26,8 +27,8 @@ module HealthCheck
         obj = { :healthy => false, :message => msg }
         respond_to do |format|
           format.html { render :text => msg, :status => HealthCheck.http_status_for_error_text, :content_type => 'text/plain'  }
-          format.json { render :xml => obj.to_json, :status => HealthCheck.http_status_for_error_object}
-          format.xml { render :xml => obj.to_xml, :status => HealthCheck.http_status_for_error_object }
+          format.json { render :json => obj, :status => HealthCheck.http_status_for_error_object}
+          format.xml { render :xml => obj, :status => HealthCheck.http_status_for_error_object }
           format.any { render :text => msg, :status => HealthCheck.http_status_for_error_text, :content_type => 'text/plain'  }
         end
         # Log a single line as some uptime checkers only record that it failed, not the text returned

data/lib/health_check/redis_health_check.rb

@@ -0,0 +1,15 @@
+module HealthCheck
+  class RedisHealthCheck
+    extend BaseHealthCheck
+
+    def self.check
+      unless defined?(::Redis)
+        raise "Wrong configuration. Missing 'redis' gem"
+      end
+      res = ::Redis.new.ping
+      res == 'PONG' ? '' : "Redis.ping returned #{res.inspect} instead of PONG"
+    rescue Exception => e
+      create_error 'redis', e.message
+    end
+  end
+end

data/lib/health_check/resque_health_check.rb

@@ -0,0 +1,15 @@
+module HealthCheck
+   class ResqueHealthCheck
+     extend BaseHealthCheck
+
+     def self.check
+       unless defined?(::Resque)
+         raise "Wrong configuration. Missing 'resque' gem"
+       end
+      res = ::Resque.redis.ping
+      res == 'PONG' ? '' : "Resque.redis.ping returned #{res.inspect} instead of PONG"
+     rescue Exception => e
+       create_error 'resque-redis', e.message
+     end
+   end
+end

data/lib/health_check/s3_health_check.rb

@@ -0,0 +1,65 @@
+module HealthCheck
+  class S3HealthCheck
+    extend BaseHealthCheck
+
+    class << self
+      def check
+        unless defined?(::Aws)
+          raise "Wrong configuration. Missing 'aws-sdk' gem"
+        end
+        return create_error 's3', 'Could not connect to aws' if aws_s3_client.nil?
+        HealthCheck.buckets.each do |bucket_name, permissions|
+          if permissions.nil? # backward compatible
+            permissions = [:R, :W, :D]
+          end
+          permissions.each do |permision|
+            begin
+            send(permision, bucket_name)
+          rescue Exception => e
+            raise "bucket:#{bucket_name}, permission:#{permision} - #{e.message}"
+          end
+          end
+        end
+        ''
+      rescue Exception => e
+        create_error 's3', e.message
+      end
+
+      private
+
+      def configure_client
+        return unless defined?(Rails)
+
+        aws_configuration = {
+          region: Rails.application.secrets.aws_default_region,
+          credentials: ::Aws::Credentials.new(
+            Rails.application.secrets.aws_access_key_id,
+            Rails.application.secrets.aws_secret_access_key
+          ),
+          force_path_style: true
+        }
+
+        ::Aws::S3::Client.new aws_configuration
+      end
+
+      def aws_s3_client
+        @aws_s3_client ||= configure_client
+      end
+
+      def R(bucket)
+        aws_s3_client.list_objects(bucket: bucket)
+      end
+
+      def W(bucket)
+        aws_s3_client.put_object(bucket: bucket,
+                                 key: "healthcheck_#{Rails.application.class.parent_name}",
+                                 body: Time.new.to_s)
+      end
+
+      def D(bucket)
+        aws_s3_client.delete_object(bucket: bucket,
+                                    key: "healthcheck_#{Rails.application.class.parent_name}")
+      end
+    end
+  end
+end

data/lib/health_check/sidekiq_health_check.rb

@@ -0,0 +1,17 @@
+module HealthCheck
+  class SidekiqHealthCheck
+    extend BaseHealthCheck
+
+    def self.check
+      unless defined?(::Sidekiq)
+        raise "Wrong configuration. Missing 'sidekiq' gem"
+      end
+      ::Sidekiq.redis do |r|
+        res = r.ping
+        res == 'PONG' ? '' : "Sidekiq.redis.ping returned #{res.inspect} instead of PONG"
+      end
+    rescue Exception => e
+      create_error 'sidekiq-redis', e.message
+    end
+  end
+end

data/lib/health_check/utils.rb

@@ -17,7 +17,6 @@ module HealthCheck
 
     cattr_accessor :default_smtp_settings
 
-
     def self.process_checks(checks)
       errors = ''
       checks.split('_').each do |check|
@@ -47,6 +46,22 @@ module HealthCheck
             end
           when 'cache'
             errors << HealthCheck::Utils.check_cache
+          when 'resque-redis-if-present'
+            errors << HealthCheck::ResqueHealthCheck.check if defined?(::Resque)
+          when 'sidekiq-redis-if-present'
+            errors << HealthCheck::SidekiqHealthCheck.check if defined?(::Sidekiq)
+          when 'redis-if-present'
+            errors << HealthCheck::RedisHealthCheck.check if defined?(::Redis)
+          when 's3-if-present'
+            errors << HealthCheck::S3HealthCheck.check if defined?(::Aws)
+          when 'resque-redis'
+            errors << HealthCheck::ResqueHealthCheck.check
+          when 'sidekiq-redis'
+            errors << HealthCheck::SidekiqHealthCheck.check
+          when 'redis'
+            errors << HealthCheck::RedisHealthCheck.check
+          when 's3'
+            errors << HealthCheck::S3HealthCheck.check
           when "standard"
             errors << HealthCheck::Utils.process_checks(HealthCheck.standard_checks.join('_'))
           when "custom"
@@ -60,9 +75,10 @@ module HealthCheck
         end
       end
       return errors
+    rescue => e
+      return e.message
     end
 
-
     def self.db_migrate_path
       # Lazy initialisation so Rails.root will be defined
       @@db_migrate_path ||= File.join(Rails.root, 'db', 'migrate')
@@ -100,7 +116,6 @@ module HealthCheck
       end
     end
 
-
     def self.check_sendmail(settings)
       File.executable?(settings[:location]) ? '' : 'no sendmail executable found. '
     end

data/lib/health_check/version.rb

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

data/test/rails_4.0.gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '1.9.3' if RUBY_VERSION < '1.9.3'
+ruby RUBY_VERSION < '1.9.3' ? '1.9.3' : RUBY_VERSION
 
 gem 'rails', "~> 4.0.0"
 gem 'rake', '>= 0.8.3'
@@ -16,8 +16,18 @@ group :development, :test do
     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
 
 # Initial Gemfile has therubyracer commented out
 gem 'therubyrhino', :platform => :jruby # REQUIRED
 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', RUBY_VERSION < '1.9.2' ? '< 2.0' : (defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' ? '< 3.0' : '>= 3.0') # REQUIRED

data/test/rails_4.1.gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '1.9.3' if RUBY_VERSION < '1.9.3'
+ruby RUBY_VERSION < '1.9.3' ? '1.9.3' : RUBY_VERSION
 
 gem 'rails', "~> 4.1.0"
 gem 'rake', '>= 0.8.3'
@@ -16,8 +16,18 @@ group :development, :test do
     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
 
 # Initial Gemfile has therubyracer commented out
 gem 'therubyrhino', :platform => :jruby # REQUIRED
 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', RUBY_VERSION < '1.9.2' ? '< 2.0' : (defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' ? '< 3.0' : '>= 3.0') # REQUIRED

data/test/rails_4.2.gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '1.9.3' if RUBY_VERSION < '1.9.3'
+ruby RUBY_VERSION < '1.9.3' ? '1.9.3' : RUBY_VERSION
 
 gem 'rails', "~> 4.2.0"
 gem 'rake', '>= 0.8.3'
@@ -16,4 +16,15 @@ group :development, :test do
     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
+
+# mime-types 2.0 requires Ruby version >= 1.9.2
+# mime-types 3.0 requires Ruby version >= 2.0
+gem 'mime-types', RUBY_VERSION < '1.9.2' ? '< 2.0' : (defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' ? '< 3.0' : '>= 3.0') # REQUIRED

data/test/rails_5.0.gemfile

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

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 # Bundle edge Rails instead:
 
-ruby '1.9.3' if RUBY_VERSION < '1.9.3'
+ruby RUBY_VERSION < '2.2.2' ? '2.2.2' : RUBY_VERSION
 
 gem 'rails'
 gem 'rake'
@@ -18,6 +18,13 @@ group :development, :test do
     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

data/test/setup_railsapp

@@ -59,8 +59,10 @@ fi
 $rehash
 
 rails="$base_dir/test/bin/rails"
+rake="$base_dir/test/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 binstub railties || echo '(ignored bundle exit status)'
 [ -f $rails ] || bundle binstub rails || echo '(ignored bundle exit status)'
 if [ ! -f $rails ]; then
@@ -68,8 +70,6 @@ if [ ! -f $rails ]; then
     exit 2
 fi
 
-rake="$base_dir/test/bin/rake"
-
 if [ ! -f $rake ]; then
     echo "Running bundle --binstub rake ..."
     if ! bundle --binstub rake || [ ! -f $rake ]; then
@@ -111,7 +111,7 @@ case "$actual_rails_version" in
     *' '[12].*)
         $rails railsapp -d $db
         ;;
-    *' '[34].*)
+    *' '[345].*)
         case "$BUNDLE_GEMFILE" in
         *rails_edge.gemfile)
             $rails new railsapp -d $db --edge
@@ -187,15 +187,16 @@ then
     $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 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)'

data/test/test_with_railsapp

@@ -9,6 +9,7 @@ trap 'err_report $LINENO' ERR
 
 # Any failure causes exit
 set -e
+export DISABLE_SPRING=1
 
 cleanup_db()
 {
@@ -78,6 +79,7 @@ start_server()
         bundle_prefix='bundle exec'
     fi
     server_arg=${RAILS_SERVER:-webrick}
+    echo "start_server called using: `env | egrep '^RAILS|^RACK|^PATH='` $bundle_prefix $server_arg"
     case "$server_arg" in
     puma) 
         $bundle_prefix puma -b tcp://127.0.0.1:$port &
@@ -103,6 +105,7 @@ start_server()
         ;;
     esac
     server_pid=$!
+    echo Server pid: $server_pid
     sleep 3
     echo
     echo 'Checking server is up ...'
@@ -193,11 +196,12 @@ common_tests()
     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*)
+        case "$RAILS_ENV=`egrep '^\s*config.serve_static_[asetfil]* *= *false' config/environments/${RAILS_ENV}.rb`" in
+        production*static*false*)
             echo "  SKIPPED (disabled in production)"
             ;;
         *)
+            grep serve_static_files config/environments/${RAILS_ENV}.rb config/[a-z]*.rb || echo no serve_static_files entry
             $testurl ${host}/static.txt 200 text/plain STATIC-FILE
             ;;
         esac
@@ -410,6 +414,9 @@ common_tests()
 # required for rails 4.1+ in production mode
 export SECRET_KEY_BASE=cf2f49c38a3fe67416ddf680f4f3187c0fce7dd1b9b117b34d195df75b274e08a04877e23803b2fdf1aa9a655269d94bc4888aa325cf7e721cc47368cfe56a80
 
+# required for rails 5 to server static files
+export RAILS_SERVE_STATIC_FILES=on
+
 case "$run_test" in
 ???)
     ;;

data/test/testurl

@@ -52,7 +52,7 @@ if ARGV[3] and ARGV[3] != ''
   if page_content.to_s.include? ARGV[3]
     puts "PASS (found #{ARGV[3]})"
   else
-    puts "FAIL (could not find #{ARGV[3]})" 
+    puts "FAIL (expected to find #{ARGV[3]}) - page contents:" , page_content.to_s, 'END-OF-CONTENTS'
     exit 3
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_check
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,8 +96,13 @@ files:
 - health_check.gemspec
 - init.rb
 - lib/health_check.rb
+- lib/health_check/base_health_check.rb
 - lib/health_check/health_check_controller.rb
 - lib/health_check/health_check_routes.rb
+- lib/health_check/redis_health_check.rb
+- lib/health_check/resque_health_check.rb
+- lib/health_check/s3_health_check.rb
+- lib/health_check/sidekiq_health_check.rb
 - lib/health_check/utils.rb
 - lib/health_check/version.rb
 - test/fake_smtp_server
@@ -110,6 +115,7 @@ files:
 - 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_helper.rb
@@ -153,6 +159,7 @@ test_files:
 - 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_helper.rb