chef 16.0.287-universal-mingw32 → 16.2.73-universal-mingw32

data/lib/chef/resource_inspector.rb

@@ -69,8 +69,8 @@ module ResourceInspector
     dir, name = File.split(path)
     Chef::Cookbook::FileVendor.fetch_from_disk(path)
     loader = Chef::CookbookLoader.new(dir)
-    cookbooks = loader.load_cookbooks
-    resources = cookbooks[name].files_for(:resources)
+    cookbook = loader.load_cookbook(name)
+    resources = cookbook.files_for(:resources)
 
     resources.each_with_object({}) do |r, res|
       pth = r["full_path"]
@@ -83,13 +83,14 @@ module ResourceInspector
   # otherwise, if we have a path then extract all the resources from the cookbook
   # or else do a list of built in resources
   #
+  # @param arguments [Array, String] One of more paths to a cookbook or a resource file to inspect
   # @param complete [TrueClass, FalseClass] Whether to show properties defined in the base Resource class
   # @return [String] JSON formatting of all resources
   def self.inspect(arguments = [], complete: false)
     output = if arguments.empty?
                ObjectSpace.each_object(Class).select { |k| k < Chef::Resource }.each_with_object({}) { |klass, acc| acc[klass.resource_name] = extract_resource(klass) }
              else
-               arguments.each_with_object({}) do |arg, acc|
+               Array(arguments).each_with_object({}) do |arg, acc|
                  if File.directory?(arg)
                    extract_cookbook(arg, complete).each { |k, v| acc[k] = v }
                  else

data/lib/chef/resources.rb

@@ -38,9 +38,9 @@ require_relative "resource/chocolatey_config"
 require_relative "resource/chocolatey_feature"
 require_relative "resource/chocolatey_package"
 require_relative "resource/chocolatey_source"
-require_relative "resource/cron"
+require_relative "resource/cron/cron"
 require_relative "resource/cron_access"
-require_relative "resource/cron_d"
+require_relative "resource/cron/cron_d"
 require_relative "resource/csh"
 require_relative "resource/directory"
 require_relative "resource/dmg_package"
@@ -60,6 +60,7 @@ require_relative "resource/hostname"
 require_relative "resource/homebrew_cask"
 require_relative "resource/homebrew_package"
 require_relative "resource/homebrew_tap"
+require_relative "resource/homebrew_update"
 require_relative "resource/ifconfig"
 require_relative "resource/kernel_module"
 require_relative "resource/ksh"
@@ -141,6 +142,7 @@ require_relative "resource/cab_package"
 require_relative "resource/powershell_package"
 require_relative "resource/msu_package"
 require_relative "resource/windows_ad_join"
+require_relative "resource/windows_audit_policy"
 require_relative "resource/windows_auto_run"
 require_relative "resource/windows_certificate"
 require_relative "resource/windows_dfs_folder"

data/lib/chef/run_context/cookbook_compiler.rb

@@ -101,7 +101,7 @@ class Chef
         @events.library_load_start(count_files_by_segment(:libraries))
         cookbook_order.each do |cookbook|
           eager_load_libraries = cookbook_collection[cookbook].metadata.eager_load_libraries
-          if eager_load_libraries == true # actully true, not truthy
+          if eager_load_libraries == true # actually true, not truthy
             load_libraries_from_cookbook(cookbook)
           else
             $LOAD_PATH.unshift File.expand_path("libraries", cookbook_collection[cookbook].root_dir)

data/lib/chef/search/query.rb

@@ -105,7 +105,7 @@ class Chef
       private
 
       def fuzzify_node_query(query)
-        if query !~ /:/
+        if !/:/.match?(query)
           "tags:*#{query}* OR roles:*#{query}* OR fqdn:*#{query}* OR addresses:*#{query}* OR policy_name:*#{query}* OR policy_group:*#{query}*"
         else
           query

data/lib/chef/shell/ext.rb

@@ -37,7 +37,7 @@ module Shell
     module ObjectCoreExtensions
 
       def ensure_session_select_defined
