(PUP-11767) Fix Style/ClassCheck from rubocop_todo

Author: tvpartytonight

.rubocop_todo.yml

@@ -361,25 +361,6 @@ Style/CaseLikeIf:
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: is_a?, kind_of?
-Style/ClassCheck:
-  Exclude:
-    - 'lib/puppet/error.rb'
-    - 'lib/puppet/functions.rb'
-    - 'lib/puppet/graph/simple_graph.rb'
-    - 'lib/puppet/node/environment.rb'
-    - 'lib/puppet/provider/group/groupadd.rb'
-    - 'lib/puppet/provider/group/windows_adsi.rb'
-    - 'lib/puppet/provider/user/windows_adsi.rb'
-    - 'lib/puppet/settings.rb'
-    - 'lib/puppet/settings/environment_conf.rb'
-    - 'lib/puppet/type.rb'
-    - 'lib/puppet/util/suidmanager.rb'
-    - 'lib/puppet/util/windows/adsi.rb'
-    - 'lib/puppet/util/windows/sid.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: ==, equal?, eql?

lib/puppet/error.rb

@@ -21,7 +21,7 @@ module ExternalFileError
     # 4 args including the position on the line.
     #
     def initialize(message, file = nil, line = nil, pos = nil, original = nil)
-      if pos.kind_of? Exception
+      if pos.is_a? Exception
         original = pos
         pos = nil
       end

lib/puppet/functions.rb

@@ -642,7 +642,7 @@ def type(assignment_string)
             ruby_file_location: rb_location
           }
       end
-      unless result.body.kind_of?(Puppet::Pops::Model::TypeAlias)
+      unless result.body.is_a?(Puppet::Pops::Model::TypeAlias)
         rb_location = rb_location.gsub(/:in.*$/, '')
         raise ArgumentError, _("Expected a type alias assignment on the form 'AliasType = T', got '%{assignment_string}'.\n" +
         "Called from <%{ruby_file_location}>") % {

lib/puppet/graph/simple_graph.rb

@@ -458,15 +458,15 @@ def to_dot_graph(params = {})
                  'fontsize' => fontsize,
                  'label' => name }
       v_label = v.ref
-      params.merge!(v_label) if v_label and v_label.kind_of? Hash
+      params.merge!(v_label) if v_label and v_label.is_a? Hash
       graph << DOT::DOTNode.new(params)
     end
     edges.each do |e|
       params = { 'from' => stringify(e.source.ref),
                  'to' => stringify(e.target.ref),
                  'fontsize' => fontsize }
       e_label = e.ref
-      params.merge!(e_label) if e_label and e_label.kind_of? Hash
+      params.merge!(e_label) if e_label and e_label.is_a? Hash
       graph << edge_klass.new(params)
     end
     graph

lib/puppet/node/environment.rb

@@ -539,7 +539,7 @@ def self.split_path(path_string)
   end
 
   def ==(other)
-    return true if other.kind_of?(Puppet::Node::Environment) &&
+    return true if other.is_a?(Puppet::Node::Environment) &&
                    self.name == other.name &&
                    self.full_modulepath == other.full_modulepath &&
                    self.manifest == other.manifest

lib/puppet/provider/group/groupadd.rb

@@ -127,7 +127,7 @@ def members_insync?(current, should)
   end
 
   def members_to_s(current)
-    return '' if current.nil? || !current.kind_of?(Array)
+    return '' if current.nil? || !current.is_a?(Array)
 
     current.join(',')
   end

lib/puppet/provider/group/windows_adsi.rb

@@ -40,7 +40,7 @@ def members_insync?(current, should)
   end
 
   def members_to_s(users)
-    return '' if users.nil? or !users.kind_of?(Array)
+    return '' if users.nil? or !users.is_a?(Array)
 
     users = users.map do |user_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(user_name)

lib/puppet/provider/user/windows_adsi.rb

@@ -69,7 +69,7 @@ def groups_insync?(current, should)
   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)

lib/puppet/settings.rb

@@ -241,7 +241,7 @@ def optparse_addargs(options)
   # Is our setting a boolean setting?
   def boolean?(param)
     param = param.to_sym
-    @config.include?(param) and @config[param].kind_of?(BooleanSetting)
+    @config.include?(param) and @config[param].is_a?(BooleanSetting)
   end
 
   # Remove all set values, potentially skipping cli values.

lib/puppet/settings/environment_conf.rb

@@ -100,7 +100,7 @@ def environment_data_provider
   def modulepath
     default_modulepath = [File.join(@path_to_env, "modules")] + @global_module_path
     get_setting(:modulepath, default_modulepath) do |modulepath|
-      path = modulepath.kind_of?(String) ?
+      path = modulepath.is_a?(String) ?
         modulepath.split(File::PATH_SEPARATOR) :
         modulepath
       path.map { |p| expand_glob(absolute(p)) }.flatten.join(File::PATH_SEPARATOR)