puppet 8.3.1 → 8.4.0

data/lib/puppet/util/tag_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'set'
 require_relative '../../puppet/network/format_support'
 

data/lib/puppet/util/tagging.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/tag_set'
 
 module Puppet::Util::Tagging
@@ -20,7 +21,7 @@ module Puppet::Util::Tagging
         # not seen before, so now we test if it is valid
         if valid_tag?(name)
           if split_qualified_tags?
-          # avoid adding twice by first testing if the string contains '::'
+            # avoid adding twice by first testing if the string contains '::'
             @tags.merge(name.split('::')) if name.include?('::')
           end
         else

data/lib/puppet/util/terminal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Util::Terminal
   # Attempts to determine the width of the terminal.  This is currently only
   # supported on POSIX systems, and relies on the claims of `stty` (or `tput`).

data/lib/puppet/util/user_attr.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class UserAttr
   def self.get_attributes_by_name(name)
     attributes = nil

data/lib/puppet/util/warnings.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Methods to help with handling warnings.
 module Puppet::Util::Warnings
   module_function
@@ -9,6 +10,7 @@ module Puppet::Util::Warnings
 
   def debug_once(msg)
     return nil unless Puppet[:debug]
+
     Puppet::Util::Warnings.maybe_log(msg, self.class) { Puppet.debug msg }
   end
 
@@ -25,6 +27,7 @@ module Puppet::Util::Warnings
     @stampwarnings ||= {}
     @stampwarnings[klass] ||= []
     return nil if @stampwarnings[klass].include? message
+
     yield
     @stampwarnings[klass] << message
     nil

data/lib/puppet/util/watched_file.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/watcher'
 
 # Monitor a given file for changes on a periodic interval. Changes are detected

data/lib/puppet/util/watcher/change_watcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Watches for changes over time. It only re-examines the values when it is requested to update readings.
 # @api private
 class Puppet::Util::Watcher::ChangeWatcher

data/lib/puppet/util/watcher/periodic_watcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Monitor a given watcher for changes on a periodic interval.
 class Puppet::Util::Watcher::PeriodicWatcher
   # @param watcher [Puppet::Util::Watcher::ChangeWatcher] a watcher for the value to watch

data/lib/puppet/util/watcher/timer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Util::Watcher::Timer
   attr_reader :timeout
 

data/lib/puppet/util/watcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Util::Watcher
   require_relative 'watcher/timer'
   require_relative 'watcher/change_watcher'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Windows Access Control Entry
 #
 # Represents an access control entry, which grants or denies a subject,

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Windows Access Control List
 #
 # Represents a list of access control entries (ACEs).
@@ -88,8 +89,8 @@ class Puppet::Util::Windows::AccessControlList
     if prepend_needed
       mask = Puppet::Util::Windows::File::STANDARD_RIGHTS_ALL | Puppet::Util::Windows::File::SPECIFIC_RIGHTS_ALL
       ace = Puppet::Util::Windows::AccessControlEntry.new(
-              Puppet::Util::Windows::SID::LocalSystem,
-              mask)
+        Puppet::Util::Windows::SID::LocalSystem,
+        mask)
       @aces << ace
     end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Util::Windows::ADSI
   require 'ffi'
 
@@ -59,6 +60,7 @@ module Puppet::Util::Windows::ADSI
             if GetComputerNameW(buffer, buffer_size) == FFI::WIN32_FALSE
               raise Puppet::Util::Windows::Error.new(_("Failed to get computer name"))
             end
+
             @computer_name = buffer.read_wide_string(buffer_size.read_dword)
           end
         end
@@ -129,7 +131,7 @@ module Puppet::Util::Windows::ADSI
     # );
     ffi_lib :kernel32
     attach_function_private :GetComputerNameW,
-      [:lpwstr, :lpdword], :win32_bool
+                            [:lpwstr, :lpdword], :win32_bool
   end
 
   # Common base class shared by the User and Group
