steto 0.0.1 → 0.0.2

data/lib/steto/cocaine_ext.rb

@@ -10,7 +10,7 @@ module Cocaine
       begin
         run_without_exit_status
       ensure
-        @exit_status = $?.exitstatus
+        @exit_status = $?.exitstatus if $?
       end
     end
     alias_method :run, :run_with_exit_status

data/lib/steto/engine.rb

@@ -18,7 +18,12 @@ module Steto
 
     def check
       Parallel.each(checks, :in_threads => 4) do |check|
-        check.check
+        begin
+          check.check
+        rescue => e
+          check.status = :unknown
+          check.text = e.to_s
+        end
       end
       self
     end

data/lib/steto/nagios_check.rb

@@ -6,6 +6,7 @@ module Steto
     attr_accessor :command, :options
     
     def initialize(attributes = {})
+      self.command = ""
       self.options = {}
       self.attributes = attributes
     end
@@ -29,11 +30,16 @@ module Steto
     end
 
     def status_from_command_line
-      { 0 => :ok,
-        1 => :warning,
-        2 => :critical,
-        3 => :unknown
-      }[command_line.exit_status]
+      case command_line.exit_status
+      when 0
+        :ok
+      when 1
+        :warning
+      when 2
+        :critical
+      else
+        :unknown
+      end
     end
 
   end

data/lib/steto/proc_check.rb

@@ -7,7 +7,23 @@ module Steto
     end
 
     def check
-      self.status = @block.call
+      self.status = status_from_response(@block.call)
     end
+
+    def status_from_response(response)
+      case response
+      when Steto::Status
+        response
+      when Symbol
+        Status.new(response)
+      when true
+        Status.new(:ok)
+      when false
+        Status.new(:critical)
+      when nil
+        Status.new(:unknown)
+      end
+    end
+
   end
 end

data/lib/steto/version.rb

@@ -1,3 +1,3 @@
 module Steto
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/steto/engine_spec.rb

@@ -12,6 +12,15 @@ describe Steto::Engine do
       subject.check
     end
 
+    it "should set as unknown a failing check" do
+      failing_check = Steto::ProcCheck.new(:name => :fail) do
+        raise "fail"
+      end
+      subject.checks << failing_check
+      subject.check
+      failing_check.status.should be_unknown
+    end
+
   end
 
   describe "#config" do

data/spec/steto/nagios_check_spec.rb

@@ -45,4 +45,13 @@ describe Steto::NagiosCheck do
     
   end
 
+  describe "#status_from_command_line" do
+    
+    it "should return unknown when exitstatus is not defined" do
+      subject.command_line.stub :exit_status => nil
+      subject.status_from_command_line.should == :unknown
+    end
+
+  end
+
 end

data/spec/steto/proc_check_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Steto::ProcCheck do
+
+  describe "#status_from_response" do
+    
+    it "should return ok when response is true" do
+      subject.status_from_response(true).should be_ok
+    end
+
+    it "should return critical when response is false" do
+      subject.status_from_response(false).should be_critical
+    end
+
+    it "should return unknown when response is nil" do
+      subject.status_from_response(nil).should be_unknown
+    end
+
+    it "should return a Status when response is Symbol" do
+      subject.status_from_response(:ok).should be_ok
+    end
+
+    it "should return the response when it is a Status" do
+      subject.status_from_response(Steto::Status.new(:ok)).should be_ok
+    end
+
+  end
+  
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: steto
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alban Peignier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -138,6 +138,7 @@ files:
 - spec/steto/engine_spec.rb
 - spec/steto/logger_reporter_spec.rb
 - spec/steto/nagios_check_spec.rb
+- spec/steto/proc_check_spec.rb
 - steto.gemspec
 homepage: https://github.com/tryphon/steto
 licenses: []
@@ -179,3 +180,4 @@ test_files:
 - spec/steto/engine_spec.rb
 - spec/steto/logger_reporter_spec.rb
 - spec/steto/nagios_check_spec.rb
+- spec/steto/proc_check_spec.rb