Merge pull request #1041 from puppetlabs/Rubocop

Rubocop Todo File Resolved

Author: willmeek

.rubocop_todo.yml

@@ -1,167 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-12-06 17:18:57 +0000 using RuboCop version 0.51.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
-  Exclude:
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 1
-Lint/AmbiguousRegexpLiteral:
-  Exclude:
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-
-# Offense count: 1
-Lint/RescueWithoutErrorClass:
-  Exclude:
-    - 'lib/facter/mysql_server_id.rb'
-
-# Offense count: 16
-Lint/ReturnInVoidContext:
-  Exclude:
-    - 'lib/puppet/provider/mysql_database/mysql.rb'
-    - 'lib/puppet/provider/mysql_user/mysql.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/ScriptPermission:
-  Exclude:
-    - 'spec/unit/puppet/functions/mysql_deepmerge_spec.rb'
-
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'spec/unit/puppet/functions/mysql_deepmerge_spec.rb'
-
-# Offense count: 56
-# Configuration parameters: Blacklist.
-# Blacklist: END, (?-mix:EO[A-Z]{1})
-Naming/HeredocDelimiterNaming:
-  Exclude:
-    - 'lib/puppet/parser/functions/mysql_deepmerge.rb'
-    - 'lib/puppet/parser/functions/mysql_dirname.rb'
-    - 'lib/puppet/parser/functions/mysql_password.rb'
-    - 'lib/puppet/parser/functions/mysql_strip_hash.rb'
-    - 'spec/acceptance/locales_spec.rb'
-    - 'spec/acceptance/mysql_backup_spec.rb'
-    - 'spec/acceptance/mysql_db_spec.rb'
-    - 'spec/acceptance/mysql_server_spec.rb'
-    - 'spec/acceptance/sql_task_spec.rb'
-    - 'spec/acceptance/types/mysql_database_spec.rb'
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/acceptance/types/mysql_plugin_spec.rb'
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/mysql_server_account_security_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
-  Exclude:
-    - 'lib/puppet/parser/functions/mysql_strip_hash.rb'
-    - 'lib/puppet/provider/mysql_database/mysql.rb'
-    - 'lib/puppet/provider/mysql_grant/mysql.rb'
-    - 'lib/puppet/provider/mysql_plugin/mysql.rb'
-    - 'lib/puppet/provider/mysql_user/mysql.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 40
-# Configuration parameters: Prefixes.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/acceptance/mysql_backup_spec.rb'
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/graceful_failures_spec.rb'
-    - 'spec/classes/mycnf_template_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_mysqltuner_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/unit/facter/mysql_server_id_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-    - 'spec/unit/puppet/type/mysql_user_spec.rb'
-
-# Offense count: 56
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/acceptance/mysql_backup_spec.rb'
-    - 'spec/acceptance/types/mysql_database_spec.rb'
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/acceptance/types/mysql_plugin_spec.rb'
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_monitor_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-
-# Offense count: 3
-# Configuration parameters: CustomTransform, IgnoreMethods.
-RSpec/FilePath:
-  Exclude:
-    - 'spec/unit/facter/mysql_server_id_spec.rb'
-    - 'spec/unit/facter/mysql_version_spec.rb'
-    - 'spec/unit/facter/mysqld_version_spec.rb'
-
-# Offense count: 41
-# Configuration parameters: AssignmentOnly.
-RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/acceptance/mysql_server_spec.rb'
-    - 'spec/unit/puppet/type/mysql_database_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-    - 'spec/unit/puppet/type/mysql_plugin_spec.rb'
-    - 'spec/unit/puppet/type/mysql_user_spec.rb'
-
-# Offense count: 42
-RSpec/MultipleExpectations:
-  Max: 4
-
-# Offense count: 42
-# Configuration parameters: Max.
-RSpec/NestedGroups:
-  Exclude:
-    - 'spec/acceptance/mysql_backup_spec.rb'
-    - 'spec/classes/mycnf_template_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedExample:
-  Exclude:
-    - 'spec/classes/mysql_server_account_security_spec.rb'
-
-# Offense count: 3
-RSpec/ScatteredLet:
-  Exclude:
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 1
-Style/CommentedKeyword:
-  Exclude:
-    - 'spec/spec_helper_acceptance.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/classes/mycnf_template_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'

spec/acceptance/locales_spec.rb

@@ -11,7 +11,7 @@
 
   context 'when triggering puppet simple string error' do
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
     class { 'mysql::server':
             config_file             => '/tmp/mysql.sFlJdV/my.cnf',
             includedir              => '/tmp/mysql.sFlJdV/include',
@@ -26,7 +26,7 @@ class { 'mysql::server':
             old_root_password       => 'kittensnmittens',
             service_enabled         => 'false'
           }
-      EOS
+      MANIFEST
     end
 
     it 'displays Japanese error' do
@@ -38,7 +38,7 @@ class { 'mysql::server':
 
   context 'when triggering puppet interpolated string failure' do
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
     class { 'mysql::server': root_password => 'password' }
     class { 'mysql::server::backup':
               backupuser     => 'myuser',
@@ -49,7 +49,7 @@ class { 'mysql::server::backup':
               provider       => 'mysqldump',
               execpath       => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin',
           }
-      EOS
+      MANIFEST
     end
 
     it 'displays Japanese failure' do
@@ -61,14 +61,14 @@ class { 'mysql::server::backup':
 
   context 'when triggering ruby simple string failure' do
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
       mysql::db { 'mydb':
         user     => 'thisisalongusernametestfortodayandtomorrowandthenextday',
         password => 'mypass',
         host     => 'localhost',
         grant    => ['SELECT', 'UPDATE'],
       }
-    EOS
+    MANIFEST
     end
 
     it 'displays Japanese failure' do
@@ -80,11 +80,11 @@ class { 'mysql::server::backup':
 
   context 'when triggering ruby interpolated string error' do
     let(:pp) do
-      <<-EOS
+      <<-MANIFEST
       mysql_user{ '"name@localhost':
         ensure => 'present',
        }
-      EOS
+      MANIFEST
     end
 
     it 'displays Japanese error' do