ironware.rb in oxidized-0.8.0

- old
+ new

@@ -1,8 +1,8 @@
 class IronWare < Oxidized::Model
 
-  prompt /^.+[>#]\s?$/
+  prompt /^.*(telnet|ssh)\@.+[>#]\s?$/i
   comment  '! '
   
   #to handle pager without enable
   #expect /^((.*)--More--(.*))$/ do |data, re|
   #  send ' '
@@ -24,17 +24,17 @@
     cfg
   end
 
   cmd 'show version' do |cfg|
     cfg.gsub! /(^((.*)[Ss]ystem uptime(.*))$)/, '' #remove unwanted line system uptime
-    cfg.gsub! /uptime is .*/,''
+    cfg.gsub! /[Uu]p\s?[Tt]ime is .*/,''
 
     comment cfg
   end
 
   cmd 'show chassis' do |cfg|
-    cfg.gsub! /\xFF/n, '' # ugly hack - avoids JSON.dump utf-8 breakage on 1.9..
+    cfg.encode!("UTF-8", :invalid => :replace) #sometimes ironware returns broken encoding
     cfg.gsub! /(^((.*)Current temp(.*))$)/, '' #remove unwanted lines current temperature
     cfg.gsub! /Speed = [A-Z]{3} \(\d{2}\%\)/, '' #remove unwanted lines Speed Fans
     cfg.gsub! /current speed is [A-Z]{3} \(\d{2}\%\)/, ''
     cfg.gsub! /Fan controlled temperature: \d{2}\.\d deg-C/, 'Fan controlled temperature: XX.X d deg-C'
     if cfg.include? "TEMPERATURE"
@@ -69,9 +69,10 @@
       post_login do
         send "enable\n"
         send vars(:enable) + "\n"
       end
     end
+    post_login ''
     post_login 'skip-page-display'
     post_login 'terminal length 0'
     pre_logout 'logout'
     pre_logout 'exit'
     pre_logout 'exit'
\ No newline at end of file