nagios_check 0.0.6 → 0.1.0

data/lib/nagios_check.rb

@@ -31,16 +31,16 @@ module NagiosCheck
     rescue OptionParser::InvalidArgument, NagiosCheck::MissingOption => e
       store_message "CLI ERROR: #{e}"
     rescue => e
-      store_message "INTERNAL ERROR: #{e}"
+      store_message "INTERNAL ERROR: #{e.to_s.gsub(/[\r\n]+/, ' ')}"
     end
     msg = status
     msg += ': ' + message if message
-    if @values && !@values.empty? 
+    if @values && !@values.empty?
       msg += '|' + @values.map do |name, value|
         "#{name}=#{value};;;;"
       end.join(' ')
     end
-    puts msg 
+    puts msg
     exit return_val
   end
 
@@ -49,6 +49,7 @@ module NagiosCheck
   end
 
   def finish
+    raise "No value was provided" if @values.empty?
     value = @values.first.last
     if @options.c && !@options.c.include?(value)
       return [2, "CRITICAL"]

data/lib/nagios_check/version.rb

@@ -1,3 +1,3 @@
 module NagiosCheck
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/spec/finish_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 def before_finish_test
-  before(:each) do 
-    subject.prepare 
-    description = example.metadata[:example_group][:example_group][:description_args].first 
-    if /^when options are '(.*)'$/ =~ description
-      subject.send :parse_options, $1.split 
+  before(:each) do
+    subject.prepare
+    description = example.metadata[:example_group][:example_group][:description_args].first
+    if description.kind_of?(String) && /^when options are '(.*)'$/ =~ description
+      subject.send :parse_options, $1.split
     end
-    
-    description = example.metadata[:example_group][:description_args].first 
-    if /^when value is (.*)$/ =~ description
-      subject.store_value 'val', $1.to_f 
+
+    description = example.metadata[:example_group][:description_args].first
+    if description.kind_of?(String) && /^when value is (.*)$/ =~ description
+      subject.store_value 'val', $1.to_f
     end
   end
 end
@@ -31,8 +31,14 @@ end
 
 describe OkTestCheck do
   before_finish_test
-  
+
   context "when options are ''" do
+    it "should fail when no value is given" do
+      lambda {
+        subject.finish
+      }.should raise_error(RuntimeError, "No value was provided")
+    end
+
     context "when value is 0" do
       specify { subject.finish.should == [0, "OK"] }
     end
@@ -43,11 +49,10 @@ describe OkTestCheck do
       specify { subject.finish.should == [0, "OK"] }
     end
   end
-
 end
 
 describe WarningTestCheck do
-  before_finish_test 
+  before_finish_test
 
   context "when options are '-w 10'" do
     context "when value is -1" do
@@ -69,7 +74,7 @@ describe WarningTestCheck do
 end
 
 describe CriticalTestCheck do
-  before_finish_test 
+  before_finish_test
 
   context "when options are '-w 10 -c 20'" do
     context "when value is -1" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios_check
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec