(PUP-11993) Style/RedundantRegexpCharacterClass

This commit enables the Style/RedundantRegexpCharacterClass cop and
fixes 32 autocorrectable offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -668,21 +668,6 @@ Style/RedundantFetchBlock:
 Style/RedundantInterpolation:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/RedundantRegexpCharacterClass:
-  Exclude:
-    - 'lib/puppet/application/apply.rb'
-    - 'lib/puppet/module.rb'
-    - 'lib/puppet/pops/lookup/interpolation.rb'
-    - 'lib/puppet/pops/parser/lexer2.rb'
-    - 'lib/puppet/pops/parser/slurp_support.rb'
-    - 'lib/puppet/pops/patterns.rb'
-    - 'lib/puppet/pops/pcore.rb'
-    - 'lib/puppet/provider/package/openbsd.rb'
-    - 'lib/puppet/settings/config_file.rb'
-    - 'lib/puppet/type/exec.rb'
-    - 'lib/puppet/util/command_line/trollop.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 Style/RedundantRegexpEscape:
   Enabled: false

lib/puppet/application/apply.rb

@@ -224,7 +224,7 @@ def main
             $stderr.puts _("%{file} is not readable") % { file: file }
             exit(63)
           end
-          node.classes = Puppet::FileSystem.read(file, :encoding => 'utf-8').split(/[\s]+/)
+          node.classes = Puppet::FileSystem.read(file, :encoding => 'utf-8').split(/\s+/)
         end
       end
 

lib/puppet/module.rb

@@ -58,7 +58,7 @@ def self.is_module_directory_name?(name)
 
   def self.is_module_namespaced_name?(name)
     # it must match the full module name according to forge validator
-    return true if name =~ /^[a-zA-Z0-9]+[-][a-z][a-z0-9_]*$/
+    return true if name =~ /^[a-zA-Z0-9]+-[a-z][a-z0-9_]*$/
 
     return false
   end

lib/puppet/pops/lookup/interpolation.rb

@@ -144,7 +144,7 @@ def nil_in_scope?(scope, key)
   end
 
   def get_method_and_data(data, allow_methods)
-    match = data.match(/^(\w+)\((?:["]([^"]+)["]|[']([^']+)['])\)$/)
+    match = data.match(/^(\w+)\((?:"([^"]+)"|'([^']+)')\)$/)
     if match
       fail(Issues::HIERA_INTERPOLATION_METHOD_SYNTAX_NOT_ALLOWED) unless allow_methods
 

lib/puppet/pops/parser/lexer2.rb

@@ -170,10 +170,10 @@ class Lexer2
   # The NAME and CLASSREF in 4x are strict. Each segment must start with
   # a letter a-z and may not contain dashes (\w includes letters, digits and _).
   #
-  PATTERN_CLASSREF       = %r{((::){0,1}[A-Z][\w]*)+}
-  PATTERN_NAME           = %r{^((::)?[a-z][\w]*)(::[a-z][\w]*)*$}
+  PATTERN_CLASSREF       = %r{((::){0,1}[A-Z]\w*)+}
+  PATTERN_NAME           = %r{^((::)?[a-z]\w*)(::[a-z]\w*)*$}
 
-  PATTERN_BARE_WORD      = %r{((?:::){0,1}(?:[a-z_](?:[\w-]*[\w])?))+}
+  PATTERN_BARE_WORD      = %r{((?:::){0,1}(?:[a-z_](?:[\w-]*\w)?))+}
 
   PATTERN_DOLLAR_VAR     = %r{\$(::)?(\w+::)*\w+}
   PATTERN_NUMBER         = %r{\b(?:0[xX][0-9A-Fa-f]+|0?\d+(?:\.\d+)?(?:[eE]-?\d+)?)\b}

lib/puppet/pops/parser/slurp_support.rb

@@ -13,9 +13,9 @@ module Parser
 module SlurpSupport
   include LexerSupport
 
-  SLURP_SQ_PATTERN  = /(?:[^\\]|^)(?:[\\]{2})*[']/
-  SLURP_DQ_PATTERN  = /(?:[^\\]|^)(?:[\\]{2})*(["]|[$]\{?)/
-  SLURP_UQ_PATTERN  = /(?:[^\\]|^)(?:[\\]{2})*([$]\{?|\z)/
+  SLURP_SQ_PATTERN  = /(?:[^\\]|^)(?:\\{2})*'/
+  SLURP_DQ_PATTERN  = /(?:[^\\]|^)(?:\\{2})*("|[$]\{?)/
+  SLURP_UQ_PATTERN  = /(?:[^\\]|^)(?:\\{2})*([$]\{?|\z)/
   # unquoted, no escapes
   SLURP_UQNE_PATTERN = /(\$\{?|\z)/m
   SLURP_ALL_PATTERN = /.*(\z)/m
@@ -76,7 +76,7 @@ def slurp(scanner, pattern, escapes, ignore_invalid_escapes)
     # If later a \u is found it is warned not to be a unicode escape
     if escapes.include?('u')
       # gsub must be repeated to cater for adjacent escapes
-      while str.gsub!(/((?:[^\\]|^)(?:[\\]{2})*)\\u(?:([\da-fA-F]{4})|\{([\da-fA-F]{1,6})\})/m) { ::Regexp.last_match(1) + [(::Regexp.last_match(2) || ::Regexp.last_match(3)).hex].pack("U") }
+      while str.gsub!(/((?:[^\\]|^)(?:\\{2})*)\\u(?:([\da-fA-F]{4})|\{([\da-fA-F]{1,6})\})/m) { ::Regexp.last_match(1) + [(::Regexp.last_match(2) || ::Regexp.last_match(3)).hex].pack("U") }
         # empty block. Everything happens in the gsub block
       end
     end

lib/puppet/pops/patterns.rb

@@ -29,20 +29,20 @@ module Puppet::Pops::Patterns
   # CLASSREF_EXT matches a class reference the same way as the lexer - i.e. the external source form
   # where each part must start with a capital letter A-Z.
   #
-  CLASSREF_EXT = %r{\A((::){0,1}[A-Z][\w]*)+\z}
+  CLASSREF_EXT = %r{\A((::){0,1}[A-Z]\w*)+\z}
 
   # Same as CLASSREF_EXT but cannot start with '::'
   #
-  CLASSREF_EXT_DECL = %r{\A[A-Z][\w]*(?:::[A-Z][\w]*)*\z}
+  CLASSREF_EXT_DECL = %r{\A[A-Z]\w*(?:::[A-Z]\w*)*\z}
 
   # CLASSREF matches a class reference the way it is represented internally in the
   # model (i.e. in lower case).
   #
-  CLASSREF = %r{\A((::){0,1}[a-z][\w]*)+\z}
+  CLASSREF = %r{\A((::){0,1}[a-z]\w*)+\z}
 
   # Same as CLASSREF but cannot start with '::'
   #
-  CLASSREF_DECL = %r{\A[a-z][\w]*(?:::[a-z][\w]*)*\z}
+  CLASSREF_DECL = %r{\A[a-z]\w*(?:::[a-z]\w*)*\z}
 
   # DOLLAR_VAR matches a variable name including the initial $ character
   DOLLAR_VAR = %r{\$(::)?(\w+::)*\w+}

lib/puppet/pops/pcore.rb

@@ -10,7 +10,7 @@ module Pcore
   TYPE_URI = Types::TypeFactory.pattern(TYPE_URI_RX)
   TYPE_URI_ALIAS = Types::PTypeAliasType.new('Pcore::URI', nil, TYPE_URI)
   TYPE_SIMPLE_TYPE_NAME = Types::TypeFactory.pattern(/\A[A-Z]\w*\z/)
-  TYPE_QUALIFIED_REFERENCE = Types::TypeFactory.pattern(/\A[A-Z][\w]*(?:::[A-Z][\w]*)*\z/)
+  TYPE_QUALIFIED_REFERENCE = Types::TypeFactory.pattern(/\A[A-Z]\w*(?:::[A-Z]\w*)*\z/)
   TYPE_MEMBER_NAME = Types::PPatternType.new([Types::PRegexpType.new(Patterns::PARAM_NAME)])
 
   KEY_PCORE_URI = 'pcore_uri'

lib/puppet/provider/package/openbsd.rb

@@ -30,7 +30,7 @@ def self.instances
     begin
       execpipe(listcmd) do |process|
         # our regex for matching pkg_info output
-        regex = /^(.*)-(\d[^-]*)[-]?([\w-]*)(.*)$/
+        regex = /^(.*)-(\d[^-]*)-?([\w-]*)(.*)$/
         fields = [:name, :ensure, :flavor]
         hash = {}
 
@@ -89,15 +89,15 @@ def latest
       return version
     else
       # Remove all fuzzy matches first.
-      output = output.split.select { |p| p =~ /^#{resource[:name]}-(\d[^-]*)[-]?(\w*)/ }.join
+      output = output.split.select { |p| p =~ /^#{resource[:name]}-(\d[^-]*)-?(\w*)/ }.join
       debug "pkg_info -Q for #{resource[:name]}: #{output}"
     end
 
-    if output =~ /^#{resource[:name]}-(\d[^-]*)[-]?(\w*) \(installed\)$/
+    if output =~ /^#{resource[:name]}-(\d[^-]*)-?(\w*) \(installed\)$/
       debug "Package is already the latest available"
       return version
     else
-      match = /^(.*)-(\d[^-]*)[-]?(\w*)$/.match(output)
+      match = /^(.*)-(\d[^-]*)-?(\w*)$/.match(output)
       debug "Latest available for #{resource[:name]}: #{match[2]}"
 
       if version.to_sym == :absent || version.to_sym == :purged
@@ -201,7 +201,7 @@ def get_full_name(latest = false)
   def get_version
     execpipe([command(:pkginfo), "-I", @resource[:name]]) do |process|
       # our regex for matching pkg_info output
-      regex = /^(.*)-(\d[^-]*)[-]?(\w*)(.*)$/
+      regex = /^(.*)-(\d[^-]*)-?(\w*)(.*)$/
       master_version = 0
       version = -1
 

lib/puppet/settings/config_file.rb

@@ -125,7 +125,7 @@ def extract_fileinfo(string)
     value = string.sub(/\{\s*([^}]+)\s*\}/) do
       params = ::Regexp.last_match(1)
       params.split(/\s*,\s*/).each do |str|
-        if str =~ /^\s*(\w+)\s*=\s*([\w]+)\s*$/
+        if str =~ /^\s*(\w+)\s*=\s*(\w+)\s*$/
           param = ::Regexp.last_match(1).intern
           value = ::Regexp.last_match(2)
           result[param] = value