puppet 8.5.1-x64-mingw32 → 8.6.0-x64-mingw32

data/lib/puppet/util/windows/daemon.rb

@@ -74,7 +74,7 @@ module Puppet::Util::Windows
     NO_ERROR = 0
 
     # Wraps SetServiceStatus.
-    SetTheServiceStatus = Proc.new do |dwCurrentState, dwWin32ExitCode, dwCheckPoint, dwWaitHint|
+    SetTheServiceStatus = proc do |dwCurrentState, dwWin32ExitCode, dwCheckPoint, dwWaitHint|
       ss = SERVICE_STATUS.new # Current status of the service.
 
       # Disable control requests until the service is started.
@@ -97,7 +97,7 @@ module Puppet::Util::Windows
       @@dwServiceState = dwCurrentState
 
       # Send status of the service to the Service Controller.
-      if !SetServiceStatus(@@ssh, ss)
+      unless SetServiceStatus(@@ssh, ss)
         SetEvent(@@hStopEvent)
       end
     end
@@ -105,7 +105,7 @@ module Puppet::Util::Windows
     ERROR_CALL_NOT_IMPLEMENTED = 0x78
 
     # Handles control signals from the service control manager.
-    Service_Ctrl_ex = Proc.new do |dwCtrlCode, _dwEventType, _lpEventData, _lpContext|
+    Service_Ctrl_ex = proc do |dwCtrlCode, _dwEventType, _lpEventData, _lpContext|
       @@waiting_control_code = dwCtrlCode;
       return_value = NO_ERROR
 
@@ -145,48 +145,46 @@ module Puppet::Util::Windows
 
     # Called by the service control manager after the call to StartServiceCtrlDispatcher.
     Service_Main = FFI::Function.new(:void, [:ulong, :pointer], :blocking => false) do |dwArgc, lpszArgv|
-      begin
-        # Obtain the name of the service.
-        if lpszArgv.address != 0
-          argv = lpszArgv.get_array_of_string(0, dwArgc)
-          lpszServiceName = argv[0]
-        else
-          lpszServiceName = ''
-        end
+      # Obtain the name of the service.
+      if lpszArgv.address != 0
+        argv = lpszArgv.get_array_of_string(0, dwArgc)
+        lpszServiceName = argv[0]
+      else
+        lpszServiceName = ''
+      end
 
-        # Args passed to Service.start
-        if (dwArgc > 1)
-          @@Argv = argv[1..]
-        else
-          @@Argv = nil
-        end
+      # Args passed to Service.start
+      if dwArgc > 1
+        @@Argv = argv[1..]
+      else
+        @@Argv = nil
+      end
 
-        # Register the service ctrl handler.
-        @@ssh = RegisterServiceCtrlHandlerExW(
-          lpszServiceName,
-          Service_Ctrl_ex,
-          nil
-        )
+      # Register the service ctrl handler.
+      @@ssh = RegisterServiceCtrlHandlerExW(
+        lpszServiceName,
+        Service_Ctrl_ex,
+        nil
+      )
 
-        # No service to stop, no service handle to notify, nothing to do but exit.
-        break if @@ssh == 0
+      # No service to stop, no service handle to notify, nothing to do but exit.
+      break if @@ssh == 0
 
-        # The service has started.
-        SetTheServiceStatus.call(SERVICE_RUNNING, NO_ERROR, 0, 0)
+      # The service has started.
+      SetTheServiceStatus.call(SERVICE_RUNNING, NO_ERROR, 0, 0)
 
-        SetEvent(@@hStartEvent)
+      SetEvent(@@hStartEvent)
 
-        # Main loop for the service.
-        while (WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0) do
-        end
+      # Main loop for the service.
+      while WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0
+      end
 
-        # Main loop for the service.
-        while (WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0) do
-        end
-      ensure
-        # Stop the service.
-        SetTheServiceStatus.call(SERVICE_STOPPED, NO_ERROR, 0, 0)
+      # Main loop for the service.
+      while WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0
       end
