oxidized 0.29.0 → 0.29.1

data/lib/oxidized/model/pfsense.rb

@@ -1,4 +1,6 @@
 class PfSense < Oxidized::Model
+  using Refinements
+
   # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
 
   cmd :secret do |cfg|

data/lib/oxidized/model/planet.rb

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

data/lib/oxidized/model/powerconnect.rb

@@ -1,4 +1,6 @@
 class PowerConnect < Oxidized::Model
+  using Refinements
+
   prompt /^([\w\s.@-]+(\(\S*\))?[#>]\s?)$/ # allow spaces in hostname..dell does not limit it.. #
 
   comment '! '

data/lib/oxidized/model/procurve.rb

@@ -1,4 +1,6 @@
 class Procurve < Oxidized::Model
+  using Refinements
+
   # previous command is repeated followed by "\eE", which sometimes ends up on last line
   # ssh switches prompt may start with \r, followed by the prompt itself, regex ([\w\s.-]+[#>] ), which ends the line
   # telnet switches may start with various vt100 control characters, regex (\e\[24;[0-9][hH]), followed by the prompt, followed

data/lib/oxidized/model/purityos.rb

@@ -1,4 +1,6 @@
 class PurityOS < Oxidized::Model
+  using Refinements
+
   # Pure Storage Purity OS
 
   prompt /\w+@\S+(\s+\S+)*\s?>\s?$/

data/lib/oxidized/model/qtech.rb

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

data/lib/oxidized/model/quantaos.rb

@@ -1,4 +1,6 @@
 class QuantaOS < Oxidized::Model
+  using Refinements
+
   prompt /^\((\w|\S)+\) (>|#)$/
   comment '! '
 

data/lib/oxidized/model/raisecom.rb

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

data/lib/oxidized/model/routeros.rb

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

data/lib/oxidized/model/saos.rb

@@ -1,4 +1,6 @@
 class SAOS < Oxidized::Model
+  using Refinements
+
   # Ciena SAOS switch
   # used for 6.x devices
 

data/lib/oxidized/model/screenos.rb

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

data/lib/oxidized/model/sgos.rb

@@ -1,4 +1,6 @@
 class SGOS < Oxidized::Model
+  using Refinements
+
   comment '!- '
   prompt /\w+>|#/
 

data/lib/oxidized/model/siklu.rb

@@ -1,4 +1,6 @@
 class Siklu < Oxidized::Model
+  using Refinements
+
   # Siklu EtherHaul #
 
   prompt /^[\^M\s]{0,}[\w\-\s\.\"]+>$/

data/lib/oxidized/model/slxos.rb

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

data/lib/oxidized/model/smartax.rb

@@ -1,4 +1,6 @@
 class SmartAX < Oxidized::Model
+  using Refinements
+
   # Huawei SmartAX GPON/EPON/DOCSIS network access devices
   prompt /^([\w.-]+[>#])$/
 

data/lib/oxidized/model/smartcs.rb

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

data/lib/oxidized/model/sonicos.rb

@@ -1,4 +1,6 @@
 class SonicOS < Oxidized::Model
+  using Refinements
+
   # Applies to Sonicwall NSA series firewalls
 
   prompt /^\w+@\w+[>]\(?.+\)?\s?/

data/lib/oxidized/model/speedtouch.rb

@@ -1,4 +1,6 @@
 class SpeedTouch < Oxidized::Model
+  using Refinements
+
   prompt /([\w{}=]+[>])$/
   comment '! '
 

data/lib/oxidized/model/sros.rb

@@ -1,10 +1,12 @@
 class SROS < Oxidized::Model
+  using Refinements
+
   #
   # Nokia SR OS (TiMOS) (formerly TiMetra, Alcatel, Alcatel-Lucent).
   # Used in 7705 SAR, 7210 SAS, 7450 ESS, 7750 SR, 7950 XRS, and NSP.
   #
 
-  comment  '# '
+  comment '# '
 
   prompt /^([-\w.:>*]+\s?[#>]\s?)$/
 

data/lib/oxidized/model/srosmd.rb

@@ -1,4 +1,6 @@
 class SROSMD < Oxidized::Model
+  using Refinements
+
   #
   # Nokia SR OS (TiMOS) (formerly TiMetra, Alcatel, Alcatel-Lucent)
   # Working in Model-Driven CLI mode.

data/lib/oxidized/model/stoneos.rb

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

data/lib/oxidized/model/swos.rb

@@ -1,5 +1,7 @@
 # Mikrotik SwOS (Lite)
 class SwOS < Oxidized::Model
+  using Refinements
+
   cmd '/backup.swb'
   cfg :http do
     @username = @node.auth[:username]

data/lib/oxidized/model/tdre.rb

@@ -1,4 +1,6 @@
 class TDRE < Oxidized::Model
+  using Refinements
+
   prompt /^>$/
   cmd "get -f"
 

data/lib/oxidized/model/telco.rb

@@ -1,4 +1,6 @@
 class TELCO < Oxidized::Model
+  using Refinements
+
   # Telco Systems T-Marc 3306
 
   prompt /^(\r?[\w.@_()-]+[#]\s?)$/

data/lib/oxidized/model/tmos.rb

@@ -1,5 +1,7 @@
 class TMOS < Oxidized::Model
-  comment  '# '
+  using Refinements
+
+  comment '# '
 
   cmd :secret do |cfg|
     cfg.gsub!(/^([\s\t]*)secret \S+/, '\1secret <secret removed>')

data/lib/oxidized/model/tplink.rb

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

data/lib/oxidized/model/trango.rb

@@ -1,4 +1,6 @@
 class Trango < Oxidized::Model
+  using Refinements
+
   # take a Trangolink sysinfo output and turn it into a configuration file
 
   prompt /^#>\s?/

data/lib/oxidized/model/truenas.rb

@@ -1,4 +1,6 @@
 class TrueNAS < Oxidized::Model
+  using Refinements
+
   comment '# '
 
   cmd('uname -a') { |cfg| comment cfg }

data/lib/oxidized/model/ucs.rb

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

data/lib/oxidized/model/viptela.rb

@@ -1,4 +1,6 @@
 class Viptela < Oxidized::Model
+  using Refinements
+
   # Cisco Vipetla
 
   prompt /[-\w]+#\s$/

data/lib/oxidized/model/voltaire.rb

@@ -1,4 +1,6 @@
 class VOLTAIRE < Oxidized::Model
+  using Refinements
+
   prompt /([\w.@()-\[:\s\]]+[#>]\s|(One or more tests have failed.*))$/
   comment '## '
 

data/lib/oxidized/model/voss.rb

@@ -1,4 +1,6 @@
 class Voss < Oxidized::Model
+  using Refinements
+
   # Extreme/Avaya VSP Operating System Software(VOSS)
   # Created by danielcoxman@gmail.com
   # March 16, 2019

data/lib/oxidized/model/vrp.rb

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

data/lib/oxidized/model/vyatta.rb

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

data/lib/oxidized/model/weos.rb

@@ -1,4 +1,6 @@
 class WEOS < Oxidized::Model
+  using Refinements
+
   # Westell WEOS, works with Westell 8178G, Westell 8266G
 
   prompt /^(\s[\w.@-]+[#>]\s?)$/

data/lib/oxidized/model/xos.rb

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

data/lib/oxidized/model/yamaha.rb

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

data/lib/oxidized/model/zhoneolt.rb

@@ -1,4 +1,6 @@
 class ZhoneOLT < Oxidized::Model
+  using Refinements
+
   # Zhone OLT/MetroE/DSL devices (ONT uses a completely different CLI)
 
   # the prompt can be anything on zhone, but it defaults to 'zXX>' and we

data/lib/oxidized/model/zteolt.rb

@@ -1,4 +1,6 @@
 class ZTEOLT < Oxidized::Model
+  using Refinements
+
   # Tested with C320 and C300 olt, firware 1.2.5P3 and 2.1.0
 
   prompt /^([\w.@()-]+[#>]\s?)$/

data/lib/oxidized/model/zy1308.rb

@@ -1,5 +1,7 @@
 # For Zyxel OLTs series 1308
 class Zy1308 < Oxidized::Model
+  using Refinements
+
   # For Zyxel OLTs series 1308
 
   cmd '/config_OLT-1308S-22.log'

data/lib/oxidized/model/zynos.rb

@@ -1,4 +1,6 @@
 class ZyNOS < Oxidized::Model
+  using Refinements
+
   # Used in Zyxel DSLAMs, such as SAM1316
 
   comment '! '

data/lib/oxidized/model/zynoscli.rb

@@ -1,4 +1,6 @@
 class ZyNOSCLI < Oxidized::Model
+  using Refinements
+
   # Used in Zyxel DSLAMs, such as SAM1316
 
   # Typical prompt "XGS4600#"

data/lib/oxidized/model/zynosgs.rb

@@ -1,4 +1,6 @@
 class ZyNOSGS < Oxidized::Model
+  using Refinements
+
   # Used in Zyxel GS1900 switches, tested with GS1900-8
   prompt /^.*# $/
   comment '! '

data/lib/oxidized/output/git.rb

@@ -79,7 +79,8 @@ module Oxidized
       i = -1
       tab = []
       walker.each do |commit|
-        next if commit.diff(paths: [path]).empty?
+        # Diabled rubocop because the suggested .empty? does not work here.
+        next if commit.diff(paths: [path]).size.zero? # rubocop:disable Style/ZeroLengthPredicate
 
         hash = {}
         hash[:date] = commit.time.to_s

data/lib/oxidized/version.rb

@@ -1,6 +1,6 @@
 module Oxidized
-  VERSION = '0.29.0'.freeze
-  VERSION_FULL = '0.29.0'.freeze
+  VERSION = '0.29.1'.freeze
+  VERSION_FULL = '0.29.1'.freeze
   def self.version_set
     version_full = %x(git describe --tags).chop rescue ""
     version      = %x(git describe --tags --abbrev=0).chop rescue ""

data/lib/oxidized.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'refinements'
 
 module Oxidized
   class OxidizedError < StandardError; end
@@ -6,7 +7,6 @@ module Oxidized
   Directory = File.expand_path(File.join(File.dirname(__FILE__), '../'))
 
   require 'oxidized/version'
-  require 'oxidized/string'
   require 'oxidized/config'
   require 'oxidized/config/vars'
   require 'oxidized/worker'

data/lib/refinements.rb

@@ -0,0 +1,43 @@
+module Refinements
+  # Use the 'refine' keyword to define refinements for the String class
+  refine String do
+    attr_accessor :type, :cmd, :name
+
+    # @return [String] copy of self with last line removed
+    def cut_tail(lines = 1)
+      return "" if length.zero?
+
+      each_line.to_a[0..(-1 - lines)].join
+    end
+
+    # @return [String] copy of self with first line removed
+    def cut_head(lines = 1)
+      return "" if length.zero?
+
+      each_line.to_a[lines..-1].join
+    end
+
+    # @return [String] copy of self with first and last lines removed
+    def cut_both(head = 1, tail = 1)
+      return "" if length.zero?
+
+      each_line.to_a[head..(-1 - tail)].join
+    end
+
+    # sets @cmd and @name unless @name is already set
+    def set_cmd(command)
+      @cmd = command
+      @name ||= @cmd.to_s.strip.gsub(/\s+/, '_') # what to do when command is proc? #to_s seems ghetto
+    end
+
+    # Initializes the String instance variables from another String instance
+    # when the given str is an instance of String with Oxidized refinements applied
+    def init_from_string(str = '')
+      raise TypeError unless str.instance_of?(String)
+
+      @cmd  = str.instance_variable_get(:@cmd)
+      @name = str.instance_variable_get(:@name)
+      @type = str.instance_variable_get(:@type)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -290,9 +290,11 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/no-response.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/codeql.yml"
 - ".github/workflows/publishdocker.yml"
 - ".github/workflows/ruby.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -546,9 +548,9 @@ files:
 - lib/oxidized/source/http.rb
 - lib/oxidized/source/source.rb
 - lib/oxidized/source/sql.rb
-- lib/oxidized/string.rb
 - lib/oxidized/version.rb
 - lib/oxidized/worker.rb
+- lib/refinements.rb
 - oxidized.gemspec
 homepage: http://github.com/ytti/oxidized
 licenses:

data/.github/no-response.yml

@@ -1,13 +0,0 @@
-# Configuration for probot-no-response - https://github.com/probot/no-response
-
-# Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 21
-# Label requiring a response
-responseRequiredLabel: user_pending 
-# Comment to post when closing an Issue for lack of response. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because there has been no response
-  to our request for more information from the original author. The information 
-  that is currently in the issue is insufficient to take further action.
-  Feel free to re-open this issue if additional information becomes available,
-  or if you believe it has been closed in error.

data/lib/oxidized/string.rb

@@ -1,42 +0,0 @@
-module Oxidized
-  # Used in models, contains convenience methods
-  class String < String
-    attr_accessor :type, :cmd, :name
-
-    # @return [Oxidized::String] copy of self with last line removed
-    def cut_tail(lines = 1)
-      return Oxidized::String.new("") if length.zero?
-
-      Oxidized::String.new each_line.to_a[0..(-1 - lines)].join
-    end
-
-    # @return [Oxidized::String] copy of self with first line removed
-    def cut_head(lines = 1)
-      return Oxidized::String.new("") if length.zero?
-
-      Oxidized::String.new each_line.to_a[lines..-1].join
-    end
-
-    # @return [Oxidized::String] copy of self with first and last lines removed
-    def cut_both(head = 1, tail = 1)
-      return Oxidized::String.new("") if length.zero?
-
-      Oxidized::String.new each_line.to_a[head..(-1 - tail)].join
-    end
-
-    # sets @cmd and @name unless @name is already set
-    def set_cmd(command)
-      @cmd = command
-      @name ||= @cmd.to_s.strip.gsub(/\s+/, '_') # what to do when command is proc? #to_s seems ghetto
-    end
-
-    def initialize(str = '')
-      super
-      return unless str.instance_of?(Oxidized::String)
-
-      @cmd  = str.cmd
-      @name = str.name
-      @type = str.type
-    end
-  end
-end