puppet 8.5.1 → 8.7.0

data/lib/puppet/forge/errors.rb

@@ -13,7 +13,7 @@ module Puppet::Forge::Errors
     #
     # @return [String] the multiline version of the error message
     def multiline
-      self.message
+      message
     end
   end
 

data/lib/puppet/forge/repository.rb

@@ -69,7 +69,7 @@ class Puppet::Forge
     # repository at +release+ (e.g. "myuser-mymodule").
     def retrieve(release)
       path = @host.chomp('/') + release
-      return cache.retrieve(path)
+      cache.retrieve(path)
     end
 
     # Return the URI string for this repository.
@@ -80,7 +80,7 @@ class Puppet::Forge
     # Return the cache key for this repository, this a hashed string based on
     # the URI.
     def cache_key
-      return @cache_key ||= [
+      @cache_key ||= [
         @host.to_s.gsub(/[^[:alnum:]]+/, '_').sub(/_$/, ''),
         Digest::SHA1.hexdigest(@host.to_s)
       ].join('-').freeze

data/lib/puppet/forge.rb

@@ -114,7 +114,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       uri = decode_uri(response['pagination']['next'])
     end
 
-    return releases
+    releases
   end
 
   def make_http_request(*args)
@@ -134,13 +134,11 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
       if meta['dependencies']
         dependencies = meta['dependencies'].collect do |dep|
-          begin
-            Puppet::ModuleTool::Metadata.new.add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
-            Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
-          rescue ArgumentError => e
-            raise ArgumentError, _("Malformed dependency: %{name}.") % { name: dep['name'] } +
-                                 ' ' + _("Exception was: %{detail}") % { detail: e }
-          end
+          Puppet::ModuleTool::Metadata.new.add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
+          Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
+        rescue ArgumentError => e
+          raise ArgumentError, _("Malformed dependency: %{name}.") % { name: dep['name'] } +
+                               ' ' + _("Exception was: %{detail}") % { detail: e }
         end
       else
         dependencies = []
@@ -150,7 +148,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def install(dir)
-      staging_dir = self.prepare
+      staging_dir = prepare
 
       module_dir = dir + name[/-(.*)/, 1]
       module_dir.rmtree if module_dir.exist?
@@ -163,7 +161,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
       # Return the Pathname object representing the directory where the
       # module release archive was unpacked the to.
-      return module_dir
+      module_dir
     ensure
       staging_dir.rmtree if staging_dir.exist?
     end
@@ -202,9 +200,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def tmpfile
-      @file ||= Tempfile.new(name, Puppet::Forge::Cache.base_path).tap do |f|
-        f.binmode
-      end
+      @file ||= Tempfile.new(name, Puppet::Forge::Cache.base_path).tap(&:binmode)
     end
     # rubocop:enable Naming/MemoizedInstanceVariableName
 
@@ -227,15 +223,13 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def unpack(file, destination)
-      begin
-        Puppet::ModuleTool::Applications::Unpacker.unpack(file.path, destination)
-      rescue Puppet::ExecutionFailure => e
-        raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
-      end
+      Puppet::ModuleTool::Applications::Unpacker.unpack(file.path, destination)
+    rescue Puppet::ExecutionFailure => e
+      raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
     end
 
     def deprecated?
-      @data['module'] && (@data['module']['deprecated_at'] != nil)
+      @data['module'] && !@data['module']['deprecated_at'].nil?
     end
   end
 

data/lib/puppet/functions/abs.rb

@@ -53,9 +53,9 @@ Puppet::Functions.create_function(:abs) do
     # version of this function.
     #
     case x
-    when %r{^-?(?:\d+)(?:\.\d+){1}$}
+    when /^-?(?:\d+)(?:\.\d+){1}$/
       x.to_f.abs
-    when %r{^-?\d+$}
+    when /^-?\d+$/
       x.to_i.abs
     else
       raise(ArgumentError, 'abs(): Requires float or integer to work with - was given non decimal string')

data/lib/puppet/functions/camelcase.rb

@@ -49,7 +49,7 @@ Puppet::Functions.create_function(:camelcase) do
   end
 
   def on_string(s)
-    s.split('_').map { |x| x.capitalize }.join('')
+    s.split('_').map(&:capitalize).join('')
   end
 
   def on_iterable(a)

data/lib/puppet/functions/compare.rb

@@ -98,7 +98,7 @@ Puppet::Functions.create_function(:compare) do
   end
 
   def on_error(a, b, *ignore_case)
-    if !ignore_case.empty?
+    unless ignore_case.empty?
       unless a.is_a?(String) && b.is_a?(String)
         # TRANSLATORS 'compare' is a name
         return _("compare(): The third argument (ignore case) can only be used when comparing strings")
@@ -115,7 +115,7 @@ Puppet::Functions.create_function(:compare) do
 
     if a.class != b.class
       # TRANSLATORS 'compare' is a name
-      return _("compare(): Can only compare values of the same type (or for Timestamp/Timespan also against Numeric). Got %{type_a} and %{type_b}") % {
+      _("compare(): Can only compare values of the same type (or for Timestamp/Timespan also against Numeric). Got %{type_a} and %{type_b}") % {
         type_a: type_label(a), type_b: type_label(b)
       }
     end

data/lib/puppet/functions/contain.rb

@@ -48,7 +48,7 @@ Puppet::Functions.create_function(:contain, Puppet::Functions::InternalFunction)
     # This is the same as calling the include function but faster and does not rely on the include
     # function.
     (scope.compiler.evaluate_classes(classes, scope, false) || []).each do |resource|
-      if !scope.catalog.edge?(containing_resource, resource)
+      unless scope.catalog.edge?(containing_resource, resource)
         scope.catalog.add_edge(containing_resource, resource)
       end
     end

data/lib/puppet/functions/defined.rb

@@ -101,7 +101,7 @@
 # @since 3.8.1 type specific requests with future parser
 # @since 4.0.0
 #
-Puppet::Functions.create_function(:'defined', Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:defined, Puppet::Functions::InternalFunction) do
   dispatch :is_defined do
     scope_param
     required_repeated_param 'Variant[String, Type[CatalogEntry], Type[Type[CatalogEntry]]]', :vals
@@ -112,7 +112,7 @@ Puppet::Functions.create_function(:'defined', Puppet::Functions::InternalFunctio
       case val
       when String
         if val =~ /^\$(.+)$/
-          scope.exist?($1)
+          scope.exist?(Regexp.last_match(1))
         else
           case val
           when ''

data/lib/puppet/functions/dig.rb

@@ -40,7 +40,7 @@ Puppet::Functions.create_function(:dig) do
     args.reduce(data) do |d, k|
       return nil if d.nil? || k.nil?
 
-      if !(d.is_a?(Array) || d.is_a?(Hash))
+      unless d.is_a?(Array) || d.is_a?(Hash)
         t = Puppet::Pops::Types::TypeCalculator.infer(d)
         msg = _("The given data does not contain a Collection at %{walked_path}, got '%{type}'") % { walked_path: walked_path, type: t }
         error_data = Puppet::DataTypes::Error.new(

data/lib/puppet/functions/eyaml_lookup_key.rb

@@ -47,21 +47,19 @@ Puppet::Functions.create_function(:eyaml_lookup_key) do
   def load_data_hash(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
-        if data.is_a?(Hash)
-          Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
-        else
-          msg = _("%{path}: file does not contain a valid yaml hash") % { path: path }
-          raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
+      data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
+      if data.is_a?(Hash)
+        Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
+      else
+        msg = _("%{path}: file does not contain a valid yaml hash") % { path: path }
+        raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
 
-          Puppet.warning(msg)
-          {}
-        end
-      rescue Puppet::Util::Yaml::YamlLoadError => ex
-        # YamlLoadErrors include the absolute path to the file, so no need to add that
-        raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
+        Puppet.warning(msg)
+        {}
       end
+    rescue Puppet::Util::Yaml::YamlLoadError => ex
+      # YamlLoadErrors include the absolute path to the file, so no need to add that
+      raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
     end
   end
 

data/lib/puppet/functions/get.rb

@@ -138,7 +138,7 @@ Puppet::Functions.create_function(:get, Puppet::Functions::InternalFunction) do
 
     begin
       result = call_function('dig', value, *segments)
-      return result.nil? ? default_value : result
+      result.nil? ? default_value : result
     rescue Puppet::ErrorWithData => e
       if block_given?
         yield(e.error_data)

data/lib/puppet/functions/hocon_data.rb

@@ -29,11 +29,9 @@ Puppet::Functions.create_function(:hocon_data) do
   def hocon_data(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        Hocon.parse(content)
-      rescue Hocon::ConfigError => ex
-        raise Puppet::DataBinding::LookupError, _("Unable to parse (%{path}): %{message}") % { path: path, message: ex.message }
-      end
+      Hocon.parse(content)
+    rescue Hocon::ConfigError => ex
+      raise Puppet::DataBinding::LookupError, _("Unable to parse (%{path}): %{message}") % { path: path, message: ex.message }
     end
   end
 

data/lib/puppet/functions/import.rb

@@ -4,6 +4,6 @@
 #
 Puppet::Functions.create_function(:import) do
   def import(*args)
-    raise Puppet::Pops::SemanticError.new(Puppet::Pops::Issues::DISCONTINUED_IMPORT)
+    raise Puppet::Pops::SemanticError, Puppet::Pops::Issues::DISCONTINUED_IMPORT
   end
 end

data/lib/puppet/functions/json_data.rb

@@ -20,12 +20,10 @@ Puppet::Functions.create_function(:json_data) do
   def json_data(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        Puppet::Util::Json.load(content)
-      rescue Puppet::Util::Json::ParseError => ex
-        # Filename not included in message, so we add it here.
-        raise Puppet::DataBinding::LookupError, "Unable to parse (%{path}): %{message}" % { path: path, message: ex.message }
-      end
+      Puppet::Util::Json.load(content)
+    rescue Puppet::Util::Json::ParseError => ex
+      # Filename not included in message, so we add it here.
+      raise Puppet::DataBinding::LookupError, "Unable to parse (%{path}): %{message}" % { path: path, message: ex.message }
     end
   end
 

data/lib/puppet/functions/max.rb

@@ -146,7 +146,7 @@ Puppet::Functions.create_function(:max) do
     assert_arg_count(args)
 
     args.max do |a, b|
-      if a.to_s =~ %r{\A^-?\d+([._eE]\d+)?\z} && b.to_s =~ %r{\A-?\d+([._eE]\d+)?\z}
+      if a.to_s =~ /\A^-?\d+([._eE]\d+)?\z/ && b.to_s =~ /\A-?\d+([._eE]\d+)?\z/
         Puppet.warn_once('deprecations', 'max_function_numeric_coerce_string',
                          _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f
@@ -232,7 +232,7 @@ Puppet::Functions.create_function(:max) do
     args.max do |a, b|
       as = a.to_s
       bs = b.to_s
-      if as =~ %r{\A^-?\d+([._eE]\d+)?\z} && bs =~ %r{\A-?\d+([._eE]\d+)?\z}
+      if as =~ /\A^-?\d+([._eE]\d+)?\z/ && bs =~ /\A-?\d+([._eE]\d+)?\z/
         Puppet.warn_once('deprecations', 'max_function_numeric_coerce_string',
                          _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f

data/lib/puppet/functions/min.rb

@@ -145,7 +145,7 @@ Puppet::Functions.create_function(:min) do
     assert_arg_count(args)
 
     args.min do |a, b|
-      if a.to_s =~ %r{\A^-?\d+([._eE]\d+)?\z} && b.to_s =~ %r{\A-?\d+([._eE]\d+)?\z}
+      if a.to_s =~ /\A^-?\d+([._eE]\d+)?\z/ && b.to_s =~ /\A-?\d+([._eE]\d+)?\z/
         Puppet.warn_once('deprecations', 'min_function_numeric_coerce_string',
                          _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f
@@ -231,7 +231,7 @@ Puppet::Functions.create_function(:min) do
     args.min do |a, b|
       as = a.to_s
       bs = b.to_s
-      if as =~ %r{\A^-?\d+([._eE]\d+)?\z} && bs =~ %r{\A-?\d+([._eE]\d+)?\z}
+      if as =~ /\A^-?\d+([._eE]\d+)?\z/ && bs =~ /\A-?\d+([._eE]\d+)?\z/
         Puppet.warn_once('deprecations', 'min_function_numeric_coerce_string',
                          _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f

data/lib/puppet/functions/new.rb

@@ -994,7 +994,7 @@ Puppet::Functions.create_function(:new, Puppet::Functions::InternalFunction) do
     return args[0] if args.size == 1 && !t.is_a?(Puppet::Pops::Types::PInitType) && t.instance?(args[0])
 
     result = assert_type(t, new_function_for_type(t).call(scope, *args))
-    return block_given? ? yield(result) : result
+    block_given? ? yield(result) : result
   end
 
   def new_function_for_type(t)

data/lib/puppet/functions/reduce.rb

@@ -142,22 +142,18 @@ Puppet::Functions.create_function(:reduce) do
   def reduce_without_memo(enumerable)
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
     enum.reduce do |memo, x|
-      begin
-        yield(memo, x)
-      rescue StopIteration
-        return memo
-      end
+      yield(memo, x)
+    rescue StopIteration
+      return memo
     end
   end
 
   def reduce_with_memo(enumerable, given_memo)
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
     enum.reduce(given_memo) do |memo, x|
-      begin
-        yield(memo, x)
-      rescue StopIteration
-        return memo
-      end
+      yield(memo, x)
+    rescue StopIteration
+      return memo
     end
   end
 end

data/lib/puppet/functions/regsubst.rb

@@ -78,7 +78,7 @@ Puppet::Functions.create_function(:regsubst) do
   def regsubst_string(target, pattern, replacement, flags = nil, encoding = nil)
     re_flags = 0
     operation = :sub
-    if !flags.nil?
+    unless flags.nil?
       flags.split(//).each do |f|
         case f
         when 'G' then operation = :gsub
@@ -92,7 +92,7 @@ Puppet::Functions.create_function(:regsubst) do
   end
 
   def regsubst_regexp(target, pattern, replacement, flags = nil)
-    pattern = (pattern.pattern || '') if pattern.is_a?(Puppet::Pops::Types::PRegexpType)
+    pattern = pattern.pattern || '' if pattern.is_a?(Puppet::Pops::Types::PRegexpType)
     inner_regsubst(target, pattern, replacement, flags == 'G' ? :gsub : :sub)
   end
 

data/lib/puppet/functions/require.rb

@@ -70,7 +70,7 @@ Puppet::Functions.create_function(:require, Puppet::Functions::InternalFunction)
     classes.each do |klass|
       # lookup the class in the scopes
       klass = (classobj = krt.find_hostclass(klass)) ? classobj.name : nil
-      raise Puppet::ParseError.new(_("Could not find class %{klass}") % { klass: klass }) unless klass
+      raise Puppet::ParseError, _("Could not find class %{klass}") % { klass: klass } unless klass
 
       ref = Puppet::Resource.new(:class, klass)
       resource = scope.resource

data/lib/puppet/functions/yaml_data.rb

@@ -22,21 +22,19 @@ Puppet::Functions.create_function(:yaml_data) do
   def yaml_data(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
-        if data.is_a?(Hash)
-          Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
-        else
-          msg = _("%{path}: file does not contain a valid yaml hash" % { path: path })
-          raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
+      data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
+      if data.is_a?(Hash)
+        Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
+      else
+        msg = _("%{path}: file does not contain a valid yaml hash" % { path: path })
+        raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
 
-          Puppet.warning(msg)
-          {}
-        end
-      rescue Puppet::Util::Yaml::YamlLoadError => ex
-        # YamlLoadErrors include the absolute path to the file, so no need to add that
-        raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
+        Puppet.warning(msg)
+        {}
       end
+    rescue Puppet::Util::Yaml::YamlLoadError => ex
+      # YamlLoadErrors include the absolute path to the file, so no need to add that
+      raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
     end
   end
 

data/lib/puppet/functions.rb

@@ -188,12 +188,11 @@ module Puppet::Functions
     # and it will fail unless protected with an if defined? if the local
     # variable does not exist in the block's binder.
     #
-    begin
-      loader = block.binding.eval('loader_injected_arg if defined?(loader_injected_arg)')
-      create_loaded_function(func_name, loader, function_base, &block)
-    rescue StandardError => e
-      raise ArgumentError, _("Function Load Error for function '%{function_name}': %{message}") % { function_name: func_name, message: e.message }
-    end
+
+    loader = block.binding.eval('loader_injected_arg if defined?(loader_injected_arg)')
+    create_loaded_function(func_name, loader, function_base, &block)
+  rescue StandardError => e
+    raise ArgumentError, _("Function Load Error for function '%{function_name}': %{message}") % { function_name: func_name, message: e.message }
   end
 
   # Creates a function in, or in a local loader under the given loader.
@@ -570,7 +569,7 @@ module Puppet::Functions
       @block_name = nil
       @return_type = nil
       @argument_mismatch_hander = argument_mismatch_handler
-      self.instance_eval(&block)
+      instance_eval(&block)
       callable_t = create_callable(@types, @block_type, @return_type, @min, @max)
       @dispatcher.add(Puppet::Pops::Functions::Dispatch.new(callable_t, meth_name, @names, @max == :default, @block_name, @injections, @weaving, @argument_mismatch_hander))
     end
@@ -591,14 +590,12 @@ module Puppet::Functions
     end
 
     def internal_type_parse(type_string, loader)
-      begin
-        Puppet::Pops::Types::TypeParser.singleton.parse(type_string, loader)
-      rescue StandardError => e
-        raise ArgumentError, _("Parsing of type string '\"%{type_string}\"' failed with message: <%{message}>.\n") % {
-          type_string: type_string,
-          message: e.message
-        }
-      end
+      Puppet::Pops::Types::TypeParser.singleton.parse(type_string, loader)
+    rescue StandardError => e
+      raise ArgumentError, _("Parsing of type string '\"%{type_string}\"' failed with message: <%{message}>.\n") % {
+        type_string: type_string,
+        message: e.message
+      }
     end
     private :internal_type_parse
   end
@@ -688,10 +685,10 @@ module Puppet::Functions
     PARAM_NAMES = [
       [],
       ['p0'].freeze,
-      ['p0', 'p1'].freeze,
-      ['p0', 'p1', 'p2'].freeze,
-      ['p0', 'p1', 'p2', 'p3'].freeze,
-      ['p0', 'p1', 'p2', 'p3', 'p4'].freeze,
+      %w[p0 p1].freeze,
+      %w[p0 p1 p2].freeze,
+      %w[p0 p1 p2 p3].freeze,
+      %w[p0 p1 p2 p3 p4].freeze
     ]
 
     # Creates an anonymous Function3x class that wraps a 3x function
@@ -746,25 +743,23 @@ module Puppet::Functions
         # used to support other features than calling.
         #
         def call(scope, *args, &block)
+          result = catch(:return) do
+            mapped_args = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.map_args(args, scope, '')
+            # this is the scope.function_xxx(...) call
+            return scope.send(self.class.method3x, mapped_args)
+          end
+          result.value
+        rescue Puppet::Pops::Evaluator::Next => jumper
+          begin
+            throw :next, jumper.value
+          rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
+            raise Puppet::ParseError.new("next() from context where this is illegal", jumper.file, jumper.line)
+          end
+        rescue Puppet::Pops::Evaluator::Return => jumper
           begin
-            result = catch(:return) do
-              mapped_args = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.map_args(args, scope, '')
-              # this is the scope.function_xxx(...) call
-              return scope.send(self.class.method3x, mapped_args)
-            end
-            return result.value
-          rescue Puppet::Pops::Evaluator::Next => jumper
-            begin
-              throw :next, jumper.value
-            rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
-              raise Puppet::ParseError.new("next() from context where this is illegal", jumper.file, jumper.line)
-            end
-          rescue Puppet::Pops::Evaluator::Return => jumper
-            begin
-              throw :return, jumper
-            rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
-              raise Puppet::ParseError.new("return() from context where this is illegal", jumper.file, jumper.line)
-            end
+            throw :return, jumper
+          rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
+            raise Puppet::ParseError.new("return() from context where this is illegal", jumper.file, jumper.line)
           end
         end
       end

data/lib/puppet/generate/type.rb

@@ -135,7 +135,7 @@ module Puppet
         end
 
         # Sort the inputs by path
-        inputs.sort_by! { |input| input.path }
+        inputs.sort_by!(&:path)
       end
 
       def self.bad_input?
@@ -155,7 +155,7 @@ module Puppet
       def self.generate(inputs, outputdir = nil, force = false)
         # remove files for non existing inputs
         unless outputdir.nil?
-          filenames_to_keep = inputs.map { |i| i.output_name }
+          filenames_to_keep = inputs.map(&:output_name)
           existing_files = Puppet::FileSystem.children(outputdir).map { |f| Puppet::FileSystem.basename(f) }
           files_to_remove = existing_files - filenames_to_keep
           files_to_remove.each do |f|

data/lib/puppet/gettext/config.rb

@@ -43,9 +43,9 @@ module Puppet::GettextConfig
   # @return [String] the active locale
   def self.current_locale
     if gettext_loaded?
-      return FastGettext.default_locale
+      FastGettext.default_locale
     else
-      return 'en'
+      'en'
     end
   end
 
@@ -55,7 +55,7 @@ module Puppet::GettextConfig
   def self.loaded_text_domains
     return [] if @gettext_disabled || !gettext_loaded?
 
-    return FastGettext.translation_repositories.keys
+    FastGettext.translation_repositories.keys
   end
 
   # @api private
@@ -191,11 +191,11 @@ module Puppet::GettextConfig
   # @return [String] path to the config, or nil if not found
   def self.puppet_locale_path
     if Puppet::FileSystem.exist?(LOCAL_PATH)
-      return LOCAL_PATH
+      LOCAL_PATH
     elsif Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(WINDOWS_PATH)
-      return WINDOWS_PATH
+      WINDOWS_PATH
     elsif !Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(POSIX_PATH)
-      return POSIX_PATH
+      POSIX_PATH
     else
       nil
     end
@@ -207,9 +207,9 @@ module Puppet::GettextConfig
   # @return [Symbol] :mo if in a package structure, :po otherwise
   def self.translation_mode(conf_path)
     if WINDOWS_PATH == conf_path || POSIX_PATH == conf_path
-      return :mo
+      :mo
     else
-      return :po
+      :po
     end
   end
 
@@ -239,7 +239,7 @@ module Puppet::GettextConfig
     end
 
     add_repository_to_domain(project_name, locale_dir, file_format, text_domain)
-    return true
+    true
   end
 
   # @api private