(PUP-11993) Style/Not

AriaXLi · AriaXLi · commit 2c892c8e012b · 2024-02-27T00:17:30.000-08:00
This commit enables the Style/Not cop and fixes 41 autocorrectable
offenses.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -629,10 +629,6 @@ Style/MultipleComparison:
 Style/MutableConstant:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/Not:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedOctalStyle.
 # SupportedOctalStyles: zero_with_o, zero_only
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb
@@ -284,7 +284,7 @@ def run_mode(mode_name = nil)
         Puppet.settings.preferred_run_mode = mode_name
       end
 
-      return @run_mode if @run_mode and not mode_name
+      return @run_mode if @run_mode and !mode_name
 
       require_relative '../puppet/util/run_mode'
       @run_mode = Puppet::Util::RunMode[mode_name || Puppet.settings.preferred_run_mode]
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
@@ -441,7 +441,7 @@ def onetime(daemon)
 
     daemon.stop(:exit => false)
 
-    if not exitstatus
+    if !exitstatus
       exit(1)
     elsif options[:detailed_exitcodes] then
       exit(exitstatus)
@@ -509,7 +509,7 @@ def enable_disable_client(agent)
   end
 
   def setup_agent
-    agent = Puppet::Agent.new(Puppet::Configurer, (not(Puppet[:onetime])))
+    agent = Puppet::Agent.new(Puppet::Configurer, (!((Puppet[:onetime]))))
 
     enable_disable_client(agent) if options[:enable] or options[:disable]
 
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
@@ -276,7 +276,7 @@ def main
 
         exit_status = apply_catalog(catalog)
 
-        if not exit_status
+        if !exit_status
           exit(1)
         elsif options[:detailed_exitcodes] then
           exit(exit_status)
diff --git a/lib/puppet/application/face_base.rb b/lib/puppet/application/face_base.rb
@@ -103,7 +103,7 @@ def parse_options
           else
             option = find_application_argument(item)
             if option
-              index += 1 if (option[:argument] and not option[:optional])
+              index += 1 if (option[:argument] and !(option[:optional]))
             else
               raise OptionParser::InvalidOption.new(item.sub(/=.*$/, ''))
             end
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
@@ -442,7 +442,7 @@ def run_internal(options)
       # facts may be used to determine which catalog we get, we need to
       # rerun the process if the environment is changed.
       tries = 0
-      while catalog.environment and not catalog.environment.empty? and catalog.environment != @environment
+      while catalog.environment and !catalog.environment.empty? and catalog.environment != @environment
         if tries > 3
           raise Puppet::Error, _("Catalog environment didn't stabilize after %{tries} fetches, aborting run") % { tries: tries }
         end
diff --git a/lib/puppet/face/epp.rb b/lib/puppet/face/epp.rb
@@ -71,7 +71,7 @@
       status = true # no validation error yet
       files = args
       if files.empty?
-        if not STDIN.tty?
+        if !STDIN.tty?
           tmp = validate_template_string(STDIN.read)
           status &&= tmp
         else
diff --git a/lib/puppet/face/parser.rb b/lib/puppet/face/parser.rb
@@ -42,7 +42,7 @@
       parse_errors = {}
 
       if files.empty?
-        if not STDIN.tty?
+        if !STDIN.tty?
           Puppet[:code] = STDIN.read
           error = validate_manifest(nil)
           parse_errors['STDIN'] = error if error
diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb
@@ -141,7 +141,7 @@ def common_checksum_type(agent_checksum_type)
     if agent_checksum_type
       agent_checksum_types = agent_checksum_type.split('.').map { |type| type.to_sym }
       checksum_type = agent_checksum_types.drop_while do |type|
-        not known_checksum_types.include? type
+        !known_checksum_types.include? type
       end.first
     end
     checksum_type
@@ -169,7 +169,7 @@ def inlineable?(resource, sources)
     when sources.empty?
       # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
       return Puppet::Util::Profiler.profile(_("Not inlining resource without sources"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :no_sources]) { false }
