health_check 1.4.4 → 1.5.0

data/.travis.yml

@@ -85,9 +85,6 @@ matrix:
     - rvm: 1.9.3
       gemfile: test/rails_3.2.gemfile
 
-    - rvm: ree
-      gemfile: test/rails_3.2.gemfile
-
     - rvm: jruby-19mode
       gemfile: test/rails_3.2.gemfile
 

data/README.rdoc

@@ -28,7 +28,7 @@ The health_check controller disables sessions for versions that eagerly load ses
 
 == 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']
 

data/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

data/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

data/lib/health_check/version.rb

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

data/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 ...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_check
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails