fix rubocop issues

Author: Julian Todt

lib/puppet/functions/mysql/deepmerge.rb

@@ -12,7 +12,6 @@
 #    When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate),
 #      the rightmost style will win.
 Puppet::Functions.create_function(:'mysql::deepmerge') do
-
   def deepmerge(*args)
     if args.length < 2
       raise Puppet::ParseError, _('mysql_deepmerge(): wrong number of arguments (%{args_length}; must be at least 2)') % { args_length: args.length }
@@ -34,7 +33,7 @@ def deepmerge(*args)
       # and repeating the process.
       overlay(result, current)
     end
-    return(result)
+    result
   end
 
   def normalized?(hash, key)
@@ -57,14 +56,11 @@ def overlay(hash1, hash2)
   end
 
   def deep_copy(inputhash)
-    if !inputhash.is_a? Hash
-      return inputhash
-    else
-      hash = Hash.new
-      inputhash.each do |k,v|
-        hash.store(k, deep_copy(v))
-      end
-      return hash
+    return inputhash unless inputhash.is_a? Hash
+    hash = {}
+    inputhash.each do |k, v|
+      hash.store(k, deep_copy(v))
     end
+    hash
   end
 end

lib/puppet/functions/mysql/dirname.rb

@@ -6,7 +6,7 @@
   end
 
   def dirname(path)
-    return '' if path == nil
-    return File.dirname(path)
+    return '' if path.nil?
+    File.dirname(path)
   end
 end

spec/functions/mysql_deepmerge_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'mysql::deepmerge'  do
+describe 'mysql::deepmerge' do
   it 'exists' do
     is_expected.not_to eq(nil)
   end
@@ -12,7 +12,7 @@
   end
 
   it 'throws error with only one argument' do
-    is_expected.to run.with_params({ 'one' => 1 }).and_raise_error(Puppet::ParseError)
+    is_expected.to run.with_params('one' => 1).and_raise_error(Puppet::ParseError)
   end
 
   it 'accepts empty strings as puppet undef' do
@@ -22,14 +22,14 @@
   index_values = %w[one two three]
   expected_values_one = %w[1 2 2]
   it 'is able to mysql_deepmerge two hashes' do
-    new_hash = subject.execute({ 'one' => '1', 'two' => '1' }, { 'two' => '2', 'three' => '2' })
+    new_hash = subject.execute({ 'one' => '1', 'two' => '1' }, 'two' => '2', 'three' => '2')
     index_values.each_with_index do |index, expected|
       expect(new_hash[index]).to eq(expected_values_one[expected])
     end
   end
 
   it 'mysql_deepmerges multiple hashes' do
-    hash = subject.execute({ 'one' => 1 }, { 'one' => '2' }, { 'one' => '3' })
+    hash = subject.execute({ 'one' => 1 }, { 'one' => '2' }, 'one' => '3')
     expect(hash['one']).to eq('3')
   end
 
@@ -39,20 +39,20 @@
 
   expected_values_two = [1, 2, 'four' => 4]
   it 'mysql_deepmerges subhashes' do
-    hash = subject.execute({ 'one' => 1 }, { 'two' => 2, 'three' => { 'four' => 4 } })
+    hash = subject.execute({ 'one' => 1 }, 'two' => 2, 'three' => { 'four' => 4 })
     index_values.each_with_index do |index, expected|
       expect(hash[index]).to eq(expected_values_two[expected])
     end
   end
 
   it 'appends to subhashes' do
-    hash = subject.execute({ 'one' => { 'two' => 2 } }, { 'one' => { 'three' => 3 } })
+    hash = subject.execute({ 'one' => { 'two' => 2 } }, 'one' => { 'three' => 3 })
     expect(hash['one']).to eq('two' => 2, 'three' => 3)
   end
 
   expected_values_three = [1, 'dos', { 'four' => 4, 'five' => 5 }]
   it 'appends to subhashes 2' do
-    hash = subject.execute({ 'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, { 'two' => 'dos', 'three' => { 'five' => 5 } })
+    hash = subject.execute({ 'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, 'two' => 'dos', 'three' => { 'five' => 5 })
     index_values.each_with_index do |index, expected|
       expect(hash[index]).to eq(expected_values_three[expected])
     end
@@ -61,18 +61,18 @@
   index_values_two = %w[key1 key2]
   expected_values_four = [{ 'a' => 1, 'b' => 99 }, 'c' => 3]
   it 'appends to subhashes 3' do
-    hash = subject.execute({ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, { 'key1' => { 'b' => 99 } })
+    hash = subject.execute({ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, 'key1' => { 'b' => 99 })
     index_values_two.each_with_index do |index, expected|
       expect(hash[index]).to eq(expected_values_four[expected])
     end
   end
 
   it 'equates keys mod dash and underscore #value' do
-    hash = subject.execute({ 'a-b-c' => 1 }, { 'a_b_c' => 10 })
+    hash = subject.execute({ 'a-b-c' => 1 }, 'a_b_c' => 10)
     expect(hash['a_b_c']).to eq(10)
   end
   it 'equates keys mod dash and underscore #not' do
-    hash = subject.execute({ 'a-b-c' => 1 }, { 'a_b_c' => 10 })
+    hash = subject.execute({ 'a-b-c' => 1 }, 'a_b_c' => 10)
     expect(hash).not_to have_key('a-b-c')
   end
 
@@ -81,11 +81,11 @@
   index_values_error = ['a-b-c', 'b_c_d']
   index_values_three.each_with_index do |index, expected|
     it 'keeps style of the last when keys are equal mod dash and underscore #value' do
-      hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, { 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 } })
+      hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 })
       expect(hash[index]).to eq(expected_values_five[expected])
     end
     it 'keeps style of the last when keys are equal mod dash and underscore #not' do
-      hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, { 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 } })
+      hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 })
       expect(hash).not_to have_key(index_values_error[expected])
     end
   end

spec/functions/mysql_strip_hash_spec.rb

@@ -10,18 +10,18 @@
   end
 
   it 'raises a ArgumentError if there is more than 1 arguments' do
-    is_expected.to run.with_params({'foo' => 1}, {'bar' => 2}).and_raise_error(ArgumentError)
+    is_expected.to run.with_params({ 'foo' => 1 }, 'bar' => 2).and_raise_error(ArgumentError)
   end
 
   it 'raises a ArgumentError if argument is not a hash' do
     is_expected.to run.with_params('foo').and_raise_error(ArgumentError)
   end
 
   it 'passes a hash without blanks through' do
-    is_expected.to run.with_params({'one' => 1, 'two' => 2, 'three' => 3}).and_return({'one' => 1, 'two' => 2, 'three' => 3})
+    is_expected.to run.with_params('one' => 1, 'two' => 2, 'three' => 3).and_return('one' => 1, 'two' => 2, 'three' => 3)
   end
 
   it 'removes blank hash elements' do
-    is_expected.to run.with_params({'one' => 1, 'two' => '', 'three' => nil, 'four' => 4}).and_return({"one"=>1, "three"=>nil, "four"=>4})
+    is_expected.to run.with_params('one' => 1, 'two' => '', 'three' => nil, 'four' => 4).and_return('one' => 1, 'three' => nil, 'four' => 4)
   end
 end