-    when (not (sources.all? { |source| source =~ /^puppet:/ }))
+    when (!(sources.all? { |source| source =~ /^puppet:/ }))
       # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
       return Puppet::Util::Profiler.profile(_("Not inlining unsupported source scheme"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :unsupported_scheme]) { false }
     else
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb
@@ -220,7 +220,7 @@ def find(key, options = {})
     terminus = prepare(request)
 
     result = find_in_cache(request)
-    if not result.nil?
+    if !result.nil?
       result
     elsif request.ignore_terminus?
       nil
diff --git a/lib/puppet/indirector/memory.rb b/lib/puppet/indirector/memory.rb
@@ -28,7 +28,7 @@ def search(request)
   end
 
   def head(request)
-    not find(request).nil?
+    !find(request).nil?
   end
 
   def save(request)
diff --git a/lib/puppet/indirector/request.rb b/lib/puppet/indirector/request.rb
@@ -80,7 +80,7 @@ def initialize(indirection_name, method, key, instance, options = {})
       # info out in the REST class, but it seemed bad design for the REST
       # class to rewrite the key.
 
-      if key.to_s =~ /^\w+:\// and not Puppet::Util.absolute_path?(key.to_s) # it's a URI
+      if key.to_s =~ /^\w+:\// and !Puppet::Util.absolute_path?(key.to_s) # it's a URI
         set_uri_key(key)
       else
         @key = key
diff --git a/lib/puppet/interface/documentation.rb b/lib/puppet/interface/documentation.rb
@@ -250,7 +250,7 @@ def author=(value)
     # @api public
     # @dsl Faces
     def copyright(owner = nil, years = nil)
-      if years.nil? and not owner.nil? then
+      if years.nil? and !owner.nil? then
         # TRANSLATORS 'copyright' is an attribute name and should not be translated
         raise ArgumentError, _('copyright takes the owners names, then the years covered')
       end
diff --git a/lib/puppet/interface/option.rb b/lib/puppet/interface/option.rb
@@ -64,7 +64,7 @@ def initialize(parent, *declaration, &block)
     # incoherence here makes our life super-difficult, and we can more easily
     # relax this rule later if we find a valid use case for it. --daniel 2011-03-30
     @argument = @optparse.any? { |o| o =~ /[ =]/ }
-    if @argument and not @optparse.all? { |o| o =~ /[ =]/ } then
+    if @argument and !@optparse.all? { |o| o =~ /[ =]/ } then
       raise ArgumentError, _("Option %{name} is inconsistent about taking an argument") % { name: @name }
     end
 
@@ -74,7 +74,7 @@ def initialize(parent, *declaration, &block)
     if @optional_argument
       raise ArgumentError, _("Options with optional arguments are not supported")
     end
