nagiosplugin 0.0.2 → 0.0.3

data/features/plugin_output.feature

@@ -4,20 +4,14 @@ 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:
+		When I run a plugin with the following methods:
 			"""
-			require 'nagiosplugin'
-			class Foo < NagiosPlugin::Plugin
-	      def critical?;	<crit>	end
-	      def warning?;		<warn>	end
-	    end
-			Foo.check!
+	    def critical?;	<crit>	end
+	    def warning?;		<warn>	end
 			"""
-		When I run `ruby check_foo`
 		Then the exit status should be <code>
-		And the stdout should contain "FOO <status>"
+		And the plugin should print "<status>"
 		
 		Examples:
 		 | crit  | warn  | code | status   |
@@ -26,40 +20,27 @@ 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:
+		When I run a plugin with the following methods:
 			"""
-			require 'nagiosplugin'
-			class Bar < NagiosPlugin::Plugin
-  		  def critical?;	false		end
-  		  def warning?;		false		end
-				def ok?;				<ok>		end
-  		end
-			Bar.check!
+  		def critical?;	false		end
+  		def warning?;		false		end
+			def ok?;				<ok>		end
 			"""
-		When I run `ruby check_bar`
 		Then the exit status should be <code>
-		And the stdout should contain "BAR <status>"
+		And the plugin should print "<status>"
 		
 		Examples:
 		 | ok    | code | status                                     |
 		 | true  | 0    | OK                                         |
 		 | false | 3    | UNKNOWN: All status checks returned false! |
 
-
 	Scenario: UNKNOWN when an exception was raised
-		Given a file named "check_baz" with:
+		When I run a plugin with the following methods:
 			"""
-			require 'nagiosplugin'
-			class Baz < NagiosPlugin::Plugin
-				def critical?
-					raise "OOPS!"
-				end
+			def critical?
+				raise "OOPS!"
 			end
-			Baz.check!
 			"""
-		When I run `ruby check_baz`
 		Then the exit status should be 3
-		And the stdout should contain "BAZ UNKNOWN: OOPS!"
-
+		And the plugin should print "UNKNOWN: OOPS!"

data/features/steps/dev_steps.rb

@@ -0,0 +1,17 @@
+When /^I run a plugin with the following methods:$/ do |methods|
+  steps %Q{
+    Given a file named "check_foo" with:
+			"""
+			require 'nagiosplugin'
+			class Foo < NagiosPlugin::Plugin
+        #{methods}
+  		end
+			Foo.check!
+			"""
+		When I run `ruby check_foo`
+  }
+end
+
+Then /^the plugin should print "([^"]*)"$/ do |stdout|
+  steps %Q{Then the stdout should contain "FOO #{stdout}"}
+end

data/lib/nagiosplugin/plugin.rb

@@ -6,38 +6,49 @@ module NagiosPlugin
     :unknown  => 3,
   }
   
+  PluginError = Class.new(StandardError)
+  
   class Plugin
     def self.check!
       plugin = self.new
       plugin.check
-    ensure
+    rescue Exception => e
+      puts [plugin.prefix, e.to_s].join(' ')
+    else
       puts plugin.message
+    ensure
       exit plugin.code
     end
     
     def check
       measure if respond_to?(:measure)
-      @status = [:critical, :warning, :ok].select { |s| send("#{s}?") }.first
-      raise "All status checks returned false!" if @status.nil?
-    rescue => e
-      @info_text = e.to_s
+      set_status
+    rescue Exception
+      @status = :unknown
       raise
     end
     
     def message
-      "#{service.upcase} #{status.upcase}: #{@info_text}"
+      [prefix, (output if respond_to?(:output))].compact.join(' ')
     end
     
-    def service
-      self.class.name
+    def prefix
+      "#{self.class.name.upcase} #{status.upcase}:"
+    end
+    
+    def code
+      EXIT_CODES[status]
     end
     
     def status
       @status || :unknown
     end
-    
-    def code
-      EXIT_CODES[status]
+  
+  protected
+  
+    def set_status
+      @status = [:critical, :warning, :ok].select { |s| send("#{s}?") }.first
+      raise PluginError, "All status checks returned false!" if @status.nil?
     end
     
     def ok?

data/lib/nagiosplugin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagiosplugin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000Z
+date: 2011-12-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70108978892680 !ruby/object:Gem::Requirement
+  requirement: &70104759276640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70108978892680
+  version_requirements: *70104759276640
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70108978891880 !ruby/object:Gem::Requirement
+  requirement: &70104759276020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70108978891880
+  version_requirements: *70104759276020
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70108978891080 !ruby/object:Gem::Requirement
+  requirement: &70104759275320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70108978891080
+  version_requirements: *70104759275320
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70108978890380 !ruby/object:Gem::Requirement
+  requirement: &70104759274600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70108978890380
+  version_requirements: *70104759274600
 description: Yet another framework for writing Nagios Plugins
 email:
 - bjoernalbers@googlemail.com
@@ -70,6 +70,7 @@ files:
 - README.md
 - Rakefile
 - features/plugin_output.feature
+- features/steps/dev_steps.rb
 - features/support/env.rb
 - lib/nagiosplugin.rb
 - lib/nagiosplugin/plugin.rb
@@ -89,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2438389996345902943
+      hash: -3495919354484579037
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,13 +99,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2438389996345902943
+      hash: -3495919354484579037
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: nagiosplugin-0.0.2
+summary: nagiosplugin-0.0.3
 test_files:
 - features/plugin_output.feature
+- features/steps/dev_steps.rb
 - features/support/env.rb