Clean up i18n and rubocop

Author: hunner

lib/puppet/provider/mysql.rb

@@ -54,25 +54,18 @@ def defaults_file
     self.class.defaults_file
   end
 
-  def self.mysql_caller(textOfSQL, type = 'undefined')
+  def self.mysql_caller(text_of_sql, type)
     if type.eql? 'system'
-      mysql_raw([defaults_file, '--host=', system_database, '-e', textOfSQL].flatten.compact)
+      mysql_raw([defaults_file, '--host=', system_database, '-e', text_of_sql].flatten.compact)
     elsif type.eql? 'regular'
-      mysql_raw([defaults_file, '-NBe', textOfSQL].flatten.compact)
-    elsif type.eql? 'undefined'
-      begin
-        raise Puppet::Error, "#mysql had an error -> did not pass in type parameter"
-      rescue => e
-        puts "Error during processing: #{$!}"
-        puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
-      end
+      mysql_raw([defaults_file, '-NBe', text_of_sql].flatten.compact)
     else
-      raise Puppet::Error, "#mysql had an error -> Unrecognised type '#type'"
+      raise Puppet::Error, _("#mysql_caller: Unrecognised type '%{type}'" % { type: type })
     end
   end
 
   def self.users
-    self.mysql_caller("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').split("\n")
+    mysql_caller("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').split("\n")
   end
 
   # Optional parameter to run a statement on the MySQL system database.

lib/puppet/provider/mysql_database/mysql.rb

@@ -5,9 +5,9 @@
   commands mysql_raw: 'mysql'
 
   def self.instances
-    self.mysql_caller('show databases', 'regular').split("\n").map do |name|
+    mysql_caller('show databases', 'regular').split("\n").map do |name|
       attributes = {}
-      self.mysql_caller(["show variables like '%_database'", name], 'regular').split("\n").each do |line|
+      mysql_caller(["show variables like '%_database'", name], 'regular').split("\n").each do |line|
         k, v = line.split(%r{\s})
         attributes[k] = v
       end

lib/puppet/provider/mysql_grant/mysql.rb

@@ -10,7 +10,7 @@ def self.instances
       user_string = cmd_user(user)
       query = "SHOW GRANTS FOR #{user_string};"
       begin
-        grants = self.mysql_caller(query, 'regular')
+        grants = mysql_caller(query, 'regular')
       rescue Puppet::ExecutionFailure => e
         # Silently ignore users with no grants. Can happen e.g. if user is
         # defined with fqdn and server is run with skip-name-resolve. Example:

lib/puppet/provider/mysql_plugin/mysql.rb

@@ -5,7 +5,7 @@
   commands mysql_raw: 'mysql'
 
   def self.instances
-    self.mysql_caller('show plugins', 'regular').split("\n").map do |line|
+    mysql_caller('show plugins', 'regular').split("\n").map do |line|
       name, _status, _type, library, _license = line.split(%r{\t})
       new(name: name,
           ensure: :present,

lib/puppet/provider/mysql_user/mysql.rb

@@ -6,7 +6,7 @@
   # Build a property_hash containing all the discovered information about MySQL
   # users.
   def self.instances
-    users = self.mysql_caller("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').split("\n")
+    users = mysql_caller("SELECT CONCAT(User, '@',Host) AS User FROM mysql.user", 'regular').split("\n")
     # To reduce the number of calls to MySQL we collect all the properties in
     # one big swoop.
     users.map do |name|
@@ -21,7 +21,7 @@ def self.instances
       end
       @max_user_connections, @max_connections_per_hour, @max_queries_per_hour,
       @max_updates_per_hour, ssl_type, ssl_cipher, x509_issuer, x509_subject,
-      @password, @plugin = self.mysql_caller(query, 'regular').split(%r{\s})
+      @password, @plugin = mysql_caller(query, 'regular').split(%r{\s})
       @tls_options = parse_tls_options(ssl_type, ssl_cipher, x509_issuer, x509_subject)
       # rubocop:enable Metrics/LineLength
       new(name: name,