puppet 8.4.0 → 8.5.0

data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -74,7 +74,7 @@ module RDoc::PuppetParserCore
       name = $2
       Puppet.debug "rdoc: module #{name} into #{modpath} ?"
       environment.modulepath.each do |mp|
-        if File.identical?(modpath,mp)
+        if File.identical?(modpath, mp)
           Puppet.debug "rdoc: found module #{name}"
           return name
         end
@@ -90,7 +90,7 @@ module RDoc::PuppetParserCore
         previous = dirname
         while (dirname = File.dirname(previous)) != previous
           previous = dirname
-          return nil if File.identical?(dirname,mp)
+          return nil if File.identical?(dirname, mp)
         end
       end
     end
@@ -106,7 +106,7 @@ module RDoc::PuppetParserCore
     %w{README README.rdoc}.each do |rfile|
       readme = File.join(File.dirname(File.dirname(@input_file_name)), rfile)
       # module README should be UTF-8, not default system encoding
-      comment = File.open(readme,"r:UTF-8") { |f| f.read } if FileTest.readable?(readme)
+      comment = File.open(readme, "r:UTF-8") { |f| f.read } if FileTest.readable?(readme)
     end
     look_for_directives_in(container, comment) unless comment.empty?
 
@@ -123,9 +123,9 @@ module RDoc::PuppetParserCore
     Puppet.debug "rdoc: scanning for #{name}"
 
     container.module_name = name
-    container.global=true if name == SITE
+    container.global = true if name == SITE
 
-    container, name = get_class_or_module(container,name)
+    container, name = get_class_or_module(container, name)
     mod = container.add_module(RDoc::PuppetModule, name)
     mod.record_location(@top_level)
     mod.add_comment(comment, @top_level)
@@ -153,19 +153,20 @@ module RDoc::PuppetParserCore
     File.open(@input_file_name) do |of|
       of.each do |line|
         # fetch comments
-        if line =~ /^[ \t]*# ?(.*)$/
+        case line
+        when /^[ \t]*# ?(.*)$/
           comments += $1 + "\n"
