senedsa 0.0.7 → 0.1.0

data/lib/senedsa/cli.rb

@@ -1,5 +1,8 @@
 require 'optparse'
 require 'yaml'
+require 'senedsa/version'
+require 'senedsa/about'
+
 
 module Senedsa
 
@@ -48,10 +51,10 @@ module Senedsa
           opts.separator ""
 
           opts.separator "Send_Nsca options:"
-          opts.on('-T', '--send_nsca-timeout TIMEOUT',   Integer,                "send_nsca connection timeout")                       { |timeout|   @cli_options[:send_nsca_timeout] = timeout }
-          opts.on('-D', '--send_nsca-delim DELIM',       String,                 "send_nsca field delimited")                          { |delim|     @cli_options[:send_nsca_delim] = delim }
-          opts.on('-C', '--send_nsca-config CONFIG',     String,                 "send_nsca configuration file")                       { |config|    @cli_options[:send_nsca_config] = config }
-          opts.on('-B', '--send_nsca-binary BINARY',     String,                 "send_nsca binary path")                              { |binary|    @cli_options[:send_nsca_binary] = binary }
+          opts.on('-T', '--send_nsca_timeout TIMEOUT',   Integer,                "send_nsca connection timeout")                       { |timeout|   @cli_options[:send_nsca_timeout] = timeout }
+          opts.on('-D', '--send_nsca_delim DELIM',       String,                 "send_nsca field delimited")                          { |delim|     @cli_options[:send_nsca_delim] = delim }
+          opts.on('-C', '--send_nsca_config CONFIG',     String,                 "send_nsca configuration file")                       { |config|    @cli_options[:send_nsca_config] = config }
+          opts.on('-B', '--send_nsca_binary BINARY',     String,                 "send_nsca binary path")                              { |binary|    @cli_options[:send_nsca_binary] = binary }
           opts.separator ""
 
           opts.separator "Service options:"
@@ -102,7 +105,7 @@ module Senedsa
       end
 
       def process_arguments
-        @cli_options[:svc_output] = @arguments.join(' ')
+        @options[:svc_output] = @arguments.join(' ')
       end
 
       def output_message(message, exitstatus=nil)

data/lib/senedsa/send_nsca.rb

@@ -34,7 +34,7 @@ module Senedsa
           begin
             cfg_options = YAML.load File.open(cfg_file)
             raise ConfigurationError, "senedsa_config not allowed in configuration file (#{cfg_file})" unless cfg_options[:senedsa_config].nil?
-          rescue Psych::SyntaxError => e
+          rescue SyntaxError::Psych::SyntaxError => e
             raise ConfigurationError, "syntax error in configuration file #{cfg_file}: #{e.message}"
           rescue Errno::ENOENT, Errno::EACCES => e
            raise ConfigurationError, e.message
@@ -52,6 +52,8 @@ module Senedsa
 
     def initialize(*args)
 
+      @options = {}
+
       case args.size
 
         when 1
@@ -67,7 +69,7 @@ module Senedsa
 
         when 2
           raise InitializationError, "invalid argument types" unless args[0].is_a? String and args[1].is_a? String
-          cfg_options = SendNsca.configure(args[0][:senedsa_config])
+          cfg_options = SendNsca.configure(@options[:senedsa_config])
           hsh_options = { :svc_hostname => args[0], :svc_descr => args[1] }
 
         when 3
@@ -76,13 +78,30 @@ module Senedsa
           hsh_options = args[2].merge({ :svc_hostname => args[0], :svc_descr => args[1] })
 
         else
-          raise InitializationError, "invalid number of arguments"
+          raise ArgumentError, "wrong number of arguments"
       end
       @options = SendNsca.defaults.merge(cfg_options).merge(hsh_options)
     end
 
     def send(*args)
-      run(@options[:status],@options[:svc_output])
+
+      case args.size
+        when 0
+          # svc_status and svc_output should be set on @options
+          raise ArgumentError, "svc_status or svc_output not set" if @options[:svc_status].nil? or @options[:svc_output].nil?
+          svc_status = @options[:status]
+          svc_output = @options[:svc_output]
+        when 2
+          raise ArgumentError, "invalid svc_status" unless args[0].is_a? Symbol and STATUS.keys.include?(args[0])
+          raise ArgumentError, "invalid svc_output" unless args[1].is_a? String
+          svc_status = args[0]
+          svc_output = args[1]
+        else
+          raise ArgumentError, "wrong number of arguments"
+      end
+      raise StandardError , "foo" # unless @options[:nsca_hostname].nil?
+      puts @options[:nsca_hostname]
+      run svc_status, svc_output
     end
 
     SendNsca.defaults.keys.each do |attr|

data/lib/senedsa/version.rb

@@ -1,3 +1,3 @@
 module Senedsa
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 end

data/lib/senedsa.rb

@@ -1,5 +1,3 @@
-require 'senedsa/version'
-require 'senedsa/about'
 require 'senedsa/send_nsca'
 
 module Senedsa

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: senedsa
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies: []
 description: Senedsa is a small utility and library wrapper for the Nagios send_nsca.
 email: gerir@evernote.com