nagiosplugin 0.0.1 → 0.0.2

data/README.md

@@ -11,6 +11,7 @@ NagiosPlugin is a simple framework for writing [Nagios](http://www.nagios.org/)
 Create your executable plugin (which will be called by nagios), `require "nagiosplugin"` and subclass from `NagiosPlugin::Plugin`.
 You must define the methods `critical?` and `warning?` which determine the plugin status during a check based on their boolean return value (`ok?` returns true by default but can be overwritten).
 The optional method `measure` will be called *first* on every check to take samples.
+Additional plugin output can be assigned to `@info_text`.
 Run `check!` on your *class* to ensure a proper plugin output (= stdout & exit status).
 
 Here's a simple example plugin named `check_u2d`:

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+
+require "cucumber/rake/task"
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "--format pretty"
+end
+
+task :default => :features

data/features/plugin_output.feature

@@ -4,6 +4,7 @@ Feature: Plugin Output
 	As a sysadmin building my own nagios plugins
 	I want to return a nagios compatible plugin output
 
+
 	Scenario Outline: CRITICAL, WARNING and OK
 		Given a file named "check_foo" with:
 			"""
@@ -16,11 +17,8 @@ Feature: Plugin Output
 			"""
 		When I run `ruby check_foo`
 		Then the exit status should be <code>
-		And the stdout should contain:
-			"""
-			FOO <status>
-			
-			"""
+		And the stdout should contain "FOO <status>"
+		
 		Examples:
 		 | crit  | warn  | code | status   |
 		 | true  | true  | 2    | CRITICAL |
@@ -28,6 +26,7 @@ Feature: Plugin Output
 		 | false | true  | 1    | WARNING  |
 		 | false | false | 0    | OK       |
 
+
 	Scenario Outline: UNKNOWN when all status checks return false
 		Given a file named "check_bar" with:
 			"""
@@ -41,17 +40,13 @@ Feature: Plugin Output
 			"""
 		When I run `ruby check_bar`
 		Then the exit status should be <code>
-		# And the stdout should contain exactly:
-		And the stdout should contain:
-			"""
-			BAR <status>
-			
-			"""
+		And the stdout should contain "BAR <status>"
+		
 		Examples:
 		 | ok    | code | status                                     |
 		 | true  | 0    | OK                                         |
-		 | false | 3    | UNKNOWN                                    |
-		 # | false | 3    | UNKNOWN: All status checks returned false! |
+		 | false | 3    | UNKNOWN: All status checks returned false! |
+
 
 	Scenario: UNKNOWN when an exception was raised
 		Given a file named "check_baz" with:
@@ -66,7 +61,5 @@ Feature: Plugin Output
 			"""
 		When I run `ruby check_baz`
 		Then the exit status should be 3
-		And the stdout should contain:
-			"""
-			BAZ UNKNOWN
-			"""
+		And the stdout should contain "BAZ UNKNOWN: OOPS!"
+

data/lib/nagiosplugin/plugin.rb

@@ -7,10 +7,6 @@ module NagiosPlugin
   }
   
   class Plugin
-    def initialize
-      @status = :unknown
-    end
-    
     def self.check!
       plugin = self.new
       plugin.check
@@ -22,26 +18,26 @@ module NagiosPlugin
     def check
       measure if respond_to?(:measure)
       @status = [:critical, :warning, :ok].select { |s| send("#{s}?") }.first
-      raise if @status.nil?
-    rescue
-      @status = :unknown
+      raise "All status checks returned false!" if @status.nil?
+    rescue => e
+      @info_text = e.to_s
       raise
     end
     
     def message
-      "#{service} #{status}"
+      "#{service.upcase} #{status.upcase}: #{@info_text}"
     end
     
     def service
-      self.class.name.upcase
+      self.class.name
     end
     
     def status
-      @status.upcase
+      @status || :unknown
     end
     
     def code
-      EXIT_CODES[@status]
+      EXIT_CODES[status]
     end
     
     def ok?

data/lib/nagiosplugin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagiosplugin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70231877033500 !ruby/object:Gem::Requirement
+  requirement: &70108978892680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70231877033500
+  version_requirements: *70108978892680
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70231877022080 !ruby/object:Gem::Requirement
+  requirement: &70108978891880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70231877022080
+  version_requirements: *70108978891880
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70231877021460 !ruby/object:Gem::Requirement
+  requirement: &70108978891080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70231877021460
+  version_requirements: *70108978891080
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70231877020820 !ruby/object:Gem::Requirement
+  requirement: &70108978890380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70231877020820
+  version_requirements: *70108978890380
 description: Yet another framework for writing Nagios Plugins
 email:
 - bjoernalbers@googlemail.com
@@ -87,18 +87,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2438389996345902943
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2438389996345902943
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: nagiosplugin-0.0.1
+summary: nagiosplugin-0.0.2
 test_files:
 - features/plugin_output.feature
 - features/support/env.rb