@@ -194,13 +196,13 @@ module Puppet::Util::Windows::ADSI
         sids = names.map do |name|
           sid = Puppet::Util::Windows::SID.name_to_principal(name, allow_unresolved)
           raise Puppet::Error.new( _("Could not resolve name: %{name}") % { name: name } ) if !sid
+
           [sid.sid, sid]
         end
 
         Hash[ sids ]
       end
 
-
       def delete(name)
         Puppet::Util::Windows::ADSI.delete(name, @object_class)
       end
@@ -212,6 +214,7 @@ module Puppet::Util::Windows::ADSI
           if sid.account_type == "SidType#{@object_class.capitalize}".to_sym
             # Check if we're getting back a local user when domain-joined
             return true unless [:MEMBER_WORKSTATION, :MEMBER_SERVER].include?(Puppet::Util::Windows::ADSI.domain_role)
+
             # The resource domain and the computer name are not always case-matching
             return sid.domain.casecmp(Puppet::Util::Windows::ADSI.computer_name) == 0
           end
@@ -221,6 +224,7 @@ module Puppet::Util::Windows::ADSI
           # https://msdn.microsoft.com/en-us/library/cc234477.aspx
           well_known = sid.account_type == :SidTypeWellKnownGroup
           return false if sid.account_type != :SidTypeAlias && !well_known
+
           name_or_sid = "#{sid.domain}\\#{sid.account}"
         end
 
@@ -251,6 +255,7 @@ module Puppet::Util::Windows::ADSI
     end
 
     attr_reader :name
+
     def initialize(name, native_object = nil)
       @name = name
       @native_object = native_object
@@ -319,6 +324,7 @@ module Puppet::Util::Windows::ADSI
       def create(name)
         # Windows error 1379: The specified local group already exists.
         raise Puppet::Error.new(_("Cannot create user if group '%{name}' exists.") % { name: name }) if Puppet::Util::Windows::ADSI::Group.exists? name
+
         new(name, Puppet::Util::Windows::ADSI.create(name, @object_class))
       end
     end
@@ -368,7 +374,6 @@ module Puppet::Util::Windows::ADSI
     end
     alias remove_from_group remove_from_groups
 
-
     def add_group_sids(*sids)
       group_names = sids.map { |s| s.domain_account }
       add_to_groups(*group_names)
