elesai 0.6.1 → 0.6.3

Sign up to get free protection for your applications and to get access to all the features.
data/lib/elesai/cli.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'optparse'
2
2
  require 'syslog'
3
+ require 'io/wait'
3
4
  require 'senedsa'
4
5
  include Senedsa
5
6
  require 'elesai/version'
@@ -190,7 +191,7 @@ module Elesai
190
191
 
191
192
  def output_message(message, exitstatus=nil)
192
193
  m = (! exitstatus.nil? and exitstatus > 0) ? "%s: error: %s" % [ID, message] : message
193
- Syslog.open("elesai", Syslog::LOG_PID | Syslog::LOG_CONS) { |s| s.err "error: #{message}" } unless @global_options[:debug] or STDIN.tty?
194
+ Syslog.open("elesai", Syslog::LOG_PID | Syslog::LOG_CONS) { |s| s.err "error: #{message}" } unless @global_options[:debug]
194
195
  $stderr.write "#{m}\n" if STDIN.tty?
195
196
  exit exitstatus unless exitstatus.nil?
196
197
  end
@@ -1,5 +1,6 @@
1
1
  require 'workflow'
2
2
  require 'open3'
3
+ require 'io/wait'
3
4
 
4
5
  module Elesai
5
6
 
@@ -255,7 +256,9 @@ module Elesai
255
256
  @log = Elesai::Logger.instance.log
256
257
  output = nil
257
258
 
258
- if STDIN.tty?
259
+ if STDIN.ready?
260
+ output = $stdin.read
261
+ else
259
262
  if opts[:fake].start_with? '-'
260
263
  megacli = opts[:megacli].nil? ? "Megacli" : opts[:megacli]
261
264
  command = "#{megacli} #{opts[:fake]} -nolog"
@@ -264,8 +267,6 @@ module Elesai
264
267
  else
265
268
  output = File.read(opts[:fake])
266
269
  end
267
- else
268
- output = STDIN.read
269
270
  end
270
271
 
271
272
  output.each_line do |line|
@@ -1,3 +1,3 @@
1
1
  module Elesai
2
- VERSION = "0.6.1"
2
+ VERSION = "0.6.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: elesai
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.1
4
+ version: 0.6.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-19 00:00:00.000000000 Z
12
+ date: 2012-06-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: workflow
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ! '>='
52
52
  - !ruby/object:Gem::Version
53
- version: 0.2.2
53
+ version: 0.2.5
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
- version: 0.2.2
61
+ version: 0.2.5
62
62
  description: Elesai is a wrapper around LSI's MegaCli utility that provides access
63
63
  to common types of information about the RAID controllers. It also has Nagios plugin
64
64
  personalities