health_check 1.7.1 → 1.7.2

data/.travis.yml

@@ -8,6 +8,7 @@ before_install:
   - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - gem install bundler ${BUNDLER_VERSION:+-v} ${BUNDLER_VERSION}
+  - gem install smarter_bundler
   - bundle --version
   - bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} --version
   - mkdir -p tmp/bundle

data/CHANGELOG

@@ -1,6 +1,11 @@
 = Change Log =
 
-* pre_rails4 branch
+* rails3 branch
+
+*1.7.2
+ * Change to using smarter_bundler to improve test robustness and pin gems that have newer versions with imcompatibilities
+ * Depends on railties rather than rails so it can be used with trimmed down stacks
+ * Cleanup test code
 *1.7.1
  * Restricted sass version for ruby 1.9.7 compatibility
  * Added Vgrantfile for easier testing

data/README.rdoc

@@ -1,13 +1,11 @@
-= health_check gem (pre_rails4 branch)
+= health_check gem (rails3 branch)
 
-Simple health check of Rails app for use with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.
+Simple health check of Rails 3.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 ~> 1.7 for Rails 3.*
-* {master}[https://github.com/ianheggie/health_check/tree/master] branch or gem versions >= 2.0 for Rails 4.0+
-* {rails2.3}[https://github.com/ianheggie/health_check/tree/rails2.3] branch or gem versions ~> 1.6.1 for Rails 2.3.*
+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).
 
-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 rails versions.
+Consider using {RAILS LTS 3.2}[https://railslts.com/] rather than the unsupported 3.x versions.
 
 health_check provides various monitoring URIs, for example:
 
@@ -50,7 +48,7 @@ Specify full or include email in the list of checks to verify the smtp settings
 
 Add the following line to Gemfile
 
-    gem "health_check"
+    gem "health_check", "~> 1.7"
 
 And then execute
 
@@ -58,7 +56,7 @@ And then execute
 
 Or install it yourself as:
 
-    gem install health_check
+    gem install --version '~> 1.7' health_check
 
 == Configuration
 
@@ -180,7 +178,7 @@ See https://github.com/ianheggie/health_check/wiki/Ajax-Example for an Ajax exam
 
 === Automated testing
 
-* {<img src="https://travis-ci.org/ianheggie/health_check.svg?branch=pre_rails4">}[https://travis-ci.org/ianheggie/health_check.svg?branch=pre_rails4]  - Travis CI 
+* {<img src="https://travis-ci.org/ianheggie/health_check.svg?branch=rails3">}[https://travis-ci.org/ianheggie/health_check.svg?branch=rails3]  - Travis CI 
 
 === Manual testing
 

data/health_check.gemspec

@@ -20,7 +20,9 @@ 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>, ['~> 3.0'])
+  gem.required_ruby_version = '>= 1.8.7'
+  gem.add_dependency(%q<railties>, ['~> 3.0'])
+  gem.add_development_dependency(%q<smarter_bundler>, [">= 0.1.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"])

data/lib/health_check/version.rb

@@ -1,4 +1,4 @@
 module HealthCheck
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end
 

data/test/rails_3.2.gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'rails', "~> 3.2.0"
-gem 'rake', '>= 0.8.3'
+gem 'rake', '>= 0.8.3', '< 11.0' # REQUIRED
 
 group :development, :test do
   if defined?(JRUBY_VERSION)
@@ -25,3 +25,6 @@ gem 'rack', "< 2.0"  if RUBY_VERSION < '2.2.2'       # REQUIRED
 # Initial Gemfile has therubyracer commented out
 gem 'therubyrhino', :platform => :jruby # REQUIRED
 gem 'therubyracer', :platform => :ruby # REQUIRED
+
+# Pin gems to avoid incompatible versions
+gem 'sass', '< 3.5.0'  # REQUIRED

data/test/setup_railsapp

@@ -45,7 +45,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
 else
@@ -84,7 +84,7 @@ 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
+    if ! smarter_bundle ; then
         echo "Test aborted (missing required gems)"
         exit 2
     else
@@ -170,72 +170,62 @@ echo Unsetting BUNDLE_GEMFILE '(so Gemfile for rails application will be used)'
 INITIAL_BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 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
-    echo Adding required Gemfile lines ...
-    egrep REQUIRED $INITIAL_BUNDLE_GEMFILE | tee -a Gemfile
-    echo
-    echo ================= Gemfile ===================
-    cat Gemfile
-    echo
-    echo running bundle install
-    bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} 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 ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub railties || echo '(ignored bundle exit status)'
-    [ -f $rails ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub rails || echo '(ignored bundle exit status)'
-    if [ ! -f $rails ]; then
-        echo "Test aborted (unable to create $rails)"
-        exit 2
-    fi
+rm -f Gemfile.lock
 
-    rake="$railsapp/bin/rake"
+echo Adding health_check as gem to Gemfile...
+echo "gem 'health_check', :path => '$base_dir'" >> Gemfile
 
-    echo Checking $rake is present ...
-    [ -f $rake ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub rake || echo '(ignored bundle exit status)'
-    if [ ! -f $rake ]; then
-        echo "Test aborted (unable to create $rake)"
-        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
+echo Adding required Gemfile lines ...
+egrep REQUIRED $INITIAL_BUNDLE_GEMFILE | tee -a Gemfile
+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"
 
-    $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
-
-        git ls-files | cpio -pdl $dest
-        
-	cd $dest
-
-        echo Files installed as plugin:
-        find . -type f
-        echo
-    )
+echo Checking $rails is present ...
+[ -f $rails ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} binstub railties || echo '(ignored bundle exit status)'
+[ -f $rails ] || bundle ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} 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 ${BUNDLER_VERSION:+_${BUNDLER_VERSION}_} 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.lock ===================
+cat Gemfile.lock
+echo
+
 for e in test ${RAILS_ENV2:-production}
 do
     if [ -f config/environments/$e.rb ]; then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_check
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 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:
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.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
@@ -137,10 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4152709430930612224
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: