senedsa 0.2.6 → 0.2.8

data/lib/senedsa/cli.rb

@@ -66,11 +66,11 @@ module Senedsa
           opts.on('-d', '--debug',                                               "Enable debug mode")                                  { @cli_options[:debug] = true}
           opts.on('-a', '--about',                                               "Display #{ID} information")                          { output_message ABOUT, 0 }
           opts.on('-V', '--version',                                             "Display #{ID} version")                              { output_message VERSION, 0 }
-          opts.on_tail('--help',                                                 "Show this message")                                  { output_message opts 0 }
-
-          output_message opts, 0 if @arguments.size == 0
+          opts.on_tail('--help',                                                 "Show this message")                                  { @cli_options[:HELP] = true }
 
           opts.parse!(@arguments)
+          output_message opts, 0 if @arguments.size == 0 or @cli_options[:HELP]
+
         rescue => e
           output_message e.message, 1
         end

data/lib/senedsa/send_nsca.rb

@@ -45,8 +45,6 @@ module Senedsa
         cfg_options
       end
 
-    attr_accessor :send_nsca, :nsca
-
     class Error < StandardError; end
     class SendNscaError < Error; end
     class ConfigurationError < SendNscaError; end
@@ -90,6 +88,9 @@ module Senedsa
 
     def send(*args)
 
+      svc_status = nil
+      svc_output = nil
+
       case args.size
         when 0
           # svc_status and svc_output should be set on @options
@@ -104,6 +105,12 @@ module Senedsa
         else
           raise ArgumentError, "wrong number of arguments"
       end
+      @options.each_key do |option|
+        next if [:send_nsca_config, :svc_status, :svc_output].include? option
+        raise ArgumentError, "missing send_nsca option #{option}" if @options[option].nil?
+      end
+      raise ArgumentError, "missing send_nsca svc_status" if svc_status.nil?
+      raise ArgumentError, "missing send_nsca svc_output" if svc_output.nil?
       run svc_status, svc_output
     end
 
@@ -124,7 +131,7 @@ module Senedsa
         c
       end
 
-      def run(status,svc_output)
+      def run(svc_status,svc_output)
         begin
           Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
             payload = "%s" % [svc_hostname,svc_descr,STATUS[svc_status],svc_output].join(send_nsca_delim)

data/lib/senedsa/version.rb

@@ -1,3 +1,3 @@
 module Senedsa
-  VERSION = '0.2.6'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: senedsa
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies: []
 description: Senedsa is a small utility and library wrapper for the Nagios send_nsca.
 email: gerir@evernote.com
@@ -52,4 +52,3 @@ signing_key:
 specification_version: 3
 summary: Utility and library wrapper for Nagios send_nsca utility
 test_files: []
-has_rdoc: