oxidized 0.25.1 → 0.26.0

data/lib/oxidized/model/grandstream.rb

@@ -0,0 +1,9 @@
+class GrandStream < Oxidized::Model
+  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}"
+  end
+
+  cfg :http do
+  end
+end

data/lib/oxidized/model/hatteras.rb

@@ -21,18 +21,18 @@ class Hatteras < Oxidized::Model
   end
 
   cmd "show switch\r" do |cfg|
-    cfg = cfg.each_line.reject { |line|
-      line.match /Switch uptime|Switch temperature|Last reset reason/ or
-        line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/
-    } .join
+    cfg = cfg.each_line.reject do |line|
+      line.match(/Switch uptime|Switch temperature|Last reset reason/) ||
+        line.match(/TermCpuUtil|^\s+\^$|ERROR: Bad command/)
+    end .join
     comment cfg
   end
 
   cmd "show card\r" do |cfg|
-    cfg = cfg.each_line.reject { |line|
-      line.match /Card uptime|Card temperature|Last reset reason/ or
-        line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/
-    } .join
+    cfg = cfg.each_line.reject do |line|
+      line.match(/Card uptime|Card temperature|Last reset reason/) ||
+        line.match(/TermCpuUtil|^\s+\^$|ERROR: Bad command/)
+    end .join
     comment cfg
   end
 

data/lib/oxidized/model/ios.rb

@@ -52,60 +52,42 @@ class IOS < Oxidized::Model
       slave = ''
       slaveslot = ''
 
-      if line.match /^Slave in slot (\d+) is running/
-        slave = " Slave:";
-        slaveslot = ", slot #{$1}";
+      if line =~ /^Slave in slot (\d+) is running/
+        slave = " Slave:"
+        slaveslot = ", slot #{Regexp.last_match(1)}"
       end
 
-      if line.match /^Compiled (.*)$/
-        comments << "Image:#{slave} Compiled: #{$1}"
-      end
+      comments << "Image:#{slave} Compiled: #{Regexp.last_match(1)}" if line =~ /^Compiled (.*)$/
 
-      if line.match /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
-        comments << "Image:#{slave} Software: #{$1}, #{$2}"
-      end
+      comments << "Image:#{slave} Software: #{Regexp.last_match(1)}, #{Regexp.last_match(2)}" if line =~ /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
 
-      if line.match /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
-        comments << "ROM Bootstrap: #{$3}"
-      end
+      comments << "ROM Bootstrap: #{Regexp.last_match(3)}" if line =~ /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
 
-      if line.match /^BOOTFLASH: .*(Version.*)$/
-        comments << "BOOTFLASH: #{$1}"
-      end
+      comments << "BOOTFLASH: #{Regexp.last_match(1)}" if line =~ /^BOOTFLASH: .*(Version.*)$/
 
-      if line.match /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
-        comments << "Memory: nvram #{$1}"
-      end
+      comments << "Memory: nvram #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
 
-      if line.match /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
-        comments << "Memory: flash #{$1}"
-      end
+      comments << "Memory: flash #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
 
-      if line.match (/^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i)
-        comments << "Memory: pcmcia #{$2} #{$3}#{$4} #{$1}";
-      end
+      comments << "Memory: pcmcia #{Regexp.last_match(2)} #{Regexp.last_match(3)}#{Regexp.last_match(4)} #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i
 
-      if line.match /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
-        sproc = $1
-        cpu = $2
-        mem = $3
+      if line =~ /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
+        sproc = Regexp.last_match(1)
+        cpu = Regexp.last_match(2)
+        mem = Regexp.last_match(3)
         cpuxtra = ''
-        comments << "Chassis type:#{slave} #{sproc}";
-        comments << "Memory:#{slave} main #{mem}";
+        comments << "Chassis type:#{slave} #{sproc}"
+        comments << "Memory:#{slave} main #{mem}"
         # check the next two lines for more CPU info
-        if cfg.lines[i + 1].match /processor board id (\S+)/i
-          comments << "Processor ID: #{$1}";
-        end
-        if cfg.lines[i + 2].match /(cpu at |processor: |#{cpu} processor,)/i
+        comments << "Processor ID: #{Regexp.last_match(1)}" if cfg.lines[i + 1] =~ /processor board id (\S+)/i
+        if cfg.lines[i + 2] =~ /(cpu at |processor: |#{cpu} processor,)/i
           # change implementation to impl and prepend comma
-          cpuxtra = cfg.lines[i + 2].gsub(/implementation/, 'impl').gsub(/^/, ', ').chomp;
+          cpuxtra = cfg.lines[i + 2].gsub(/implementation/, 'impl').gsub(/^/, ', ').chomp
         end
-        comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}";
+        comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}"
       end
 
-      if line.match /^System image file is "([^"]*)"$/
-        comments << "Image: #{$1}"
-      end
+      comments << "Image: #{Regexp.last_match(1)}" if line =~ /^System image file is "([^"]*)"$/
     end
     comments << "\n"
     comment comments.join "\n"
@@ -113,7 +95,7 @@ class IOS < Oxidized::Model
 
   cmd 'show vtp status' do |cfg|
     cfg.gsub! /^$\n/, ''
-    cfg.gsub! /^/, 'VTP: ' if (!cfg.empty?)
+    cfg.gsub! /^/, 'VTP: ' unless cfg.empty?
     comment "#{cfg}\n"
   end
 

data/lib/oxidized/model/ironware.rb

@@ -28,7 +28,7 @@ class IronWare < Oxidized::Model
   end
 
   cmd 'show chassis' do |cfg|
-    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) # sometimes ironware returns broken encoding
+    cfg.encode!("UTF-8", invalid: :replace, undef: :replace) # sometimes ironware returns broken encoding
     cfg.gsub! /(^((.*)Current temp(.*))$)/, '' # remove unwanted lines current temperature
     cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}%\)/, '' # remove unwanted lines Speed Fans
     cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}%\)/, ''

data/lib/oxidized/model/junos.rb

@@ -20,7 +20,7 @@ class JunOS < Oxidized::Model
   cmd 'show configuration | display omit'
 
   cmd 'show version' do |cfg|
-    @model = $1 if cfg.match(/^Model: (\S+)/)
+    @model = Regexp.last_match(1) if cfg =~ /^Model: (\S+)/
     comment cfg
   end
 

data/lib/oxidized/model/mlnxos.rb

@@ -16,7 +16,7 @@ class MLNXOS < Oxidized::Model
     cfg.gsub! /^System memory:\s.+/, '' # Omit constantly changing memory info
     cfg.gsub! /^Uptime:\s.+/, '' # Omit constantly changing uptime info
     cfg.gsub! /.+Generated at\s\d+.+/, '' # Omit constantly changing generation time info
-    cfg = cfg.lines.to_a[2..-3].join
+    cfg.lines.to_a[2..-3].join
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/model.rb

@@ -6,26 +6,26 @@ module Oxidized
     include Oxidized::Config::Vars
 
     class << self
-      def inherited klass
-        klass.instance_variable_set '@cmd',   Hash.new { |h, k| h[k] = [] }
-        klass.instance_variable_set '@cfg',   Hash.new { |h, k| h[k] = [] }
-        klass.instance_variable_set '@procs', Hash.new { |h, k| h[k] = [] }
-        klass.instance_variable_set '@expect', []
+      def inherited(klass)
+        klass.instance_variable_set '@cmd',     (Hash.new { |h, k| h[k] = [] })
+        klass.instance_variable_set '@cfg',     (Hash.new { |h, k| h[k] = [] })
+        klass.instance_variable_set '@procs',   (Hash.new { |h, k| h[k] = [] })
+        klass.instance_variable_set '@expect',  []
         klass.instance_variable_set '@comment', nil
-        klass.instance_variable_set '@prompt', nil
+        klass.instance_variable_set '@prompt',  nil
       end
 
-      def comment _comment = '# '
+      def comment(str = '# ')
         return @comment if @comment
 
-        @comment = block_given? ? yield : _comment
+        @comment = block_given? ? yield : str
       end
 
-      def prompt _prompt = nil
-        @prompt or @prompt = _prompt
+      def prompt(regex = nil)
+        @prompt || (@prompt = regex)
       end
 
-      def cfg *methods, **args, &block
+      def cfg(*methods, **args, &block)
         [methods].flatten.each do |method|
           process_args_block(@cfg[method.to_s], args, block)
         end
@@ -35,21 +35,21 @@ module Oxidized
         @cfg
       end
 
-      def cmd _cmd = nil, **args, &block
-        if _cmd.class == Symbol
-          process_args_block(@cmd[_cmd], args, block)
+      def cmd(cmd_arg = nil, **args, &block)
+        if cmd_arg.class == Symbol
+          process_args_block(@cmd[cmd_arg], args, block)
         else
-          process_args_block(@cmd[:cmd], args, [_cmd, block])
+          process_args_block(@cmd[:cmd], args, [cmd_arg, block])
         end
-        Oxidized.logger.debug "lib/oxidized/model/model.rb Added #{_cmd} to the commands list"
+        Oxidized.logger.debug "lib/oxidized/model/model.rb Added #{cmd_arg} to the commands list"
       end
 
       def cmds
         @cmd
       end
 
-      def expect re, **args, &block
-        process_args_block(@expect, args, [re, block])
+      def expect(regex, **args, &block)
+        process_args_block(@expect, args, [regex, block])
       end
 
       def expects
@@ -63,7 +63,7 @@ module Oxidized
       # @since 0.0.39
       # @yield expects block which should return [String]
       # @return [void]
-      def pre **args, &block
+      def pre(**args, &block)
         process_args_block(@procs[:pre], args, block)
       end
 
@@ -74,16 +74,14 @@ module Oxidized
       # @since 0.0.39
       # @yield expects block which should return [String]
       # @return [void]
-      def post **args, &block
+      def post(**args, &block)
         process_args_block(@procs[:post], args, block)
       end
 
       # @author Saku Ytti <saku@ytti.fi>
       # @since 0.0.39
       # @return [Hash] hash proc procs :pre+:post to be prepended/postfixed to output
-      def procs
-        @procs
-      end
+      attr_reader :procs
 
       private
 
@@ -99,7 +97,7 @@ module Oxidized
 
     attr_accessor :input, :node
 
-    def cmd string, &block
+    def cmd(string, &block)
       Oxidized.logger.debug "lib/oxidized/model/model.rb Executing #{string}"
       out = @input.cmd(string)
       return false unless out
@@ -121,12 +119,12 @@ module Oxidized
       @input.output
     end
 
-    def send data
+    def send(data)
       @input.send data
     end
 
-    def expect re, &block
-      self.class.expect re, &block
+    def expect(regex, &block)
+      self.class.expect regex, &block
     end
 
     def cfg
@@ -137,14 +135,10 @@ module Oxidized
       self.class.prompt
     end
 
-    def expects data
+    def expects(data)
       self.class.expects.each do |re, cb|
         if data.match re
-          if cb.arity == 2
-            data = instance_exec [data, re], &cb
-          else
-            data = instance_exec data, &cb
-          end
+          data = cb.arity == 2 ? instance_exec([data, re], &cb) : instance_exec(data, &cb)
         end
       end
       data
@@ -169,9 +163,9 @@ module Oxidized
       outputs
     end
 
-    def comment _comment
+    def comment(str)
       data = ''
-      _comment.each_line do |line|
+      str.each_line do |line|
         data << self.class.comment << line
       end
       data
@@ -183,9 +177,9 @@ module Oxidized
 
     private
 
-    def process_cmd_output output, name
-      output = Oxidized::String.new output if ::String === output
-      output = Oxidized::String.new '' unless Oxidized::String === output
+    def process_cmd_output(output, name)
+      output = Oxidized::String.new output if ::String == output.class
+      output = Oxidized::String.new '' unless Oxidized::String == output.class
       output.set_cmd(name)
       output
     end

data/lib/oxidized/model/netgearxs716.rb

@@ -0,0 +1,23 @@
+class NetgearXS716 < Oxidized::Model
+  cfg_cb = lambda do
+    c = @m.get("/upload_download/startup-config")
+    c.body
+  end
+
+  cmd cfg_cb do |cfg|
+    cfg
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password (\S+)/, 'password <hidden>')
+    cfg.gsub!(/encrypted (\S+)/, 'encrypted <hidden>')
+    cfg
+  end
+
+  cfg :http do
+    @main_page = "/base/main_login.html"
+    define_singleton_method :login do
+      @m_page = @m.post("/base/cheetah_login.html", 'pwd' => @node.auth[:password])
+    end
+  end
+end

data/lib/oxidized/model/netonix.rb

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

data/lib/oxidized/model/netscaler.rb

@@ -1,5 +1,5 @@
 class NetScaler < Oxidized::Model
-  prompt /^>\s*$/
+  prompt /^([\w\.-]*>\s?)$/
   comment '# '
 
   cmd :all do |cfg|

data/lib/oxidized/model/nos.rb

@@ -21,11 +21,11 @@ class NOS < Oxidized::Model
   end
 
   cmd 'show chassis' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /Time/ or line.match /Update/ }.join
+    comment cfg.each_line.reject { |line| line.match(/Time/) || line.match(/Update/) }.join
   end
 
   cfg 'show system' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /Time/ or line.match /speed/ }
+    comment(cfg.each_line.reject { |line| line.match(/Time/) || line.match(/speed/) })
   end
 
   cmd 'show running-config | nomore'

data/lib/oxidized/model/nxos.rb

@@ -2,7 +2,7 @@ class NXOS < Oxidized::Model
   prompt /^(\r?[\w.@_()-]+[#]\s?)$/
   comment '! '
 
-  def filter cfg
+  def filter(cfg)
     cfg.gsub! /\r\n?/, "\n"
     cfg.gsub! prompt, ''
   end

data/lib/oxidized/model/openbsd.rb

@@ -7,11 +7,11 @@ class Openbsd < Oxidized::Model
   comment '# '
 
   # Add a comment between files/configs
-  def add_comment comment
+  def add_comment(comment)
     "\n+++++++++++++++++++++++++++++++++++++++++ #{comment} ++++++++++++++++++++++++++++++++++++++++++++++\n"
   end
 
-  def add_small_comment comment
+  def add_small_comment(comment)
     "\n=============== #{comment} ===============\n"
   end
 
@@ -49,6 +49,7 @@ class Openbsd < Oxidized::Model
     cfg += cmd('cat /etc/passwd')
 
     cfg += add_small_comment('END')
+    cfg
   end
 
   cfg :telnet do

data/lib/oxidized/model/outputs.rb

@@ -5,15 +5,15 @@ module Oxidized
         type_to_str(nil)
       end
 
-      def type_to_str want_type
+      def type_to_str(want_type)
         type(want_type).map { |out| out }.join
       end
 
-      def << output
+      def <<(output)
         @outputs << output
       end
 
-      def unshift output
+      def unshift(output)
         @outputs.unshift output
       end
 
@@ -21,7 +21,7 @@ module Oxidized
         @outputs
       end
 
-      def type type
+      def type(type)
         @outputs.select { |out| out.type == type }
       end
 

data/lib/oxidized/model/planet.rb

@@ -33,8 +33,8 @@ class Planet < Oxidized::Model
 
   cmd 'show version' do |cfg|
     cfg.gsub! "\n\r", "\n"
-    @planetgs = true if cfg.match /^System Name\w*:\w*GS-.*$/
-    @planetsgs = true if cfg.match /SGS-(.*) Device, Compiled on .*$/
+    @planetgs = true if cfg =~ /^System Name\w*:\w*GS-.*$/
+    @planetsgs = true if cfg =~ /SGS-(.*) Device, Compiled on .*$/
 
     cfg = cfg.each_line.to_a[0...-2]
 
@@ -53,8 +53,8 @@ class Planet < Oxidized::Model
     cfg = cfg.reject { |line| line.match "Building configuration..." }
 
     if @planetsgs
-      cfg << cmd('show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information') do |cfg|
-        comment cfg
+      cfg << cmd('show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information') do |cfg_optic|
+        comment cfg_optic
       end
     end