@@ -421,26 +426,26 @@ module Puppet::Util::Windows::ADSI
     #   https://support.microsoft.com/en-us/help/305144/how-to-use-the-useraccountcontrol-flags-to-manipulate-user-account-pro
     # for the flag values.
     ADS_USERFLAGS = {
-      ADS_UF_SCRIPT:                                 0x0001,
-      ADS_UF_ACCOUNTDISABLE:                         0x0002,
-      ADS_UF_HOMEDIR_REQUIRED:                       0x0008,
-      ADS_UF_LOCKOUT:                                0x0010,
-      ADS_UF_PASSWD_NOTREQD:                         0x0020,
-      ADS_UF_PASSWD_CANT_CHANGE:                     0x0040,
-      ADS_UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED:        0x0080,
-      ADS_UF_TEMP_DUPLICATE_ACCOUNT:                 0x0100,
-      ADS_UF_NORMAL_ACCOUNT:                         0x0200,
-      ADS_UF_INTERDOMAIN_TRUST_ACCOUNT:              0x0800,
-      ADS_UF_WORKSTATION_TRUST_ACCOUNT:              0x1000,
-      ADS_UF_SERVER_TRUST_ACCOUNT:                   0x2000,
-      ADS_UF_DONT_EXPIRE_PASSWD:                     0x10000,
-      ADS_UF_MNS_LOGON_ACCOUNT:                      0x20000,
-      ADS_UF_SMARTCARD_REQUIRED:                     0x40000,
-      ADS_UF_TRUSTED_FOR_DELEGATION:                 0x80000,
-      ADS_UF_NOT_DELEGATED:                          0x100000,
-      ADS_UF_USE_DES_KEY_ONLY:                       0x200000,
-      ADS_UF_DONT_REQUIRE_PREAUTH:                   0x400000,
-      ADS_UF_PASSWORD_EXPIRED:                       0x800000,
+      ADS_UF_SCRIPT: 0x0001,
+      ADS_UF_ACCOUNTDISABLE: 0x0002,
+      ADS_UF_HOMEDIR_REQUIRED: 0x0008,
+      ADS_UF_LOCKOUT: 0x0010,
+      ADS_UF_PASSWD_NOTREQD: 0x0020,
+      ADS_UF_PASSWD_CANT_CHANGE: 0x0040,
+      ADS_UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED: 0x0080,
+      ADS_UF_TEMP_DUPLICATE_ACCOUNT: 0x0100,
+      ADS_UF_NORMAL_ACCOUNT: 0x0200,
+      ADS_UF_INTERDOMAIN_TRUST_ACCOUNT: 0x0800,
+      ADS_UF_WORKSTATION_TRUST_ACCOUNT: 0x1000,
+      ADS_UF_SERVER_TRUST_ACCOUNT: 0x2000,
+      ADS_UF_DONT_EXPIRE_PASSWD: 0x10000,
+      ADS_UF_MNS_LOGON_ACCOUNT: 0x20000,
+      ADS_UF_SMARTCARD_REQUIRED: 0x40000,
+      ADS_UF_TRUSTED_FOR_DELEGATION: 0x80000,
+      ADS_UF_NOT_DELEGATED: 0x100000,
+      ADS_UF_USE_DES_KEY_ONLY: 0x200000,
+      ADS_UF_DONT_REQUIRE_PREAUTH: 0x400000,
+      ADS_UF_PASSWORD_EXPIRED: 0x800000,
       ADS_UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION: 0x1000000
     }
 
@@ -489,6 +494,7 @@ module Puppet::Util::Windows::ADSI
     rescue WIN32OLERuntimeError => e
       # This OLE error code indicates the property can't be found in the cache
       raise e unless e.message =~ /8000500D/m
+
       false
     end
 
@@ -504,6 +510,7 @@ module Puppet::Util::Windows::ADSI
           if GetUserNameW(buffer, buffer_size) == FFI::WIN32_FALSE
             raise Puppet::Util::Windows::Error.new(_("Failed to get user name"))
           end
+
           # buffer_size includes trailing NULL
           user_name = buffer.read_wide_string(buffer_size.read_dword - 1)
         end
@@ -562,7 +569,7 @@ module Puppet::Util::Windows::ADSI
     # );
     ffi_lib :advapi32
     attach_function_private :GetUserNameW,
-      [:lpwstr, :lpdword], :win32_bool
+                            [:lpwstr, :lpdword], :win32_bool
 
     # https://docs.microsoft.com/en-us/windows/win32/api/secext/nf-secext-getusernameexa
     # BOOLEAN SEC_ENTRY GetUserNameExA(
@@ -591,7 +598,6 @@ module Puppet::Util::Windows::ADSI
   end
 
   class Group < ADSIObject
-
     # https://msdn.microsoft.com/en-us/library/aa706021.aspx
     # IADsGroup interface
     @object_class = 'group'
@@ -604,6 +610,7 @@ module Puppet::Util::Windows::ADSI
       def create(name)
         # Windows error 2224: The account already exists.
         raise Puppet::Error.new( _("Cannot create group if user '%{name}' exists.") % { name: name } ) if Puppet::Util::Windows::ADSI::User.exists?(name)
+
         new(name, Puppet::Util::Windows::ADSI.create(name, @object_class))
       end
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'ffi'
 
 module Puppet::Util::Windows::COM
@@ -60,7 +61,7 @@ module Puppet::Util::Windows::COM
   # );
   ffi_lib :ole32
   attach_function_private :CoCreateInstance,
