Merge pull request #1003 from puppetlabs/i18nTesting

merge i18nTesting to master

Author: eputnam

.fixtures.yml

@@ -2,5 +2,6 @@ fixtures:
   repositories:
     "stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib"
     "staging": "https://github.com/voxpupuli/puppet-staging"
+    "translate": "https://github.com/puppetlabs/puppetlabs-translate"
   symlinks:
     "mysql": "#{source_dir}"

.rubocop.yml

@@ -1,5 +1,7 @@
 ---
-require: rubocop-rspec
+require:
+ - rubocop-rspec
+ - rubocop-i18n
 AllCops:
   TargetRubyVersion: '2.1'
   Include:
@@ -12,6 +14,7 @@ AllCops:
   - pkg/**/*
   - spec/fixtures/**/*
   - vendor/**/*
+inherit_from: .rubocop_todo.yml
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
@@ -94,3 +97,7 @@ Style/IfUnlessModifier:
   Enabled: false
 Style/SymbolProc:
   Enabled: false
+GetText/DecorateString:
+  Enabled: false
+GetText/DecorateFunctionMessage:
+  Enabled: true

.rubocop_todo.yml

@@ -0,0 +1,123 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-09-04 11:31:12 +0100 using RuboCop version 0.49.1.
+# 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/DuplicatedKey:
+  Exclude:
+    - 'spec/classes/mysql_server_backup_spec.rb'
+
+# Offense count: 1
+Lint/HandleExceptions:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+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: 11
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 351
+
+# Offense count: 1
+RSpec/BeforeAfterAll:
+  Exclude:
+    - 'spec/acceptance/**/*.rb'
+    - 'spec/unit/puppet/functions/mysql_password_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: 38
+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: 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'

.sync.yml

@@ -6,5 +6,4 @@ spec/spec_helper.rb:
 .travis.yml:
   extras:
   - rvm: 2.1.9
-    bundler_args: --without system_tests
-    script: bundle exec rubocop lib  
+    script: bundle exec rake rubocop

.travis.yml

@@ -29,7 +29,6 @@ matrix:
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0"
   - rvm: 2.1.9
-    bundler_args: --without system_tests
     script: bundle exec rubocop lib
 notifications:
   email: false

Gemfile

@@ -31,7 +31,6 @@ end
 supports_windows = false
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
-
 group :development do
   gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
   gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
@@ -45,12 +44,16 @@ end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
   gem "puppet-module-win-system-r#{minor_version}",                              :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')
   gem "beaker-pe",                                                               :require => false
-  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
+  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
-  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
   gem "puppet-blacksmith", '~> 3.4',                                             :require => false
+  gem "puppet-lint-i18n"
+  gem "puppet_pot_generator"
+  gem "rubocop-i18n", '~> 1.0'
+  gem "beaker-i18n_helper"
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

Rakefile

@@ -1,5 +1,6 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'puppet_pot_generator/rake_tasks' if Bundler.rubygems.find_name('puppet_pot_generator').any?
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 
 PuppetLint.configuration.fail_on_warnings = true

lib/puppet/parser/functions/mysql_deepmerge.rb

@@ -19,15 +19,15 @@ module Puppet::Parser::Functions
     ENDHEREDOC
 
     if args.length < 2
-      raise Puppet::ParseError, "mysql_deepmerge(): wrong number of arguments (#{args.length}; must be at least 2)"
+      raise Puppet::ParseError, _('mysql_deepmerge(): wrong number of arguments (%{args_length}; must be at least 2)') % { args_length: args.length }
     end
 
     result = {}
     args.each do |arg|
       next if arg.is_a?(String) && arg.empty? # empty string is synonym for puppet's undef
       # If the argument was not a hash, skip it.
       unless arg.is_a?(Hash)
-        raise Puppet::ParseError, "mysql_deepmerge: unexpected argument type #{arg.class}, only expects hash arguments"
+        raise Puppet::ParseError, _('mysql_deepmerge: unexpected argument type %{arg_class}, only expects hash arguments.') % { args_class: args.class }
       end
 
       # Now we have to traverse our hash assigning our non-hash values

lib/puppet/parser/functions/mysql_dirname.rb

@@ -6,13 +6,10 @@ module Puppet::Parser::Functions
              ) do |arguments|
 
     if arguments.empty?
