(PUP-11993) Style/NilComparison

This commit enables the Style/NilComparison cop and fixes 14 autocorrectable
offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -629,21 +629,6 @@ Style/MultipleComparison:
 Style/MutableConstant:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: predicate, comparison
-Style/NilComparison:
-  Exclude:
-    - 'lib/puppet/pops/types/type_factory.rb'
-    - 'lib/puppet/pops/types/types.rb'
-    - 'lib/puppet/provider/package/dnfmodule.rb'
-    - 'lib/puppet/provider/package/nim.rb'
-    - 'lib/puppet/provider/package/windows/exe_package.rb'
-    - 'lib/puppet/provider/user/directoryservice.rb'
-    - 'lib/puppet/type/file.rb'
-    - 'lib/puppet/util/pidlock.rb'
-    - 'lib/puppet/util/suidmanager.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: IncludeSemanticChanges.
 Style/NonNilCheck:

lib/puppet/pops/types/type_factory.rb

@@ -627,7 +627,7 @@ def self.type_alias(name = nil, expression = nil)
   # @param type_string [String] the string form of the type
   # @return [PTypeReferenceType] the type reference
   def self.type_reference(type_string = nil)
-    type_string == nil ? PTypeReferenceType::DEFAULT : PTypeReferenceType.new(type_string)
+    type_string.nil? ? PTypeReferenceType::DEFAULT : PTypeReferenceType.new(type_string)
   end
 
   # Returns true if the given type t is of valid range parameter type (integer

lib/puppet/pops/types/types.rb

@@ -2438,7 +2438,7 @@ def callable_with?(args, block = nil)
     return false unless @param_types.instance?(args)
 
     if @block_type.nil?
-      block == nil
+      block.nil?
     else
       @block_type.instance?(block)
     end

lib/puppet/provider/package/dnfmodule.rb

@@ -95,7 +95,7 @@ def install
         # module has no default profile and no profile was requested, so just enable the stream
         # DNF versions prior to 4.2.8 do not need this workaround
         # see https://bugzilla.redhat.com/show_bug.cgi?id=1669527
-        if @resource[:flavor] == nil && e.message =~ /^(?:missing|broken) groups or modules: #{Regexp.quote(args)}$/
+        if @resource[:flavor].nil? && e.message =~ /^(?:missing|broken) groups or modules: #{Regexp.quote(args)}$/
           enable(args)
         else
           raise

lib/puppet/provider/package/nim.rb

@@ -96,7 +96,7 @@ def install(useversion = true)
       package_type, version = determine_latest_version(output, pkg)
     end
 
-    if (package_type == nil)
+    if (package_type.nil?)
 
       errmsg = if version_specified
                  _("Unable to find package '%{package}' with version '%{version}' on lpp_source '%{source}'") %

lib/puppet/provider/package/windows/exe_package.rb

@@ -44,10 +44,10 @@ def self.valid?(name, values)
          values['UninstallString'].length > 0 &&
          values['WindowsInstaller'] != 1 && # DWORD
          name !~ /^KB[0-9]{6}/ &&
-         values['ParentKeyName'] == nil &&
-         values['Security Update'] == nil &&
-         values['Update Rollup'] == nil &&
-         values['Hotfix'] == nil)
+         values['ParentKeyName'].nil? &&
+         values['Security Update'].nil? &&
+         values['Update Rollup'].nil? &&
+         values['Hotfix'].nil?)
     end
 
     def initialize(name, version, uninstall_string)

lib/puppet/provider/user/directoryservice.rb

@@ -216,7 +216,7 @@ def self.get_salted_sha512_pbkdf2(field, embedded_binary_plist, user_name = "")
     case field
     when 'salt', 'entropy'
       value = embedded_binary_plist['SALTED-SHA512-PBKDF2'][field]
-      if value == nil
+      if value.nil?
         raise Puppet::Error, "Invalid #{field} given for user #{user_name}"
       end
 

lib/puppet/type/file.rb

@@ -827,7 +827,7 @@ def retrieve
        [:use, :use_when_creating].include?(self[:source_permissions])
       # TRANSLATORS "source_permissions => ignore" should not be translated
       err_msg = _("Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore.")
-      if self[:owner] == nil || self[:group] == nil || self[:mode] == nil
+      if self[:owner].nil? || self[:group].nil? || self[:mode].nil?
         # Fail on Windows if source permissions are being used and the file resource
         # does not have mode owner, group, and mode all set (which would take precedence).
         self.fail err_msg

lib/puppet/util/pidlock.rb

@@ -59,7 +59,7 @@ def ps_argument_for_current_kernel
 
   def clear_if_stale
     pid = lock_pid
-    return @lockfile.unlock if pid == nil
+    return @lockfile.unlock if pid.nil?
     return if Process.pid == pid
 
     errors = [Errno::ESRCH]

lib/puppet/util/suidmanager.rb

@@ -147,7 +147,7 @@ def convert_xid(type, id)
     raise ArgumentError, _("Invalid id type %{type}") % { type: type } unless map.include?(type)
 
     ret = Puppet::Util.send(type, id)
-    if ret == nil
+    if ret.nil?
       raise Puppet::Error, _("Invalid %{klass}: %{id}") % { klass: map[type], id: id }
     end