-    [:pointer, :lpunknown, :dword, :pointer, :lpvoid], :hresult
+                          [:pointer, :lpunknown, :dword, :pointer, :lpvoid], :hresult
 
   # code modified from Unknownr project https://github.com/rpeev/Unknownr
   # licensed under MIT
@@ -68,7 +69,7 @@ module Puppet::Util::Windows::COM
     def self.[](*args)
       spec, iid, *ifaces = args.reverse
 
-      spec.each { |name, signature| signature[0].unshift(:pointer) }
+      spec.each { |_name, signature| signature[0].unshift(:pointer) }
 
       Class.new(FFI::Struct) do
         const_set(:IID, iid)
@@ -143,6 +144,7 @@ module Puppet::Util::Windows::COM
             if Puppet::Util::Windows::COM.FAILED(result = @vtbl[name].call(self, *args))
               raise Puppet::Util::Windows::Error.new(_("Failed to call %{klass}::%{name} with HRESULT: %{result}.") % { klass: self, name: name, result: result }, result)
             end
+
             result
           end
         end
@@ -184,6 +186,7 @@ module Puppet::Util::Windows::COM
             if Puppet::Util::Windows::COM.FAILED(result = @vtbl[name].call(self, *args))
               raise Puppet::Util::Windows::Error.new(_("Failed to call %{klass}::%{name} with HRESULT: %{result}.") % { klass: self, name: name, result: result }, result)
             end
+
             result
           end
         end
@@ -196,7 +199,6 @@ module Puppet::Util::Windows::COM
 
   IUnknown = Interface[
     FFI::WIN32::GUID['00000000-0000-0000-C000-000000000046'],
-
     QueryInterface: [[:pointer, :pointer], :hresult],
     AddRef: [[], :win32_ulong],
     Release: [[], :win32_ulong]

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows
-
   # The Daemon class, based on the chef/win32-service implementation
   class Daemon
     include Puppet::FFI::Windows::Constants
@@ -75,15 +75,15 @@ module Puppet::Util::Windows
 
     # Wraps SetServiceStatus.
     SetTheServiceStatus = Proc.new do |dwCurrentState, dwWin32ExitCode, dwCheckPoint, dwWaitHint|
-      ss = SERVICE_STATUS.new  # Current status of the service.
+      ss = SERVICE_STATUS.new # Current status of the service.
 
       # Disable control requests until the service is started.
       if dwCurrentState == SERVICE_START_PENDING
         ss[:dwControlsAccepted] = 0
       else
         ss[:dwControlsAccepted] =
-        SERVICE_ACCEPT_STOP|SERVICE_ACCEPT_SHUTDOWN|
-        SERVICE_ACCEPT_PAUSE_CONTINUE|SERVICE_ACCEPT_PARAMCHANGE
+          SERVICE_ACCEPT_STOP|SERVICE_ACCEPT_SHUTDOWN|
+          SERVICE_ACCEPT_PAUSE_CONTINUE|SERVICE_ACCEPT_PARAMCHANGE
       end
 
       # Initialize ss structure.
@@ -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.new do |dwCtrlCode, _dwEventType, _lpEventData, _lpContext|
       @@waiting_control_code = dwCtrlCode;
       return_value = NO_ERROR
 
@@ -113,16 +113,16 @@ module Puppet::Util::Windows
         dwState = SERVICE_RUNNING
 
         case dwCtrlCode
-          when SERVICE_CONTROL_STOP
-            dwState = SERVICE_STOP_PENDING
-          when SERVICE_CONTROL_SHUTDOWN
-            dwState = SERVICE_STOP_PENDING
-          when SERVICE_CONTROL_PAUSE
-            dwState = SERVICE_PAUSED
-          when SERVICE_CONTROL_CONTINUE
-            dwState = SERVICE_RUNNING
-          #else
-            # TODO: Handle other control codes? Retain the current state?
+        when SERVICE_CONTROL_STOP
+          dwState = SERVICE_STOP_PENDING
+        when SERVICE_CONTROL_SHUTDOWN
+          dwState = SERVICE_STOP_PENDING
+        when SERVICE_CONTROL_PAUSE
+          dwState = SERVICE_PAUSED
+        when SERVICE_CONTROL_CONTINUE
+          dwState = SERVICE_RUNNING
+          # else
+          # TODO: Handle other control codes? Retain the current state?
         end
 
         # Set the status of the service except on interrogation.
@@ -284,24 +284,24 @@ module Puppet::Util::Windows
           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')
+            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
           end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/windows'
 require_relative '../../../puppet/error'
 
@@ -37,7 +38,7 @@ class Puppet::Util::Windows::Error < Puppet::Error
     # this pointer actually points to a :lpwstr (pointer) since we're letting Windows allocate for us
     FFI::MemoryPointer.new(:pointer, 1) do |buffer_ptr|
       length = FormatMessageW(flags, FFI::Pointer::NULL, code, dwLanguageId,
-        buffer_ptr, 0, FFI::Pointer::NULL)
+                              buffer_ptr, 0, FFI::Pointer::NULL)
 
       if length == FFI::WIN32_FALSE
         # can't raise same error type here or potentially recurse infinitely