-      raise(Puppet::ParseError, 'mysql_dirname(): Wrong number of arguments ' \
-        "given (#{arguments.size} for 1)")
+      raise Puppet::ParseError, _('mysql_dirname(): Wrong number of arguments given (%{args_length} for 1)') % { args_length: args.length }
     end
 
     path = arguments[0]
     return File.dirname(path)
   end
 end
-
-# vim: set ts=2 sw=2 et :

lib/puppet/parser/functions/mysql_password.rb

@@ -8,8 +8,7 @@ module Puppet::Parser::Functions
              ) do |args|
 
     if args.size != 1
-      raise(Puppet::ParseError, 'mysql_password(): Wrong number of arguments ' \
-        "given (#{args.size} for 1)")
+      raise Puppet::ParseError, _('mysql_password(): Wrong number of arguments given (%{args_length} for 1)') % { args_length: args.length }
     end
 
     return '' if args[0].empty?

lib/puppet/parser/functions/mysql_strip_hash.rb

@@ -8,7 +8,7 @@ module Puppet::Parser::Functions
 
     hash = args[0]
     unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'mysql_strip_hash(): Requires hash to work with')
+      raise(Puppet::ParseError, _('mysql_strip_hash(): Requires a hash to work.'))
     end
 
     # Filter out all the top level blanks.

lib/puppet/provider/mysql_datadir/mysql.rb

@@ -21,7 +21,7 @@ def create
     # rubocop:enable Lint/UselessAssignment
     unless defaults_extra_file.nil?
       unless File.exist?(defaults_extra_file)
-        raise ArgumentError, "Defaults-extra-file #{defaults_extra_file} is missing"
+        raise ArgumentError, _('Defaults-extra-file %{file} is missing.') % { file: defaults_extra_file }
       end
       defaults_extra_file = "--defaults-extra-file=#{defaults_extra_file}"
     end
@@ -56,7 +56,7 @@ def create
 
   def destroy
     name = @resource[:name] # rubocop:disable Lint/UselessAssignment
-    raise ArgumentError, 'ERROR: Resource can not be removed'
+    raise ArgumentError, _('ERROR: `Resource` can not be removed.')
   end
 
   def exists?

lib/puppet/provider/mysql_grant/mysql.rb

@@ -16,16 +16,14 @@ def self.instances
         # of myhost.mydomain.my: [email protected], when MySQL is started
         # with --skip-name-resolve.
         next if e.inspect =~ %r{There is no such grant defined for user}
-        raise Puppet::Error, "#mysql had an error ->  #{e.inspect}"
+        raise Puppet::Error, _('#mysql had an error ->  %{inspect}') % { inspect: e.inspect }
       end
       # Once we have the list of grants generate entries for each.
       grants.each_line do |grant|
         # Match the munges we do in the type.
         munged_grant = grant.delete("'").delete('`').delete('"')
         # Matching: GRANT (SELECT, UPDATE) PRIVILEGES ON (*.*) TO ('root')@('127.0.0.1') (WITH GRANT OPTION)
-        # rubocop:disable Lint/AssignmentInCondition
-        next unless match = munged_grant.match(%r{^GRANT\s(.+)\sON\s(.+)\sTO\s(.*)@(.*?)(\s.*)?$})
-        # rubocop:enable Lint/AssignmentInCondition
+        next unless match = munged_grant.match(%r{^GRANT\s(.+)\sON\s(.+)\sTO\s(.*)@(.*?)(\s.*)?$}) # rubocop:disable Lint/AssignmentInCondition
         privileges, table, user, host, rest = match.captures
         table.gsub!('\\\\', '\\')
 

lib/puppet/provider/mysql_user/mysql.rb

@@ -122,7 +122,7 @@ def password_hash=(string)
       # default ... if mysqld_version does not work
       mysql([defaults_file, system_database, '-e', "SET PASSWORD FOR #{merged_name} = '#{string}'"].compact)
     elsif (mysqld_type == 'mysql' || mysqld_type == 'percona') && Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0
