nagios-probe 0.1.1 → 0.1.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 David Abdemoulaie
+Copyright (c) 2009-2010 David Abdemoulaie
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -66,4 +66,4 @@ To use your probe you *must* wrap it in a begin/rescue block to catch any except
 
 == Copyright
 
-Copyright (c) 2009 David Abdemoulaie. See LICENSE for details.
+Copyright (c) 2009-2010 David Abdemoulaie. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/nagios-probe.rb

@@ -4,49 +4,33 @@ module Nagios
   CRITICAL = 2
   UNKNOWN = 3
 
-  def crit(message)
-    "Critical: #{message}"
-  end
-
-  def warn(message)
-    "Warning: #{message}"
-  end
-
-  def ok(message)
-    "OK: #{message}"
-  end
-
   class Probe
-    include Nagios
     attr_reader :retval, :message
 
     def initialize(opts = {})
       @opts = opts
-      @retval = OK
-      @message = ok(ok_message)
+      @retval = Nagios::OK
+      @message = "OK: #{ok_message}"
     end
 
     def crit?
-      is_crit = check_crit
-      return false unless is_crit
-      @retval = CRITICAL
-      @message = crit(crit_message)
+      return false unless check_crit
+      @retval = Nagios::CRITICAL
+      @message = "Critical: #{crit_message}"
       true
     end
 
     def warn?
-      is_warn = check_warn
-      return false unless is_warn
-      @retval = WARNING
-      @message = warn(warn_message)
+      return false unless check_warn
+      @retval = Nagios::WARNING
+      @message = "Warning: #{warn_message}"
       true
     end
 
     def ok?
-      is_ok = check_ok
-      return false unless is_ok
-      @retval = OK
-      @message = ok(ok_message)
+      return false unless check_ok
+      @retval = Nagios::OK
+      @message = "OK: #{ok_message}"
       true
     end
 
@@ -58,7 +42,7 @@ module Nagios
       if !crit?
         if !warn?
           if !ok?
-            @retval = UNKNOWN
+            @retval = Nagios::UNKNOWN
             raise RuntimeError, "crit? warn? and ok? all returned false"
           end
         end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nagios-probe
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Abdemoulaie
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -06:00
+date: 2010-10-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Provides an easy to use API for generating custom probes and communicating probe success/failure to Nagios
 email: dave@hobodave.com
 executables: []
@@ -51,21 +61,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A very simple tool to assist with creating custom nagios probes in Ruby