health_check 1.6.1 → 1.6.2

data/CHANGELOG

@@ -1,6 +1,7 @@
 = Change Log =
 
 * rails2.3 branch
+*1.6.2 - Added Vagrantfile with provisioning script for easier testing, removed badges that don't work with branches
 *1.6.1 - rails 2.3 only version
  * rails 2.3 only version
 *1.6.0

data/README.rdoc

@@ -195,38 +195,50 @@ See https://github.com/ianheggie/health_check/wiki/Ajax-Example for an Ajax exam
 
 == Testing
 
-=== Automated testing and other checks
+=== Automated testing
 
-* {<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=rails2.3">}[https://travis-ci.org/ianheggie/health_check.svg?branch=rails2.3]  - 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 1.8.7 
+    # or 
+    chruby 1.9.3
+
     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.
 
@@ -237,7 +249,7 @@ The command `rake test` will also launch these tests, except it cannot install t
 
 == Copyright
 
-Copyright (c) 2010-2015 Ian Heggie, released under the MIT license.
+Copyright (c) 2010-2017 Ian Heggie, released under the MIT license.
 See MIT-LICENSE for details.
 
 == Contributors

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/lib/health_check/version.rb

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

data/test/init_variables

@@ -20,6 +20,8 @@ if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
   echo "Detected user installed rvm"
 elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
   echo "Detected root installed rvm"
+elif [[ -s /usr/local/share/chruby/chruby.sh ]] ; then
+  echo "Detected root installed chruby"
 elif [[ -d "$HOME/.rbenv" ]] ; then
   echo "Detected rbenv: `rbenv version`"
   rehash='rbenv rehash'

data/test/provision_vagrant

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+case `id` in
+*root*)
+        ;;
+*)
+        exec echo Must be run as root
+        ;;
+esac
+
+chruby_version=0.3.9
+chruby=chruby-${chruby_version}
+
+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 ruby ruby-dev sqlite3 libsqlite3-dev nodejs subversion git git-core
+# https://github.com/rbenv/ruby-build/wiki#suggested-build-environment
+# using default gcc-5 since xenial doesn't have gcc-6
+apt install --yes --force-yes -q gcc-5 autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev
+
+# The following is not required for testing, install if you are doing manual tests with extra gems
+# apt install --yes --force-yes -q mysql-client mysql-server libmysqlclient-dev
+# apt install --yes --force-yes -q libcurl4-openssl-dev libncurses5-dev libxml2-dev libxslt1-dev
+(
+  echo Install chruby
+  [ -s ${chruby}.tar.gz ] || wget -q -O ${chruby}.tar.gz https://github.com/postmodern/chruby/archive/v${chruby_version}.tar.gz
+  [ -d ${chruby} ] || tar -xzf ${chruby}.tar.gz
+  cd ${chruby}/
+  ./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
+  #source /usr/local/share/chruby/auto
+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
+  v=1.8.7-p375
+  [ -x /opt/rubies/${v}/bin/bundle ] || ( ruby-build ${v} /opt/rubies/${v} && /opt/rubies/${v}/bin/gem update --system 1.8.25 && /opt/rubies/${v}/bin/gem install bundler )
+    
+  v=1.9.3-p551
+  [ -x /opt/rubies/${v}/bin/bundle ] || ( ruby-build ${v} /opt/rubies/${v} && /opt/rubies/${v}/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:
+
+  vagrant ssh
+  cd /vagrant
+
+  chruby RUBY_VERSION
+  or
+  chruby system # for system version 2.3.1
+
+  ./test/test_with_railsapp
+
+  exit
+
+EOF
+exit

metadata

@@ -1,103 +1,95 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: health_check
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 1.6.2
   prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 1
-  version: 1.6.1
 platform: ruby
-authors: 
+authors:
 - Ian Heggie
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-09-29 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.3
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 11
-        - 0
-        version: "11.0"
+      - !ruby/object:Gem::Version
+        version: '11.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id004
-description: "  \tSimple health check of Rails app for uptime monitoring with Pingdom, NewRelic, EngineYard or uptime.openacs.org etc.\n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+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
@@ -107,6 +99,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- Vagrantfile
 - config/routes.rb
 - health_check.gemspec
 - init.rb
@@ -123,6 +116,7 @@ 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_2.3.gemfile
 - test/rails_2.3_lts.gemfile
 - test/setup_railsapp
@@ -131,41 +125,35 @@ files:
 - test/testurl
 - test/unit/health_check_controller_test.rb
 - test/unit/routes_test.rb
-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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4237956159374351486
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23.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
@@ -173,6 +161,7 @@ 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_2.3.gemfile
 - test/rails_2.3_lts.gemfile
 - test/setup_railsapp