senedsa 0.2.2 → 0.2.5

data/lib/senedsa/send_nsca.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'psych'
+require 'socket'
 
 module Senedsa
 
@@ -59,10 +60,12 @@ module Senedsa
 
         when 1
           if args[0].is_a? String
-            cfg_options = SendNsca.configure(args[0])
+            cfg_file = args[0].nil? ? nil : args[0]
+            cfg_options = cfg_file.nil? ? {} : SendNsca.configure(cfg_file)
             hsh_options = {}
           elsif args[0].is_a? Hash
-            cfg_options = SendNsca.configure(args[0][:senedsa_config])
+            cfg_file = args[0][:senedsa_config].nil? ? nil : args[0][:senedsa_config]
+            cfg_options = cfg_file.nil? ? {} : SendNsca.configure(cfg_file)
             hsh_options = args[0]
           else
             raise InitializationError, "invalid argument types"
@@ -82,6 +85,7 @@ module Senedsa
           raise ArgumentError, "wrong number of arguments"
       end
       @options = SendNsca.defaults.merge(cfg_options).merge(hsh_options)
+      @options[:svc_hostname] = Socket.gethostname if @options[:svc_hostname].nil?
     end
 
     def send(*args)
@@ -108,6 +112,10 @@ module Senedsa
       define_method(attr.to_s + '=') { |value| @options[attr.to_sym] = value }
     end
 
+    def inspect
+      @options
+    end
+
     private
 
       def command
@@ -120,7 +128,7 @@ module Senedsa
         begin
           Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
             stdin.write("%s\n" % [svc_hostname,svc_descr,STATUS[status],svc_output].join(send_nsca_delim))
-            $stdout.write stdout.gets
+            $stdout.write stdout.gets if STDIN.tty?
             raise SendNscaError, stderr.gets.chomp unless wait_thr.value.exitstatus == 0
           end
         rescue Errno::ENOENT, Errno::EACCES => e

data/lib/senedsa/version.rb

@@ -1,3 +1,3 @@
 module Senedsa
-  VERSION = '0.2.2'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: senedsa
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -52,3 +52,4 @@ signing_key:
 specification_version: 3
 summary: Utility and library wrapper for Nagios send_nsca utility
 test_files: []
+has_rdoc: