sensu-plugin 0.2.2 → 0.3.0

data/lib/sensu-handler.rb

@@ -1,11 +1,20 @@
 require 'net/http'
 require 'json'
 require 'sensu-plugin/utils'
+require 'mixlib/cli'
 
 module Sensu
 
   class Handler
     include Sensu::Plugin::Utils
+    include Mixlib::CLI
+
+    attr_accessor :argv
+
+    def initialize(argv = ARGV)
+      super()
+      self.argv = parse_options(argv)
+    end
 
     # Implementing classes should override this.
 

data/lib/sensu-plugin.rb

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

data/lib/sensu-plugin/cli.rb

@@ -57,7 +57,9 @@ module Sensu
         rescue SystemExit => e
           exit e.status
         rescue Exception => e
-          check.critical "Check failed to run: #{e.message}, #{e.backtrace}"
+          # This can't call check.critical, as the check may have failed to construct
+          puts "Check failed to run: #{e.message}, #{e.backtrace}"
+          exit 2
         end
         check.warning "Check did not exit! You should call an exit code method."
       end

data/test/external_check_test.rb

@@ -48,4 +48,8 @@ class TestCheckExternal < MiniTest::Unit::TestCase
     assert $?.exitstatus == 0 && output.include?('argv = foo')
   end
 
+  def test_bad_commandline
+    output = run_script '--doesnotexist'
+    assert $?.exitstatus == 2 && output.include?('doesnotexist') && output.include?('invalid option')
+  end
 end

data/test/external_handler_argument_test.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'json'
+
+class TestHandlerArgumentExternal < MiniTest::Unit::TestCase
+  include SensuPluginTestHelper
+
+  def test_default
+    set_script 'external/handle-argument'
+    output = run_script_with_input(JSON.generate({}))
+    assert $?.exitstatus == 0 && output =~ /Value:\sfoo/
+  end
+
+  def test_short
+    set_script 'external/handle-argument -t bar'
+    output = run_script_with_input(JSON.generate({}))
+    assert $?.exitstatus == 0 && output =~ /Value:\sbar/
+  end
+
+  def test_long
+    set_script 'external/handle-argument --test bar'
+    output = run_script_with_input(JSON.generate({}))
+    assert $?.exitstatus == 0 && output =~ /Value:\sbar/
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Decklin Foster
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-19 00:00:00 -08:00
+date: 2014-05-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - lib/sensu-plugin/utils.rb
 - lib/sensu-plugin.rb
 - test/external_check_test.rb
+- test/external_handler_argument_test.rb
 - test/external_handler_test.rb
 - test/external_metric_test.rb
 - test/handle_filter_test.rb
@@ -135,6 +136,7 @@ specification_version: 3
 summary: Sensu Plugins
 test_files: 
 - test/external_check_test.rb
+- test/external_handler_argument_test.rb
 - test/external_handler_test.rb
 - test/external_metric_test.rb
 - test/handle_filter_test.rb