-        # irb breaks if you prematurely define IRB::JobMangager
+        # irb breaks if you prematurely define IRB::JobManager
         # so these methods need to be defined at the latest possible time.
         unless jobs.respond_to?(:select_session_by_context)
           def jobs.select_session_by_context(&block) # rubocop:disable Lint/NestedMethodDefinition

data/lib/chef/util/diff.rb

@@ -136,7 +136,7 @@ class Chef
           return "(file sizes exceed #{diff_filesize_threshold} bytes, diff output suppressed)"
         end
 
-        # MacOSX(BSD?) diff will *sometimes* happily spit out nasty binary diffs
+        # macOS(BSD?) diff will *sometimes* happily spit out nasty binary diffs
         return "(current file is binary, diff output suppressed)" if is_binary?(old_file)
         return "(new content is binary, diff output suppressed)" if is_binary?(new_file)
 
@@ -171,7 +171,7 @@ class Chef
           begin
             return buff !~ /\A[\s[:print:]]*\z/m
           rescue ArgumentError => e
-            return true if e.message =~ /invalid byte sequence/
+            return true if /invalid byte sequence/.match?(e.message)
 
             raise
           end

data/lib/chef/util/windows/net_user.rb

@@ -100,7 +100,7 @@ class Chef::Util::Windows::NetUser < Chef::Util::Windows
   rescue Chef::Exceptions::Win32APIError => e
     Chef::Log.trace(e)
     # we're only interested in the incorrect password failures
-    if e.to_s =~ /System Error Code: 1326/
+    if /System Error Code: 1326/.match?(e.to_s)
       return false
     end
 

data/lib/chef/util/windows/volume.rb

@@ -25,7 +25,7 @@ class Chef::Util::Windows::Volume < Chef::Util::Windows
   attr_reader :mount_point
 
   def initialize(name)
-    name += "\\" unless name =~ /\\$/ # trailing slash required
+    name += "\\" unless /\\$/.match?(name) # trailing slash required
     @mount_point = name
   end
 

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("16.0.287")
+  VERSION = Chef::VersionString.new("16.2.73")
 end
 
 #

data/lib/chef/win32/api.rb

@@ -94,7 +94,7 @@ class Chef
         host.typedef :ulong,   :HMENU # (L) Handle to a menu. http://msdn.microsoft.com/en-us/library/ms646977%28VS.85%29.aspx
         host.typedef :ulong,   :HMETAFILE # (L) Handle to a metafile. http://msdn.microsoft.com/en-us/library/dd145051%28VS.85%29.aspx
         host.typedef :ulong,   :HMODULE # (L) Handle to an instance. Same as HINSTANCE today, but was different in 16-bit Windows.
-        host.typedef :ulong,   :HMONITOR # (L) Рandle to a display monitor. WinDef.h: if(WINVER >= 0x0500) host.typedef HANDLE HMONITOR;
+        host.typedef :ulong,   :HMONITOR # (L) Handle to a display monitor. WinDef.h: if(WINVER >= 0x0500) host.typedef HANDLE HMONITOR;
         host.typedef :ulong,   :HPALETTE # (L) Handle to a palette.
         host.typedef :ulong,   :HPEN # (L) Handle to a pen. http://msdn.microsoft.com/en-us/library/dd162786%28VS.85%29.aspx
         host.typedef :long,    :HRESULT # Return code used by COM interfaces. For more info, Structure of the COM Error Codes.
@@ -115,7 +115,7 @@ class Chef
         host.typedef :uint32,  :LCID # Locale identifier. For more information, see Locales.
         host.typedef :uint32,  :LCTYPE # Locale information type. For a list, see Locale Information Constants.
         host.typedef :uint32,  :LGRPID # Language group identifier. For a list, see EnumLanguageGroupLocales.
