litmus_paper 0.2.1 → 0.2.2

data/lib/litmus_paper/dependency/tcp.rb

@@ -6,11 +6,12 @@ module LitmusPaper
           @fiber = fiber
           @ip = ip
           @port = port
-          EM.add_timer(timeout, method(:connection_timeout))
+          @timer = EM::Timer.new(timeout, method(:connection_timeout))
         end
 
         def connection_completed
           close_connection
+          @timer.cancel
           @fiber.resume(true)
         end
 

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.2.1"
+  VERSION = "0.2.2"
 end

data/spec/litmus_paper/dependency/tcp_spec.rb

@@ -12,11 +12,19 @@ describe LitmusPaper::Dependency::TCP do
         EM.stop_server @server if @server
       end
     end
+
     it "is true when it's able to reach the ip and port" do
       check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3333)
       check.should be_available
     end
 
+    it "cancels the timer when successful" do
+      SpecHelper.ensure_no_outstanding_timers do
+        check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3333)
+        check.should be_available
+      end
+    end
+
     it "is false when the ip is not available" do
       check = LitmusPaper::Dependency::TCP.new("127.1.1.15", 3333, :timeout => 0.3)
       check.should_not be_available

data/spec/litmus_paper/metric/available_memory_spec.rb

@@ -10,12 +10,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)
@@ -30,6 +42,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

data/spec/spec_helper.rb

@@ -37,6 +37,15 @@ module SpecHelper
     file.path
   end
 
+  def self.ensure_no_outstanding_timers(&block)
+    timer_keys = EM.instance_variable_get("@timers").keys
+    yield
+    new_timer_keys = EM.instance_variable_get("@timers").keys - timer_keys
+    new_timer_keys.each do |timer_key|
+      EM.instance_variable_get("@timers")[timer_key].should == false
+    end
+  end
+
   def self.wait_for_service(options)
     Timeout::timeout(options[:timeout] || 20) do
       loop do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: litmus_paper
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70215677416940 !ruby/object:Gem::Requirement
+  requirement: &70141208657940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70215677416940
+  version_requirements: *70141208657940
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &70215677415940 !ruby/object:Gem::Requirement
+  requirement: &70141208657480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70215677415940
+  version_requirements: *70141208657480
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70215677415220 !ruby/object:Gem::Requirement
+  requirement: &70141208657020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70215677415220
+  version_requirements: *70141208657020
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
-  requirement: &70215677413900 !ruby/object:Gem::Requirement
+  requirement: &70141208656540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70215677413900
+  version_requirements: *70141208656540
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70215677413180 !ruby/object:Gem::Requirement
+  requirement: &70141208656060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70215677413180
+  version_requirements: *70141208656060
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70215677412460 !ruby/object:Gem::Requirement
+  requirement: &70141208655560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -79,10 +79,10 @@ dependencies:
         version: 1.0.0.beta.100
   type: :runtime
   prerelease: false
-  version_requirements: *70215677412460
+  version_requirements: *70141208655560
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70215677410920 !ruby/object:Gem::Requirement
+  requirement: &70141208654800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70215677410920
+  version_requirements: *70141208654800
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70215677410360 !ruby/object:Gem::Requirement
+  requirement: &70141208654320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70215677410360
+  version_requirements: *70141208654320
 - !ruby/object:Gem::Dependency
   name: em-resolv-replace
-  requirement: &70215677409700 !ruby/object:Gem::Requirement
+  requirement: &70141208653820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70215677409700
+  version_requirements: *70141208653820
 - !ruby/object:Gem::Dependency
   name: em-syslog
-  requirement: &70215677408960 !ruby/object:Gem::Requirement
+  requirement: &70141208653340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70215677408960
+  version_requirements: *70141208653340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70215677408220 !ruby/object:Gem::Requirement
+  requirement: &70141208652840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70215677408220
+  version_requirements: *70141208652840
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70215677407320 !ruby/object:Gem::Requirement
+  requirement: &70141208652340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +145,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70215677407320
+  version_requirements: *70141208652340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70215677406340 !ruby/object:Gem::Requirement
+  requirement: &70141208651880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70215677406340
+  version_requirements: *70141208651880
 - !ruby/object:Gem::Dependency
   name: rake_commit
-  requirement: &70215677405580 !ruby/object:Gem::Requirement
+  requirement: &70141208651420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,7 +167,7 @@ dependencies:
         version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: *70215677405580
+  version_requirements: *70141208651420
 description: Backend health tester for HA Services
 email:
 - code@getbraintree.com