Merge branch 'i18nTesting' of github.com:puppetlabs/puppetlabs-mysql into i18nTesting

Author: Helen Campbell

lib/puppet/parser/functions/mysql_deepmerge.rb

@@ -39,7 +39,7 @@ module Puppet::Parser::Functions
   end
 end
 
-def normalized!(hash, key)
+def normalized?(hash, key)
   return true if hash.key?(key)
   return false unless key =~ %r{-|_}
   other_key = key.include?('-') ? key.tr('-', '_') : key.tr('_', '-')
@@ -50,7 +50,7 @@ def normalized!(hash, key)
 
 def overlay(hash1, hash2)
   hash2.each do |key, value|
-    if normalized!(hash1, key) && value.is_a?(Hash) && hash1[key].is_a?(Hash)
+    if normalized?(hash1, key) && value.is_a?(Hash) && hash1[key].is_a?(Hash)
       overlay(hash1[key], value)
     else
       hash1[key] = value

lib/puppet/provider/mysql.rb

@@ -6,9 +6,11 @@ class Puppet::Provider::Mysql < Puppet::Provider
   # Make sure we find mysql commands on CentOS and FreeBSD
   ENV['PATH'] = ENV['PATH'] + ':/usr/libexec:/usr/local/libexec:/usr/local/bin'
 
-  commands mysql: 'mysql'
-  commands mysqld: 'mysqld'
-  commands mysqladmin: 'mysqladmin'
+  # rubocop:disable Style/HashSyntax
+  commands :mysql      => 'mysql'
+  commands :mysqld     => 'mysqld'
+  commands :mysqladmin => 'mysqladmin'
+  # rubocop:enable Style/HashSyntax
 
   # Optional defaults file
   def self.defaults_file

lib/puppet/provider/mysql_datadir/mysql.rb

@@ -11,7 +11,7 @@
   commands mysql_install_db: 'mysql_install_db'
   # rubocop:disable Lint/UselessAssignment
   def create
-    name = @resource[:name]
+    name                     = @resource[:name]
     insecure                 = @resource.value(:insecure) || true
     defaults_extra_file      = @resource.value(:defaults_extra_file)
     user                     = @resource.value(:user) || 'mysql'
@@ -34,9 +34,7 @@ def create
 
     opts = [defaults_extra_file]
     %w[basedir datadir user].each do |opt|
-      # rubocop:disable Security/Eval
-      val = eval(opt)
-      # rubocop:enable Security/Eval
+      val = eval(opt) # rubocop:disable Security/Eval
       opts << "--#{opt}=#{val}" unless val.nil?
     end
 
@@ -57,9 +55,7 @@ def create
   end
 
   def destroy
-    # rubocop:disable Lint/UselessAssignment
-    name = @resource[:name]
-    # rubocop:enable Lint/UselessAssignment
+    name = @resource[:name] # rubocop:disable Lint/UselessAssignment
     raise ArgumentError, 'ERROR: Resource can not be removed'
   end
 

lib/puppet/provider/mysql_grant/mysql.rb

@@ -68,11 +68,9 @@ def self.instances
   def self.prefetch(resources)
     users = instances
     resources.keys.each do |name|
-      # rubocop:disable Lint/AssignmentInCondition
-      if provider = users.find { |user| user.name == name }
+      if provider = users.find { |user| user.name == name } # rubocop:disable Lint/AssignmentInCondition
         resources[name].provider = provider
       end
-      # rubocop:enable Lint/AssignmentInCondition
     end
   end
 

lib/puppet/provider/mysql_plugin/mysql.rb

@@ -18,11 +18,9 @@ def self.instances
   def self.prefetch(resources)
     plugins = instances
     resources.keys.each do |plugin|
-      # rubocop:disable Lint/AssignmentInCondition
-      if provider = plugins.find { |pl| pl.name == plugin }
+      if provider = plugins.find { |pl| pl.name == plugin } # rubocop:disable Lint/AssignmentInCondition
         resources[plugin].provider = provider
       end
-      # rubocop:enable Lint/AssignmentInCondition
     end
   end
 

spec/classes/graceful_failures_spec.rb

@@ -3,12 +3,11 @@
 describe 'mysql::server' do
   context "on an unsupported OS" do
     let(:facts) do
-      {    
-			  :osfamily => 'UNSUPPORTED',
+      {
+        :osfamily => 'UNSUPPORTED',
         :operatingsystem => 'UNSUPPORTED'
       }
-		end
-    
+    end
     it 'should gracefully fail' do
       is_expected.to compile.and_raise_error(/Unsupported platform:/)
     end