puppet 8.4.0-universal-darwin → 8.5.1-universal-darwin

data/lib/puppet/provider/service/systemd.rb

@@ -16,11 +16,13 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   confine :true => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
 
   defaultfor 'os.family' => [:archlinux]
-  defaultfor 'os.family' => :redhat, 'os.release.major' => ["7", "8", "9"]
+  defaultfor 'os.family' => :redhat
+  notdefaultfor 'os.name' => :redhat, 'os.release.major' => (4..6).to_a # Use the "RedHat" service provider
   defaultfor 'os.family' => :redhat, 'os.name' => :fedora
   defaultfor 'os.family' => :suse
   defaultfor 'os.family' => :coreos
   defaultfor 'os.family' => :gentoo
+  notdefaultfor 'os.name' => :amazon, 'os.release.major' => ["2017", "2018"]
   defaultfor 'os.name' => :amazon, 'os.release.major' => ["2", "2023"]
   defaultfor 'os.name' => :debian
   notdefaultfor 'os.name' => :debian, 'os.release.major' => ["5", "6", "7"] # These are using the "debian" method
@@ -233,4 +235,3 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     error_return << "journalctl log for #{name}:\n#{journalctl_output}"
   end
 end
-

data/lib/puppet/provider/service/upstart.rb

@@ -30,7 +30,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   # We only want to use upstart as our provider if the upstart daemon is running.
   # This can be checked by running `initctl version --quiet` on a machine that has
   # upstart installed.
-  confine :true => lambda { has_initctl? }
+  confine :true => -> { has_initctl? }
 
   def self.has_initctl?
     # Puppet::Util::Execution.execute does not currently work on jRuby.
@@ -68,7 +68,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     excludes
   end
 
-  def self.get_services(exclude=[])
+  def self.get_services(exclude = [])
     instances = []
     execpipe("#{command(:initctl)} list") { |process|
       process.each_line { |line|
@@ -104,7 +104,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
 
   # Where is our override script?
   def overscript
-    @overscript ||= initscript.gsub(/\.conf$/,".override")
+    @overscript ||= initscript.gsub(/\.conf$/, ".override")
   end
 
   def search(name)
@@ -179,8 +179,8 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
 
   def status
     if (@resource[:hasstatus] == :false) ||
-        @resource[:status] ||
-        ! is_upstart?
+       @resource[:status] ||
+       !is_upstart?
       return super
     end
 
@@ -374,9 +374,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def read_script_from(filename)
-    File.open(filename) do |file|
-      file.read
-    end
+    File.read(filename)
   end
 
   def write_script_to(file, text)

data/lib/puppet/provider/service/windows.rb

@@ -18,27 +18,27 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
   has_feature :refreshable, :configurable_timeout, :manages_logon_credentials
 
   def enable
-    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: {startup_type: :SERVICE_AUTO_START})
+    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: { startup_type: :SERVICE_AUTO_START })
   rescue => detail
