(CONT-789) Rubocop Unsafe Autocorrect 7-10

- Style/GlobalStdStream
- Style/NumericPredicate
- Style/StringConcatenation
- Style/SymbolProc

Author: david22swan

.rubocop_todo.yml

@@ -155,13 +155,6 @@ RSpec/StubbedMock:
     - 'spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb'
     - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
-  Exclude:
-    - 'tasks/export.rb'
-    - 'tasks/sql.rb'
-
 # Offense count: 1
 # Configuration parameters: MinBranchesCount.
 Style/HashLikeCase:
@@ -174,43 +167,10 @@ Style/MixinUsage:
     - 'spec/spec_helper.rb'
     - 'spec/spec_helper_local.rb'
 
-# Offense count: 8
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/puppet/provider/mysql.rb'
-    - 'lib/puppet/type/mysql_grant.rb'
-    - 'lib/puppet/type/mysql_user.rb'
-
 # Offense count: 2
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/puppet/functions/mysql/password.rb'
     - 'lib/puppet/functions/mysql_password.rb'
-
-# Offense count: 6
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/puppet/functions/mysql/password.rb'
-    - 'lib/puppet/provider/mysql.rb'
-    - 'lib/puppet/provider/mysql_grant/mysql.rb'
-    - 'lib/puppet/provider/mysql_login_path/mysql_login_path.rb'
-    - 'lib/puppet/provider/mysql_plugin/mysql.rb'
-    - 'lib/puppet/type/mysql_grant.rb'
-
-# Offense count: 10
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
-# AllowedMethods: define_method
-Style/SymbolProc:
-  Exclude:
-    - 'lib/puppet/provider/mysql_login_path/inifile.rb'
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'

lib/puppet/functions/mysql/password.rb

@@ -27,7 +27,7 @@ def password(password, sensitive = false)
                     elsif password.empty?
                       ''
                     else
-                      '*' + Digest::SHA1.hexdigest(Digest::SHA1.digest(password)).upcase
+                      "*#{Digest::SHA1.hexdigest(Digest::SHA1.digest(password)).upcase}"
                     end
 
     if sensitive

lib/puppet/provider/mysql.rb

@@ -6,7 +6,7 @@ class Puppet::Provider::Mysql < Puppet::Provider
   initvars
 
   # Make sure we find mysql commands on CentOS and FreeBSD
-  ENV['PATH'] = ENV.fetch('PATH', nil) + ':/usr/libexec:/usr/local/libexec:/usr/local/bin'
+  ENV['PATH'] = "#{ENV.fetch('PATH', nil)}:/usr/libexec:/usr/local/libexec:/usr/local/bin"
   ENV['LD_LIBRARY_PATH'] = [
     ENV.fetch('LD_LIBRARY_PATH', nil),
     '/usr/lib',
@@ -90,7 +90,7 @@ def newer_than(forks_versions)
   end
 
   def self.older_than(forks_versions)
-    forks_versions.key?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) < 0
+    forks_versions.key?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]).negative?
   end
 
   def older_than(forks_versions)

lib/puppet/provider/mysql_grant/mysql.rb

@@ -40,7 +40,7 @@ def self.instances
           # split and sort the column_privileges in the parentheses and rejoin
           if priv.include?('(')
             type, col = priv.strip.split(%r{\s+|\b}, 2)
-            type.upcase + ' (' + col.slice(1...-1).strip.split(%r{\s*,\s*}).sort.join(', ') + ')'
+            "#{type.upcase} (#{col.slice(1...-1).strip.split(%r{\s*,\s*}).sort.join(', ')})"
           else
             # Once we split privileges up on the , we need to make sure we
             # shortern ALL PRIVILEGES to just all.

lib/puppet/provider/mysql_login_path/inifile.rb

@@ -325,7 +325,7 @@ def sections
   # Returns this IniFile.
   def freeze
     super
-    @ini.each_value { |h| h.freeze }
+    @ini.each_value(&:freeze)
     @ini.freeze
     self
   end
@@ -336,7 +336,7 @@ def freeze
   # Returns this IniFile.
   def taint
     super
-    @ini.each_value { |h| h.taint }
+    @ini.each_value(&:taint)
     @ini.taint
     self
   end

lib/puppet/provider/mysql_login_path/mysql_login_path.rb