-        host.typedef :pointer, :LMSTR # Pointer to null termiated string of unicode characters
+        host.typedef :pointer, :LMSTR # Pointer to null terminated string of unicode characters
         host.typedef :long,    :LONG # 32-bit signed integer. The range is -2,147,483,648 through +...647 decimal.
         host.typedef :int32,   :LONG32 # 32-bit signed integer. The range is -2,147,483,648 through +...647 decimal.
         host.typedef :int64,   :LONG64 # 64-bit signed integer. The range is –9,223,372,036,854,775,808 through +...807

data/lib/chef/win32/api/error.rb

@@ -64,7 +64,7 @@ class Chef
         ERROR_SHARING_VIOLATION   = 32
         ERROR_LOCK_VIOLATION      = 33
         ERROR_WRONG_DISK          = 34
-        ERROR_FCB_UNAVAILABLE     = 35  # gets returned for some unsuccessful DeviceIoControl calls
+        ERROR_FCB_UNAVAILABLE     = 35 # gets returned for some unsuccessful DeviceIoControl calls
         ERROR_SHARING_BUFFER_EXCEEDED = 36
         ERROR_HANDLE_EOF          = 38
         ERROR_HANDLE_DISK_FULL    = 39
@@ -90,6 +90,7 @@ class Chef
         ERROR_TOO_MANY_NAMES      = 68
         ERROR_TOO_MANY_SESS       = 69
         ERROR_SHARING_PAUSED      = 70
+        # cspell:disable-next-line
         ERROR_REQ_NOT_ACCEP       = 71
         ERROR_REDIR_PAUSED        = 72
 
@@ -876,6 +877,7 @@ class Chef
 
         # Flags for LoadLibraryEx
 
+        # cspell:disable-next-line
         DONT_RESOLVE_DLL_REFERENCES = 0x00000001
         LOAD_IGNORE_CODE_AUTHZ_LEVEL = 0x00000010
         LOAD_LIBRARY_AS_DATAFILE = 0x00000002

data/lib/chef/win32/api/file.rb

