oxidized 0.34.3 → 0.36.0

data/lib/oxidized/worker.rb

@@ -23,11 +23,11 @@ module Oxidized
                      "#{@jobs_done} of #{@nodes.size}"
         # ask for next node in queue non destructive way
         nextnode = @nodes.first
-        unless nextnode.last.nil?
-          # Set unobtainable value for 'last' if interval checking is disabled
-          last = Oxidized.config.interval.zero? ? Time.now.utc + 10 : nextnode.last.end
-          break if last + Oxidized.config.interval > Time.now.utc
-        end
+        break if Oxidized.config.interval.zero? && !nextnode.nexted?
+
+        nextnode.nexted = false
+        break if !nextnode.last.nil? && (nextnode.last.end + Oxidized.config.interval > Time.now.utc)
+
         # shift nodes and get the next node
         node = @nodes.get
         node.running? ? next : node.running = true
@@ -64,21 +64,43 @@ module Oxidized
 
     private
 
+    def significant_changes?(job, output)
+      node = job.node
+      model = node.model
+      return true unless model.vars(:output_store_mode) == "on_significant"
+
+      unless output.respond_to?(:fetch)
+        logger.error("Detection of significant changes needs an output " \
+                     "capable of fetching the last configuration")
+        return true
+      end
+
+      old = model.significant_changes output.fetch(node, node.group)
+      new = model.significant_changes job.config.to_cfg
+      if old == new
+        logger.debug "No significant change on node #{node.name}"
+        false
+      else
+        true
+      end
+    end
+
     def process_success(node, job)
       @jobs_done += 1 # needed for :nodes_done hook
-      Oxidized.hooks.handle :node_success, node: node,
-                                           job:  job
+      Oxidized.hooks.node_success(node: node, job: job)
       msg = "update #{node.group}/#{node.name}"
       msg += " from #{node.from}" if node.from
       msg += " with message '#{node.msg}'" if node.msg
       output = node.output.new
-      if output.store node.name, job.config,
-                      msg: msg, email: node.email, user: node.user, group: node.group
+
+      significant_changes = significant_changes?(job, output)
+      if output.store(node.name, job.config,
+                      msg: msg, email: node.email, user: node.user,
+                      group: node.group,
+                      significant_changes: significant_changes)
         node.modified
         logger.info "Configuration updated for #{node.group}/#{node.name}"
-        Oxidized.hooks.handle :post_store, node:      node,
-                                           job:       job,
-                                           commitref: output.commitref
+        Oxidized.hooks.post_store(node: node, job: job, commitref: output.commitref)
       end
       node.reset
     end
@@ -97,8 +119,7 @@ module Oxidized
         @jobs_done += 1
         msg += ", retries exhausted, giving up"
         node.retry = 0
-        Oxidized.hooks.handle :node_fail, node: node,
-                                          job:  job
+        Oxidized.hooks.node_fail(node: node, job: job)
       end
       logger.warn msg
     end
@@ -110,7 +131,7 @@ module Oxidized
 
     def run_done_hook
       logger.debug "Running :nodes_done hook"
-      Oxidized.hooks.handle :nodes_done
+      Oxidized.hooks.nodes_done
     rescue StandardError => e
       # swallow the hook erros and continue as normal
       logger.error e.message

data/lib/refinements.rb

@@ -32,6 +32,24 @@ module Refinements
       # rubocop:enable Naming/MemoizedInstanceVariableName
     end
 
+    # keeps lines matching any pattern (String or Regexp)
+    def keep_lines(patterns)
+      each_line.select do |line|
+        patterns.any? do |pattern|
+          pattern.is_a?(Regexp) ? line =~ pattern : line.include?(pattern)
+        end
+      end.join
+    end
+
+    # remove lines matching any pattern (String or Regexp)
+    def reject_lines(patterns)
+      each_line.reject do |line|
+        patterns.any? do |pattern|
+          pattern.is_a?(Regexp) ? line =~ pattern : line.include?(pattern)
+        end
+      end.join
+    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 = '')

data/oxidized.gemspec

@@ -18,48 +18,51 @@ Gem::Specification.new do |s|
 
   s.metadata['rubygems_mfa_required'] = 'true'
 
-  s.required_ruby_version = '>= 3.1'
+  # Ruby version strategy
+  #
+  # We try to keep the minimum version of Ruby to match supported LTS versions
+  # of common Linux distributions, as long as the maintenance effort remains
+  # reasonable.
+  s.required_ruby_version = '>= 3.0'
 
   # Gemspec strategy
   #
   # For dependency and optional dependencies, we try to set the minimal
-  # dependency lower than the Ubuntu Noble or Debian Bookworm package version,
+  # dependency lower or equal to the Debian 13 "Trixie" package version,
   # so that native packages can be used.
-  # We limit the maximal version so that dependabot can warn about new versions
-  # and we can test them before activating them in Oxidized.
-  #
-  # development dependencies are set to the latest minor version of a library
-  # and updated after having tested them
+  # We limit the maximal minor version so that dependabot can warn about new
+  # major versions and we can test them before activating them in Oxidized.
 
   s.add_dependency 'asetus',               '~> 0.4'
   s.add_dependency 'bcrypt_pbkdf',         '~> 1.0'
   s.add_dependency 'ed25519',              '~> 1.2'
   s.add_dependency 'net-ftp',              '~> 0.2'
   s.add_dependency 'net-http-digest_auth', '~> 1.4'
-  s.add_dependency 'net-scp',              '~> 4.1'
   s.add_dependency 'net-ssh',              '~> 7.3'
   s.add_dependency 'net-telnet',           '~> 0.2'
   s.add_dependency 'psych',                '~> 5.0'
   s.add_dependency 'rugged',               '~> 1.6'
-  s.add_dependency 'semantic_logger',      '~> 4.17.0'
+  s.add_dependency 'semantic_logger',      '~> 4.17'
   s.add_dependency 'slop',                 '~> 4.6'
-  s.add_dependency 'syslog',               '~> 0.3.0'
-  s.add_dependency 'syslog_protocol',      '~> 0.9.2'
+  s.add_dependency 'syslog',               '~> 0.3'
+  s.add_dependency 'syslog_protocol',      '~> 0.9'
 
-  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 '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-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'
+  s.add_development_dependency 'minitest',         '>= 5.18', '<7'
+  s.add_development_dependency 'mocha',            '>= 2.1', '<4'
+  s.add_development_dependency 'pry',              '~> 0.15'
+  s.add_development_dependency 'rake',             '~> 13.0'
+  # Rubocop introduces new rules in minor versions, so we limit automatic
+  # updates to patches
+  s.add_development_dependency 'rubocop',          '~> 1.86.0'
+  s.add_development_dependency 'rubocop-minitest', '~> 0.39.1'
+  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'
 
   # 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 'git',              '>= 2.0', '< 5'
+  s.add_development_dependency 'net-scp',          '~> 4.1'
+  s.add_development_dependency 'net-tftp',         '~> 0.1.0'
+  s.add_development_dependency 'oxidized-web',     '>= 0.17.1'
+  s.add_development_dependency 'sequel',           '>= 5.63.0', '< 6'
 end