+    ensure
+      # Stop the service.
+      SetTheServiceStatus.call(SERVICE_STOPPED, NO_ERROR, 0, 0)
     end
 
     ThreadProc = FFI::Function.new(:ulong, [:pointer]) do |lpParameter|
@@ -201,7 +199,7 @@ module Puppet::Util::Windows
       s[:lpServiceProc] = nil
 
       # No service to step, no service handle, no ruby exceptions, just terminate the thread..
-      if !StartServiceCtrlDispatcherW(ste)
+      unless StartServiceCtrlDispatcherW(ste)
         return 1
       end
 
@@ -211,7 +209,7 @@ module Puppet::Util::Windows
     # This is a shortcut for Daemon.new + Daemon#mainloop.
     #
     def self.mainloop
-      self.new.mainloop
+      new.mainloop
     end
 
     # This is the method that actually puts your code into a loop and allows it
@@ -267,7 +265,7 @@ module Puppet::Util::Windows
       events.put_pointer(0, FFI::Pointer.new(hThread))
       events.put_pointer(FFI::Pointer.size, FFI::Pointer.new(@@hStartEvent))
 
-      while ((index = WaitForMultipleObjects(2, events, 0, 1000)) == WAIT_TIMEOUT) do
+      while (index = WaitForMultipleObjects(2, events, 0, 1000)) == WAIT_TIMEOUT
       end
 
       if index == WAIT_FAILED
@@ -280,36 +278,34 @@ module Puppet::Util::Windows
       end
 
       thr = Thread.new do
-        begin
-          while (WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT)
-            # Check to see if anything interesting has been signaled
-            case @@waiting_control_code
-            when SERVICE_CONTROL_PAUSE
-              service_pause() if respond_to?('service_pause')
-            when SERVICE_CONTROL_CONTINUE
-              service_resume() if respond_to?('service_resume')
-            when SERVICE_CONTROL_INTERROGATE
-              service_interrogate() if respond_to?('service_interrogate')
-            when SERVICE_CONTROL_SHUTDOWN
-              service_shutdown() if respond_to?('service_shutdown')
-            when SERVICE_CONTROL_PARAMCHANGE
-              service_paramchange() if respond_to?('service_paramchange')
-            when SERVICE_CONTROL_NETBINDADD
-              service_netbindadd() if respond_to?('service_netbindadd')
-            when SERVICE_CONTROL_NETBINDREMOVE
-              service_netbindremove() if respond_to?('service_netbindremove')
-            when SERVICE_CONTROL_NETBINDENABLE
-              service_netbindenable() if respond_to?('service_netbindenable')
-            when SERVICE_CONTROL_NETBINDDISABLE
-              service_netbinddisable() if respond_to?('service_netbinddisable')
-            end
-            @@waiting_control_code = IDLE_CONTROL_CODE
+        while WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT
+          # Check to see if anything interesting has been signaled
+          case @@waiting_control_code
+          when SERVICE_CONTROL_PAUSE
+            service_pause() if respond_to?('service_pause')
+          when SERVICE_CONTROL_CONTINUE
+            service_resume() if respond_to?('service_resume')
+          when SERVICE_CONTROL_INTERROGATE
+            service_interrogate() if respond_to?('service_interrogate')
+          when SERVICE_CONTROL_SHUTDOWN
+            service_shutdown() if respond_to?('service_shutdown')
+          when SERVICE_CONTROL_PARAMCHANGE
+            service_paramchange() if respond_to?('service_paramchange')
+          when SERVICE_CONTROL_NETBINDADD
+            service_netbindadd() if respond_to?('service_netbindadd')
+          when SERVICE_CONTROL_NETBINDREMOVE
+            service_netbindremove() if respond_to?('service_netbindremove')
+          when SERVICE_CONTROL_NETBINDENABLE
+            service_netbindenable() if respond_to?('service_netbindenable')
+          when SERVICE_CONTROL_NETBINDDISABLE
+            service_netbinddisable() if respond_to?('service_netbinddisable')
           end
-
-          service_stop() if respond_to?('service_stop')
-        ensure
-          SetEvent(@@hStopCompletedEvent)
+          @@waiting_control_code = IDLE_CONTROL_CODE
         end
+
+        service_stop() if respond_to?('service_stop')
+      ensure
+        SetEvent(@@hStopCompletedEvent)
       end
 
       if respond_to?('service_main')

data/lib/puppet/util/windows/error.rb

@@ -42,13 +42,13 @@ class Puppet::Util::Windows::Error < Puppet::Error
 
       if length == FFI::WIN32_FALSE
         # can't raise same error type here or potentially recurse infinitely
-        raise Puppet::Error.new(_("FormatMessageW could not format code %{code}") % { code: code })
+        raise Puppet::Error, _("FormatMessageW could not format code %{code}") % { code: code }
       end
 
       # returns an FFI::Pointer with autorelease set to false, which is what we want
       buffer_ptr.read_win32_local_pointer do |wide_string_ptr|
         if wide_string_ptr.null?
-          raise Puppet::Error.new(_("FormatMessageW failed to allocate buffer for code %{code}") % { code: code })
+          raise Puppet::Error, _("FormatMessageW failed to allocate buffer for code %{code}") % { code: code }
         end
 
         error_string = wide_string_ptr.read_wide_string(length)

data/lib/puppet/util/windows/file.rb

@@ -30,7 +30,7 @@ module Puppet::Util::Windows::File
 
     return true if result != FFI::WIN32_FALSE
 
-    raise Puppet::Util::Windows::Error.new("ReplaceFile(#{target}, #{source})")
+    raise Puppet::Util::Windows::Error, "ReplaceFile(#{target}, #{source})"
   end
   module_function :replace_file
 
@@ -41,8 +41,7 @@ module Puppet::Util::Windows::File
 
     return true if result != FFI::WIN32_FALSE
 
-    raise Puppet::Util::Windows::Error
-      .new("MoveFileEx(#{source}, #{target}, #{flags.to_s(8)})")
+    raise Puppet::Util::Windows::Error, "MoveFileEx(#{source}, #{target}, #{flags.to_s(8)})"
   end
   module_function :move_file_ex
 
@@ -52,9 +51,7 @@ module Puppet::Util::Windows::File
                                  wide_string(target.to_s), flags)
     return true if result != FFI::WIN32_FALSE
 
-    raise Puppet::Util::Windows::Error.new(
-      "CreateSymbolicLink(#{symlink}, #{target}, #{flags.to_s(8)})"
-    )
+    raise Puppet::Util::Windows::Error, "CreateSymbolicLink(#{symlink}, #{target}, #{flags.to_s(8)})"
   end
   module_function :symlink
 
@@ -93,7 +90,7 @@ module Puppet::Util::Windows::File
   def get_attributes(file_name, raise_on_invalid = true)
     result = GetFileAttributesW(wide_string(file_name.to_s))
     if raise_on_invalid && result == INVALID_FILE_ATTRIBUTES
-      raise Puppet::Util::Windows::Error.new("GetFileAttributes(#{file_name})")
+      raise Puppet::Util::Windows::Error, "GetFileAttributes(#{file_name})"
     end
 
     result
@@ -120,7 +117,7 @@ module Puppet::Util::Windows::File
 
   def set_attributes(path, flags)
     success = SetFileAttributesW(wide_string(path), flags) != FFI::WIN32_FALSE
-    raise Puppet::Util::Windows::Error.new(_("Failed to set file attributes")) if !success
+    raise Puppet::Util::Windows::Error, _("Failed to set file attributes") unless success
 
     success
   end
@@ -137,11 +134,9 @@ module Puppet::Util::Windows::File
 
     return result unless result == INVALID_HANDLE_VALUE
 
-    raise Puppet::Util::Windows::Error.new(
-      "CreateFile(#{file_name}, #{desired_access.to_s(8)}, #{share_mode.to_s(8)}, " \
-      "#{security_attributes}, #{creation_disposition.to_s(8)}, " \
-      "#{flags_and_attributes.to_s(8)}, #{template_file_handle})"
-    )
+    raise Puppet::Util::Windows::Error, "CreateFile(#{file_name}, #{desired_access.to_s(8)}, #{share_mode.to_s(8)}, " \
+                                        "#{security_attributes}, #{creation_disposition.to_s(8)}, " \
+                                        "#{flags_and_attributes.to_s(8)}, #{template_file_handle})"
   end
 
   def self.get_reparse_point_data(handle, &block)