@@ -121,7 +121,7 @@ def list_login_paths(context, uid)
       result.push(ensure: 'present',
                   name: section,
                   owner: uid.to_s,
-                  title: section + '-' + uid.to_s,
+                  title: "#{section}-#{uid}",
                   host: ini[section]['host'].nil? ? nil : ini[section]['host'],
                   user: ini[section]['user'].nil? ? nil : ini[section]['user'],
                   password: ini[section]['password'].nil? ? nil : gen_pw(get_password(context, uid, section)),

lib/puppet/provider/mysql_plugin/mysql.rb

@@ -29,7 +29,7 @@ def self.prefetch(resources)
   def create
     # Use plugin_name.so as soname if it's not specified. This won't work on windows as
     # there it should be plugin_name.dll
-    @resource[:soname].nil? ? (soname = @resource[:name] + '.so') : (soname = @resource[:soname])
+    @resource[:soname].nil? ? (soname = "#{@resource[:name]}.so") : (soname = @resource[:soname])
     self.class.mysql_caller("install plugin #{@resource[:name]} soname '#{soname}'", 'regular')
 
     @property_hash[:ensure] = :present

lib/puppet/type/mysql_grant.rb

@@ -25,7 +25,7 @@ def initialize(*args)
                           # split and sort the column_privileges in the parentheses and rejoin
                           if priv.include?('(')
                             type, col = priv.strip.split(%r{\s+|\b}, 2)
-                            type.upcase + ' (' + col.slice(1...-1).strip.split(%r{\s*,\s*}).sort.join(', ') + ')'
+                            "#{type.upcase} (#{col.slice(1...-1).strip.split(%r{\s*,\s*}).sort.join(', ')})"
                           else
                             priv.strip.upcase
                           end
@@ -54,7 +54,7 @@ def initialize(*args)
 
     validate do |value|
       mysql_version = Facter.value(:mysql_version)
-      if value =~ %r{proxy}i && Puppet::Util::Package.versioncmp(mysql_version, '5.5.0') < 0
+      if value =~ %r{proxy}i && Puppet::Util::Package.versioncmp(mysql_version, '5.5.0').negative?
         raise(ArgumentError, _('mysql_grant: PROXY user not supported on mysql versions < 5.5.0. Current version %{version}.') % { version: mysql_version })
       end
     end
@@ -100,9 +100,9 @@ def initialize(*args)
       # rubocop:enable Lint/UselessAssignment
       mysql_version = Facter.value(:mysql_version)
       unless mysql_version.nil?
-        raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 16 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8') < 0 && user_part.size > 16
-        raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 32 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') < 0 && user_part.size > 32
-        raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 80 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') > 0 && user_part.size > 80
+        raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 16 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8').negative? && user_part.size > 16
+        raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 32 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0').negative? && user_part.size > 32
+        raise(ArgumentError, _('mysql_grant: MySQL usernames are limited to a maximum of 80 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0').positive? && user_part.size > 80
       end
     end
 

lib/puppet/type/mysql_user.rb

@@ -36,9 +36,9 @@
       # rubocop:enable Lint/AssignmentInCondition
       # rubocop:enable Lint/UselessAssignment
       unless mysql_version.nil?
-        raise(ArgumentError, _('MySQL usernames are limited to a maximum of 16 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8') < 0 && user_part.size > 16
-        raise(ArgumentError, _('MySQL usernames are limited to a maximum of 32 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') < 0 && user_part.size > 32
-        raise(ArgumentError, _('MySQL usernames are limited to a maximum of 80 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') > 0 && user_part.size > 80
+        raise(ArgumentError, _('MySQL usernames are limited to a maximum of 16 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8').negative? && user_part.size > 16
+        raise(ArgumentError, _('MySQL usernames are limited to a maximum of 32 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0').negative? && user_part.size > 32
+        raise(ArgumentError, _('MySQL usernames are limited to a maximum of 80 characters.')) if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0').positive? && user_part.size > 80
       end
     end
 

spec/unit/puppet/provider/mysql_database/mysql_spec.rb

@@ -38,7 +38,7 @@
       raw_databases.each_line do |db|
         allow(provider.class).to receive(:mysql_caller).with(["show variables like '%_database'", db.chomp], 'regular').and_return("character_set_database latin1\ncollation_database  latin1_swedish_ci\nskip_show_database  OFF") # rubocop:disable Layout/LineLength
       end
-      databases = provider.class.instances.map { |x| x.name }
+      databases = provider.class.instances.map(&:name)
       expect(parsed_databases).to match_array(databases)
     end
   end