oxidized 0.25.1 → 0.26.0

data/lib/oxidized/manager.rb

@@ -5,13 +5,13 @@ module Oxidized
   require 'oxidized/source/source'
   class Manager
     class << self
-      def load dir, file
+      def load(dir, file)
         require File.join dir, file + '.rb'
         klass = nil
         [Oxidized, Object].each do |mod|
-          klass = mod.constants.find { |const| const.to_s.downcase == file.downcase }
-          klass = mod.constants.find { |const| const.to_s.downcase == 'oxidized' + file.downcase } unless klass
-          klass = mod.const_get klass if klass
+          klass   = mod.constants.find { |const| const.to_s.casecmp(file).zero? }
+          klass ||= mod.constants.find { |const| const.to_s.downcase == 'oxidized' + file.downcase }
+          klass   = mod.const_get klass if klass
           break if klass
         end
         i = klass.new
@@ -31,33 +31,33 @@ module Oxidized
       @hook   = {}
     end
 
-    def add_input name
+    def add_input(name)
       loader @input, Config::InputDir, "input", name
     end
 
-    def add_output name
+    def add_output(name)
       loader @output, Config::OutputDir, "output", name
     end
 
-    def add_source name
+    def add_source(name)
       loader @source, Config::SourceDir, "source", name
     end
 
-    def add_model name
+    def add_model(name)
       loader @model, Config::ModelDir, "model", name
     end
 
-    def add_hook name
+    def add_hook(name)
       loader @hook, Config::HookDir, "hook", name
     end
 
     private
 
     # if local version of file exists, load it, else load global - return falsy value if nothing loaded
-    def loader hash, global_dir, local_dir, name
-      dir = File.join(Config::Root, local_dir)
-      map = Manager.load(dir, name) if File.exist? File.join(dir, name + ".rb")
-      map = Manager.load(global_dir, name) unless map
+    def loader(hash, global_dir, local_dir, name)
+      dir   = File.join(Config::Root, local_dir)
+      map   = Manager.load(dir, name) if File.exist? File.join(dir, name + ".rb")
+      map ||= Manager.load(global_dir, name)
       hash.merge!(map) if map
     end
   end

data/lib/oxidized/model/acos.rb

@@ -51,9 +51,9 @@ class ACOS < Oxidized::Model
 
   cmd 'show aflex all-partitions' do |cfg|
     @partitions_aflex = cfg.lines.each_with_object({}) do |l, h|
-      h[$1] = [] if l.match /partition: (.+)/
+      h[Regexp.last_match(1)] = [] if l =~ /partition: (.+)/
       # only consider scripts that have passed syntax check
-      h[h.keys.last] << $1 if l.match /^([\w-]+) +Check/
+      h[h.keys.last] << Regexp.last_match(1) if l =~ /^([\w-]+) +Check/
     end
     ''
   end

data/lib/oxidized/model/aireos.rb

@@ -39,11 +39,11 @@ class Aireos < Oxidized::Model
     end
   end
 
-  def clean cfg
+  def clean(cfg)
     out = []
     cfg.each_line do |line|
-      next if line.match /^\s*$/
-      next if line.match /rogue (adhoc|client) (alert|Unknown) [\da-f]{2}:/
+      next if line =~ /^\s*$/
+      next if line =~ /rogue (adhoc|client) (alert|Unknown) [\da-f]{2}:/
 
       line = line[1..-1] if line[0] == "\r"
       out << line.strip

data/lib/oxidized/model/aos7.rb

@@ -17,7 +17,7 @@ class AOS7 < Oxidized::Model
   cmd 'show chassis' do |cfg|
     # check for virtual chassis existence
     @slave_vcids = cfg.scan(/Chassis ID (\d+) \(Slave\)/).flatten
-    @master_vcid = $1 if cfg.match /Chassis ID (\d+) \(Master\)/
+    @master_vcid = Regexp.last_match(1) if cfg =~ /Chassis ID (\d+) \(Master\)/
     comment cfg
   end
 

data/lib/oxidized/model/aosw.rb

@@ -44,25 +44,25 @@ class AOSW < Oxidized::Model
   end
 
   cmd 'show inventory' do |cfg|
-    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
     rstrip_cfg clean cfg
   end
 
   cmd 'show slots' do |cfg|
-    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
     rstrip_cfg comment cfg
   end
 
   cmd 'show license' do |cfg|
-    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
     rstrip_cfg comment cfg
   end
 
   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/
+      next if line =~ /^controller config \d+$/
+      next if line =~ /^Building Configuration/
 
       out << line.strip
     end
@@ -84,13 +84,11 @@ class AOSW < Oxidized::Model
     end
     post_login 'no paging'
     post_login 'encrypt disable'
-    if vars :enable
-      pre_logout 'exit'
-    end
+    pre_logout 'exit' if vars :enable
     pre_logout 'exit'
   end
 
-  def rstrip_cfg cfg
+  def rstrip_cfg(cfg)
     out = []
     cfg.each_line do |line|
       out << line.rstrip
@@ -99,14 +97,14 @@ class AOSW < Oxidized::Model
     out << "\n"
   end
 
-  def clean cfg
+  def clean(cfg)
     out = []
     cfg.each_line do |line|
       # 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
+      next if line =~ /Output \d Config/i
+      next if line =~ /(Tachometers|Temperatures|Voltages)/
+      next if line =~ /((Card|CPU) Temperature|Chassis Fan|VMON1[0-9])/
+      next if line =~ /[0-9]+\s+(RPMS?|m?V|C)/i
 
       out << line.strip
     end

data/lib/oxidized/model/apc_aos.rb

@@ -1,4 +1,4 @@
-class Apc_aos < Oxidized::Model
+class Apc_aos < Oxidized::Model # rubocop:disable Naming/ClassAndModuleCamelCase
   cmd 'config.ini' do |cfg|
     cfg.gsub! /^; Configuration file, generated on.*/, ''
   end

data/lib/oxidized/model/aricentiss.rb

@@ -4,7 +4,7 @@
 # 0               SSE-G48-TG4   (P2-01)           1.0.16-9
 
 class AricentISS < Oxidized::Model
-  prompt (/^(\e\[27m)?[ \r]*[\w-]+# ?$/)
+  prompt /^(\e\[27m)?[ \r]*[\w-]+# ?$/
 
   cfg :ssh do
     # "pagination" was misspelled in some (earlier) versions (at least 1.0.16-9)
@@ -33,19 +33,17 @@ class AricentISS < Oxidized::Model
 
   cmd 'show running-config' do |cfg|
     comment_next = 0
-    cfg.each_line.map { |l|
-      next '' if l.match /^Building configuration/
+    cfg.each_line.map do |l|
+      next '' if l =~ /^Building configuration/
 
-      if l.match /^Switch ID.*Hardware Version.*Firmware Version/ then
-        comment_next = 2
-      end
+      comment_next = 2 if l =~ /^Switch ID.*Hardware Version.*Firmware Version/
 
-      if comment_next > 0 then
+      if comment_next.positive?
         comment_next -= 1
         next comment(l)
       end
 
       l
-    }.join.gsub(/ +$/, '')
+    end.join.gsub(/ +$/, '')
   end
 end

data/lib/oxidized/model/asa.rb

@@ -69,7 +69,7 @@ class ASA < Oxidized::Model
       anyconnect_profiles = cfg.scan(Regexp.new('(\sdisk0:/.+\.xml)')).flatten
       anyconnect_profiles.each do |profile|
         cfg << (comment profile + "\n")
-        cmd ("more" + profile) do |xml|
+        cmd("more" + profile) do |xml|
           cfg << (comment xml)
         end
       end

data/lib/oxidized/model/audiocodesmp.rb

@@ -0,0 +1,28 @@
+class AudioCodesMP < Oxidized::Model
+  # AudioCodes MediaPack MP1xx and Mediant 1000 devices (firmware v4.xx, v5.xx, v6.xx) by pedjajks@gmail.com
+
+  prompt /^\/\w*>/
+
+  comment ';'
+
+  cmd 'conf' do
+  end
+
+  cmd 'cf get' do |cfg|
+    lines = cfg.each_line.to_a[0..-1]
+    # remove any garbage before ';**************' and after '; End of INI file.'
+    lines[lines.index(";**************\r\n")..lines.index("; End of INI file.\n")].join
+  end
+
+  cfg :ssh do
+    username /^login as:\s$/
+    password /^.+password:\s$/
+    pre_logout 'exit'
+  end
+
+  cfg :telnet do
+    username /login:\s$/
+    password /password:\s$/
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/awplus.rb

@@ -15,7 +15,7 @@ class AWPlus < Oxidized::Model
   cmd :all do |cfg|
     cfg.gsub! /\e\[K/, ''         # example how to handle pager - cleareol EL0
     cfg.gsub! /\e\[7m\e\[m/, ''   # example how to handle pager - Reverse SGR7
-    cfg.gsub! /\r/, '' # Filters rogue ^M - see issue #415
+    cfg.delete! "\r" # Filters rogue ^M - see issue #415
     cfg.cut_both
   end
 
@@ -43,14 +43,14 @@ class AWPlus < Oxidized::Model
     comment cfg << "\n--------------------------------------------------------------------------------! \n \n"
     # Removes the following lines from "show system" in output file. This ensures oxidized diffs are meaningful.
     comment cfg.each_line.reject { |line|
-              line.match /^$\n/ or # Remove blank lines in "sh sys"
-                line.match /System Status\s*.*/ or
-                line.match /RAM\s*:.*/ or
-                line.match /Uptime\s*:.*/ or
-                line.match /Flash\s*:.*/ or
-                line.match /Current software\s*:.*/ or
-                line.match /Software version\s*:.*/ or
-                line.match /Build date\s*:.*/
+              line.match(/^$\n/) || # Remove blank lines in "sh sys"
+                line.match(/System Status\s*.*/) ||
+                line.match(/RAM\s*:.*/) ||
+                line.match(/Uptime\s*:.*/) ||
+                line.match(/Flash\s*:.*/) ||
+                line.match(/Current software\s*:.*/) ||
+                line.match(/Software version\s*:.*/) ||
+                line.match(/Build date\s*:.*/)
             } .join
   end
 

data/lib/oxidized/model/boss.rb

@@ -37,7 +37,7 @@ class Boss < Oxidized::Model
 
   # Do a sys-info and check and see if it supports stack
   cmd 'show sys-info' do |cfg|
-    @stack = true if cfg.match /Stack/
+    @stack = true if cfg =~ /Stack/
     cfg.gsub! /(^((.*)sysUpTime(.*))$)/, 'removed sysUpTime'
     cfg.gsub! /(^((.*)sysNtpTime(.*))$)/, 'removed sysNtpTime'
     cfg.gsub! /(^((.*)sysRtcTime(.*))$)/, 'removed sysNtpTime'

data/lib/oxidized/model/ciscosmb.rb

@@ -8,7 +8,7 @@ class CiscoSMB < Oxidized::Model
   cmd :all do |cfg|
     lines = cfg.each_line.to_a[1..-2]
     # Remove \r from beginning of response
-    lines[0].gsub!(/^\r.*?/, '') if lines.length > 0
+    lines[0].gsub!(/^\r.*?/, '') unless lines.empty?
     lines.join
   end
 

data/lib/oxidized/model/ciscovpn3k.rb

@@ -0,0 +1,11 @@
+class CiscoVPN3k < Oxidized::Model
+  # Used in Cisco VPN3000 concentrators
+  # it have buggy code 227 reply with whitespace before trailing bracket
+  # "227 Passive mode OK (172,16,0,9,4,9 )"
+  # so use active ftp if you can. Or patch net/ftp
+
+  cmd 'CONFIG'
+
+  cfg :ftp do
+  end
+end

data/lib/oxidized/model/comware.rb

@@ -14,7 +14,7 @@ class Comware < Oxidized::Model
   cmd :all do |cfg|
     # cfg.gsub! /^.*\e\[42D/, ''        # example how to handle pager
     # skip rogue ^M
-    cfg = cfg.gsub /\r/, ''
+    cfg = cfg.delete "\r"
     cfg.cut_both
   end
 

data/lib/oxidized/model/cumulus.rb

@@ -3,7 +3,7 @@ class Cumulus < Oxidized::Model
   comment '# '
 
   # add a comment in the final conf
-  def add_comment comment
+  def add_comment(comment)
     "\n###### #{comment} ######\n"
   end
 
@@ -80,6 +80,8 @@ class Cumulus < Oxidized::Model
 
     cfg += add_comment 'License'
     cfg += cmd 'cl-license'
+
+    cfg
   end
 
   cfg :telnet do

data/lib/oxidized/model/dellx.rb

@@ -21,7 +21,7 @@ class DellX < Oxidized::Model
 
   cmd 'show version' do |cfg|
     if @stackable.nil?
-      @stackable = true if cfg.match /(U|u)nit\s/
+      @stackable = true if cfg =~ /(U|u)nit\s/
     end
     cfg = cfg.split("\n").reject { |line| line[/Up\sTime/] }
     comment cfg.join("\n") + "\n"
@@ -52,18 +52,18 @@ class DellX < Oxidized::Model
     pre_logout "exit"
   end
 
-  def clean cfg
+  def clean(cfg)
     out = []
     skip_blocks = 0
     cfg.each_line do |line|
       # If this is a stackable switch we should skip this block of information
-      if line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true
+      if line.match(/Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i) && (@stackable == true)
         skip_blocks = 1
         # Some switches have another empty line. This is identified by this line having a colon
-        skip_blocks = 2 if line.match /:/
+        skip_blocks = 2 if line =~ /:/
       end
       # If we have lines to skip do this until we reach and empty line
-      if skip_blocks > 0
+      if skip_blocks.positive?
         skip_blocks -= 1 if /\S/ !~ line
         next
       end

data/lib/oxidized/model/edgeos.rb

@@ -4,7 +4,7 @@ class Edgeos < Oxidized::Model
   prompt /@.*?:~\$\s/
 
   cmd :all do |cfg|
-    cfg = cfg.lines.to_a[1..-2].join
+    cfg.lines.to_a[1..-2].join
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/edgeswitch.rb

@@ -6,7 +6,7 @@ class EdgeSwitch < Oxidized::Model
   prompt /\(.*\)\s[#>]/
 
   cmd 'show running-config' do |cfg|
-    cfg.each_line.to_a[2..-2].reject { |line| line.match /System Up Time.*/ or line.match /Current SNTP Synchronized Time.*/ }.join
+    cfg.each_line.to_a[2..-2].reject { |line| line.match(/System Up Time.*/) || line.match(/Current SNTP Synchronized Time.*/) }.join
   end
 
   cfg :telnet do

data/lib/oxidized/model/fabricos.rb

@@ -6,7 +6,7 @@ class FabricOS < Oxidized::Model
   comment '# '
 
   cmd 'chassisShow' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /Time Awake:/ or line.match /Power Usage \(Watts\):/ or line.match /Time Alive:/ or line.match /Update:/ }.join
+    comment cfg.each_line.reject { |line| line.match(/Time Awake:/) || line.match(/Power Usage \(Watts\):/) || line.match(/Time Alive:/) || line.match(/Update:/) }.join
   end
 
   cmd 'configShow -all' do |cfg|

data/lib/oxidized/model/fortios.rb

@@ -38,16 +38,16 @@ class FortiOS < Oxidized::Model
     cfg = []
     cfg << cmd('config global') if @vdom_enabled
 
-    cfg << cmd('get hardware status') do |cfg|
-      comment cfg
+    cfg << cmd('get hardware status') do |cfg_hw|
+      comment cfg_hw
     end
 
     # default behaviour: include autoupdate output (backwards compatibility)
     # do not include if variable "show_autoupdate" is set to false
     if defined?(vars(:fortios_autoupdate)).nil? || vars(:fortios_autoupdate)
-      cfg << cmd('diagnose autoupdate version') do |cfg|
-        cfg.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
-        comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
+      cfg << cmd('diagnose autoupdate version') do |cfg_auto|
+        cfg_auto.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
+        comment cfg_auto.each_line.reject { |line| line.match /Last Update|Result/ }.join
       end
     end
 

data/lib/oxidized/model/ftos.rb

@@ -18,7 +18,7 @@ class FTOS < Oxidized::Model
 
   cmd 'show inventory' do |cfg|
     # Old versions of FTOS can occasionally return data that triggers encoding errors.
-    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => "")
+    cfg.encode!("UTF-8", invalid: :replace, undef: :replace, replace: "")
     comment cfg
   end
 

data/lib/oxidized/model/gcombnps.rb

@@ -37,11 +37,11 @@ class GcomBNPS < Oxidized::Model
   cmd 'show interface sfp' do |cfg|
     out = []
     cfg.each_line do |line|
-      next if line.match /^  Temperature/
-      next if line.match /^  Voltage\(V\)/
-      next if line.match /^  Bias Current\(mA\)/
-      next if line.match /^  RX Power\(dBM\)/
-      next if line.match /^  TX Power\(dBM\)/
+      next if line =~ /^  Temperature/
+      next if line =~ /^  Voltage\(V\)/
+      next if line =~ /^  Bias Current\(mA\)/
+      next if line =~ /^  RX Power\(dBM\)/
+      next if line =~ /^  TX Power\(dBM\)/
 
       out << line
     end
@@ -56,8 +56,8 @@ class GcomBNPS < Oxidized::Model
   cmd 'show system' do |cfg|
     out = []
     cfg.each_line do |line|
-      next if line.match /^system run time        :/
-      next if line.match /^switch temperature     :/
+      next if line =~ /^system run time        :/
+      next if line =~ /^switch temperature     :/
 
       out << line
     end