litmus_paper 0.3.1 → 0.3.2

data/lib/litmus_paper/app.rb

@@ -1,7 +1,8 @@
 module LitmusPaper
   class App < Sinatra::Base
     get "/" do
-      output = "Services monitored:\n"
+      output = "Litmus Paper #{LitmusPaper::VERSION}\n"
+      output += "Services monitored:\n"
       output +=  LitmusPaper.services.keys.join("\n")
 
       text 200, output

data/lib/litmus_paper/dependency/haproxy_backends.rb

@@ -17,6 +17,10 @@ module LitmusPaper
         available.size > 0
       end
 
+      def to_s
+        "Dependency::HaproxyBackends(#{@domain_socket}, #{@cluster})"
+      end
+
       def _servers_in(stats, cluster)
         stats.select do |line|
           line['# pxname'] == cluster && !["FRONTEND", "BACKEND"].include?(line["svname"])

data/lib/litmus_paper/metric/available_memory.rb

@@ -20,12 +20,12 @@ module LitmusPaper
         return @memory_total unless @memory_total.nil?
 
         size, scale = @facter.value('memorytotal').split(' ')
-        @memory_total = size.to_i * MULTIPLIER[scale]
+        @memory_total = (size.to_f * MULTIPLIER[scale]).to_i
       end
 
       def memory_free
         size, scale = @facter.value('memoryfree').split(' ')
-        size.to_i * MULTIPLIER[scale]
+        (size.to_f * MULTIPLIER[scale]).to_i
       end
 
       def to_s

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/litmus_paper.rb

@@ -22,6 +22,7 @@ require 'litmus_paper/metric/available_memory'
 require 'litmus_paper/metric/cpu_load'
 require 'litmus_paper/service'
 require 'litmus_paper/status_file'
+require 'litmus_paper/version'
 
 module LitmusPaper
   class << self

data/spec/litmus_paper/app_spec.rb

@@ -16,6 +16,13 @@ describe LitmusPaper::App do
       last_response.body.should include('test')
       last_response.body.should include('another')
     end
+
+    it "includes the litmus version" do
+      get "/"
+
+      last_response.status.should == 200
+      last_response.body.should include("Litmus Paper #{LitmusPaper::VERSION}")
+    end
   end
 
   describe "POST /force/*" do

data/spec/litmus_paper/dependency/haproxy_backends_spec.rb

@@ -20,5 +20,12 @@ describe LitmusPaper::Dependency::HaproxyBackends do
       haproxy.should_not be_available
     end
   end
+
+  describe "to_s" do
+    it "includes the socket file and the cluster" do
+      haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/stub-haproxy-stats", "orange_cluster")
+      haproxy.to_s.should == 'Dependency::HaproxyBackends(/tmp/stub-haproxy-stats, orange_cluster)'
+    end
+  end
 end
 

data/spec/litmus_paper/metric/available_memory_spec.rb

@@ -8,12 +8,24 @@ describe LitmusPaper::Metric::AvailableMemory do
       memory.current_health.should == 25
     end
 
+    it "multiplies weight by memory available when handling floating point values" do
+      facter = StubFacter.new({"memorytotal" => "2.0 GB", "memoryfree" => "1.8 GB"})
+      memory = LitmusPaper::Metric::AvailableMemory.new(50, facter)
+      memory.current_health.should == 44
+    end
+
     describe "#memory_total" do
       it "is a positive integer" do
         metric = LitmusPaper::Metric::AvailableMemory.new(50)
         metric.memory_total.should > 1_000
       end
 
+      it "handles floating point values properly" do
+        facter = StubFacter.new("memorytotal" => "1.80 GB")
+        memory = LitmusPaper::Metric::AvailableMemory.new(50, facter)
+        memory.memory_total.should == 1932735283
+      end
+
       it "is cached" do
         Facter.should_receive(:value).once.and_return("10 MB")
         metric = LitmusPaper::Metric::AvailableMemory.new(50)
@@ -28,6 +40,12 @@ describe LitmusPaper::Metric::AvailableMemory do
         metric = LitmusPaper::Metric::AvailableMemory.new(50)
         metric.memory_free.should > 100
       end
+
+      it "handles floating point values properly" do
+        facter = StubFacter.new("memoryfree" => "1.80 GB")
+        memory = LitmusPaper::Metric::AvailableMemory.new(50, facter)
+        memory.memory_free.should == 1932735283
+      end
     end
 
     describe "#to_s" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: litmus_paper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70366165028280 !ruby/object:Gem::Requirement
+  requirement: &70248649019060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70366165028280
+  version_requirements: *70248649019060
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70366165009340 !ruby/object:Gem::Requirement
+  requirement: &70248649000380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70366165009340
+  version_requirements: *70248649000380
 - !ruby/object:Gem::Dependency
   name: SyslogLogger
-  requirement: &70366164935220 !ruby/object:Gem::Requirement
+  requirement: &70248648925460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70366164935220
+  version_requirements: *70248648925460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70366160654080 !ruby/object:Gem::Requirement
+  requirement: &70248644644480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70366160654080
+  version_requirements: *70248644644480
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70366160547260 !ruby/object:Gem::Requirement
+  requirement: &70248644537640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70366160547260
+  version_requirements: *70248644537640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70366160552680 !ruby/object:Gem::Requirement
+  requirement: &70248644543240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70366160552680
+  version_requirements: *70248644543240
 - !ruby/object:Gem::Dependency
   name: rake_commit
-  requirement: &70366160551600 !ruby/object:Gem::Requirement
+  requirement: &70248644542440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: *70366160551600
+  version_requirements: *70248644542440
 description: Backend health tester for HA Services
 email:
 - code@getbraintree.com