@@ -156,10 +151,10 @@ module Puppet::Util::Windows::File
                     when IO_REPARSE_TAG_MOUNT_POINT
                       MOUNT_POINT_REPARSE_DATA_BUFFER
                     when IO_REPARSE_TAG_NFS
-                      raise Puppet::Util::Windows::Error.new("Retrieving NFS reparse point data is unsupported")
+                      raise Puppet::Util::Windows::Error, "Retrieving NFS reparse point data is unsupported"
                     else
-                      raise Puppet::Util::Windows::Error.new("DeviceIoControl(#{handle}, " \
-                                                             "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}")
+                      raise Puppet::Util::Windows::Error, "DeviceIoControl(#{handle}, " \
+                                                          "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}"
                     end
 
       yield buffer_type.new(reparse_data_buffer_ptr)
@@ -185,7 +180,7 @@ module Puppet::Util::Windows::File
 
   def self.device_io_control(handle, io_control_code, in_buffer = nil, out_buffer = nil)
     if out_buffer.nil?
-      raise Puppet::Util::Windows::Error.new(_("out_buffer is required"))
+      raise Puppet::Util::Windows::Error, _("out_buffer is required")
     end
 
     FFI::MemoryPointer.new(:dword, 1) do |bytes_returned_ptr|
@@ -199,11 +194,9 @@ module Puppet::Util::Windows::File
       )
 
       if result == FFI::WIN32_FALSE
-        raise Puppet::Util::Windows::Error.new(
-          "DeviceIoControl(#{handle}, #{io_control_code}, " \
-          "#{in_buffer}, #{in_buffer ? in_buffer.size : ''}, " \
-          "#{out_buffer}, #{out_buffer ? out_buffer.size : ''}"
-        )
+        raise Puppet::Util::Windows::Error, "DeviceIoControl(#{handle}, #{io_control_code}, " \
+                                            "#{in_buffer}, #{in_buffer ? in_buffer.size : ''}, " \
+                                            "#{out_buffer}, #{out_buffer ? out_buffer.size : ''}"
       end
     end
 
@@ -213,7 +206,7 @@ module Puppet::Util::Windows::File
   def reparse_point?(file_name)
     attributes = get_attributes(file_name, false)
 
-    return false if (attributes == INVALID_FILE_ATTRIBUTES)
+    return false if attributes == INVALID_FILE_ATTRIBUTES
 
     (attributes & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT
   end
@@ -261,7 +254,7 @@ module Puppet::Util::Windows::File
       buffer_size = GetLongPathNameW(path_ptr, FFI::Pointer::NULL, 0)
       FFI::MemoryPointer.new(:wchar, buffer_size) do |converted_ptr|
         if GetLongPathNameW(path_ptr, converted_ptr, buffer_size) == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new(_("Failed to call GetLongPathName"))
+          raise Puppet::Util::Windows::Error, _("Failed to call GetLongPathName")
         end
 
         converted = converted_ptr.read_wide_string(buffer_size - 1)
@@ -279,7 +272,7 @@ module Puppet::Util::Windows::File
       buffer_size = GetShortPathNameW(path_ptr, FFI::Pointer::NULL, 0)
       FFI::MemoryPointer.new(:wchar, buffer_size) do |converted_ptr|
         if GetShortPathNameW(path_ptr, converted_ptr, buffer_size) == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new("Failed to call GetShortPathName")
+          raise Puppet::Util::Windows::Error, "Failed to call GetShortPathName"
         end
 
         converted = converted_ptr.read_wide_string(buffer_size - 1)

data/lib/puppet/util/windows/monkey_patches/process.rb

@@ -197,7 +197,7 @@ module Process
         FFI::WIN32.CloseHandle(handle)
       end
 
-      return 0
+      0
     end
 
     private

data/lib/puppet/util/windows/principal.rb

@@ -19,9 +19,9 @@ module Puppet::Util::Windows::SID
       #   otherwise if domain is available then combine it with parsed account
       #   otherwise when the domain is not available, use the account value directly
       # WinNT naming standard https://msdn.microsoft.com/en-us/library/windows/desktop/aa746534(v=vs.85).aspx
-      if (domain && !domain.empty? && @account_type == :SidTypeDomain)
+      if domain && !domain.empty? && @account_type == :SidTypeDomain
         @domain_account = @domain
-      elsif (domain && !domain.empty?)
+      elsif domain && !domain.empty?
         @domain_account = "#{domain}\\#{@account}"
       else
         @domain_account = account
@@ -65,7 +65,7 @@ module Puppet::Util::Windows::SID
                                                FFI::Pointer::NULL, domain_length_ptr, name_use_enum_ptr)
                   last_error = FFI.errno
 