-        elsif line =~ /^[ \t]*(Facter.add|Puppet\.runtime\[:facter\].add)\(['"](.*?)['"]\)/
-          current_fact = RDoc::Fact.new($1,{})
+        when /^[ \t]*(Facter.add|Puppet\.runtime\[:facter\].add)\(['"](.*?)['"]\)/
+          current_fact = RDoc::Fact.new($1, {})
           look_for_directives_in(container, comments) unless comments.empty?
           current_fact.comment = comments
           parsed_facts << current_fact
           comments = ""
           Puppet.debug "rdoc: found custom fact #{current_fact.name}"
-        elsif line =~ /^[ \t]*confine[ \t]*:(.*?)[ \t]*=>[ \t]*(.*)$/
+        when /^[ \t]*confine[ \t]*:(.*?)[ \t]*=>[ \t]*(.*)$/
           current_fact.confine = { :type => $1, :value => $2 } unless current_fact.nil?
         else # unknown line type
-          comments =""
+          comments = ""
         end
       end
     end
@@ -184,9 +185,10 @@ module RDoc::PuppetParserCore
     File.open(@input_file_name) do |of|
       of.each do |line|
         # fetch comments
-        if line =~ /^[ \t]*# ?(.*)$/
+        case line
+        when /^[ \t]*# ?(.*)$/
           comments += $1 + "\n"
-        elsif line =~ /^[ \t]*(?:Puppet::Parser::Functions::)?newfunction[ \t]*\([ \t]*:(.*?)[ \t]*,[ \t]*:type[ \t]*=>[ \t]*(:rvalue|:lvalue)/
+        when /^[ \t]*(?:Puppet::Parser::Functions::)?newfunction[ \t]*\([ \t]*:(.*?)[ \t]*,[ \t]*:type[ \t]*=>[ \t]*(:rvalue|:lvalue)/
           current_plugin = RDoc::Plugin.new($1, "function")
           look_for_directives_in(container, comments) unless comments.empty?
           current_plugin.comment = comments
@@ -194,7 +196,7 @@ module RDoc::PuppetParserCore
           container.add_plugin(current_plugin)
           comments = ""
           Puppet.debug "rdoc: found new function plugins #{current_plugin.name}"
-        elsif line =~ /^[ \t]*Puppet::Type.newtype[ \t]*\([ \t]*:(.*?)\)/
+        when /^[ \t]*Puppet::Type.newtype[ \t]*\([ \t]*:(.*?)\)/
           current_plugin = RDoc::Plugin.new($1, "type")
           look_for_directives_in(container, comments) unless comments.empty?
           current_plugin.comment = comments
@@ -202,10 +204,10 @@ module RDoc::PuppetParserCore
           container.add_plugin(current_plugin)
           comments = ""
           Puppet.debug "rdoc: found new type plugins #{current_plugin.name}"
-        elsif line =~ /module Puppet::Parser::Functions/
+        when /module Puppet::Parser::Functions/
           # skip
         else # unknown line type
-          comments =""
+          comments = ""
         end
       end
     end

data/lib/puppet/util/rdoc.rb

@@ -17,16 +17,16 @@ module Puppet::Util::RDoc
     r = RDoc::RDoc.new
 
     # specify our own format & where to output
-    options = [ "--fmt", "puppet",
-                "--quiet",
-                "--exclude", "/modules/[^/]*/spec/.*$",
-                "--exclude", "/modules/[^/]*/files/.*$",
-                "--exclude", "/modules/[^/]*/tests/.*$",
-                "--exclude", "/modules/[^/]*/templates/.*$",
-                "--op", outputdir ]
+    options = ["--fmt", "puppet",
+               "--quiet",
+               "--exclude", "/modules/[^/]*/spec/.*$",
+               "--exclude", "/modules/[^/]*/files/.*$",
+               "--exclude", "/modules/[^/]*/tests/.*$",
+               "--exclude", "/modules/[^/]*/templates/.*$",
+               "--op", outputdir]
 
     options << "--force-update"
-    options += [ "--charset", charset] if charset
+    options += ["--charset", charset] if charset
     options += files
 
     # launch the documentation process

data/lib/puppet/util/reference.rb

@@ -35,10 +35,10 @@ class Puppet::Util::Reference
   def self.pdf(text)
     puts _("creating pdf")
     rst2latex = which('rst2latex') || which('rst2latex.py') ||
-      raise(_("Could not find rst2latex"))
+                raise(_("Could not find rst2latex"))
 
     cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
-    Puppet::Util.replace_file("/tmp/puppetdoc.txt") {|f| f.puts text }
+    Puppet::Util.replace_file("/tmp/puppetdoc.txt") { |f| f.puts text }
     # There used to be an attempt to use secure_open / replace_file to secure
     # the target, too, but that did nothing: the race was still here.  We can
     # get exactly the same benefit from running this effort:

data/lib/puppet/util/resource_template.rb

@@ -61,4 +61,3 @@ class Puppet::Util::ResourceTemplate
     end
   end
 end
-

data/lib/puppet/util/retry_action.rb

@@ -3,7 +3,7 @@
 module Puppet::Util::RetryAction
   class RetryException < Exception; end # rubocop:disable Lint/InheritException
   class RetryException::NoBlockGiven < RetryException; end
-  class RetryException::NoRetriesGiven < RetryException;end
+  class RetryException::NoRetriesGiven < RetryException; end
   class RetryException::RetriesExceeded < RetryException; end
 
   # Execute the supplied block retrying with exponential backoff.
@@ -39,7 +39,7 @@ module Puppet::Util::RetryAction
 
       # Increase the amount of time that we sleep after every
       # failed retry attempt.
-      sleep(((2 ** failures) -1) * 0.1)
+      sleep(((2**failures) - 1) * 0.1)
 
       retry
     end

data/lib/puppet/util/rpm_compare.rb

@@ -36,8 +36,8 @@ module Puppet::Util::RpmCompare
       # "handle the tilde separator, it sorts before everything else"
       if str1 =~ /^~/ && str2 =~ /^~/
         # if they both have ~, strip it
-        str1 = str1[1..-1]
-        str2 = str2[1..-1]
+        str1 = str1[1..]
+        str2 = str2[1..]
         next
       elsif str1 =~ /^~/
         return -1
@@ -117,8 +117,8 @@ module Puppet::Util::RpmCompare
   def rpm_parse_evr(full_version)
     epoch_index = full_version.index(':')
     if epoch_index
-      epoch = full_version[0,epoch_index]
-      full_version = full_version[epoch_index+1,full_version.length]
+      epoch = full_version[0, epoch_index]
+      full_version = full_version[epoch_index + 1, full_version.length]
     else
       epoch = nil
     end
@@ -130,8 +130,8 @@ module Puppet::Util::RpmCompare
     end
     release_index = full_version.index('-')
     if release_index
-      version = full_version[0,release_index]
-      release = full_version[release_index+1,full_version.length]
+      version = full_version[0, release_index]
+      release = full_version[release_index + 1, full_version.length]
       arch = release.scan(ARCH_REGEX)[0]
       if arch
         architecture = arch.delete('.')
@@ -149,7 +149,7 @@ module Puppet::Util::RpmCompare
   # found in python/header-py.c, as used by rpm.
   def compare_values(s1, s2)
     return 0 if s1.nil? && s2.nil?
-    return 1 if ( not s1.nil? ) && s2.nil?
+    return 1 if (not s1.nil?) && s2.nil?
     return -1 if s1.nil? && (not s2.nil?)
 
     return rpmvercmp(s1, s2)

data/lib/puppet/util/rubygems.rb

@@ -65,4 +65,3 @@ module Puppet::Util::RubyGems
     def clear_paths; end
   end
 end
-

data/lib/puppet/util/run_mode.rb

@@ -9,7 +9,7 @@ module Puppet
         @name = name.to_sym
       end
 
-      attr :name
+      attr_reader :name
 
       def self.[](name)
         @run_modes ||= {}
@@ -54,7 +54,7 @@ module Puppet
       #
       # @todo this code duplicates {Puppet::Settings#which\_configuration\_file}
       #   as described in {https://projects.puppetlabs.com/issues/16637 #16637}
-      def which_dir( system, user )
+      def which_dir(system, user)
         if Puppet.features.root?
           File.expand_path(system)
         else
@@ -117,7 +117,7 @@ module Puppet
       private
 
       def windows_common_base(*extra)
-        [ENV['ALLUSERSPROFILE'], "PuppetLabs"] + extra
+        [ENV.fetch('ALLUSERSPROFILE', nil), "PuppetLabs"] + extra
       end
     end
   end

data/lib/puppet/util/selinux.rb

@@ -46,7 +46,7 @@ module Puppet::Util::SELinux
 
   # Retrieve and return the default context of the file.  If we don't have
   # SELinux support or if the SELinux call fails to file a default then return nil.
-  def get_selinux_default_context(file, resource_ensure=nil)
+  def get_selinux_default_context(file, resource_ensure = nil)
     return nil unless selinux_support?
     # If the filesystem has no support for SELinux labels, return a default of nil
     # instead of what matchpathcon would return
@@ -154,7 +154,7 @@ module Puppet::Util::SELinux
   # Puppet uses.  This will set the file's SELinux context to the policy's
   # default context (if any) if it differs from the context currently on
   # the file.
-  def set_selinux_default_context(file, resource_ensure=nil)
+  def set_selinux_default_context(file, resource_ensure = nil)
     new_context = get_selinux_default_context(file, resource_ensure)
     return nil unless new_context
 
@@ -242,7 +242,7 @@ module Puppet::Util::SELinux
       if File.method_defined? "read_nonblock"
         # If possible we use read_nonblock in a loop rather than read to work-
         # a linux kernel bug.  See ticket #1963 for details.
-        mountfh = File.open("/proc/mounts")
+        mountfh = File.new("/proc/mounts")
         loop do
           mounts += mountfh.read_nonblock(1024)
         end

data/lib/puppet/util/storage.rb

@@ -89,7 +89,7 @@ class Puppet::Util::Storage
       Puppet::Util.benchmark(:debug, "Pruned old state cache entries in %{seconds} seconds") do
         ttl_cutoff = Time.now - Puppet[:statettl]
 
-        @@state.reject! do |k,_v|
+        @@state.reject! do |k, _v|
           @@state[k][:checked] && @@state[k][:checked] < ttl_cutoff
         end
       end

data/lib/puppet/util/suidmanager.rb

@@ -10,7 +10,7 @@ module Puppet::Util::SUIDManager
 
   # Note groups= is handled specially due to a bug in OS X 10.6, 10.7,
   # and probably upcoming releases...
-  to_delegate_to_process = [ :euid=, :euid, :egid=, :egid, :uid=, :uid, :gid=, :gid, :groups ]
+  to_delegate_to_process = [:euid=, :euid, :egid=, :egid, :uid=, :uid, :gid=, :gid, :groups]
 
   to_delegate_to_process.each do |method|
     def_delegator Process, method
@@ -62,7 +62,7 @@ module Puppet::Util::SUIDManager
   # Runs block setting euid and egid if provided then restoring original ids.
   # If running on Windows or without root, the block will be run with the
   # current euid/egid.
-  def asuser(new_uid=nil, new_gid=nil)
+  def asuser(new_uid = nil, new_gid = nil)
     return yield if Puppet::Util::Platform.windows?
     return yield unless root?
     return yield unless new_uid or new_gid
@@ -83,7 +83,7 @@ module Puppet::Util::SUIDManager
   # the primary group of the supplied gid will be used. If only gid is
   # supplied, only gid will be changed. This method will fail if used on
   # Windows.
-  def change_privileges(uid=nil, gid=nil, permanently=false)
+  def change_privileges(uid = nil, gid = nil, permanently = false)
     return unless uid or gid
 
     unless gid
@@ -99,7 +99,7 @@ module Puppet::Util::SUIDManager
   # Changes the egid of the process if `permanently` is not set, otherwise
   # changes gid. This method will fail if used on Windows, or attempting to
   # change to a different gid without root.
-  def change_group(group, permanently=false)
+  def change_group(group, permanently = false)
     gid = convert_xid(:gid, group)
     raise Puppet::Error, _("No such group %{group}") % { group: group } unless gid
 
@@ -115,7 +115,7 @@ module Puppet::Util::SUIDManager
 
   # As change_group, but operates on uids. If changing user permanently,
   # supplementary groups will be set the to default groups for the new uid.
-  def change_user(user, permanently=false)
+  def change_user(user, permanently = false)
     uid = convert_xid(:uid, user)
     raise Puppet::Error, _("No such user %{user}") % { user: user } unless uid
 
@@ -126,26 +126,24 @@ module Puppet::Util::SUIDManager
       initgroups(uid)
 
       Process::UID.change_privilege(uid)
-    else
+    elsif Process.euid == 0
       # We must be root to initgroups, so initgroups before dropping euid if
       # we're root, otherwise elevate euid before initgroups.
       # change euid (to root) first.
-      if Process.euid == 0
-        initgroups(uid)
-        Process.euid = uid
-      else
-        Process.euid = uid
-        initgroups(uid)
-      end
+      initgroups(uid)
+      Process.euid = uid
+    else
+      Process.euid = uid
+      initgroups(uid)
     end
   end
   module_function :change_user
 
   # Make sure the passed argument is a number.
   def convert_xid(type, id)
-    return id if id.kind_of? Integer
+    return id if id.is_a? Integer
 
-    map = {:gid => :group, :uid => :user}
+    map = { :gid => :group, :uid => :user }
     raise ArgumentError, _("Invalid id type %{type}") % { type: type } unless map.include?(type)
 
     ret = Puppet::Util.send(type, id)

data/lib/puppet/util/symbolic_file_mode.rb

@@ -38,9 +38,10 @@ module SymbolicFileMode
     # "A numeric mode is from one to four octal digits (0-7), derived by adding
     # up the bits with values 4, 2, and 1. Omitted digits are assumed to be
     # leading zeros."
-    if value.is_a? Numeric
+    case value
+    when Numeric
       value.to_s(8)
-    elsif value =~ /^0?[0-7]{1,4}$/
+    when /^0?[0-7]{1,4}$/
       value.to_i(8).to_s(8) # strip leading 0's
     else
       value
@@ -85,17 +86,17 @@ module SymbolicFileMode
         # the original mode, the final mode, or the current snapshot of the
         # mode, for added fun.
         snapshot_mode = {}
-        final_mode.each {|k,v| snapshot_mode[k] = v }
+        final_mode.each { |k, v| snapshot_mode[k] = v }
 
         to.gsub('a', 'ugo').split('').uniq.each do |who|
           value = snapshot_mode[who]
 
           action = '!'
           actions = {
-            '!' => lambda {|_,_| raise Puppet::Error, _('Missing operation (-, =, or +)') },
-            '=' => lambda {|m,v| m | v },
-            '+' => lambda {|m,v| m | v },
-            '-' => lambda {|m,v| m & ~v },
+            '!' => ->(_, _) { raise Puppet::Error, _('Missing operation (-, =, or +)') },
+            '=' => ->(m, v) { m | v },
+            '+' => ->(m, v) { m | v },
+            '-' => ->(m, v) { m & ~v },
           }
 
           dsl.split('').each do |op|

data/lib/puppet/util/tagging.rb

@@ -34,7 +34,7 @@ module Puppet::Util::Tagging
 
   # Add a name to the current tag set. Silently ignore names that does not
   # represent valid tags.
-  # 
+  #
   # Use this method instead of doing this:
   #
   #  tag(name) if is_valid?(name)
@@ -59,7 +59,7 @@ module Puppet::Util::Tagging
   # @return [Boolean] true if this instance is tagged with at least one of the provided tags
   #
   def tagged?(*tags)
-    raw_tagged?(tags.collect {|t| t.to_s.downcase})
+    raw_tagged?(tags.collect { |t| t.to_s.downcase })
   end
 
   # Answers if this resource is tagged with at least one of the tags given in downcased string form.

data/lib/puppet/util/user_attr.rb

@@ -10,7 +10,7 @@ class UserAttr
       token = line.split(':')
 
       if token[0] == name
-        attributes = {:name => name}
+        attributes = { :name => name }
         token[4].split(';').each do |attr|
           key_value = attr.split('=')
           attributes[key_value[0].intern] = key_value[1].strip

data/lib/puppet/util/watched_file.rb

@@ -19,7 +19,8 @@ class Puppet::Util::WatchedFile
 
     @info = Puppet::Util::Watcher::PeriodicWatcher.new(
       Puppet::Util::Watcher::Common.file_ctime_change_watcher(@filename),
-      timer)
+      timer
+    )
   end
 
   # @return [true, false] If the file has changed since it was last checked.

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

@@ -36,4 +36,3 @@ class Puppet::Util::Watcher::PeriodicWatcher
     end
   end
 end
-

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

@@ -27,7 +27,7 @@ class Puppet::Util::Windows::AccessControlList
   #
   # @yieldparam ace [Hash] the ace
   def each
-    @aces.each {|ace| yield ace}
+    @aces.each { |ace| yield ace }
   end
 
   # Allow the +sid+ to access a resource with the specified access +mask+.
@@ -71,8 +71,8 @@ class Puppet::Util::Windows::AccessControlList
           # flags except those affecting inheritance of the
           # ACE we're creating.
           inherit_mask = Puppet::Util::Windows::AccessControlEntry::CONTAINER_INHERIT_ACE |
-            Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE |
-            Puppet::Util::Windows::AccessControlEntry::INHERIT_ONLY_ACE
+                         Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE |
+                         Puppet::Util::Windows::AccessControlEntry::INHERIT_ONLY_ACE
           explicit_ace = Puppet::Util::Windows::AccessControlEntry.new(new_sid, ace.mask, ace.flags & inherit_mask, ace.type)
           aces_to_prepend << explicit_ace
         else
@@ -90,7 +90,8 @@ class Puppet::Util::Windows::AccessControlList
       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)
+        mask
+      )
       @aces << ace
     end
 

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

@@ -25,7 +25,7 @@ module Puppet::Util::Windows::ADSI
 
     def connectable?(uri)
       begin
-        !! connect(uri)
+        !!connect(uri)
       rescue
         false
       end
@@ -35,7 +35,7 @@ module Puppet::Util::Windows::ADSI
       begin
         WIN32OLE.connect(uri)
       rescue WIN32OLERuntimeError => e
-        raise Puppet::Error.new( _("ADSI connection error: %{e}") % { e: e }, e )
+        raise Puppet::Error.new(_("ADSI connection error: %{e}") % { e: e }, e)
       end
     end
 
@@ -72,7 +72,7 @@ module Puppet::Util::Windows::ADSI
       "WinNT://#{host}"
     end
 
-    def wmi_resource_uri( host = '.' )
+    def wmi_resource_uri(host = '.')
       "winmgmts:{impersonationLevel=impersonate}!//#{host}/root/cimv2"
     end
 
@@ -83,7 +83,7 @@ module Puppet::Util::Windows::ADSI
     # account name with or without domain prefix
     # @api private
     def sid_uri_safe(sid)
-      return sid_uri(sid) if sid.kind_of?(Puppet::Util::Windows::SID::Principal)
+      return sid_uri(sid) if sid.is_a?(Puppet::Util::Windows::SID::Principal)
 
       begin
         sid = Puppet::Util::Windows::SID.name_to_principal(sid)
@@ -97,7 +97,7 @@ module Puppet::Util::Windows::ADSI
     # used for IAdsGroup::Add / IAdsGroup::Remove.  These URIs are not useable
     # to resolve an account with WIN32OLE.connect
     def sid_uri(sid)
-      raise Puppet::Error.new( _("Must use a valid SID::Principal") ) if !sid.kind_of?(Puppet::Util::Windows::SID::Principal)
+      raise Puppet::Error.new(_("Must use a valid SID::Principal")) if !sid.is_a?(Puppet::Util::Windows::SID::Principal)
 
       "WinNT://#{sid.sid}"
     end
@@ -162,7 +162,7 @@ module Puppet::Util::Windows::ADSI
 
       def parse_name(name)
         if name =~ /\//
-          raise Puppet::Error.new( _("Value must be in DOMAIN\\%{object_class} style syntax") % { object_class: @object_class } )
+          raise Puppet::Error.new(_("Value must be in DOMAIN\\%{object_class} style syntax") % { object_class: @object_class })
         end
 
         matches = name.scan(/((.*)\\)?(.*)/)
@@ -195,12 +195,12 @@ 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
+          raise Puppet::Error.new(_("Could not resolve name: %{name}") % { name: name }) if !sid
 
           [sid.sid, sid]
         end
 
-        Hash[ sids ]
+        sids.to_h
       end
 
       def delete(name)
@@ -297,7 +297,7 @@ module Puppet::Util::Windows::ADSI
           )
         end
 
-        raise Puppet::Error.new( _("%{object_class} update failed: %{error}") % { object_class: object_class.capitalize, error: e }, e )
+        raise Puppet::Error.new(_("%{object_class} update failed: %{error}") % { object_class: object_class.capitalize, error: e }, e)
       end
       self
     end
@@ -356,7 +356,7 @@ module Puppet::Util::Windows::ADSI
       # WIN32OLE objects aren't enumerable, so no map
       groups = []
       # Setting WIN32OLE.codepage ensures values are returned as UTF-8
-      native_object.Groups.each {|g| groups << g.Name} rescue nil
+      native_object.Groups.each { |g| groups << g.Name } rescue nil
       groups
     end
 
@@ -397,7 +397,7 @@ module Puppet::Util::Windows::ADSI
 
       desired_groups = desired_groups.split(',').map(&:strip)
 
-      current_hash = Hash[ self.group_sids.map { |sid| [sid.sid, sid] } ]
+      current_hash = self.group_sids.to_h { |sid| [sid.sid, sid] }
       desired_hash = self.class.name_sid_hash(desired_groups)
 
       # First we add the user to all the groups it should be in but isn't
@@ -451,7 +451,7 @@ module Puppet::Util::Windows::ADSI
 
     def userflag_set?(flag)
       flag_value = ADS_USERFLAGS[flag] || 0
-      ! (self['UserFlags'] & flag_value).zero?
+      !(self['UserFlags'] & flag_value).zero?
     end
 
     # Common helper for set_userflags and unset_userflags.
@@ -609,7 +609,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)
+        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
@@ -638,7 +638,7 @@ module Puppet::Util::Windows::ADSI
     def set_members(desired_members, inclusive = true)
       return if desired_members.nil?
 
-      current_hash = Hash[ self.member_sids.map { |sid| [sid.sid, sid] } ]
+      current_hash = self.member_sids.to_h { |sid| [sid.sid, sid] }
       desired_hash = self.class.name_sid_hash(desired_members)
 
       # First we add all missing members

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

@@ -75,7 +75,7 @@ module Puppet::Util::Windows::COM
         const_set(:IID, iid)
 
         vtable = Class.new(FFI::Struct) do
-          vtable_hash = Hash[(ifaces.map { |iface| iface::VTBL::SPEC.to_a } << spec.to_a).flatten(1)]
+          vtable_hash = (ifaces.map { |iface| iface::VTBL::SPEC.to_a } << spec.to_a).flatten(1).to_h
           const_set(:SPEC, vtable_hash)
 
           layout(
@@ -122,7 +122,7 @@ module Puppet::Util::Windows::COM
 
       self
     ensure
-      instance.Release if instance && ! instance.null?
+      instance.Release if instance && !instance.null?
     end
   end
 

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

@@ -82,8 +82,8 @@ module Puppet::Util::Windows
         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.
@@ -155,8 +155,8 @@ module Puppet::Util::Windows
         end
 
         # Args passed to Service.start
-        if(dwArgc > 1)
-          @@Argv = argv[1..-1]
+        if (dwArgc > 1)
+          @@Argv = argv[1..]
         else
           @@Argv = nil
         end
@@ -177,11 +177,11 @@ module Puppet::Util::Windows
         SetEvent(@@hStartEvent)
 
         # Main loop for the service.
-        while(WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0) do
+        while (WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0) do
         end
 
         # Main loop for the service.
-        while(WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0) do
+        while (WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0) do
         end
       ensure
         # Stop the service.
@@ -189,7 +189,7 @@ module Puppet::Util::Windows
       end
     end
 
-    ThreadProc = FFI::Function.new(:ulong,[:pointer]) do |lpParameter|
+    ThreadProc = FFI::Function.new(:ulong, [:pointer]) do |lpParameter|
       ste = FFI::MemoryPointer.new(SERVICE_TABLE_ENTRYW, 2)
 
       s = SERVICE_TABLE_ENTRYW.new(ste[0])
@@ -281,7 +281,7 @@ module Puppet::Util::Windows
 
       thr = Thread.new do
         begin
-          while(WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT)
+          while (WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT)
             # Check to see if anything interesting has been signaled
             case @@waiting_control_code
             when SERVICE_CONTROL_PAUSE