-    raise Puppet::Error.new(_("Cannot enable %{resource_name}, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail )
+    raise Puppet::Error.new(_("Cannot enable %{resource_name}, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail)
   end
 
   def disable
-    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: {startup_type: :SERVICE_DISABLED})
+    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: { startup_type: :SERVICE_DISABLED })
   rescue => detail
-    raise Puppet::Error.new(_("Cannot disable %{resource_name}, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail )
+    raise Puppet::Error.new(_("Cannot disable %{resource_name}, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail)
   end
 
   def manual_start
-    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: {startup_type: :SERVICE_DEMAND_START})
+    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: { startup_type: :SERVICE_DEMAND_START })
   rescue => detail
-    raise Puppet::Error.new(_("Cannot enable %{resource_name} for manual start, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail )
+    raise Puppet::Error.new(_("Cannot enable %{resource_name} for manual start, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail)
   end
 
   def delayed_start
-    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: {startup_type: :SERVICE_AUTO_START, delayed: true})
+    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: { startup_type: :SERVICE_AUTO_START, delayed: true })
   rescue => detail
-    raise Puppet::Error.new(_("Cannot enable %{resource_name} for delayed start, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail )
+    raise Puppet::Error.new(_("Cannot enable %{resource_name} for delayed start, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail)
   end
 
   def enabled?
@@ -59,7 +59,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
       raise Puppet::Error.new(_("Unknown start type: %{start_type}") % { start_type: start_type })
     end
   rescue => detail
-    raise Puppet::Error.new(_("Cannot get start type %{resource_name}, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail )
+    raise Puppet::Error.new(_("Cannot get start type %{resource_name}, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail)
   end
 
   def start
@@ -140,20 +140,20 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
 
   def logonaccount=(value)
     validate_logon_credentials
-    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: {logon_account: value, logon_password: @resource[:logonpassword]})
+    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: { logon_account: value, logon_password: @resource[:logonpassword] })
     restart if @resource[:ensure] == :running && [:running, :paused].include?(status)
   end
 
   def logonpassword=(value)
     validate_logon_credentials
-    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: {logon_password: value})
+    Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: { logon_password: value })
   end
 
   private
 
   def normalize_logonaccount
     logon_account = @resource[:logonaccount].sub(/^\.\\/, "#{Puppet::Util::Windows::ADSI.computer_name}\\")
-    return 'LocalSystem' if Puppet::Util::Windows::User::localsystem?(logon_account)
+    return 'LocalSystem' if Puppet::Util::Windows::User.localsystem?(logon_account)
 
     @logonaccount_information ||= Puppet::Util::Windows::SID.name_to_principal(logon_account)
     return logon_account unless @logonaccount_information
@@ -163,15 +163,15 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
   end
 
   def validate_logon_credentials
-    unless Puppet::Util::Windows::User::localsystem?(@normalized_logon_account)
+    unless Puppet::Util::Windows::User.localsystem?(@normalized_logon_account)
       raise Puppet::Error.new("\"#{@normalized_logon_account}\" is not a valid account") unless @logonaccount_information && [:SidTypeUser, :SidTypeWellKnownGroup].include?(@logonaccount_information.account_type)
 
-      user_rights = Puppet::Util::Windows::User::get_rights(@logonaccount_information.domain_account) unless Puppet::Util::Windows::User::default_system_account?(@normalized_logon_account)
+      user_rights = Puppet::Util::Windows::User.get_rights(@logonaccount_information.domain_account) unless Puppet::Util::Windows::User.default_system_account?(@normalized_logon_account)
       raise Puppet::Error.new("\"#{@normalized_logon_account}\" has the 'Log On As A Service' right set to denied.") if user_rights =~ /SeDenyServiceLogonRight/
       raise Puppet::Error.new("\"#{@normalized_logon_account}\" is missing the 'Log On As A Service' right.") unless user_rights.nil? || user_rights =~ /SeServiceLogonRight/
     end
 
-    is_a_predefined_local_account = Puppet::Util::Windows::User::default_system_account?(@normalized_logon_account) || @normalized_logon_account == 'LocalSystem'
+    is_a_predefined_local_account = Puppet::Util::Windows::User.default_system_account?(@normalized_logon_account) || @normalized_logon_account == 'LocalSystem'
     account_info = @normalized_logon_account.split("\\")
     able_to_logon = Puppet::Util::Windows::User.password_is?(account_info[1], @resource[:logonpassword], account_info[0]) unless is_a_predefined_local_account
     raise Puppet::Error.new("The given password is invalid for user '#{@normalized_logon_account}'.") unless is_a_predefined_local_account || able_to_logon

data/lib/puppet/provider/user/aix.rb

@@ -58,9 +58,9 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
 
     def expiry_to_expires(expiry)
       return '0' if expiry == "0000-00-00" || expiry.to_sym == :absent
-      
+
       DateTime.parse(expiry, "%Y-%m-%d %H:%M")
-        .strftime("%m%d%H%M%y")
+              .strftime("%m%d%H%M%y")
     end
 
     def expires_to_expiry(provider, expires)
@@ -112,7 +112,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
           property_to_attribute: method(:gid_to_pgrp),
           attribute_to_property: method(:pgrp_to_gid)
 
-  mapping puppet_property: :groups, 
+  mapping puppet_property: :groups,
           property_to_attribute: method(:groups_property_to_attribute),
           attribute_to_property: method(:groups_attribute_to_property)
 
@@ -187,7 +187,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
     match_obj[1]
   end
 
-  #- **password**
+  # - **password**
   #    The user's password, in whatever encrypted format the local machine
   #    requires. Be sure to enclose any value that includes a dollar sign ($)
   #    in single quotes (').  Requires features manages_passwords.
@@ -312,49 +312,49 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   end
 
   # UNSUPPORTED
-  #- **profile_membership**
+  # - **profile_membership**
   #    Whether specified roles should be treated as the only roles
   #    of which the user is a member or whether they should merely
   #    be treated as the minimum membership list.  Valid values are
   #    `inclusive`, `minimum`.
   # UNSUPPORTED
-  #- **profiles**
+  # - **profiles**
   #    The profiles the user has.  Multiple profiles should be
   #    specified as an array.  Requires features manages_solaris_rbac.
   # UNSUPPORTED
-  #- **project**
+  # - **project**
   #    The name of the project associated with a user  Requires features
   #    manages_solaris_rbac.
   # UNSUPPORTED
-  #- **role_membership**
+  # - **role_membership**
   #    Whether specified roles should be treated as the only roles
   #    of which the user is a member or whether they should merely
   #    be treated as the minimum membership list.  Valid values are
   #    `inclusive`, `minimum`.
   # UNSUPPORTED
-  #- **roles**
+  # - **roles**
   #    The roles the user has.  Multiple roles should be
   #    specified as an array.  Requires features manages_roles.
   # UNSUPPORTED
-  #- **key_membership**
+  # - **key_membership**
   #    Whether specified key value pairs should be treated as the only
   #    attributes
   #    of the user or whether they should merely
   #    be treated as the minimum list.  Valid values are `inclusive`,
   #    `minimum`.
   # UNSUPPORTED
-  #- **keys**
+  # - **keys**
   #    Specify user attributes in an array of keyvalue pairs  Requires features
   #    manages_solaris_rbac.
   # UNSUPPORTED
-  #- **allowdupe**
+  # - **allowdupe**
   #  Whether to allow duplicate UIDs.  Valid values are `true`, `false`.
   # UNSUPPORTED
-  #- **auths**
+  # - **auths**
   #    The auths the user has.  Multiple auths should be
   #    specified as an array.  Requires features manages_solaris_rbac.
   # UNSUPPORTED
-  #- **auth_membership**
+  # - **auth_membership**
   #    Whether specified auths should be treated as the only auths
   #    of which the user is a member or whether they should merely
   #    be treated as the minimum membership list.  Valid values are

data/lib/puppet/provider/user/directoryservice.rb

@@ -458,15 +458,15 @@ Puppet::Type.type(:user).provide :directoryservice do
         begin
           dscl '.', '-change', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], @property_hash[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
-          raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " +
-               "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
+          raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " \
+                               "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
         end
       else
         begin
           dscl '.', '-create', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
-          raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " +
-               "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
+          raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " \
+                               "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
         end
       end
     end
@@ -517,15 +517,15 @@ Puppet::Type.type(:user).provide :directoryservice do
 
   # Get the next available uid on the system by getting a list of user ids,
   # sorting them, grabbing the last one, and adding a 1. Scientific stuff here.
-  def next_system_id(min_id=20)
+  def next_system_id(min_id = 20)
     dscl_output = dscl '.', '-list', '/Users', 'uid'
     # We're ok with throwing away negative uids here. Also, remove nil values.
     user_ids = dscl_output.split.compact.collect { |l| l.to_i if l =~ /^\d+$/ }
-    ids = user_ids.compact!.sort! { |a,b| a.to_f <=> b.to_f }
+    ids = user_ids.compact!.sort_by!(&:to_f)
     # We're just looking for an unused id in our sorted array.
     ids.each_index do |i|
       next_id = ids[i] + 1
-      return next_id if ids[i+1] != next_id and next_id >= min_id
+      return next_id if ids[i + 1] != next_id and next_id >= min_id
     end
   end
 
@@ -549,7 +549,7 @@ Puppet::Type.type(:user).provide :directoryservice do
       # variable IS a Hash and contains the 'SALTED-SHA512' key (indicating an
       # older 10.7-style password hash), it will be deleted and a newer
       # 10.8-style (PBKDF2) password hash will be generated.
-      if (shadow_hash_data.class == Hash) && (shadow_hash_data.has_key?('SALTED-SHA512'))
+      if (shadow_hash_data.instance_of?(Hash)) && (shadow_hash_data.has_key?('SALTED-SHA512'))
         shadow_hash_data.delete('SALTED-SHA512')
       end
 

data/lib/puppet/provider/user/hpux.rb

@@ -26,12 +26,12 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   has_features :manages_homedir, :allows_duplicates, :manages_passwords
 
   def deletecmd
-    super.insert(1,"-F")
+    super.insert(1, "-F")
   end
 
-  def modifycmd(param,value)
+  def modifycmd(param, value)
     cmd = super(param, value)
-    cmd.insert(1,"-F")
+    cmd.insert(1, "-F")
     if trusted then
       # Append an additional command to reset the password age to 0
       # until a workaround with expiry module can be found for trusted
@@ -50,7 +50,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
     # temp=""
     while ent = Etc.getpwent() do # rubocop:disable Lint/AssignmentInCondition
       if ent.name == resource.name
-        temp=ent.name
+        temp = ent.name
         break
       end
     end
@@ -62,12 +62,12 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
     ent = Etc.getpwnam(resource.name)
     if ent.passwd == "*"
       # Either no password or trusted password, check trusted
-      file_name="/tcb/files/auth/#{resource.name.chars.first}/#{resource.name}"
+      file_name = "/tcb/files/auth/#{resource.name.chars.first}/#{resource.name}"
       if File.file?(file_name)
         # Found the tcb user for the specific user, now get passwd
         File.open(file_name).each do |line|
-          if ( line =~ /u_pwd/ )
-            temp_passwd=line.split(":")[1].split("=")[1]
+          if (line =~ /u_pwd/)
+            temp_passwd = line.split(":")[1].split("=")[1]
             ent.passwd = temp_passwd
             return ent.passwd
           end
@@ -83,7 +83,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   def trusted
     # Check to see if the HP-UX box is running in trusted compute mode
     # UID for root should always be 0
-    trusted_sys = exec_getprpw('root','-m uid')
+    trusted_sys = exec_getprpw('root', '-m uid')
     if trusted_sys.chomp == "uid=0"
       return true
     else
@@ -91,7 +91,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
     end
   end
 
-  def exec_getprpw(user,opts)
+  def exec_getprpw(user, opts)
     Puppet::Util::Execution.execute("/usr/lbin/getprpw #{opts} #{user}", { :combine => true })
   end
 end

data/lib/puppet/provider/user/ldap.rb

@@ -100,7 +100,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
       current = ldap_group[:members]
 
       if form == :add
-        if current.is_a?(Array) and ! current.empty?
+        if current.is_a?(Array) and !current.empty?
           new = current + [name]
         else
           new = [name]
@@ -110,7 +110,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
         new = :absent if new.empty?
       end
 
-      group_manager.update(group, {:ensure => :present, :members => current}, {:ensure => :present, :members => new})
+      group_manager.update(group, { :ensure => :present, :members => current }, { :ensure => :present, :members => new })
     end
   end
 
@@ -127,9 +127,9 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
 
   def group_properties(values)
     if values.empty? or values == :absent
-      {:ensure => :present}
+      { :ensure => :present }
     else
-      {:ensure => :present, :members => values}
+      { :ensure => :present, :members => values }
     end
   end
 end

data/lib/puppet/provider/user/openbsd.rb

@@ -34,7 +34,7 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
                                    :absent
                                  else
                                    # Expiry is days after 1970-01-01
-                                   (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
+                                   (Date.new(1970, 1, 1) + value).strftime('%Y-%m-%d')
                                  end
                                }
 

data/lib/puppet/provider/user/pw.rb

@@ -35,7 +35,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
 
       value = @resource.should(property)
       if value and value != ""
-        cmd << flag(property) << munge(property,value)
+        cmd << flag(property) << munge(property, value)
       end
     end
 
@@ -107,4 +107,3 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     expiry
   end
 end
-

data/lib/puppet/provider/user/user_role_add.rb

@@ -112,7 +112,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def destroy
-    run(deletecmd, "delete "+ (is_role? ? "role" : "user"))
+    run(deletecmd, "delete " + (is_role? ? "role" : "user"))
   end
 
   def create_role
@@ -145,7 +145,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
 
   def remove_managed_attributes
     managed = managed_attributes
-    user_attributes.select { |k,_v| !managed.include?(k) }.inject({}) { |hash, array| hash[array[0]] = array[1]; hash }
+    user_attributes.select { |k, _v| !managed.include?(k) }.each_with_object({}) { |array, hash| hash[array[0]] = array[1]; }
   end
 
   def keys
@@ -157,7 +157,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
 
   def build_keys_cmd(keys_hash)
     cmd = []
-    keys_hash.each do |k,v|
+    keys_hash.each do |k, v|
       cmd << "-K" << "#{k}=#{v}"
     end
     cmd
@@ -179,11 +179,11 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   def shadow_entry
     return @shadow_entry if defined? @shadow_entry
 
-    @shadow_entry = File.readlines(target_file_path)
-      .reject { |r| r =~ /^[^\w]/ }.
-      # PUP-229: don't suppress the empty fields
-      collect { |l| l.chomp.split(':', -1) }
-      .find { |user, _| user == @resource[:name] }
+    @shadow_entry =
+      File.readlines(target_file_path)
+          .reject { |r| r =~ /^[^\w]/ }
+          .collect { |l| l.chomp.split(':', -1) } # Don't suppress empty fields (PUP-229)
+          .find { |user, _| user == @resource[:name] }
   end
 
   def password
@@ -232,7 +232,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
           line_arr = line.split(':')
           if line_arr[0] == @resource[:name]
             line_arr[1] = cryptopw
-            line_arr[2] = (Date.today - Date.new(1970,1,1)).to_i.to_s
+            line_arr[2] = (Date.today - Date.new(1970, 1, 1)).to_i.to_s
             line = line_arr.join(':')
           end
           fh.print line

data/lib/puppet/provider/user/useradd.rb

@@ -26,7 +26,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   options :expiry, :method => :sp_expire,
                    :munge => proc { |value|
                                if value == :absent
-                                 if Puppet.runtime[:facter].value('os.name')=='SLES' && Puppet.runtime[:facter].value('os.release.major') == "11"
+                                 if Puppet.runtime[:facter].value('os.name') == 'SLES' && Puppet.runtime[:facter].value('os.release.major') == "11"
                                    -1
                                  else
                                    ''
@@ -47,7 +47,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
                                    :absent
                                  else
                                    # Expiry is days after 1970-01-01
-                                   (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
+                                   (Date.new(1970, 1, 1) + value).strftime('%Y-%m-%d')
                                  end
                                }
 
@@ -108,7 +108,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
       @users = []
       Puppet::FileSystem.each_line(passwd_file) do |line|
         user = line.chomp.split(':')
-        @users << Hash[passwd_keys.zip(user)]
+        @users << passwd_keys.zip(user).to_h
       end
     end
     @users.find { |param| param[key] == value } || false
@@ -378,7 +378,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     if age_limits.empty?
       nil
     else
-      [cmd, age_limits.collect { |property| [flag(property), @resource.should(property)]}, @resource[:name]].flatten
+      [cmd, age_limits.collect { |property| [flag(property), @resource.should(property)] }, @resource[:name]].flatten
     end
   end
 

data/lib/puppet/provider/user/windows_adsi.rb

@@ -10,7 +10,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
 
   has_features :manages_homedir, :manages_passwords, :manages_roles
 
-  def initialize(value={})
+  def initialize(value = {})
     super(value)
     @deleted = false
   end
@@ -20,7 +20,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def roles
-    Puppet::Util::Windows::User::get_rights(@resource[:name])
+    Puppet::Util::Windows::User.get_rights(@resource[:name])
   end
 
   def roles=(value)
@@ -28,11 +28,11 @@ Puppet::Type.type(:user).provide :windows_adsi do
     should  = value.split(',')
 
     add_list = should - current
-    Puppet::Util::Windows::User::set_rights(@resource[:name], add_list) unless add_list.empty?
+    Puppet::Util::Windows::User.set_rights(@resource[:name], add_list) unless add_list.empty?
 
     if @resource[:role_membership] == :inclusive
       remove_list = current - should
-      Puppet::Util::Windows::User::remove_rights(@resource[:name], remove_list) unless remove_list.empty?
+      Puppet::Util::Windows::User.remove_rights(@resource[:name], remove_list) unless remove_list.empty?
     end
   end
 
@@ -69,7 +69,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def groups_to_s(groups)
-    return '' if groups.nil? || !groups.kind_of?(Array)
+    return '' if groups.nil? || !groups.is_a?(Array)
 
     groups = groups.map do |group_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(group_name)
@@ -141,7 +141,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
     # populated with a password (as is the case with `puppet resource user`)
     return nil if @resource[:password].nil?
 
-    user.password_is?( @resource[:password] ) ? @resource[:password] : nil
+    user.password_is?(@resource[:password]) ? @resource[:password] : nil
   end
 
   def password=(value)

data/lib/puppet/provider.rb

@@ -127,7 +127,7 @@ class Puppet::Provider
   def self.command(name)
     name = name.intern
 
-    command = @commands[name] if defined?(@commands)    
+    command = @commands[name] if defined?(@commands)
     command = superclass.command(name) if !command && superclass.respond_to?(:command)
 
     unless command
@@ -195,7 +195,7 @@ class Puppet::Provider
   # @param name [Symbol] The name of the command (will become the name of the generated method that executes the command)
   # @param path [String] The path to the executable for the command
   # @yield [ ] A block that configures the command (see {Puppet::Provider::Command})
-  # @comment a yield [ ] produces {|| ...} in the signature, do not remove the space.
+  # @comment a yield [ ] produces { ... } in the signature, do not remove the space.
   # @note the name ´has_command´ looks odd in an API context, but makes more sense when seen in the internal
   #   DSL context where a Provider is declaratively defined.
   # @api public

data/lib/puppet/reference/configuration.rb

@@ -24,23 +24,24 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
 
     # Now print the data about the item.
     val = object.default
-    if name.to_s == 'vardir'
+    case name.to_s
+    when 'vardir'
       val = 'Unix/Linux: /opt/puppetlabs/puppet/cache -- Windows: C:\ProgramData\PuppetLabs\puppet\cache -- Non-root user: ~/.puppetlabs/opt/puppet/cache'
-    elsif name.to_s == 'publicdir'
+    when 'publicdir'
       val = 'Unix/Linux: /opt/puppetlabs/puppet/public -- Windows: C:\ProgramData\PuppetLabs\puppet\public -- Non-root user: ~/.puppetlabs/opt/puppet/public'
-    elsif name.to_s == 'confdir'
+    when 'confdir'
       val = 'Unix/Linux: /etc/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\etc -- Non-root user: ~/.puppetlabs/etc/puppet'
-    elsif name.to_s == 'codedir'
+    when 'codedir'
       val = 'Unix/Linux: /etc/puppetlabs/code -- Windows: C:\ProgramData\PuppetLabs\code -- Non-root user: ~/.puppetlabs/etc/code'
-    elsif name.to_s == 'rundir'
+    when 'rundir'
       val = 'Unix/Linux: /var/run/puppetlabs -- Windows: C:\ProgramData\PuppetLabs\puppet\var\run -- Non-root user: ~/.puppetlabs/var/run'
-    elsif name.to_s == 'logdir'
+    when 'logdir'
       val = 'Unix/Linux: /var/log/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\var\log -- Non-root user: ~/.puppetlabs/var/log'
-    elsif name.to_s == 'hiera_config'
+    when 'hiera_config'
       val = '$confdir/hiera.yaml. However, for backwards compatibility, if a file exists at $codedir/hiera.yaml, Puppet uses that instead.'
-    elsif name.to_s == 'certname'
+    when 'certname'
       val = "the Host's fully qualified domain name, as determined by Facter"
-    elsif name.to_s == 'srv_domain'
+    when 'srv_domain'
       val = 'example.com'
     end
 
@@ -57,7 +58,7 @@ end
 
 config.header = <<~EOT
   ## Configuration settings
-  
+
   * Each of these settings can be specified in `puppet.conf` or on the
     command line.
   * Puppet Enterprise (PE) and open source Puppet share the configuration settings
@@ -89,11 +90,11 @@ config.header = <<~EOT
     group = puppet, mode = 644 }`
   * The Puppet executables ignores any setting that isn't relevant to
     their function.
-  
+
   See the [configuration guide][confguide] for more details.
-  
+
   [confguide]: https://puppet.com/docs/puppet/latest/config_about_settings.html
-  
+
   * * *
-  
+
 EOT