-                  if (success == FFI::WIN32_FALSE && last_error != ERROR_INSUFFICIENT_BUFFER)
+                  if success == FFI::WIN32_FALSE && last_error != ERROR_INSUFFICIENT_BUFFER
                     raise Puppet::Util::Windows::Error.new(_('Failed to call LookupAccountNameW with account: %{account_name}') % { account_name: account_name }, last_error)
                   end
 
@@ -73,7 +73,7 @@ module Puppet::Util::Windows::SID
                     if LookupAccountNameW(system_name_ptr, account_name_ptr,
                                           sid_ptr, sid_length_ptr,
                                           domain_ptr, domain_length_ptr, name_use_enum_ptr) == FFI::WIN32_FALSE
-                      raise Puppet::Util::Windows::Error.new(_('Failed to call LookupAccountNameW with account: %{account_name}') % { account_name: account_name })
+                      raise Puppet::Util::Windows::Error, _('Failed to call LookupAccountNameW with account: %{account_name}') % { account_name: account_name }
                     end
 
                     # with a SID returned, loop back through lookup_account_sid to retrieve official name
@@ -95,9 +95,9 @@ module Puppet::Util::Windows::SID
 
     def self.lookup_account_sid(system_name = nil, sid_bytes)
       system_name_ptr = FFI::Pointer::NULL
-      if (sid_bytes.nil? || (!sid_bytes.is_a? Array) || (sid_bytes.length == 0))
+      if sid_bytes.nil? || (!sid_bytes.is_a? Array) || (sid_bytes.length == 0)
         # TRANSLATORS `lookup_account_sid` is a variable name and should not be translated
-        raise Puppet::Util::Windows::Error.new(_('Byte array for lookup_account_sid must not be nil and must be at least 1 byte long'))
+        raise Puppet::Util::Windows::Error, _('Byte array for lookup_account_sid must not be nil and must be at least 1 byte long')
       end
 
       begin
@@ -120,7 +120,7 @@ module Puppet::Util::Windows::SID
                                             FFI::Pointer::NULL, domain_length_ptr, name_use_enum_ptr)
                 last_error = FFI.errno
 
-                if (success == FFI::WIN32_FALSE && last_error != ERROR_INSUFFICIENT_BUFFER)
+                if success == FFI::WIN32_FALSE && last_error != ERROR_INSUFFICIENT_BUFFER
                   raise Puppet::Util::Windows::Error.new(_('Failed to call LookupAccountSidW with bytes: %{sid_bytes}') % { sid_bytes: sid_bytes }, last_error)
                 end
 
@@ -128,7 +128,7 @@ module Puppet::Util::Windows::SID
                   FFI::MemoryPointer.new(:lpwstr, domain_length_ptr.read_dword) do |domain_ptr|
                     if LookupAccountSidW(system_name_ptr, sid_ptr, name_ptr, name_length_ptr,
                                          domain_ptr, domain_length_ptr, name_use_enum_ptr) == FFI::WIN32_FALSE
