aosw.rb in oxidized-0.25.0

- old
+ new

@@ -11,11 +11,11 @@
 
   comment  '# '
   prompt /^\(?.+\)?\s[#>]/
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|
     cfg.gsub!(/secret (\S+)$/, 'secret <secret removed>')
     cfg.gsub!(/enable secret (\S+)$/, 'enable secret <secret removed>')
@@ -23,12 +23,12 @@
     cfg.gsub!(/ipsec (\S+)$/, 'ipsec <secret removed>')
     cfg.gsub!(/community (\S+)$/, 'community <secret removed>')
     cfg.gsub!(/ sha (\S+)/, ' sha <secret removed>')
     cfg.gsub!(/ des (\S+)/, ' des <secret removed>')
     cfg.gsub!(/mobility-manager (\S+) user (\S+) (\S+)/, 'mobility-manager \1 user \2 <secret removed>')
-    cfg.gsub!(/mgmt-user (\S+) (root|guest\-provisioning|network\-operations|read\-only|location\-api\-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
-    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read\-only|guest\-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') # IAP
+    cfg.gsub!(/mgmt-user (\S+) (root|guest-provisioning|network-operations|read-only|location-api-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
+    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read-only|guest-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') # IAP
     # MAS format: mgmt-user <username> <accesslevel> <password hash>
     # IAP format (root user): mgmt-user <username> <password hash>
     # IAP format: mgmt-user <username> <password hash> <access level>
     cfg.gsub!(/key (\S+)$/, 'key <secret removed>')
     cfg.gsub!(/wpa-passphrase (\S+)$/, 'wpa-passphrase <secret removed>')
@@ -61,10 +61,11 @@
   cmd 'show running-config' do |cfg|
     out = []
     cfg.each_line do |line|
       next if line.match /^controller config \d+$/
       next if line.match /^Building Configuration/
+
       out << line.strip
     end
     out = out.join "\n"
     out << "\n"
   end
@@ -104,9 +105,10 @@
       # drop the temperature, fan speed and voltage, which change each run
       next if line.match /Output \d Config/i
       next if line.match /(Tachometers|Temperatures|Voltages)/
       next if line.match /((Card|CPU) Temperature|Chassis Fan|VMON1[0-9])/
       next if line.match /[0-9]+\s+(RPMS?|m?V|C)/i
+
       out << line.strip
     end
     out = comment out.join "\n"
     out << "\n"
   end