fix lib name for chef-client 18.6.2 and greater

CHANGELOG.md

@@ -4,6 +4,8 @@ This file is used to list changes made in each version of the homebrew cookbook.
 
 ## Unreleased
 
+- Updated library call for new homebrew class name
+
 ## 5.4.9 - *2024-11-18*
 
 Standardise files with files in sous-chefs/repo-management

libraries/helpers.rb

@@ -20,8 +20,8 @@
 #
 
 class HomebrewUserWrapper
-  require 'chef/mixin/homebrew_user'
-  include Chef::Mixin::HomebrewUser
+  require Chef::VERSION >= Chef::Version.new('18.6.2') ? 'chef/mixin/homebrew' : 'chef/mixin/homebrew_user'
+  include Chef::VERSION >= Chef::Version.new('18.6.2') ? Chef::Mixin::Homebrew : Chef::Mixin::HomebrewUser
   include Chef::Mixin::Which
 end
 
@@ -60,9 +60,7 @@ def exist?
 
   def owner
     @owner ||= begin
-      # once we only support 14.0 we can switch this to find_homebrew_username
-      require 'etc'
-      ::Etc.getpwuid(HomebrewUserWrapper.new.find_homebrew_uid).name
+                 find_homebrew_username
                rescue Chef::Exceptions::CannotDetermineHomebrewOwner
                  calculate_owner
     end.tap do |owner|

spec/recipes/default_spec.rb

@@ -40,7 +40,7 @@
     end
 
     before do
-      allow_any_instance_of(Chef::Mixin::HomebrewUser).to receive(:find_homebrew_uid).and_return(Process.uid)
+      allow_any_instance_of(Chef::Mixin::Homebrew).to receive(:find_homebrew_uid).and_return(Process.uid)
     end
 
     it 'does not run homebrew installation' do