Refactor into process_running?

Author: nmburgan

lib/facter/util/linux.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Facter
+  module Util
+    module Linux
+      def self.process_running?(process_name)
+        pidfiles = Dir.glob("{/run,/var/run}/#{process_name}{,*,/}*.pid")
+        pidfiles.each do |pf|
+          next unless File.file?(pf)
+
+          pid = begin
+            Integer(Facter::Util::FileHelper.safe_read(pf, '').strip, 10)
+          rescue StandardError
+            nil
+          end
+          next unless pid&.positive?
+
+          begin
+            # Doesn't actually kill, just detects if the process exists
+            Process.kill(0, pid)
+            return true if proc_comm(pid) == process_name || proc_cmdline(pid)&.match?(%r{(^|\s|/)#{process_name}(\s|$)})
+          rescue Errno::ESRCH
+            # If we can't confirm identity, still treat it as not running to be safe.
+            next
+          rescue Errno::EPERM
+            # Exists but we can't inspect it; assume it's running.
+            return true
+          end
+        end
+
+        # Fallback: Try to find it in /proc
+        return false unless Dir.exist?('/proc')
+
+        Dir.glob('/proc/[0-9]*/comm').any? do |path|
+          Facter::Util::FileHelper.safe_read(path, nil)&.strip == process_name
+        end
+      end
+
+      def self.proc_comm(pid)
+        Facter::Util::FileHelper.safe_read("/proc/#{pid}/comm", nil)&.strip
+      end
+
+      def self.proc_cmdline(pid)
+        raw = Facter::Util::FileHelper.safe_read("/proc/#{pid}/cmdline", nil)
+        raw&.tr("\0", ' ')
+      end
+    end
+  end
+end

lib/facter/util/linux/dhcp.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'facter/util/linux'
+
 module Facter
   module Util
     module Linux
@@ -78,7 +80,7 @@ def search_with_dhcpcd_command(interface_name)
             @dhcpcd_command ||= Facter::Core::Execution.which('dhcpcd')
             return unless @dhcpcd_command
 
-            unless dhcpcd_running?
+            unless Facter::Util::Linux.process_running?('dhcpcd')
               @log.debug('Skipping dhcpcd -U because dhcpcd daemon is not running')
               return
             end
@@ -89,48 +91,6 @@ def search_with_dhcpcd_command(interface_name)
             dhcp = output.match(/dhcp_server_identifier='(.*)'/)
             dhcp[1] if dhcp
           end
-
-          def dhcpcd_running?
-            pidfiles = Dir.glob('{/run,/var/run}/dhcpcd{,*,/}*.pid')
-            pidfiles.each do |pf|
-              next unless File.file?(pf)
-
-              pid = begin
-                Integer(Facter::Util::FileHelper.safe_read(pf, '').strip, 10)
-              rescue StandardError
-                nil
-              end
-              next unless pid&.positive?
-
-              begin
-                # Doesn't actually kill, just detects if the process exists
-                Process.kill(0, pid)
-                return true if proc_comm(pid) == 'dhcpcd' || proc_cmdline(pid)&.match?(%r{(^|\s|/)dhcpcd(\s|$)})
-              rescue Errno::ESRCH
-                # If we can't confirm identity, still treat it as not running to be safe.
-                next
-              rescue Errno::EPERM
-                # Exists but we can't inspect it; assume it's running.
-                return true
-              end
-            end
-
-            # Fallback: Try to find it in /proc
-            return false unless Dir.exist?('/proc')
-
-            Dir.glob('/proc/[0-9]*/comm').any? do |path|
-              Facter::Util::FileHelper.safe_read(path, nil)&.strip == 'dhcpcd'
-            end
-          end
-
-          def proc_comm(pid)
-            Facter::Util::FileHelper.safe_read("/proc/#{pid}/comm", nil)&.strip
-          end
-
-          def proc_cmdline(pid)
-            raw = Facter::Util::FileHelper.safe_read("/proc/#{pid}/cmdline", nil)
-            raw&.tr("\0", ' ')
-          end
         end
       end
     end

spec/facter/util/linux/dhcp_spec.rb

@@ -115,6 +115,8 @@
         allow(File).to receive(:readable?).with('/var/lib/dhcp3/').and_return(false)
         allow(File).to receive(:readable?).with('/var/lib/NetworkManager/').and_return(false)
         allow(File).to receive(:readable?).with('/var/db/').and_return(false)
+        allow(Dir).to receive(:glob).with('{/run,/var/run}/dhcpcd{,*,/}*.pid').and_return([''])
+
 
         allow(Facter::Core::Execution).to receive(:which)
           .with('dhcpcd').and_return('/usr/bin/dhcpcd')