@@ -81,5 +82,5 @@ class Puppet::Util::Windows::Error < Puppet::Error
   # NOTE: since we're not preallocating the buffer, use a :pointer for lpBuffer
   ffi_lib :kernel32
   attach_function_private :FormatMessageW,
-    [:dword, :lpcvoid, :dword, :dword, :pointer, :dword, :pointer], :dword
+                          [:dword, :lpcvoid, :dword, :dword, :pointer, :dword, :pointer], :dword
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'ffi'
 
 # Puppet::Util::Windows::EventLog needs to be requirable without having loaded
@@ -32,7 +33,7 @@ class Puppet::Util::Windows::EventLog
   def initialize(source_name = 'Puppet')
     @eventlog_handle = RegisterEventSourceW(FFI::Pointer::NULL, wide_string(source_name))
     if @eventlog_handle == NULL_HANDLE
-      #TRANSLATORS 'Windows' is the operating system and 'RegisterEventSourceW' is a API call and should not be translated
+      # TRANSLATORS 'Windows' is the operating system and 'RegisterEventSourceW' is a API call and should not be translated
       raise EventLogError.new(_("RegisterEventSourceW failed to open Windows eventlog"), FFI.errno)
     end
   end
@@ -60,6 +61,7 @@ class Puppet::Util::Windows::EventLog
     unless args[:data].is_a?(String)
       raise ArgumentError, _("data must be a string, not %{class_name}") % { class_name: args[:data].class }
     end
+
     from_string_to_wide_string(args[:data]) do |message_ptr|
       FFI::MemoryPointer.new(:pointer) do |message_array_ptr|
         message_array_ptr.write_pointer(message_ptr)
@@ -69,11 +71,11 @@ class Puppet::Util::Windows::EventLog
         num_strings = 1
         eventlog_category = 0
         report_result = ReportEventW(@eventlog_handle, args[:event_type],
-          eventlog_category, args[:event_id], user_sid,
-          num_strings, raw_data_size, message_array_ptr, raw_data)
+                                     eventlog_category, args[:event_id], user_sid,
+                                     num_strings, raw_data_size, message_array_ptr, raw_data)
 
         if report_result == WIN32_FALSE
-          #TRANSLATORS 'Windows' is the operating system and 'ReportEventW' is a API call and should not be translated
+          # TRANSLATORS 'Windows' is the operating system and 'ReportEventW' is a API call and should not be translated
           raise EventLogError.new(_("ReportEventW failed to report event to Windows eventlog"), FFI.errno)
         end
       end
@@ -103,6 +105,7 @@ class Puppet::Util::Windows::EventLog
   end
 
   private
+
   # For the purposes of allowing this class to be standalone, the following are
   # duplicate definitions from elsewhere in Puppet:
 
@@ -115,7 +118,7 @@ class Puppet::Util::Windows::EventLog
   else
     class EventLogError < RuntimeError
       def initialize(msg, code)
-        #TRANSLATORS 'Win32' is the Windows API and should not be translated
+        # TRANSLATORS 'Win32' is the Windows API and should not be translated
         super(msg + ' ' + _("(Win32 error: %{detail})") % { detail: code})
       end
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows::File
@@ -28,6 +29,7 @@ module Puppet::Util::Windows::File
     )
 
     return true if result != FFI::WIN32_FALSE
+
     raise Puppet::Util::Windows::Error.new("ReplaceFile(#{target}, #{source})")
   end
   module_function :replace_file
@@ -38,16 +40,18 @@ module Puppet::Util::Windows::File
                          flags)
 
     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
+      .new("MoveFileEx(#{source}, #{target}, #{flags.to_s(8)})")
   end
   module_function :move_file_ex
 
   def symlink(target, symlink)
     flags = File.directory?(target) ? 0x1 : 0x0
     result = CreateSymbolicLinkW(wide_string(symlink.to_s),
-      wide_string(target.to_s), flags)
+                                 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)})")
   end
@@ -59,7 +63,7 @@ module Puppet::Util::Windows::File
 
     seen_paths = []
     # follow up to 64 symlinks before giving up
-    0.upto(64) do |depth|
+    0.upto(64) do |_depth|
       # return false if this path has been seen before.  This is protection against circular symlinks
       return false if seen_paths.include?(path.downcase)
 
@@ -121,16 +125,17 @@ module Puppet::Util::Windows::File
   end
   module_function :set_attributes
 
-  #define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1)
+  # define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1)
   INVALID_HANDLE_VALUE = FFI::Pointer.new(-1).address
   def self.create_file(file_name, desired_access, share_mode, security_attributes,
     creation_disposition, flags_and_attributes, template_file_handle)
 
     result = CreateFileW(wide_string(file_name.to_s),
-      desired_access, share_mode, security_attributes, creation_disposition,
-      flags_and_attributes, template_file_handle)
+                         desired_access, share_mode, security_attributes, creation_disposition,
+                         flags_and_attributes, template_file_handle)
 
     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)}, " +
@@ -144,16 +149,16 @@ module Puppet::Util::Windows::File
 
       reparse_tag = reparse_data_buffer_ptr.read_win32_ulong
       buffer_type = case reparse_tag
-      when IO_REPARSE_TAG_SYMLINK
-        SYMLINK_REPARSE_DATA_BUFFER
-      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")
-      else
-        raise Puppet::Util::Windows::Error.new("DeviceIoControl(#{handle}, " +
-          "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}")
-      end
+                    when IO_REPARSE_TAG_SYMLINK
+                      SYMLINK_REPARSE_DATA_BUFFER
+                    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")
+                    else
+                      raise Puppet::Util::Windows::Error.new("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)
     end
@@ -206,6 +211,7 @@ module Puppet::Util::Windows::File
     attributes = get_attributes(file_name, false)
 
     return false if (attributes == INVALID_FILE_ATTRIBUTES)
+
     (attributes & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT
   end
   module_function :reparse_point?
@@ -219,13 +225,13 @@ module Puppet::Util::Windows::File
   def self.open_symlink(link_name)
     begin
       yield handle = create_file(
-      link_name,
-      GENERIC_READ,
-      FILE_SHARE_READ,
-      nil, # security_attributes
-      OPEN_EXISTING,
-      FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS,
-      0) # template_file
+        link_name,
+        GENERIC_READ,
+        FILE_SHARE_READ,
+        nil, # security_attributes
+        OPEN_EXISTING,
+        FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS,
+        0) # template_file
     ensure
       FFI::WIN32.CloseHandle(handle) if handle
     end

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

@@ -29,7 +29,6 @@ module Process
   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX)
 
   class << self
-
     private :SetHandleInformation, :SetErrorMode, :CreateProcessW, :OpenProcess,
             :SetPriorityClass, :CreateProcessWithLogonW, :get_osfhandle, :get_errno