nagios_check 0.0.4 → 0.0.5

data/README.md

@@ -29,7 +29,7 @@ Features
 Usage and documentation
 -----------------------
 
-NagiosCheck is a module. To use it simply include it in a class and declare
+NagiosCheck is a module. To use it, simply include it in a class and declare
 how the check should behave:
 
 ``` ruby

data/lib/nagios_check.rb

@@ -17,9 +17,9 @@ module NagiosCheck
 
   def run
     prepare
-    parse_options
     return_val, status = 3, "UNKNOWN"
     begin
+      parse_options
       if @timeout
         check_with_timeout
       else
@@ -28,6 +28,8 @@ module NagiosCheck
       return_val, status = finish
     rescue Timeout::Error
       store_message "TIMEOUT after #{@timeout}s"
+    rescue OptionParser::InvalidArgument, NagiosCheck::MissingOption => e
+      store_message "CLI ERROR: #{e}"
     rescue => e
       store_message "INTERNAL ERROR: #{e}"
     end
@@ -160,6 +162,13 @@ module NagiosCheck
     Timeout.timeout(@timeout) { check } 
   end
 
-  class MissingOption < StandardError; end
-  class MissingOption < StandardError; end
+  class MissingOption < StandardError; 
+    def initialize(name)
+      @name = name
+    end
+
+    def to_s
+      "missing option: '#{@name}'"
+    end
+  end
 end

data/lib/nagios_check/version.rb

@@ -1,3 +1,3 @@
 module NagiosCheck
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios_check
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000Z
+date: 2012-03-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152780360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152780360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152779940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152779940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An easy to use DSL for building custom probes for the Nagios monitoring
   system
 email:
@@ -74,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nagios_check
-rubygems_version: 1.8.6
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Ruby Nagios Check Integration