@@ -540,7 +540,7 @@ BOOL WINAPI VerQueryValue(
         def file_search_handle(path)
           # Workaround for CHEF-4419:
           # Make sure paths starting with "/" has a drive letter
-          # assigned from the current working diretory.
+          # assigned from the current working directory.
           # Note: With CHEF-4427 this issue will be fixed with a
           # broader fix to map all the paths starting with "/" to
           # SYSTEM_DRIVE on windows.

data/lib/chef/win32/api/net.rb

@@ -39,6 +39,7 @@ class Chef
         UF_ACCOUNTDISABLE      = 0x000002
         UF_PASSWD_CANT_CHANGE  = 0x000040
         UF_NORMAL_ACCOUNT      = 0x000200
+        # cspell:disable-next-line
         UF_DONT_EXPIRE_PASSWD  = 0x010000
 
         USE_NOFORCE = 0

data/lib/chef/win32/file.rb

@@ -123,7 +123,7 @@ class Chef
 
           # Return the link destination (strip off \??\ at the beginning, which is a local filesystem thing)
           link_dest = reparse_buffer.reparse_buffer.substitute_name
-          if link_dest =~ /^\\\?\?\\/
+          if /^\\\?\?\\/.match?(link_dest)
             link_dest = link_dest[4..-1]
           end
           link_dest

data/lib/chef/win32/mutex.rb

@@ -95,7 +95,7 @@ if other threads attempt to acquire the mutex.")
         @handle = OpenMutexW(SYNCHRONIZE, true, name.to_wstring)
 
         if @handle == 0
-          # Mutext doesn't exist so create one.
+          # Mutex doesn't exist so create one.
           # In the initial creation of the mutex initial_owner is set to
           # false so that mutex will not be acquired until someone calls
           # acquire.

data/lib/chef/win32/net.rb

@@ -40,6 +40,7 @@ class Chef
             usri3_priv: 0,
             usri3_home_dir: nil,
             usri3_comment: nil,
+            # cspell:disable-next-line
             usri3_flags: UF_SCRIPT | UF_DONT_EXPIRE_PASSWD | UF_NORMAL_ACCOUNT,
             usri3_script_path: nil,
             usri3_auth_flags: 0,

data/lib/chef/win32/registry.rb

@@ -20,7 +20,7 @@ require_relative "../reserved_names"
 require_relative "api"
 require_relative "../mixin/wide_string"
 
-if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
   require_relative "../monkey_patches/win32/registry"
   require_relative "api/registry"
   require "win32/registry" unless defined?(Win32::Registry)
@@ -31,7 +31,7 @@ class Chef
   class Win32
     class Registry
 
-      if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+      if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
         include Chef::ReservedNames::Win32::API::Registry
         extend Chef::ReservedNames::Win32::API::Registry
       end

data/lib/chef/win32/security.rb

@@ -694,7 +694,7 @@ class Chef
         begin
           process_token = open_current_process_token(TOKEN_READ)
         rescue Exception => run_error
-          return false if run_error.message =~ /Access is denied/
+          return false if /Access is denied/.match?(run_error.message)
 
           Chef::ReservedNames::Win32::Error.raise!
         end

data/lib/chef/win32/security/sid.rb

@@ -261,7 +261,7 @@ class Chef
 
         SYSTEM_USER = SERVICE_ACCOUNT_USERS + BUILT_IN_GROUPS
 
-        # Сheck if the user belongs to service accounts category
+        # Check if the user belongs to service accounts category
         #
         # @return [Boolean] True or False
         #
@@ -269,7 +269,7 @@ class Chef
           SERVICE_ACCOUNT_USERS.include?(user.to_s.upcase)
         end
 
-        # Сheck if the user is in builtin system group
+        # Check if the user is in builtin system group
         #
         # @return [Boolean] True or False
         #
@@ -277,7 +277,7 @@ class Chef
           BUILT_IN_GROUPS.include?(user.to_s.upcase)
         end
 
-        # Сheck if the user belongs to system users category
+        # Check if the user belongs to system users category
         #
         # @return [Boolean] True or False
         #
@@ -325,7 +325,7 @@ class Chef
                 Array.new(entriesread.read_long) do |i|
                   user_info = USER_INFO_3.new(bufptr.read_pointer + i * USER_INFO_3.size)
                   # Check if the account is the Administrator account
-                  # RID for the Administrator account is always 500 and it's privilage is set to USER_PRIV_ADMIN
+                  # RID for the Administrator account is always 500 and it's privilege is set to USER_PRIV_ADMIN
                   if user_info[:usri3_user_id] == 500 && user_info[:usri3_priv] == 2 # USER_PRIV_ADMIN (2) - Administrator
                     admin_account_name = user_info[:usri3_name].read_wstring
                     break

data/spec/data/lwrp/providers/buck_passer.rb

@@ -4,7 +4,7 @@ def without_deprecation_warnings(&block)
   old_treat_deprecation_warnings_as_errors = Chef::Config[:treat_deprecation_warnings_as_errors]
   Chef::Config[:treat_deprecation_warnings_as_errors] = false
   begin
-    block.call
+    yield
   ensure
     Chef::Config[:treat_deprecation_warnings_as_errors] = old_treat_deprecation_warnings_as_errors
   end

data/spec/data/lwrp/providers/buck_passer_2.rb

@@ -2,7 +2,7 @@ def without_deprecation_warnings(&block)
   old_treat_deprecation_warnings_as_errors = Chef::Config[:treat_deprecation_warnings_as_errors]
   Chef::Config[:treat_deprecation_warnings_as_errors] = false
   begin
-    block.call
+    yield
   ensure
     Chef::Config[:treat_deprecation_warnings_as_errors] = old_treat_deprecation_warnings_as_errors
   end

data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb

@@ -7,7 +7,7 @@ def without_deprecation_warnings(&block)
   old_treat_deprecation_warnings_as_errors = Chef::Config[:treat_deprecation_warnings_as_errors]
   Chef::Config[:treat_deprecation_warnings_as_errors] = false
   begin
-    block.call
+    yield
   ensure
     Chef::Config[:treat_deprecation_warnings_as_errors] = old_treat_deprecation_warnings_as_errors
   end

data/spec/functional/knife/configure_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 require "chef/knife/configure"
 
 describe "knife configure" do
-  let (:ohai) do
+  let(:ohai) do
     OHAI_SYSTEM
   end
 

data/spec/functional/resource/aix_service_spec.rb

@@ -18,7 +18,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 shared_examples "src service" do
@@ -80,6 +79,16 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
     shell_out("id -u #{ENV["USER"]}").stdout.chomp
   end
 
+  let(:run_context) do
+    node = Chef::Node.new
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    node.default[:os] = ohai[:os]
+    events = Chef::EventDispatch::Dispatcher.new
+    Chef::RunContext.new(node, {}, events)
+  end
+
+
   describe "When service is a subsystem" do
     before(:all) do
       script_dir = File.join(File.dirname(__FILE__), "/../assets/")

data/spec/functional/resource/aixinit_service_spec.rb

@@ -18,7 +18,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 require "fileutils"
 
@@ -57,6 +56,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
   # Actual tests
   let(:new_resource) do
+    run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
     new_resource = Chef::Resource::Service.new("chefinittest", run_context)
     new_resource.provider Chef::Provider::Service::AixInit
     new_resource.supports({ status: true, restart: true, reload: true })

data/spec/functional/resource/bash_spec.rb

@@ -17,18 +17,19 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 
 describe Chef::Resource::Bash, :unix_only do
   let(:code) { "echo hello" }
   let(:resource) do
+    run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+
     resource = Chef::Resource::Bash.new("foo_resource", run_context)
     resource.code(code) unless code.nil?
     resource
   end
 
   describe "when setting the command property" do
-    let (:command) { "wizard racket" }
+    let(:command) { "wizard racket" }
 
     it "should raise an exception when trying to set the command" do
       expect { resource.command command }.to raise_error(Chef::Exceptions::Script)

data/spec/functional/resource/bff_spec.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 # Run the test only for AIX platform.
@@ -24,6 +23,7 @@ describe Chef::Resource::BffPackage, :requires_root, external: ohai[:platform] !
   include Chef::Mixin::ShellOut
 
   let(:new_resource) do
+    run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
     new_resource = Chef::Resource::BffPackage.new(@pkg_name, run_context)
     new_resource.source @pkg_path
     new_resource

data/spec/functional/resource/chocolatey_package_spec.rb

@@ -25,6 +25,10 @@ describe Chef::Resource::ChocolateyPackage, :windows_only, :choco_installed do
   let(:package_list) { proc { powershell_out!("choco list -lo -r #{Array(package_name).join(" ")}").stdout.chomp } }
   let(:package_source) { File.join(CHEF_SPEC_ASSETS, "chocolatey_feed") }
 
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
   subject do
     new_resource = Chef::Resource::ChocolateyPackage.new("test choco package", run_context)
     new_resource.package_name package_name

data/spec/functional/resource/cron_spec.rb

@@ -18,7 +18,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 describe Chef::Resource::Cron, :requires_root, :unix_only do
@@ -53,6 +52,16 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
   end
 
   # Actual tests
+
+  let(:run_context) do
+    node = Chef::Node.new
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    node.default[:os] = ohai[:os]
+    events = Chef::EventDispatch::Dispatcher.new
+    Chef::RunContext.new(node, {}, events)
+  end
+
   let(:new_resource) do
     new_resource = Chef::Resource::Cron.new("Chef functional test cron", run_context)
     new_resource.user "root"
@@ -80,6 +89,16 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
       5.times { new_resource.run_action(:create) }
       cron_should_exists(new_resource.name, new_resource.command)
     end
+
+    # Test cron for day of week
+    weekdays = { Mon: 1, tuesday: 2, '3': 3, 'thursday': 4, 'Fri': 5, 6 => 6 }
+    weekdays.each do |key, value|
+      it "should create crontab entry and set #{value} for #{key} as weekday" do
+        new_resource.weekday key
+        expect { new_resource.run_action(:create) }.not_to raise_error
+        cron_should_exists(new_resource.name, new_resource.command)
+      end
+    end
   end
 
   describe "delete action" do