-      raise ArgumentError, 'Only mysql_native_password (*ABCD...XXX) hashes are supported' unless string =~ %r{^\*}
+      raise ArgumentError, _('Only mysql_native_password (*ABCD...XXX) hashes are supported.') unless string =~ %r{^\*}
       mysql([defaults_file, system_database, '-e', "ALTER USER #{merged_name} IDENTIFIED WITH mysql_native_password AS '#{string}'"].compact)
     else
       mysql([defaults_file, system_database, '-e', "SET PASSWORD FOR #{merged_name} = '#{string}'"].compact)

lib/puppet/type/mysql_grant.rb

@@ -31,12 +31,12 @@ def initialize(*args)
   end
   # rubocop:enable Style/MultilineBlockChain
   validate do
-    raise('privileges parameter is required.') if self[:ensure] == :present && self[:privileges].nil?
-    raise('PROXY must be the only privilege specified.') if Array(self[:privileges]).count > 1 && Array(self[:privileges]).include?('PROXY')
-    raise('table parameter is required.') if self[:ensure] == :present && self[:table].nil?
-    raise('user parameter is required.') if self[:ensure] == :present && self[:user].nil?
+    raise(_('`privileges` `parameter` is required.')) if self[:ensure] == :present && self[:privileges].nil?
+    raise(_('`privileges` `parameter`: PROXY can only be specified by itself.')) if Array(self[:privileges]).count > 1 && Array(self[:privileges]).include?('PROXY')
+    raise(_('`table` `parameter` is required.')) if self[:ensure] == :present && self[:table].nil?
+    raise(_('`user` `parameter` is required.')) if self[:ensure] == :present && self[:user].nil?
     if self[:user] && self[:table]
-      raise('name must match user@host/table format') if self[:name] != "#{self[:user]}/#{self[:table]}"
+      raise(_('`name` `parameter` must match user@host/table format.')) if self[:name] != "#{self[:user]}/#{self[:table]}"
     end
   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
-        raise(ArgumentError, "PROXY user not supported on mysql versions < 5.5.0. Current version #{mysql_version}")
+        raise(ArgumentError, _('PROXY user not supported on mysql versions < 5.5.0. Current version %{version}.') % { version: mysql_version })
       end
     end
   end
@@ -63,7 +63,9 @@ def initialize(*args)
     desc 'Table to apply privileges to.'
 
     validate do |value|
-      raise(ArgumentError, '"table" for PROXY should be specified as proxy_user@proxy_host') if Array(@resource[:privileges]).include?('PROXY') && !%r{^[0-9a-zA-Z$_]*@[\w%\.:\-/]*$}.match(value)
+      if Array(@resource[:privileges]).include?('PROXY') && !%r{^[0-9a-zA-Z$_]*@[\w%\.:\-\/]*$}.match(value)
+        raise(ArgumentError, _('`table` `property` for PROXY should be specified as proxy_user@proxy_host.'))
+      end
     end
 
     munge do |value|
@@ -91,15 +93,15 @@ def initialize(*args)
         user_part = matches[1]
         host_part = matches[2]
       else
-        raise(ArgumentError, "Invalid database user #{value}")
+        raise(ArgumentError, _('Invalid database user %{user}.') % { user: value })
       end
       # rubocop:enable Lint/AssignmentInCondition
       # rubocop:enable Lint/UselessAssignment
       mysql_version = Facter.value(:mysql_version)
       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') < 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
       end
     end
 

lib/puppet/type/mysql_user.rb

@@ -26,14 +26,14 @@
         user_part = matches[1]
         host_part = matches[2]
       else
-        raise(ArgumentError, "Invalid database user #{value}")
+        raise ArgumentError, _('Invalid database user %{user}.') % { user: value }
       end
       # 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') < 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
       end
     end
 
@@ -79,12 +79,12 @@
       value = [value] unless value.is_a?(Array)
       if value.include?('NONE') || value.include?('SSL') || value.include?('X509')
         if value.length > 1
-          raise(ArgumentError, 'REQUIRE tls options NONE, SSL and X509 cannot be used with other options, you may only use one of them.')
+          raise(ArgumentError, _('`tls_options` `property`: The values NONE, SSL and X509 cannot be used with other options, you may only pick one of them.'))
         end
       else
         value.each do |opt|
           o = opt.match(%r{^(CIPHER|ISSUER|SUBJECT)}i)
-          raise(ArgumentError, "Invalid tls option #{o}") unless o
+          raise(ArgumentError, _('Invalid tls option %{option}.') % { option: o }) unless o
         end
       end
     end