elesai 0.5.4 → 0.5.8

data/lib/elesai/cli.rb

@@ -80,6 +80,7 @@ module Elesai
         output_message opts, 0 if @arguments.size == 0 or @global_options[:HELP]
 
         @action = ARGV.shift.to_sym
+        raise OptionParser::InvalidArgument, "invalid action #@action" if actions[@action].nil?
         actions[@action].order!
       end
 
@@ -101,8 +102,8 @@ module Elesai
       def options_valid?
         case @action
           when :check
-            raise OptionParser::MissingArgument, "NSCA hostname (-H) must be specified" if @action_options[:nsca_hostname].nil?
-            raise OptionParser::MissingArgument, "service description (-S) must be specified" if @action_options[:svc_descr].nil?
+            raise OptionParser::MissingArgument, "NSCA hostname (-H) must be specified" if @action_options[:nsca_hostname].nil? and @action_options[:mode] == 'passive'
+            raise OptionParser::MissingArgument, "service description (-S) must be specified" if @action_options[:svc_descr].nil? and @action_options[:mode] == 'passive'
         end
       end
 
@@ -166,7 +167,7 @@ module Elesai
           end
         end
 
-        plugin_output = "no RAID subsystems errors found" if plugin_output.empty? and plugin_status.empty?
+        plugin_output = "no LSI RAID errors found" if plugin_output.empty? and plugin_status.empty?
         plugin_status = :ok if plugin_status.empty?
 
         case @action_options[:monitor]

data/lib/elesai/megacli.rb

@@ -11,7 +11,7 @@ module Elesai
     VIRTUALDRIVE_RE = /^Virtual\s+Drive:\s+\d+\s+\((?<key>Target\s+Id):\s+(?<value>\d+)\)/
     SPAN_RE = /^Span:\s+(?<value>\d+)/
     PHYSICALDRIVE_RE = /^(?<key>Enclosure\s+Device\s+ID):\s+(?<value>\d+)/
-    ATTRIBUTE_RE = /^(?<key>[A-Za-z0-9()\s#]+):(?<value>.*)/
+    ATTRIBUTE_RE = /^(?<key>[A-Za-z0-9()\s#']+):(?<value>.*)/
     EXIT_RE = /^Exit Code: /
 
     ### Context
@@ -253,16 +253,14 @@ module Elesai
 
       @lsi = lsi
       @log = Elesai::Logger.instance.log
+      output = nil
 
       if STDIN.tty?
         if opts[:fake].start_with? '-'
           megacli = opts[:megacli].nil? ? "Megacli" : opts[:megacli]
           command = "#{megacli} #{opts[:fake]} -nolog"
-          output = Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
-            stdin.close
-            raise RuntimeError, stderr.gets.chomp unless wait_thr.value.exitstatus == 0
-            stdout.gets
-          end
+          output, stderr_str, status = Open3.capture3(command)
+          raise RuntimeError, stderr_str unless status.exitstatus == 0
         else
           output = File.read(opts[:fake])
         end

data/lib/elesai/version.rb

@@ -1,3 +1,3 @@
 module Elesai
-  VERSION = "0.5.4"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elesai
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -106,3 +106,4 @@ signing_key:
 specification_version: 3
 summary: Wrapper for LSI's MegaCli utility
 test_files: []
+has_rdoc: