oxidized 0.29.0 → 0.29.1

data/lib/oxidized/model/comtrol.rb

@@ -1,4 +1,6 @@
 class Comtrol < Oxidized::Model
+  using Refinements
+
   # Used in Comtrol Industrial Switches, such as RocketLinx ES8510
 
   # Typical prompt "<hostname>#"

data/lib/oxidized/model/comware.rb

@@ -1,5 +1,6 @@
 class Comware < Oxidized::Model
   # HP (A-series)/H3C/3Com Comware
+  using Refinements
 
   # sometimes the prompt might have a leading nul or trailing ASCII Bell (^G)
   prompt /^\0*(<[\w.-]+>).?$/

data/lib/oxidized/model/coriant8600.rb

@@ -1,4 +1,6 @@
 class Coriant8600 < Oxidized::Model
+  using Refinements
+
   comment '# '
 
   prompt /^[^\s#>]+[#>]$/

data/lib/oxidized/model/coriantgroove.rb

@@ -1,4 +1,6 @@
 class CoriantGroove < Oxidized::Model
+  using Refinements
+
   comment '# '
 
   prompt /^(\w+@.*>\s*)$/

data/lib/oxidized/model/corianttmos.rb

@@ -1,4 +1,6 @@
 class CoriantTmos < Oxidized::Model
+  using Refinements
+
   comment '# '
 
   prompt /^[^\s#]+#\s$/

data/lib/oxidized/model/cumulus.rb

@@ -1,4 +1,6 @@
 class Cumulus < Oxidized::Model
+  using Refinements
+
   prompt /^((\w*)@(.*)):/
   comment '# '
 

data/lib/oxidized/model/datacom.rb

@@ -1,4 +1,6 @@
 class DataCom < Oxidized::Model
+  using Refinements
+
   comment '! '
 
   expect /^--More--\s+$/ do |data, re|

data/lib/oxidized/model/dcnos.rb

@@ -5,6 +5,8 @@
 # Developed against SNR S2950-24G 7.0.3.5
 
 class DCNOS < Oxidized::Model
+  using Refinements
+
   comment '! '
 
   cmd :all do |cfg|

data/lib/oxidized/model/dellx.rb

@@ -1,4 +1,6 @@
 class DellX < Oxidized::Model
+  using Refinements
+
   # Used in Dell X-Series Switches
 
   prompt /[#>]$/

data/lib/oxidized/model/dlink.rb

@@ -1,4 +1,6 @@
 class Dlink < Oxidized::Model
+  using Refinements
+
   # D-LINK Switches
   # Add support dgs 1100 series (tested only with dgs-1100-10/me)
 

data/lib/oxidized/model/dnos.rb

@@ -1,4 +1,6 @@
 class DNOS < Oxidized::Model
+  using Refinements
+
   # Force10 DNOS model #
 
   comment  '! '

data/lib/oxidized/model/eciapollo.rb

@@ -2,6 +2,8 @@
 # Tested on OPT9608 systems via SSH and telnet
 
 class ECIapollo < Oxidized::Model
+  using Refinements
+
   prompt /^([\w.@()-]+[#>]\s?)$/
   comment '# '
 

data/lib/oxidized/model/edgecos.rb

@@ -1,4 +1,6 @@
 class EdgeCOS < Oxidized::Model
+  using Refinements
+
   comment '! '
 
   # Handle pager for ES3526XA-V2

data/lib/oxidized/model/edgeos.rb

@@ -1,4 +1,6 @@
 class Edgeos < Oxidized::Model
+  using Refinements
+
   # EdgeOS #
 
   prompt /@.*?:~\$\s/

data/lib/oxidized/model/edgeswitch.rb

@@ -1,4 +1,6 @@
 class EdgeSwitch < Oxidized::Model
+  using Refinements
+
   # Ubiquiti EdgeSwitch #
 
   comment '!'

data/lib/oxidized/model/eltex.rb

@@ -1,4 +1,6 @@
 class Eltex < Oxidized::Model
+  using Refinements
+
   # Tested with MES2324FB Version: 4.0.7.1 Build: 37 (master)
 
   prompt /^\s?[\w.@\(\)-]+[#>]\s?$/

data/lib/oxidized/model/enterasys.rb

@@ -1,4 +1,6 @@
 class Enterasys < Oxidized::Model
+  using Refinements
+
   # Enterasys B3/C3 models #
 
   prompt /^.+\w\((su|rw)\)->\s?$/

data/lib/oxidized/model/enterasys800.rb

@@ -1,4 +1,6 @@
 class Enterasys800 < Oxidized::Model
+  using Refinements
+
   # Enterasys 800 models #
   # Tested with 08H20G4-24 Fast Ethernet Switch Firmware: Build 01.01.01.0017
   comment '# '

data/lib/oxidized/model/eos.rb

@@ -1,4 +1,6 @@
 class EOS < Oxidized::Model
+  using Refinements
+
   # Arista EOS model #
 
   prompt /^.+[#>]$/

data/lib/oxidized/model/fabricos.rb

@@ -1,4 +1,6 @@
 class FabricOS < Oxidized::Model
+  using Refinements
+
   # Brocade Fabric OS model #
   ## FIXME: Only ssh exec mode support, no telnet, no ssh screenscraping
 

data/lib/oxidized/model/fastiron.rb

@@ -1,4 +1,6 @@
 class FastIron < Oxidized::Model
+  using Refinements
+
   prompt /^([\w.@()-]+[#>]\s?)$/
   comment  '! '
 

data/lib/oxidized/model/fiberdriver.rb

@@ -1,4 +1,6 @@
 class FiberDriver < Oxidized::Model
+  using Refinements
+
   prompt /\w+#/
   comment "! "
 

data/lib/oxidized/model/firebrick.rb

@@ -1,4 +1,6 @@
 class Firebrick < Oxidized::Model
+  using Refinements
+
   # Firebrick #
   prompt /\x0a\x1b\x5b\x32\x4b\x0d.*>\s/
 

data/lib/oxidized/model/firelinuxos.rb

@@ -1,4 +1,6 @@
 class FireLinuxOS < Oxidized::Model
+  using Refinements
+
   # Fire Linux OS is what the new FTD (FirePOWER) series devices from Cisco run. At the backend, it's mostly identical to ASA's.
 
   prompt /^[#>]\(?.+\)?\s?/

data/lib/oxidized/model/firewareos.rb

@@ -1,4 +1,6 @@
 class FirewareOS < Oxidized::Model
+  using Refinements
+
   prompt /^\[?\w*\]?\w*?(<\w*>)?(#|>)\s*$/
   comment  '-- '
 

data/lib/oxidized/model/fortios.rb

@@ -1,4 +1,6 @@
 class FortiOS < Oxidized::Model
+  using Refinements
+
   comment '# '
 
   prompt /^([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/

data/lib/oxidized/model/fortiwlc.rb

@@ -1,4 +1,6 @@
 class FortiWLC < Oxidized::Model
+  using Refinements
+
   comment '# '
 
   cmd :all do |cfg, cmdstring|

data/lib/oxidized/model/ftos.rb

@@ -1,4 +1,6 @@
 class FTOS < Oxidized::Model
+  using Refinements
+
   # Force10 FTOS model #
 
   comment  '! '

data/lib/oxidized/model/fujitsupy.rb

@@ -1,4 +1,6 @@
 class FujitsuPY < Oxidized::Model
+  using Refinements
+
   prompt /^(\([\w.-]*\)\s#|^\S+#\s)$/
   comment  '! '
 

data/lib/oxidized/model/gaiaos.rb

@@ -1,4 +1,6 @@
 class GaiaOS < Oxidized::Model
+  using Refinements
+
   # CheckPoint - Gaia OS Model
 
   # Gaia Prompt

data/lib/oxidized/model/gcombnps.rb

@@ -1,4 +1,6 @@
 class GcomBNPS < Oxidized::Model
+  using Refinements
+
   # For switches from GCOM Technologies Co.,Ltd. running the "Broadband Network Platform Software"
   # Author: Frederik Kriewitz <frederik@kriewitz.eu>
   #

data/lib/oxidized/model/grandstream.rb

@@ -1,4 +1,6 @@
 class GrandStream < Oxidized::Model
+  using Refinements
+
   cmd "/cgi-bin/dologin?password=%<password>s" do |cfg| # rubocop:disable Style/FormatStringToken
     sid = JSON.parse(cfg)["body"]["sid"]
     cmd "/cgi-bin/download_cfg?sid=#{sid}"

data/lib/oxidized/model/h3c.rb

@@ -1,4 +1,6 @@
 class H3C < Oxidized::Model
+  using Refinements
+
   # H3C
 
   prompt /^.*(<[\w.-]+>)$/

data/lib/oxidized/model/hatteras.rb

@@ -1,4 +1,6 @@
 class Hatteras < Oxidized::Model
+  using Refinements
+
   # Hatteras Networks
 
   prompt /^(\r?[\w.@()-]+[#>]\s?)$/

data/lib/oxidized/model/hios.rb

@@ -1,4 +1,6 @@
 class Hios < Oxidized::Model
+  using Refinements
+
   ## Docker location: /var/lib/gems/2.7.0/gems/oxidized-0.28.0/lib/oxidized/model/hios.rb
   prompt /^\[[\w\s\W]+\][>|#]+?$/
 

data/lib/oxidized/model/hirschmann.rb

@@ -1,4 +1,6 @@
 class Hirschmann < Oxidized::Model
+  using Refinements
+
   prompt /^[(\w\s)]+\s[>|#]+?$/
 
   comment '## '

data/lib/oxidized/model/hpebladesystem.rb

@@ -1,4 +1,6 @@
 class HPEBladeSystem < Oxidized::Model
+  using Refinements
+
   # HPE Onboard Administrator
 
   prompt /.*> /

data/lib/oxidized/model/hpemsa.rb

@@ -1,4 +1,6 @@
 class HpeMsa < Oxidized::Model
+  using Refinements
+
   prompt /^#\s?$/
 
   cmd 'show configuration'

data/lib/oxidized/model/hpmsm.rb

@@ -1,4 +1,6 @@
 class HPMSM < Oxidized::Model
+  using Refinements
+
   prompt /^CLI[>#] +$/
 
   comment '! '

data/lib/oxidized/model/ibos.rb

@@ -1,4 +1,6 @@
 class IBOS < Oxidized::Model
+  using Refinements
+
   # IBOS model, Intelligent Broadband Operating System (iBOS)
   # Used in Waystream (previously PacketFront) Routers and Switches
 

data/lib/oxidized/model/icotera.rb

@@ -1,4 +1,6 @@
 class Icotera < Oxidized::Model
+  using Refinements
+
   comment '## '
 
   cmd :all do |cfg|

data/lib/oxidized/model/ios.rb

@@ -1,4 +1,6 @@
 class IOS < Oxidized::Model
+  using Refinements
+
   prompt /^([\w.@()-]+[#>]\s?)$/
   comment  '! '
 

data/lib/oxidized/model/iosxr.rb

@@ -1,4 +1,6 @@
 class IOSXR < Oxidized::Model
+  using Refinements
+
   # IOS XR model #
 
   prompt /^(\r?[\w.@:\/-]+[#>]\s?)$/

data/lib/oxidized/model/ipos.rb

@@ -1,4 +1,6 @@
 class IPOS < Oxidized::Model
+  using Refinements
+
   # Ericsson SSR (IPOS)
   # Redback SE (SEOS)
 

data/lib/oxidized/model/ironware.rb

@@ -1,4 +1,6 @@
 class IronWare < Oxidized::Model
+  using Refinements
+
   prompt /^.*(telnet|ssh)@.+[>#]\s?$/i
   comment  '! '
 

data/lib/oxidized/model/isam.rb

@@ -1,4 +1,6 @@
 class ISAM < Oxidized::Model
+  using Refinements
+
   # Alcatel ISAM 7302/7330 FTTN
 
   prompt /^([\w.:@-]+>#\s)$/

data/lib/oxidized/model/junos.rb

@@ -1,4 +1,6 @@
 class JunOS < Oxidized::Model
+  using Refinements
+
   comment '# '
 
   def telnet

data/lib/oxidized/model/lancom.rb

@@ -1,4 +1,6 @@
 class LANCOM < Oxidized::Model
+  using Refinements
+
   # LANCOM Systems GmbH
   # tested on LANCOM 1781EF+ router using Lancom OS 10.32.0176RU9 / 21.04.2020
   comment '# '

data/lib/oxidized/model/lenovonos.rb

@@ -1,4 +1,6 @@
 class LenovoNOS < Oxidized::Model
+  using Refinements
+
   prompt /^([\w.@()-]+[#>]\s?)$/
   comment '! '
 

data/lib/oxidized/model/linksyssrw.rb

@@ -1,4 +1,6 @@
 class LinksysSRW < Oxidized::Model
+  using Refinements
+
   comment '! '
 
   prompt /^([\r\w.@-]+[#>]\s?)$/

data/lib/oxidized/model/linuxgeneric.rb

@@ -1,4 +1,6 @@
 class LinuxGeneric < Oxidized::Model
+  using Refinements
+
   prompt /^(\w.*|\W.*)(:|#) /
   comment '# '
 

data/lib/oxidized/model/masteros.rb

@@ -1,4 +1,6 @@
 class MasterOS < Oxidized::Model
+  using Refinements
+
   # MRV MasterOS model #
 
   comment '!'

data/lib/oxidized/model/mlnxos.rb

@@ -1,4 +1,6 @@
 class MLNXOS < Oxidized::Model
+  using Refinements
+
   prompt /([\w.@()-\[:\s\]]+[#>]\s)$/
   comment '## '
 

data/lib/oxidized/model/model.rb

@@ -3,6 +3,8 @@ require_relative 'outputs'
 
 module Oxidized
   class Model
+    using Refinements
+
     include Oxidized::Config::Vars
 
     class << self
@@ -122,14 +124,14 @@ module Oxidized
 
       out = out.b unless Oxidized.config.input.utf8_encoded?
       self.class.cmds[:all].each do |all_block|
-        out = instance_exec Oxidized::String.new(out), string, &all_block
+        out = instance_exec out, string, &all_block
       end
       if vars :remove_secret
         self.class.cmds[:secret].each do |all_block|
-          out = instance_exec Oxidized::String.new(out), string, &all_block
+          out = instance_exec out, string, &all_block
         end
       end
-      out = instance_exec Oxidized::String.new(out), &block if block
+      out = instance_exec out, &block if block
       process_cmd_output out, string
     end
 
@@ -214,8 +216,7 @@ module Oxidized
     private
 
     def process_cmd_output(output, name)
-      output = Oxidized::String.new(output) if output.is_a?(::String)
-      output = Oxidized::String.new('') unless output.instance_of?(Oxidized::String)
+      output = String.new('') unless output.instance_of?(String)
       output.set_cmd(name)
       output
     end

data/lib/oxidized/model/mtrlrfs.rb

@@ -1,4 +1,6 @@
 class Mtrlrfs < Oxidized::Model
+  using Refinements
+
   # Motorola RFS/Extreme WM
 
   comment  '# '

data/lib/oxidized/model/ndms.rb

@@ -1,7 +1,9 @@
 class NDMS < Oxidized::Model
+  using Refinements
+
   # Pull config from Zyxel Keenetic devices from version NDMS >= 2.0
 
-  comment  '! '
+  comment '! '
 
   prompt /^([\w.@()-]+[#>]\s?)/m
 

data/lib/oxidized/model/necix.rb

@@ -1,4 +1,6 @@
 class NecIX < Oxidized::Model
+  using Refinements
+
   prompt /^(\([\w.-]*\)\s[#$]|^\S+[$#]\s?)$/
   comment '! '
   expect /^--More--$/ do |data, re|

data/lib/oxidized/model/netgear.rb

@@ -1,4 +1,6 @@
 class Netgear < Oxidized::Model
+  using Refinements
+
   comment '!'
   prompt /^(\([\w\s\-.]+\)\s[#>])$/
 

data/lib/oxidized/model/netonix.rb

@@ -1,4 +1,6 @@
 class Netonix < Oxidized::Model
+  using Refinements
+
   prompt /^[\w\s\(\).@_\/:-]+#/
 
   cmd :all do |cfg|

data/lib/oxidized/model/netscaler.rb

@@ -1,4 +1,6 @@
 class NetScaler < Oxidized::Model
+  using Refinements
+
   prompt /^([\w\.-]*>\s?)$/
   comment '# '
 

data/lib/oxidized/model/nodegrid.rb

@@ -1,4 +1,6 @@
 class Nodegrid < Oxidized::Model
+  using Refinements
+
   # ZPE Nodegrid (Tested with Nodegrid Gate/Bold/NSR)
   # https://www.zpesystems.com/products/
 

data/lib/oxidized/model/nos.rb

@@ -1,4 +1,6 @@
 class NOS < Oxidized::Model
+  using Refinements
+
   # Brocade Network Operating System
 
   prompt /^(?:\e\[..h)?[\w.-]+# $/

data/lib/oxidized/model/nsxconfig.rb

@@ -1,5 +1,7 @@
 require 'net/http'
 class NSXConfig < Oxidized::Model
+  using Refinements
+
   cmd "/api/4.0/edges/" do |cfg|
     edges = JSON.parse(cfg.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))["edgePage"]["data"]
     data = []

data/lib/oxidized/model/nsxfirewall.rb

@@ -1,5 +1,7 @@
 require 'net/http'
 class NSXFirewall < Oxidized::Model
+  using Refinements
+
   cmd "/api/4.0/edges/" do |cfg|
     edges = JSON.parse(cfg.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))["edgePage"]["data"]
     data = []

data/lib/oxidized/model/nxos.rb

@@ -1,4 +1,6 @@
 class NXOS < Oxidized::Model
+  using Refinements
+
   prompt /^(\r?[\w.@_()-]+[#]\s?)$/
   comment '! '
 

data/lib/oxidized/model/oneos.rb

@@ -1,4 +1,6 @@
 class OneOS < Oxidized::Model
+  using Refinements
+
   prompt /^([\w.@()-]+#\s?)$/
   comment  '! '
 

data/lib/oxidized/model/openbsd.rb

@@ -1,4 +1,6 @@
 class Openbsd < Oxidized::Model
+  using Refinements
+
   # OpenBSD with custom promp, like user@hostname:~$
   # you can edit the one that your user uses, with root would be /root/.profile using the next PS1 def
   # export PS1="\033[32m\u@\h\033[00m:\033[36m\w\033[00m$ "

data/lib/oxidized/model/opengear.rb

@@ -1,4 +1,6 @@
 class OpenGear < Oxidized::Model
+  using Refinements
+
   comment '# '
 
   prompt /^(\$\s)$/

data/lib/oxidized/model/openwrt.rb

@@ -1,4 +1,6 @@
 class OpenWrt < Oxidized::Model
+  using Refinements
+
   prompt /^[^#]+#/
   comment '#'
 

data/lib/oxidized/model/opnsense.rb

@@ -1,4 +1,6 @@
 class OpnSense < Oxidized::Model
+  using Refinements
+
   # minimum required permissions: "System: Shell account access"
   # must enable SSH and password-based SSH access
 

data/lib/oxidized/model/os10.rb

@@ -1,4 +1,6 @@
 class OS10 < Oxidized::Model
+  using Refinements
+
   # For switches running Dell EMC Networking OS10 #
   #
   # Tested with : Dell PowerSwitch S4148U-ON

data/lib/oxidized/model/outputs.rb

@@ -1,5 +1,7 @@
 module Oxidized
   class Model
+    using Refinements
+
     class Outputs
       def to_cfg
         type_to_str(nil)

data/lib/oxidized/model/panos.rb

@@ -1,4 +1,6 @@
 class PanOS < Oxidized::Model
+  using Refinements
+
   # PaloAlto PAN-OS model #
 
   comment '! '

data/lib/oxidized/model/panos_api.rb

@@ -17,6 +17,8 @@ rescue LoadError
 end
 
 class PanOS_API < Oxidized::Model # rubocop:disable Naming/ClassAndModuleCamelCase
+  using Refinements
+
   # Callback function for getting the configuration file.
   cfg_cb = lambda do
     url_param = URI.encode_www_form(