cepa-health 0.2.1 → 0.3.0

data/lib/cepa-health/version.rb

@@ -1,4 +1,4 @@
 module CepaHealth
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end
 

data/lib/cepa-health.rb

@@ -11,6 +11,9 @@ module CepaHealth
     def execute(block)
       v = instance_exec(&block)
       Array === v ? record(*v) : record("Probe", v, v ? "Success" : "Failed")
+    rescue Exception => e
+      $stderr.puts "#{e.class}: #{e.message}\n#{e.backtrace * "\n"}"
+      record("Probe Exception", false, "#{e.class}: #{e.message}")
     end
 
     def initialize
@@ -18,9 +21,9 @@ module CepaHealth
       @success = true
     end
 
-    def record(name, status, comment)
+    def record(name, status, comment = nil)
       @success = @success && !!status
-      @records << [name.to_s, !!status, comment.to_s]
+      @records << [name.to_s, !!status, (comment || "").to_s]
     end
 
     def success?

data/spec/cepa_health_middleware_spec.rb

@@ -13,7 +13,7 @@ describe CepaHealth::Middleware do
   end
 
   let(:rackapp) do
-    app = ->(e) { [200, { 'Content-Type' => 'text/plain' }, ["Boom"]] }
+    app = ->(e) { [200, { 'Content-Type' => 'text/plain; charset=utf-8' }, ["Boom"]] }
     Rack::Lint.new CepaHealth::Middleware.new(app)
   end
 
@@ -29,22 +29,22 @@ describe CepaHealth::Middleware do
   end
 
   it "should return a 200 OK for passing probes" do
-    CepaHealth.register("VeryUniqueTestIFear") { true }
+    CepaHealth.register { ["VeryUniqueTestIFear", true, ""] }
     code, headers, body = get("/healthy.html")
     code.should == 200
     body.should =~ /VeryUniqueTestIFear/
   end
 
   it "should return a 500 Error for failing probes" do
-    CepaHealth.register("VeryUniqueTestIFear") { true }
-    CepaHealth.register("TotallyUniqueFailure") { false }
+    CepaHealth.register { ["VeryUniqueTestIFear", true, ""] }
+    CepaHealth.register { ["TotallyUniqueFailure", false, ""] }
     code, headers, body = get("/healthy.html")
     code.should == 500
     body.should =~ /TotallyUniqueFailure/
   end
 
   it "should return a 404 if a key is set and not specified" do
-    CepaHealth.register("VeryUniqueTestIFear") { true }
+    CepaHealth.register { ["VeryUniqueTestIFear", true, "" ] }
     CepaHealth.key = 'stone'
     code, headers, body = get("/healthy.html")
     code.should == 404
@@ -52,7 +52,7 @@ describe CepaHealth::Middleware do
   end
 
   it "should return successful if a key is set and specified" do
-    CepaHealth.register("VeryUniqueTestIFear") { true }
+    CepaHealth.register { ['VeryUniqueTestIFear', true, "" ] }
     CepaHealth.key = 'stone'
     code, headers, body = get("/healthy.html", 'QUERY_STRING' => 'key=stone')
     code.should == 200
@@ -60,10 +60,10 @@ describe CepaHealth::Middleware do
   end
 
   it "should filter responses if they have different levels" do
-    CepaHealth.register("error1", "error") { false }
-    CepaHealth.register("error2", "error") { false }
-    CepaHealth.register("warn1", "warn") { true }
-    CepaHealth.register("warn2", "warn") { true }
+    CepaHealth.register("error") { ['error1', false, ""] }
+    CepaHealth.register("error") { ['error2', false, ""] }
+    CepaHealth.register("warn") { ['warn1', true, ""] }
+    CepaHealth.register("warn") { ['warn2', true, ""] }
     CepaHealth.key = 'stone'
 
     code, headers, body = get("/healthy.txt", 'QUERY_STRING' => 'key=stone')
@@ -96,100 +96,3 @@ describe CepaHealth::Middleware do
   end
 
 end
