sensu-plugin 0.1.5 → 0.1.6

data/lib/sensu-plugin.rb

@@ -1,6 +1,6 @@
 module Sensu
   module Plugin
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
     EXIT_CODES = {
       'OK'       => 0,
       'WARNING'  => 1,

data/lib/sensu-plugin/cli.rb

@@ -8,6 +8,11 @@ module Sensu
 
       attr_accessor :argv
 
+      def initialize
+        super
+        self.argv = self.parse_options
+      end
+
       # Implementing classes should override this to produce appropriate
       # output for their handler.
 
@@ -48,7 +53,6 @@ module Sensu
       at_exit do
         begin
           check = @@autorun.new
-          check.argv = check.parse_options
           check.run
         rescue SystemExit => e
           exit e.status

data/lib/sensu-plugin/metric/cli.rb

@@ -8,7 +8,9 @@ module Sensu
 
         class JSON < Sensu::Plugin::CLI
           def output(obj=nil)
-            unless obj.nil? || obj.is_a?(String) || obj.is_a?(Exception)
+            if obj.is_a?(String) || obj.is_a?(Exception)
+              puts obj.to_s
+            elsif obj.is_a?(Hash)
               obj['timestamp'] ||= Time.now.to_i
               puts ::JSON.generate(obj)
             end
@@ -16,9 +18,12 @@ module Sensu
         end
 
         class Graphite < Sensu::Plugin::CLI
-          def output(path=nil, value=nil, timestamp=Time.now.to_i)
-            unless path.nil? || path.is_a?(Exception) || value.nil?
-              puts [path, value, timestamp].join("\t")
+          def output(*args)
+            if args[0].is_a?(Exception) || args[1].nil?
+              puts args[0].to_s
+            else
+              args[2] ||= Time.now.to_i
+              puts args[0..2].join("\t")
             end
           end
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu-plugin
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Decklin Foster
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-14 00:00:00 -08:00
+date: 2013-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,20 @@ dependencies:
         version: 1.1.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Plugins and helper libraries for Sensu, a monitoring framework
 email: 
 - decklin@red-bean.com