oxidized 0.34.3 → 0.35.0

data/lib/oxidized/model/mlnxos.rb

@@ -1,27 +1,20 @@
 class MLNXOS < Oxidized::Model
   using Refinements
 
-  prompt /^\r?(\e.+\e>\r)?\S* \[\S+: (master|standby)\] [#>] $/
+  prompt /^\r?\S* \[\S+: (master|standby)\] [#>] $/
   comment '## '
+  clean :escape_codes
 
   # Pager Handling
   # "Normal" pager: "lines 183-204 "
   # Last pager:     "lines 256-269/269 (END) "
-  expect /\e\[7mlines \d+-\d+( |\/\d+ \(END\) )/ do |data, re|
+  expect /lines \d+-\d+( |\/\d+ \(END\) )/ do |data, re|
     send ' '
     data.sub re, ''
   end
 
-  # Remove ANSI escape codes
-  expect /\e\[[0-?]*[ -\/]*[@-~]\r?/ do |data, re|
-    data.sub re, ''
-  end
-
   cmd :all do |cfg|
-    cfg.gsub! "\e[m", '' # Remove reset formating
-    cfg.gsub! "\e[K", '' # Remove erase in line
     cfg.gsub! /.\x08/, '' # Remove Backspace char
-    cfg.gsub! "\r", '' # Remove Cariage Return
     cfg.gsub! /^CPU load averages:\s.+/, '' # Omit constantly changing CPU info
     cfg.gsub! /^System memory:\s.+/, '' # Omit constantly changing memory info
     cfg.gsub! /^Uptime:\s.+/, '' # Omit constantly changing uptime info

data/lib/oxidized/model/model.rb

@@ -9,18 +9,22 @@ module Oxidized
 
     include Oxidized::Config::Vars
 
+    # rubocop:disable Style/FormatStringToken
+    METADATA_DEFAULT = "%{comment}Fetched by Oxidized with model %{model} " \
+                       "from host %{name} [%{ip}]\n".freeze
+    # rubocop:enable Style/FormatStringToken
+
     class << self
       def inherited(klass)
         super
         if klass.superclass == Oxidized::Model
-          # rubocop:disable Style/RedundantParentheses
-          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] = [] })
-          # rubocop:enable Style/RedundantParentheses
+          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 '@metadata', {}
         else # we're subclassing some existing model, take its variables
           instance_variables.each do |var|
             iv = instance_variable_get(var)
@@ -58,11 +62,23 @@ module Oxidized
         if cmd_arg.instance_of?(Symbol)
           process_args_block(@cmd[cmd_arg], args, block)
         else
-          process_args_block(@cmd[:cmd], args, [cmd_arg, block])
+          # Normal command
+          process_args_block(@cmd[:cmd], args,
+                             { cmd: cmd_arg, args: args, block: block })
         end
         logger.debug "Added #{cmd_arg} to the commands list"
       end
 
+      def metadata(position, value = nil, &block)
+        return unless %i[top bottom].include? position
+
+        if block_given?
+          @metadata[position] = block
+        else
+          @metadata[position] = value
+        end
+      end
+
       def cmds
         @cmd
       end
@@ -75,11 +91,33 @@ module Oxidized
         @expect
       end
 
+      def clean(what)
+        case what
+        when :escape_codes
+          ansi_escape_regex = /
+            \r?        # Optional carriage return at start
+            \e         # ESC character - starts escape sequence
+            (?:        # Non-capturing group for different sequence types:
+              # Type 1: CSI (Control Sequence Introducer)
+              \[       # Literal '[' - starts CSI sequence
+              [0-?]*   # Parameter bytes: digits (0-9), semicolon, colon, etc.
+              [ -\/]*  # Intermediate bytes: space through slash characters
+              [@-~]    # Final byte: determines the actual command
+            |          # OR
+              # Type 2: Simple escape
+              [=>]     # Single character commands after ESC
+            )
+            \r?        # Optional carriage return at end
+          /x
+          expect ansi_escape_regex do |data, re|
+            data.gsub re, ''
+          end
+        end
+      end
+
       # calls the block at the end of the model, prepending the output of the
       # block to the output string
       #
-      # @author Saku Ytti <saku@ytti.fi>
-      # @since 0.0.39
       # @yield expects block which should return [String]
       # @return [void]
       def pre(**args, &block)
@@ -89,8 +127,6 @@ module Oxidized
       # calls the block at the end of the model, adding the output of the block
       # to the output string
       #
-      # @author Saku Ytti <saku@ytti.fi>
-      # @since 0.0.39
       # @yield expects block which should return [String]
       # @return [void]
       def post(**args, &block)
@@ -109,6 +145,9 @@ module Oxidized
           if block.instance_of?(Array)
             target.reject! { |k, _| k == block[0] }
             target.push(block)
+          elsif block.instance_of?(Hash)
+            target.reject! { |item| item[:cmd] == block[:cmd] }
+            target.push(block)
           else
             target.replace([block])
           end
@@ -139,6 +178,44 @@ module Oxidized
       process_cmd_output out, string
     end
 
+    def metadata(position)
+      return unless %i[top bottom].include? position
+
+      model_metadata = self.class.instance_variable_get(:@metadata)
+      var_position = { top: "metadata_top", bottom: "metadata_bottom" }
+      if model_metadata[:top] || model_metadata[:bottom]
+        # the model defines metadata at :top ot :bottom, use the model
+        value = model_metadata[position]
+        value.is_a?(Proc) ? instance_eval(&value) : interpolate_string(value)
+      elsif vars("metadata_top") || vars("metadata_bottom")
+        # vars defines metadata_top or metadata bottom, use the vars
+        interpolate_string(vars(var_position[position]))
+      elsif position == :top
+        # default: use METADATA_DEFAULT for top
+        interpolate_string(METADATA_DEFAULT)
+      end
+    end
+
+    def interpolate_string(template)
+      return nil unless template
+
+      time = Time.now
+      template_variables = {
+        model:   self.class.name,
+        name:    node.name,
+        ip:      node.ip,
+        group:   node.group,
+        comment: self.class.comment,
+        year:    time.year,
+        month:   "%02d" % time.month,
+        day:     "%02d" % time.day,
+        hour:    "%02d" % time.hour,
+        minute:  "%02d" % time.min,
+        second:  "%02d" % time.sec
+      }
+      template % template_variables
+    end
+
     def output
       @input.output
     end
@@ -171,19 +248,31 @@ module Oxidized
     def get
       logger.debug 'Collecting commands\' outputs'
       outputs = Outputs.new
-      procs = self.class.procs
-      self.class.cmds[:cmd].each do |command, block|
+      self.class.cmds[:cmd].each do |data|
+        command = data[:cmd]
+        args = data[:args]
+        block = data[:block]
+
+        next if args.include?(:if) && !instance_exec(&args[:if])
+
         out = cmd command, &block
         return false unless out
 
         outputs << out
       end
+      procs = self.class.procs
       procs[:pre].each do |pre_proc|
         outputs.unshift process_cmd_output(instance_eval(&pre_proc), '')
       end
       procs[:post].each do |post_proc|
         outputs << process_cmd_output(instance_eval(&post_proc), '')
       end
+      if vars("metadata") == true
+        metadata_top = metadata(:top)
+        metadata_bottom = metadata(:bottom)
+        outputs.unshift metadata_top if metadata_top
+        outputs << metadata_bottom if metadata_bottom
+      end
       outputs
     end
 

data/lib/oxidized/model/netgear.rb

@@ -3,6 +3,7 @@ class Netgear < Oxidized::Model
 
   comment '!'
   prompt /^\(?[\w \-+.]+\)? ?[#>] ?$/
+  clean :escape_codes
 
   # Handle pager for "show version" on old Netgear models: #2394
   expect /^--More-- or \(q\)uit$/ do |data, re|

data/lib/oxidized/model/netonix.rb

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

data/lib/oxidized/model/netscaler.rb

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

data/lib/oxidized/model/nxos.rb

@@ -1,12 +1,11 @@
 class NXOS < Oxidized::Model
   using Refinements
 
-  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  prompt /^(\r?[\w.@_()-]+\#\s?)$/
   comment '! '
 
-  def filter(cfg)
-    cfg.gsub! /\r\n?/, "\n"
-    cfg.gsub! prompt, ''
+  cmd :all do |cfg|
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|
@@ -21,21 +20,22 @@ class NXOS < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    cfg = filter cfg
     cfg = cfg.each_line.take_while { |line| not line.match(/uptime|bootflash:\s+\d+\skB|sysmgrcli_show_flash_size/i) }
-    comment cfg.join
+    comment cfg.join + "\n"
   end
 
   cmd 'show inventory all' do |cfg|
-    cfg = filter cfg
+    if cfg.include? "% Invalid parameter detected at '^' marker."
+      # 'show inventory all' isn't supported on older versions (See Issue #3657)
+      cfg = cmd 'show inventory'
+    end
     comment cfg
   end
 
   cmd 'show running-config' do |cfg|
-    cfg = filter cfg
     cfg.gsub! /^(show run.*)$/, '! \1'
     cfg.gsub! /^!Time:[^\n]*\n/, ''
-    cfg.gsub! /^[\w.@_()-]+[#].*$/, ''
+    cfg.gsub! /^[\w.@_()-]+\#.*$/, ''
     cfg
   end
 

data/lib/oxidized/model/onefinity.rb

@@ -3,7 +3,7 @@ class OneFinity < Oxidized::Model
 
   # Fujitsu 1finity
 
-  prompt /(\r?[\w.@_()-]+[>]\s?)$/
+  prompt /(\r?[\w.@_()-]+>\s?)$/
 
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-3].join

data/lib/oxidized/model/opnsense.rb

@@ -22,6 +22,14 @@ class OpnSense < Oxidized::Model
     xmlcomment version
   end
 
+  metadata :bottom do
+    xmlcomment interpolate_string(
+      vars("metadata_bottom") ||
+      vars("metadata_top") ||
+      Oxidized::Model::METADATA_DEFAULT
+    )
+  end
+
   cfg :ssh do
     exec true
     pre_logout 'exit'

data/lib/oxidized/model/perle.rb

@@ -0,0 +1,35 @@
+class Perle < Oxidized::Model
+  using Refinements
+
+  prompt /^[\w.-]+#/
+  comment '! '
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  cmd 'show version verbose' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system hardware' do |cfg|
+    comment cfg + "\n"
+  end
+
+  cmd 'show interfaces transceiver' do |cfg|
+    out = []
+    cfg.each_line do |line|
+      out << line if line =~ /SFP Information/
+      out << line if line =~ /Vendor Name/
+      out << line if line =~ /Vendor Serial Number/
+    end
+    comment out.join + "\n"
+  end
+
+  cmd 'show running-config'
+
+  cfg :ssh do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/pfsense.rb

@@ -26,6 +26,14 @@ class PfSense < Oxidized::Model
     xmlcomment "PFsense #{version}"
   end
 
+  metadata :bottom do
+    xmlcomment interpolate_string(
+      vars("metadata_bottom") ||
+      vars("metadata_top") ||
+      Oxidized::Model::METADATA_DEFAULT
+    )
+  end
+
   cfg :ssh do
     exec true
     pre_logout 'exit'

data/lib/oxidized/model/saos10.rb

@@ -3,7 +3,7 @@ class SAOS10 < Oxidized::Model
   # Ciena SAOS switch
   # used for 10.x devices
 
-  prompt /^[\w\-]+\*?> ?$/
+  prompt /^[\w-]+\*?> ?$/
   comment  '# '
 
   cmd :all do |cfg|

data/lib/oxidized/model/siklu.rb

@@ -3,7 +3,7 @@ class Siklu < Oxidized::Model
 
   # Siklu EtherHaul #
 
-  prompt /^[\^M\s]{0,}[\w\-\s\.\"]+>$/
+  prompt /^[\^M\s]{0,}[\w\-\s."]+>$/
 
   cmd 'copy startup-configuration display' do |cfg|
     cfg.each_line.to_a[2..2].join

data/lib/oxidized/model/siklumhtg.rb

@@ -4,7 +4,7 @@ class SikluMHTG < Oxidized::Model
   # Siklu MultiHaul TG#
   # Requires source to define the model as SikluMHTG #
 
-  prompt /^\r?MH-[TN]\d{3}[\@][\w]{2,8}>$/
+  prompt /^\r?MH-[TN]\d{3}@\w{2,8}>$/
 
   expect /--More--/ do |data, re|
     send ' '

data/lib/oxidized/model/sixwind.rb

@@ -1,7 +1,7 @@
 class SixWind < Oxidized::Model
   using Refinements
 
-  prompt /^[\w\s\(\).@_\/:-]+[>] $/
+  prompt /^[\w\s().@_\/:-]+> $/
   comment '# '
 
   cmd :all do |cfg|

data/lib/oxidized/model/slxos.rb

@@ -16,7 +16,7 @@ class SLXOS < Oxidized::Model
     cfg.gsub! /.*Power Usage.*/, '' # remove unwanted lines power usage
     cfg.gsub! /^Update:.*$/, '' # remove unwanted current date
     cfg.gsub! /Time A(live|wake).*/, '' # remove unwanted lines time alive/awake
-    cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
+    cfg.gsub! /(\[*)1(\]*)<->(\[*)2(\]*)(<->(\[*)3(\]*))*/, ''
 
     comment cfg
   end

data/lib/oxidized/model/sonicos.rb

@@ -3,7 +3,7 @@ class SonicOS < Oxidized::Model
 
   # Applies to Sonicwall NSA series firewalls
 
-  prompt /^\w+@[\w\-]+[>]\(?.+\)?\s?/
+  prompt /^\w+@[\w-]+>\(?.+\)?\s?/
   comment '! '
 
   # Accept policiy message (see Issue #3339). Tested on 6.5 and 7.1

data/lib/oxidized/model/speedtouch.rb

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

data/lib/oxidized/model/telco.rb

@@ -3,7 +3,7 @@ class TELCO < Oxidized::Model
 
   # Telco Systems T-Marc 3306
 
-  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  prompt /^(\r?[\w.@_()-]+\#\s?)$/
   comment '! '
 
   cmd :all do |cfg|

data/lib/oxidized/model/tnsr.rb

@@ -13,14 +13,16 @@ class TNSR < Oxidized::Model
   #  received "\r\nVersion: 25.02-2\r\n\r\nFor information see 'show documentation'\r\n\r\n"
   #  received "\rbgp01 tnsr# "
   # when the --More-- pager is the last line of paged output, the prompt contains \x08\x20\x08 orphans on the begin
+  # on older version (23.06) --More-- pager is sometimes misplaced
   #  you can look for context into spec simulation:
-  #    spec/model/data/tnsr:TNSR_24.10-3_short-config:simulation.yaml
-  #    spec/model/data/tnsr:TNSR_25.02-2_long-config-and-pager-at-last-line:simulation.yaml
+  #    spec/model/data/tnsr#TNSR_24.10-3_short-config#simulation.yaml
+  #    spec/model/data/tnsr#TNSR_25.02-2_long-config-and-pager-at-last-line#simulation.yaml
+  #    spec/model/data/tnsr#TNSR_23.06-3_with-misplaced-pager#simulation.yaml
   prompt /^((\x08{8}\x20{8}\x08{8})?\r?[\w-]+\stnsr#\s?)$/
 
   comment '! '
 
-  expect /^--More--/ do |data, re|
+  expect /^--More--|--More--$/ do |data, re|
     send ' '
     data.sub re, ''
   end
@@ -40,6 +42,8 @@ class TNSR < Oxidized::Model
   end
 
   cmd 'show version all' do |cfg|
+    # for older tnsr versions
+    cfg = cmd('show version') if cfg.to_s =~ /^CLI syntax error:.+Unknown command$/
     comment cfg
   end
 

data/lib/oxidized/model/trango.rb

@@ -14,7 +14,7 @@ class Trango < Oxidized::Model
         out << ("opmode " + Regexp.last_match[1])
         out << ("defaultopmode " + Regexp.last_match[2])
       end
-      out << ("power " + Regexp.last_match[1]) if line =~ /\[Tx Power\] ([\-\d]+) dBm/
+      out << ("power " + Regexp.last_match[1]) if line =~ /\[Tx Power\] ([-\d]+) dBm/
       out << ("freq " + Regexp.last_match[1] + ' ' + Regexp.last_match[2]) if line =~ /\[Active Channel\] (\d+) (v|h)/
       out << ("peerid " + Regexp.last_match[1]) if line =~ /\[Peer ID\] ([A-F0-9]+)/
       out << ("utype " + Regexp.last_match[1]) if line =~ /\[Unit Type\] (\S+)/

data/lib/oxidized/model/ucs.rb

@@ -1,7 +1,7 @@
 class UCS < Oxidized::Model
   using Refinements
 
-  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  prompt /^(\r?[\w.@_()-]+\#\s?)$/
   comment '! '
 
   cmd 'show version brief' do |cfg|

data/lib/oxidized/model/voltaire.rb

@@ -5,7 +5,7 @@ class VOLTAIRE < Oxidized::Model
   comment '## '
 
   # Pager Handling
-  expect /.+lines\s\d+-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
+  expect /.+lines\s\d+-\d+(\s|\/\d+\s\(END\)\s).+$/ do |data, re|
     send ' '
     data.sub re, ''
   end

data/lib/oxidized/model/vyatta.rb

@@ -1,7 +1,7 @@
 class Vyatta < Oxidized::Model
   using Refinements
 
-  # Brocade Vyatta / VyOS model #
+  # Brocade Vyatta model #
 
   prompt /@.*(:~\$|>)\s/
 

data/lib/oxidized/model/vyos.rb

@@ -0,0 +1,34 @@
+class Vyos < Oxidized::Model
+  using Refinements
+
+  # VyOS model #
+  # Vyos is a Fork of Vyatta and is being actively developed.
+  # https://vyos.org/
+
+  prompt /^\S+@\S+(:~\$|>) $/
+  clean :escape_codes
+
+  cmd :all do |cfg|
+    cfg.lines.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /secret (\S+).*/, 'secret <secret removed>'
+    cfg.gsub! /password (\S+).*/, 'password <secret removed>'
+    cfg.gsub! /community (\S+)/, 'community <secret removed>'
+    cfg.gsub! /private key (\S+).*/, 'private key <secret removed>'
+    # password in URLs like protocol://user:password@domain.tld/
+    cfg.gsub! /([a-z]+:\/\/[^:\s]+:)\S+@/, '\1<secret removed>@'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show configuration commands | no-more'
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/zhoneolt.rb

@@ -5,7 +5,7 @@ class ZhoneOLT < Oxidized::Model
 
   # the prompt can be anything on zhone, but it defaults to 'zXX>' and we
   # always use hostname>
-  prompt /^(\r*[\w.@():-]+[>]\s?)$/
+  prompt /^(\r*[\w.@():-]+>\s?)$/
   comment '# '
 
   cmd :secret do |cfg|

data/lib/oxidized/model/zynoscli.rb

@@ -30,7 +30,7 @@ class ZyNOSCLI < Oxidized::Model
           expect /[pP]assword:\s?$/
           send vars(:enable) + "\n"
         end
-        expect /^.+[#]$/
+        expect /^.+\#$/
       end
     end
     pre_logout 'exit'

data/lib/oxidized/node.rb

@@ -7,7 +7,7 @@ module Oxidized
   class Node
     include SemanticLogger::Loggable
 
-    attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :vars, :last, :repo
+    attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :timeout, :vars, :last, :repo
     attr_accessor :running, :user, :email, :msg, :from, :stats, :retry, :err_type, :err_reason
     alias running? running
 
@@ -27,6 +27,7 @@ module Oxidized
       @output = resolve_output opt
       @auth = resolve_auth opt
       @prompt = resolve_prompt opt
+      @timeout = resolve_timeout opt
       @vars = opt[:vars] || {}
       @stats = Stats.new
       @retry = 0
@@ -156,6 +157,10 @@ module Oxidized
       opt[:prompt] || @model.prompt || Oxidized.config.prompt
     end
 
+    def resolve_timeout(opt)
+      resolve_key :timeout, opt, Oxidized.config.timeout
+    end
+
     def resolve_auth(opt)
       # Resolve configured username/password
       {

data/lib/oxidized/source/http.rb

@@ -50,14 +50,22 @@ module Oxidized
         end
 
         next_key = @cfg.pagination_key_name
+        # Process the initial batch first
+        node_data += string_navigate_object(data, @cfg.hosts_location) if @cfg.hosts_location?
+
+        # Now loop only for subsequent pages
         loop do
-          node_data += string_navigate_object(data, @cfg.hosts_location) if @cfg.hosts_location?
+          # Check for the next URL *before* trying to fetch/add
           break if data[next_key].nil?
 
-          new_uri = URI.parse(data[next_key]) if data.has_key?(next_key)
+          # Fetch the next page
+          new_uri = URI.parse(data[next_key]) # Safe to parse now
           data = JSON.parse(read_http(new_uri, node_want))
+
+          # Add nodes from the *newly fetched* batch
           node_data += string_navigate_object(data, @cfg.hosts_location) if @cfg.hosts_location?
         end
+
         node_data
       end
 

data/lib/oxidized/version.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Oxidized
-  VERSION = '0.34.3'
-  VERSION_FULL = '0.34.3'
+  VERSION = '0.35.0'
+  VERSION_FULL = '0.35.0'
   def self.version_set
     version_full = %x(git describe --tags).chop rescue ""
     version      = %x(git describe --tags --abbrev=0).chop rescue ""

data/oxidized.gemspec

@@ -46,20 +46,19 @@ Gem::Specification.new do |s|
   s.add_dependency 'syslog',               '~> 0.3.0'
   s.add_dependency 'syslog_protocol',      '~> 0.9.2'
 
-  s.add_development_dependency 'bundler',             '~> 2.2'
   # ruby-git 4.0 requests ruby >= 3.2, we stick to ruby >= 3.1 (Ubuntu Noble/Debian Bookworm)
   s.add_development_dependency 'git',                 '>= 2.0', '< 3.2.0'
-  s.add_development_dependency 'minitest',            '~> 5.25.4'
+  s.add_development_dependency 'minitest',            '~> 5.26.0'
   s.add_development_dependency 'mocha',               '~> 2.1'
   s.add_development_dependency 'pry',                 '~> 0.15.0'
   s.add_development_dependency 'rake',                '~> 13.0'
-  s.add_development_dependency 'rubocop',             '~> 1.79.1'
+  s.add_development_dependency 'rubocop',             '~> 1.81.0'
   s.add_development_dependency 'rubocop-minitest',    '~> 0.38.0'
   s.add_development_dependency 'rubocop-rake',        '~> 0.7.0'
   s.add_development_dependency 'rubocop-sequel',      '~> 0.4.0'
   s.add_development_dependency 'simplecov',           '~> 0.22.0'
 
   # Dependencies on optional libraries, used for unit tests & development
-  s.add_development_dependency 'oxidized-web',        '~> 0.17.1'
-  s.add_development_dependency 'sequel',              '>= 5.63.0', '< 5.96.0'
+  s.add_development_dependency 'oxidized-web',        '>= 0.17.1'
+  s.add_development_dependency 'sequel',              '>= 5.63.0', '< 5.100.0'
 end