-                      raise Puppet::Util::Windows::Error.new(_('Failed to call LookupAccountSidW with bytes: %{sid_bytes}') % { sid_bytes: sid_bytes })
+                      raise Puppet::Util::Windows::Error, _('Failed to call LookupAccountSidW with bytes: %{sid_bytes}') % { sid_bytes: sid_bytes }
                     end
 
                     return new(

data/lib/puppet/util/windows/process.rb

@@ -15,7 +15,7 @@ module Puppet::Util::Windows::Process
   # https://docs.microsoft.com/en-us/windows/desktop/ProcThread/process-security-and-access-rights
   PROCESS_QUERY_INFORMATION = 0x0400
   # https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file#maximum-path-length-limitation
-  MAX_PATH_LENGTH = 32767
+  MAX_PATH_LENGTH = 32_767
 
   def execute(command, arguments, stdin, stdout, stderr)
     create_args = {
@@ -45,7 +45,7 @@ module Puppet::Util::Windows::Process
     exit_status = -1
     FFI::MemoryPointer.new(:dword, 1) do |exit_status_ptr|
       if GetExitCodeProcess(handle, exit_status_ptr) == FFI::WIN32_FALSE
-        raise Puppet::Util::Windows::Error.new(_("Failed to get child process exit code"))
+        raise Puppet::Util::Windows::Error, _("Failed to get child process exit code")
       end
 
       exit_status = exit_status_ptr.read_dword
@@ -54,7 +54,7 @@ module Puppet::Util::Windows::Process
       # and since it's read-only, we can't set it. But we can execute a
       # a shell that simply returns the desired exit status, which has the
       # desired effect.
-      %x{#{ENV.fetch('COMSPEC', nil)} /c exit #{exit_status}}
+      %x(#{ENV.fetch('COMSPEC', nil)} /c exit #{exit_status})
     end
 
     exit_status
@@ -73,9 +73,7 @@ module Puppet::Util::Windows::Process
     begin
       phandle = OpenProcess(desired_access, inherit, process_id)
       if phandle == FFI::Pointer::NULL_HANDLE
-        raise Puppet::Util::Windows::Error.new(
-          "OpenProcess(#{desired_access.to_s(8)}, #{inherit}, #{process_id})"
-        )
+        raise Puppet::Util::Windows::Error, "OpenProcess(#{desired_access.to_s(8)}, #{inherit}, #{process_id})"
       end
 
       yield phandle
@@ -94,9 +92,7 @@ module Puppet::Util::Windows::Process
       FFI::MemoryPointer.new(:handle, 1) do |token_handle_ptr|
         result = OpenProcessToken(handle, desired_access, token_handle_ptr)
         if result == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new(
-            "OpenProcessToken(#{handle}, #{desired_access.to_s(8)}, #{token_handle_ptr})"
-          )
+          raise Puppet::Util::Windows::Error, "OpenProcessToken(#{handle}, #{desired_access.to_s(8)}, #{token_handle_ptr})"
         end
 
         yield token_handle = token_handle_ptr.read_handle
@@ -137,10 +133,8 @@ module Puppet::Util::Windows::Process
             use_win32_path_format = 0
             result = QueryFullProcessImageNameW(phandle, use_win32_path_format, exe_name_ptr, exe_name_length_ptr)
             if result == FFI::WIN32_FALSE
-              raise Puppet::Util::Windows::Error.new(
-                "QueryFullProcessImageNameW(phandle, #{use_win32_path_format}, " \
-                "exe_name_ptr, #{max_chars}"
-              )
+              raise Puppet::Util::Windows::Error, "QueryFullProcessImageNameW(phandle, #{use_win32_path_format}, " \
+                                                  "exe_name_ptr, #{max_chars}"
             end
             image_name = exe_name_ptr.read_wide_string(exe_name_length_ptr.read_dword)
           end
@@ -161,9 +155,7 @@ module Puppet::Util::Windows::Process
       )
 
       if result == FFI::WIN32_FALSE
-        raise Puppet::Util::Windows::Error.new(
-          "LookupPrivilegeValue(#{system_name}, #{name}, #{luid_ptr})"
-        )
+        raise Puppet::Util::Windows::Error, "LookupPrivilegeValue(#{system_name}, #{name}, #{luid_ptr})"
       end
 
       yield LUID.new(luid_ptr)
@@ -181,9 +173,7 @@ module Puppet::Util::Windows::Process
       return_length = return_length_ptr.read_dword
 
       if return_length <= 0
-        raise Puppet::Util::Windows::Error.new(
-          "GetTokenInformation(#{token_handle}, #{token_information}, nil, 0, #{return_length_ptr})"
-        )
+        raise Puppet::Util::Windows::Error, "GetTokenInformation(#{token_handle}, #{token_information}, nil, 0, #{return_length_ptr})"
       end
 
       # re-call API with properly sized buffer for all results
@@ -192,10 +182,8 @@ module Puppet::Util::Windows::Process
                                      token_information_buf, return_length, return_length_ptr)
 
         if result == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new(
-            "GetTokenInformation(#{token_handle}, #{token_information}, #{token_information_buf}, " \
-            "#{return_length}, #{return_length_ptr})"
-          )
+          raise Puppet::Util::Windows::Error, "GetTokenInformation(#{token_handle}, #{token_information}, #{token_information_buf}, " \
+                                              "#{return_length}, #{return_length_ptr})"
         end
 
         yield token_information_buf
@@ -292,7 +280,7 @@ module Puppet::Util::Windows::Process
       result = GetVersionExW(os_version_ptr)
 
       if result == FFI::WIN32_FALSE
-        raise Puppet::Util::Windows::Error.new(_("GetVersionEx failed"))
+        raise Puppet::Util::Windows::Error, _("GetVersionEx failed")
       end
 
       ver = os_version[:dwMajorVersion]
@@ -315,7 +303,7 @@ module Puppet::Util::Windows::Process
     env_ptr = GetEnvironmentStringsW()
 
     # pass :invalid => :replace to the Ruby String#encode to use replacement characters
-    pairs = env_ptr.read_arbitrary_wide_string_up_to(65534, :double_null, { :invalid => :replace })
+    pairs = env_ptr.read_arbitrary_wide_string_up_to(65_534, :double_null, { :invalid => :replace })
                    .split(?\x00)
                    .reject { |env_str| env_str.nil? || env_str.empty? || env_str[0] == '=' }
                    .reject do |env_str|
@@ -340,14 +328,14 @@ module Puppet::Util::Windows::Process
     raise Puppet::Util::Windows::Error(_('environment variable name must not be nil or empty')) if !name || name.empty?
 
     FFI::MemoryPointer.from_string_to_wide_string(name) do |name_ptr|
-      if (val.nil?)
+      if val.nil?
         if SetEnvironmentVariableW(name_ptr, FFI::MemoryPointer::NULL) == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new(_("Failed to remove environment variable: %{name}") % { name: name })
+          raise Puppet::Util::Windows::Error, _("Failed to remove environment variable: %{name}") % { name: name }
         end
       else
         FFI::MemoryPointer.from_string_to_wide_string(val) do |val_ptr|
           if SetEnvironmentVariableW(name_ptr, val_ptr) == FFI::WIN32_FALSE
-            raise Puppet::Util::Windows::Error.new(_("Failed to set environment variable: %{name}") % { name: name })
+            raise Puppet::Util::Windows::Error, _("Failed to set environment variable: %{name}") % { name: name }
           end
         end
       end

data/lib/puppet/util/windows/registry.rb

@@ -21,8 +21,8 @@ module Puppet::Util::Windows
 
     def root(name)
       Win32::Registry.const_get(name)
-    rescue NameError
-      raise Puppet::Error, _("Invalid registry key '%{name}'") % { name: name }, $!.backtrace
+    rescue NameError => e
+      raise Puppet::Error, _("Invalid registry key '%{name}'") % { name: name }, e.backtrace
     end
 
     def open(name, path, mode = KEY_READ | KEY64, &block)
@@ -52,7 +52,7 @@ module Puppet::Util::Windows
 
       loop do
         subkey, filetime = reg_enum_key(key, index, subkey_max_len)
-        yield subkey, filetime if !subkey.nil?
+        yield subkey, filetime unless subkey.nil?
         index += 1
         break if subkey.nil?
       end
@@ -81,12 +81,10 @@ module Puppet::Util::Windows
       vals = {}
       names.each do |name|
         FFI::Pointer.from_string_to_wide_string(name) do |subkeyname_ptr|
-          begin
-            _, vals[name] = read(key, subkeyname_ptr)
-          rescue Puppet::Util::Windows::Error => e
-            # ignore missing names, but raise other errors
-            raise e unless e.code == Puppet::Util::Windows::Error::ERROR_FILE_NOT_FOUND
-          end
+          _, vals[name] = read(key, subkeyname_ptr)
+        rescue Puppet::Util::Windows::Error => e
+          # ignore missing names, but raise other errors
+          raise e unless e.code == Puppet::Util::Windows::Error::ERROR_FILE_NOT_FOUND
         end
       end
       vals
@@ -100,7 +98,7 @@ module Puppet::Util::Windows
 
       loop do
         subkey, type, data = reg_enum_value(key, index, value_max_len)
-        yield subkey, type, data if !subkey.nil?
+        yield subkey, type, data unless subkey.nil?
         index += 1
         break if subkey.nil?
       end
@@ -118,7 +116,8 @@ module Puppet::Util::Windows
     MAX_KEY_CHAR_LENGTH = 255 + 1
 
     def reg_enum_key(key, index, max_key_char_length = MAX_KEY_CHAR_LENGTH)
-      subkey, filetime = nil, nil
+      subkey = nil
+      filetime = nil
 
       FFI::MemoryPointer.new(:dword) do |subkey_length_ptr|
         FFI::MemoryPointer.new(FFI::WIN32::FILETIME.size) do |filetime_ptr|
@@ -149,10 +148,12 @@ module Puppet::Util::Windows
     end
 
     # max number of wide characters including NULL terminator
-    MAX_VALUE_CHAR_LENGTH = 16383 + 1
+    MAX_VALUE_CHAR_LENGTH = 16_383 + 1
 
     def reg_enum_value(key, index, max_value_length = MAX_VALUE_CHAR_LENGTH)
-      subkey, type, data = nil, nil, nil
+      subkey = nil
+      type = nil
+      data = nil
 
       FFI::MemoryPointer.new(:dword) do |subkey_length_ptr|
         FFI::MemoryPointer.new(:wchar, max_value_length) do |subkey_ptr|
@@ -202,7 +203,7 @@ module Puppet::Util::Windows
           result = [
             # Unicode characters *not* including trailing NULL
             max_subkey_name_length_ptr.read_dword + 1,
-            max_value_name_length_ptr.read_dword + 1,
+            max_value_name_length_ptr.read_dword + 1
           ]
         end
       end
@@ -256,7 +257,7 @@ module Puppet::Util::Windows
                      raise TypeError, _("Type %{type} is not supported.") % { type: type }
                    end
         rescue IndexError => ex
-          raise if (ex.message !~ /^Memory access .* is out of bounds$/i)
+          raise if ex.message !~ /^Memory access .* is out of bounds$/i
 
           parent_key_name = key.parent ? "#{key.parent.keyname}\\" : ""
           Puppet.warning _("A value in the registry key %{parent_key_name}%{key} is corrupt or invalid") % { parent_key_name: parent_key_name, key: key.keyname }

data/lib/puppet/util/windows/root_certs.rb

@@ -25,7 +25,7 @@ class Puppet::Util::Windows::RootCerts
   # Returns a new instance.
   # @return [Puppet::Util::Windows::RootCerts] object constructed from current root certificates
   def self.instance
-    new(self.load_certs)
+    new(load_certs)
   end
 
   # Returns an array of root certificates.
@@ -40,7 +40,7 @@ class Puppet::Util::Windows::RootCerts
     ptr = FFI::Pointer::NULL
     store = CertOpenSystemStoreA(nil, "ROOT")
     begin
-      while (ptr = CertEnumCertificatesInStore(store, ptr)) and not ptr.null?
+      while (ptr = CertEnumCertificatesInStore(store, ptr)) and !ptr.null?
         context = CERT_CONTEXT.new(ptr)
         cert_buf = context[:pbCertEncoded].read_bytes(context[:cbCertEncoded])
         begin