-# describe Rack::Health do
-#   def env(url='/', *args)
-#     Rack::MockRequest.env_for(url, *args)
-#   end
-
-#   let(:base_app) do
-#     lambda do |env|
-#       [200, {'Content-Type' => 'text/plain'}, ["I'm base_app"]]
-#     end
-#   end
-#   let(:app) { Rack::Lint.new Rack::Health.new(base_app, rack_health_options) }
-#   let(:rack_health_options) { {} }
-#   let(:status) { subject[0] }
-#   let(:body) { str = ''; subject[2].each {|s| str += s }; str }
-
-#   describe 'with default options' do
-#     let(:rack_health_options) { {} }
-
-#     describe '/' do
-#       subject { app.call env('/') }
-
-#       it { status.should == 200 }
-#       it { body.should == "I'm base_app" }
-#     end
-
-#     describe '/rack_health' do
-#       subject { app.call env('/rack_health') }
-
-#       it { status.should == 200 }
-#       it { body.should == 'Rack::Health says "healthy"' }
-#     end
-#   end
-
-#   describe 'with :sick_if' do
-#     subject { app.call env('/rack_health') }
-
-#     describe '== lambda { true }' do
-#       let(:rack_health_options) { { :sick_if => lambda { true } } }
-
-#       it { status.should == 503 }
-#       it { body.should == 'Rack::Health says "sick"' }
-#     end
-
-#     describe '== lambda { false }' do
-#       let(:rack_health_options) { { :sick_if => lambda { false } } }
-
-#       it { status.should == 200 }
-#       it { body.should == 'Rack::Health says "healthy"' }
-#     end
-#   end
-
-#   describe 'with :status' do
-#     let(:status_proc) { lambda {|healthy| healthy ? 202 : 404 } }
-#     subject { app.call env('/rack_health') }
-
-#     context 'healthy' do
-#       let(:rack_health_options) { { :sick_if => lambda { false }, :status => status_proc } }
-
-#       it { status.should == 202 }
-#       it { body.should == 'Rack::Health says "healthy"' }
-#     end
-
-#     context 'sick' do
-#       let(:rack_health_options) { { :sick_if => lambda { true }, :status => status_proc } }
-
-#       it { status.should == 404 }
-#       it { body.should == 'Rack::Health says "sick"' }
-#     end
-#   end
-
-#   describe 'with :body' do
-#     let(:body_proc) { lambda {|healthy| healthy ? 'fine' : 'bad' } }
-#     subject { app.call env('/rack_health') }
-
-#     context 'healthy' do
-#       let(:rack_health_options) { { :sick_if => lambda { false }, :body => body_proc } }
-
-#       it { status.should == 200 }
-#       it { body.should == 'fine' }
-#     end
-
-#     context 'sick' do
-#       let(:rack_health_options) { { :sick_if => lambda { true }, :body => body_proc } }
-
-#       it { status.should == 503 }
-#       it { body.should == 'bad' }
-#     end
-#   end
-
-#   describe 'with :path' do
-#     subject { app.call env('/how_are_you') }
-#     let(:rack_health_options) { { :path => '/how_are_you' } }
-
-#     it { status.should == 200 }
-#     it { body.should == 'Rack::Health says "healthy"' }
-#   end
-# end

data/spec/cepa_health_spec.rb

@@ -14,17 +14,17 @@ describe CepaHealth do
 
   it "should register a failure on any unsuccessful probe" do
     standard_setup
-    CepaHealth.register("Fail") { false }
-    CepaHealth.register("Four") { true }
+    CepaHealth.register { ["Fail", false] }
+    CepaHealth.register { ["Four", true] }
     should_be(false, 6)
   end
 
   it "should allow the registration of probes in levels" do
-    CepaHealth.register("One") { false }
-    CepaHealth.register("Two", "error") { false }
-    CepaHealth.register("Three", "warn") { true }
-    CepaHealth.register("Four", "warn") { true }
-    CepaHealth.register("Five", "warn") { true }
+    CepaHealth.register { ["One", false] }
+    CepaHealth.register('error') { ["Two", false] }
+    CepaHealth.register('warn') { ["Three", true] }
+    CepaHealth.register('warn') { ["Four", true] }
+    CepaHealth.register('warn') { ["Five", true] }
     should_be(false, 5)
     should_be(false, 2, "error")
     should_be(true, 3, "warn")
@@ -41,9 +41,9 @@ describe CepaHealth do
   end
 
   def standard_setup
-    CepaHealth.register("One") { true }
-    CepaHealth.register("Two") { true }
-    CepaHealth.register("Three") { record("Three-B", true, "") }    
+    CepaHealth.register { ["One", true] }
+    CepaHealth.register { ["Two", true] }
+    CepaHealth.register { record("Three-B", true, ""); ["Three", true] }    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cepa-health
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack