litmus_paper 0.8.3 → 0.8.4

data/lib/litmus_paper/app.rb

@@ -3,14 +3,15 @@ module LitmusPaper
     disable :show_exceptions
 
     get "/" do
-      output = "Litmus Paper #{LitmusPaper::VERSION}\n\n"
-      output += "Services monitored:\n"
-      output += " Service ( Health / Measured Health )\n"
+      output = "Litmus Paper #{LitmusPaper::VERSION}\n"
+      max_service_length = (LitmusPaper.services.keys << "Service").max { |a, b| a.length <=> b.length }.length
+      output += sprintf "  %-#{max_service_length}s %6s [%s] [%s]\n", "", "", "Measured", "Forced"
+      output += sprintf "  %-#{max_service_length}s %6s [%s] [%s]\n", "Service", "Health", "Health".center(8), "Reason"
       LitmusPaper.services.each do |service_name, service|
         health = service.current_health
-        output += "* #{service_name} ( #{health.value} / #{health.measured_health} )"
+        output += sprintf "* %-#{max_service_length}s %6s", service_name, health.value
         if health.forced?
-          output += " - forced: #{service.current_health.summary}"
+          output += sprintf " %10s %s", health.measured_health, service.current_health.forced_reason
         end
         output += "\n"
       end
@@ -51,6 +52,7 @@ module LitmusPaper
         body = "Health: #{health.value}\n"
         if health.forced?
           body << "Measured Health: #{health.measured_health}\n"
+          body << "Forced Reason: #{health.forced_reason}\n"
         end
         body << health.summary
 

data/lib/litmus_paper/health.rb

@@ -1,13 +1,14 @@
 module LitmusPaper
   class Health
 
-    attr_reader :summary
+    attr_reader :summary, :forced_reason
 
-    def initialize(forced = :none, summary = "")
+    def initialize(forced = :none, forced_reason = "")
       @value = 0
       @dependencies_available = true
-      @summary = summary
+      @summary = ""
       @forced = forced
+      @forced_reason = forced_reason
     end
 
     def ok?

data/lib/litmus_paper/status_file.rb

@@ -33,7 +33,7 @@ module LitmusPaper
     end
 
     def content
-      File.read(@path).chomp + "\n"
+      File.read(@path).chomp
     end
 
     def create(reason)

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/spec/litmus_paper/app_spec.rb

@@ -35,7 +35,7 @@ describe LitmusPaper::App do
       get "/"
 
       last_response.status.should == 200
-      last_response.body.should include("* test ( 0 / 0 )\n")
+      last_response.body.should match(/\* test +0\n/)
     end
 
     it "includes the status if forced" do
@@ -48,8 +48,8 @@ describe LitmusPaper::App do
       get "/"
 
       last_response.status.should == 200
-      last_response.body.should include("* another ( 0 / 0 ) - forced: Down for testing\n")
-      last_response.body.should include("* test ( 100 / 0 ) - forced: Up for testing\n")
+      last_response.body.should match(/\* another +0 +0 +Down for testing\n/)
+      last_response.body.should match(/\* test +100 +0 +Up for testing\n/)
     end
   end
 

data/spec/litmus_paper/service_spec.rb

@@ -26,7 +26,7 @@ describe LitmusPaper::Service do
       LitmusPaper::StatusFile.service_down_file("test").create("Down for testing")
 
       service.current_health.value.should == 0
-      service.current_health.summary.should match(/Down for testing/)
+      service.current_health.forced_reason.should match(/Down for testing/)
     end
 
     it "is 0 when a global down file exists" do
@@ -37,7 +37,7 @@ describe LitmusPaper::Service do
       LitmusPaper::StatusFile.global_down_file.create("Down for testing")
 
       service.current_health.value.should == 0
-      service.current_health.summary.should match(/Down for testing/)
+      service.current_health.forced_reason.should match(/Down for testing/)
     end
 
     it "is 100 when an up file exists" do
@@ -48,7 +48,7 @@ describe LitmusPaper::Service do
       LitmusPaper::StatusFile.service_up_file("test").create("Up for testing")
 
       service.current_health.value.should == 100
-      service.current_health.summary.should match(/Up for testing/)
+      service.current_health.forced_reason.should match(/Up for testing/)
     end
 
     it "is 100 when a global up file exists" do
@@ -59,7 +59,7 @@ describe LitmusPaper::Service do
       LitmusPaper::StatusFile.global_up_file.create("Up for testing")
 
       service.current_health.value.should == 100
-      service.current_health.summary.should match(/Up for testing/)
+      service.current_health.forced_reason.should match(/Up for testing/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: litmus_paper
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -246,15 +246,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2773355175135324952
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2773355175135324952
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Backend health tester for HA Services, partner project of big_brother