-    if @optional_argument and not @optparse.all? { |o| o =~ /[ =]\[/ } then
+    if @optional_argument and !@optparse.all? { |o| o =~ /[ =]\[/ } then
       raise ArgumentError, _("Option %{name} is inconsistent about the argument being optional") % { name: @name }
     end
   end
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
@@ -178,7 +178,7 @@ def decode_params(params)
   end
 
   def allowed_parameter?(name)
-    not (name.nil? || name.empty? || DISALLOWED_KEYS.include?(name))
+    !(name.nil? || name.empty? || DISALLOWED_KEYS.include?(name))
   end
 
   def parse_parameter_value(param, value)
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb
@@ -79,7 +79,7 @@ def add_resource(scope, resource)
     # Note that this will fail if the resource is not unique.
     @catalog.add_resource(resource)
 
-    if not resource.class? and resource[:stage]
+    if !resource.class? and resource[:stage]
       # TRANSLATORS "stage" is a keyword in Puppet and should not be translated
       raise ArgumentError, _("Only classes can set 'stage'; normal resources like %{resource} cannot change run stage") % { resource: resource }
     end
diff --git a/lib/puppet/provider/group/groupadd.rb b/lib/puppet/provider/group/groupadd.rb
@@ -47,11 +47,11 @@ def check_allow_dup
     # because by default duplicates are allowed.  This check is
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
-    if not @resource.allowdupe? and @resource.forcelocal?
+    if !@resource.allowdupe? and @resource.forcelocal?
       if @resource.should(:gid) and findgroup(:gid, @resource.should(:gid).to_s)
         raise(Puppet::Error, _("GID %{resource} already exists, use allowdupe to force group creation") % { resource: @resource.should(:gid).to_s })
       end
-    elsif @resource.allowdupe? and not @resource.forcelocal?
+    elsif @resource.allowdupe? and !@resource.forcelocal?
       return ["-o"]
     end
     []
diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb
@@ -361,7 +361,7 @@ def set(param, value)
       # If we are meant to be authoritative for the group membership
       # then remove all existing members who haven't been specified
       # in the manifest.
-      remove_unwanted_members(current_members, value) if @resource[:auth_membership] and not current_members.nil?
+      remove_unwanted_members(current_members, value) if @resource[:auth_membership] and !current_members.nil?
 
       # if they're not a member, make them one.
       add_members(current_members, value)
@@ -421,7 +421,7 @@ def create
       if property == :uid and value.nil?
         value = self.class.next_system_id('uid')
       end
-      if value != "" and not value.nil?
+      if value != "" and !value.nil?
         if property == :members
           add_members(nil, value)
         else
@@ -462,7 +462,7 @@ def remove_unwanted_members(current_members, new_members)
 
   def add_members(current_members, new_members)
     new_members.flatten.each do |new_member|
-      next unless current_members.nil? or not current_members.include?(new_member)
+      next unless current_members.nil? or !current_members.include?(new_member)
 
       cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-a", new_member, @resource[:name]]
       begin
diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb
@@ -90,7 +90,7 @@ def self.installpkgdmg(source, name)
         args = ["-o", cached_source, "-C", "-", "-L", "-s", "--fail", "--url", source]
         if http_proxy_host and http_proxy_port
           args << "--proxy" << "#{http_proxy_host}:#{http_proxy_port}"
-        elsif http_proxy_host and not http_proxy_port
+        elsif http_proxy_host and !http_proxy_port
           args << "--proxy" << http_proxy_host
         end
         begin
diff --git a/lib/puppet/provider/package/pkgng.rb b/lib/puppet/provider/package/pkgng.rb
@@ -120,7 +120,7 @@ def install
       end
     end
 
-    if not source # install using default repo logic
+    if !source # install using default repo logic
       args = ['install', '-qy']
     elsif source.scheme == 'urn' # install from repo named in URN
       tag = repo_tag_from_urn(source.to_s)
diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb
@@ -135,7 +135,7 @@ def self.return_globbed_list_of_file_paths(path)
   #
   # @api private
   def self.make_label_to_path_map(refresh = false)
-    return @label_to_path_map if @label_to_path_map and not refresh
+    return @label_to_path_map if @label_to_path_map and !refresh
 
     @label_to_path_map = {}
     launchd_paths.each do |path|
diff --git a/lib/puppet/provider/user/directoryservice.rb b/lib/puppet/provider/user/directoryservice.rb
@@ -300,7 +300,7 @@ def create
       # For the :password and :groups properties, call the setter methods
       # to enforce those values. For everything else, use dscl with the
       # ns_to_ds_attribute_map to set the appropriate values.
-      next unless value != "" and not value.nil?
+      next unless value != "" and !value.nil?
 
       case attribute
       when :password
diff --git a/lib/puppet/settings/base_setting.rb b/lib/puppet/settings/base_setting.rb
@@ -97,10 +97,10 @@ def initialize(args = {})
     @name = args[:name] if args.include? :name
 
     # set the default value for call_hook
-    @call_hook = :on_write_only if args[:hook] and not args[:call_hook]
+    @call_hook = :on_write_only if args[:hook] and !(args[:call_hook])
     @has_hook = false
 
-    if args[:call_hook] and not args[:hook]
+    if args[:call_hook] and !(args[:hook])
       # TRANSLATORS ':call_hook' and ':hook' are specific setting names and should not be translated
       raise ArgumentError, _("Cannot reference :call_hook for :%{name} if no :hook is defined") % { name: @name }
     end
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
@@ -450,7 +450,7 @@ def missing_tags?(resource)
     return false if ignore_tags?
     return false if tags.empty?
 
-    not resource.tagged?(*tags)
+    !resource.tagged?(*tags)
   end
 
   def skip_tags?(resource)
diff --git a/lib/puppet/type/file/selcontext.rb b/lib/puppet/type/file/selcontext.rb
@@ -55,10 +55,10 @@ def retrieve_default_context(property)
     end
 
     def insync?(value)
-      if not selinux_support?
+      if !selinux_support?
         debug("SELinux bindings not found. Ignoring parameter.")
         true
-      elsif not selinux_label_support?(@resource[:path])
+      elsif !selinux_label_support?(@resource[:path])
         debug("SELinux not available for this filesystem. Ignoring parameter.")
         true
       else
diff --git a/lib/puppet/type/filebucket.rb b/lib/puppet/type/filebucket.rb
@@ -75,7 +75,7 @@ module Puppet
           raise ArgumentError, _("You can only have one filebucket path")
         end
 
-        if value.is_a? String and not Puppet::Util.absolute_path?(value)
+        if value.is_a? String and !Puppet::Util.absolute_path?(value)
           raise ArgumentError, _("Filebucket paths must be absolute")
         end
 
diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb
@@ -440,7 +440,7 @@ def insync?(current)
 
       validate do |val|
         if munge(val)
-          raise ArgumentError, _("User provider %{name} can not manage home directories") % { name: provider.class.name } if provider and not provider.class.manages_homedir?
+          raise ArgumentError, _("User provider %{name} can not manage home directories") % { name: provider.class.name } if provider and !provider.class.manages_homedir?
         end
       end
     end
diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb
@@ -135,7 +135,7 @@ def Log.newdestination(dest)
       klass.match?(dest)
     end
 
-    if type.respond_to?(:suitable?) and not type.suitable?(dest)
+    if type.respond_to?(:suitable?) and !type.suitable?(dest)
       return
     end
 
diff --git a/lib/puppet/util/rdoc/code_objects.rb b/lib/puppet/util/rdoc/code_objects.rb
@@ -147,7 +147,7 @@ def add_child(child)
     # ourselves.
     def find_symbol(symbol, method = nil)
       result = super(symbol)
-      if not result and symbol =~ /::/
+      if !result and symbol =~ /::/
         modules = symbol.split(/::/)
         unless modules.empty?
           module_name = modules.shift
diff --git a/lib/puppet/util/rdoc/generators/puppet_generator.rb b/lib/puppet/util/rdoc/generators/puppet_generator.rb
@@ -40,7 +40,7 @@ module MarkUp
     def new_markup(str, remove_para = false)
       first = @markup.nil?
       res = old_markup(str, remove_para)
-      if first and not @markup.nil?
+      if first and !@markup.nil?
         @markup.add_special(/\b([a-z]\w+(::\w+)*)/, :CROSSREF)
         # we need to call it again, since we added a rule
         res = old_markup(str, remove_para)
diff --git a/lib/puppet/util/rpm_compare.rb b/lib/puppet/util/rpm_compare.rb
@@ -149,8 +149,8 @@ def rpm_parse_evr(full_version)
   # 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 s1.nil? && (not s2.nil?)
+    return 1 if (!s1.nil?) && s2.nil?
+    return -1 if s1.nil? && (!s2.nil?)
 
     return rpmvercmp(s1, s2)
   end
diff --git a/lib/puppet/util/rubygems.rb b/lib/puppet/util/rubygems.rb
@@ -16,7 +16,7 @@ def has_rubygems?
         # rubygems installs. So when Bundler is around we have to act
         # as though rubygems is not, e.g. we shouldn't be able to load
         # a gem that Bundler doesn't want us to see.
-        defined? ::Gem and not defined? ::Bundler
+        defined? ::Gem and !defined? ::Bundler
       end
 
       # @api private
diff --git a/lib/puppet/util/windows/root_certs.rb b/lib/puppet/util/windows/root_certs.rb
@@ -40,7 +40,7 @@ def self.load_certs
     ptr = FFI::Pointer::NULL
     store = CertOpenSystemStoreA(nil, "ROOT")
     begin
-      while (ptr = CertEnumCertificatesInStore(store, ptr)) and not ptr.null?
+      while (ptr = CertEnumCertificatesInStore(store, ptr)) and !ptr.null?
         context = CERT_CONTEXT.new(ptr)
         cert_buf = context[:pbCertEncoded].read_bytes(context[:cbCertEncoded])
         begin
