puppet 8.5.0-universal-darwin → 8.6.0-universal-darwin

data/lib/puppet/configurer.rb

@@ -83,8 +83,8 @@ class Puppet::Configurer
     else
       result = retrieve_new_catalog(facts, query_options)
 
-      if !result
-        if !Puppet[:usecacheonfailure]
+      unless result
+        unless Puppet[:usecacheonfailure]
           Puppet.warning _("Not using cache on failed catalog")
           return nil
         end
@@ -390,7 +390,7 @@ class Puppet::Configurer
       configured_environment = Puppet[:environment] if Puppet.settings.set_by_config?(:environment)
 
       # We only need to find out the environment to run in if we don't already have a catalog
-      unless (cached_catalog || options[:catalog] || Puppet.settings.set_by_cli?(:environment) || Puppet[:strict_environment_mode])
+      unless cached_catalog || options[:catalog] || Puppet.settings.set_by_cli?(:environment) || Puppet[:strict_environment_mode]
         Puppet.debug(_("Environment not passed via CLI and no catalog was given, attempting to find out the last server-specified environment"))
         initial_environment, loaded_last_environment = last_server_specified_environment
 
@@ -442,7 +442,7 @@ class Puppet::Configurer
       # facts may be used to determine which catalog we get, we need to
       # rerun the process if the environment is changed.
       tries = 0
-      while catalog.environment and not catalog.environment.empty? and catalog.environment != @environment
+      while catalog.environment and !catalog.environment.empty? and catalog.environment != @environment
         if tries > 3
           raise Puppet::Error, _("Catalog environment didn't stabilize after %{tries} fetches, aborting run") % { tries: tries }
         end
@@ -505,7 +505,7 @@ class Puppet::Configurer
       true
     rescue => detail
       Puppet.log_exception(detail, _("Failed to apply catalog: %{detail}") % { detail: detail })
-      return nil
+      nil
     ensure
       execute_postrun_command or return nil # rubocop:disable Lint/EnsureReturn
     end
@@ -536,7 +536,7 @@ class Puppet::Configurer
     rescue Puppet::HTTP::ResponseError => detail
       if detail.response.code == 404
         if Puppet[:strict_environment_mode]
-          raise Puppet::Error.new(_("Environment '%{environment}' not found on server, aborting run.") % { environment: @environment })
+          raise Puppet::Error, _("Environment '%{environment}' not found on server, aborting run.") % { environment: @environment }
         else
           Puppet.notice(_("Environment '%{environment}' not found on server, skipping initial pluginsync.") % { environment: @environment })
         end
@@ -675,12 +675,12 @@ class Puppet::Configurer
 
     puppet.put_facts(facts.name, facts: facts, environment: Puppet.lookup(:current_environment).name.to_s)
 
-    return true
+    true
   rescue => detail
     Puppet.log_exception(detail, _("Failed to submit facts: %{detail}") %
                                  { detail: detail })
 
-    return false
+    false
   end
 
   private
@@ -722,7 +722,7 @@ class Puppet::Configurer
     result
   rescue => detail
     Puppet.log_exception(detail, _("Could not retrieve catalog from cache: %{detail}") % { detail: detail })
-    return nil
+    nil
   end
 
   def retrieve_new_catalog(facts, query_options)
@@ -744,18 +744,16 @@ class Puppet::Configurer
     result
   rescue StandardError => detail
     Puppet.log_exception(detail, _("Could not retrieve catalog from remote server: %{detail}") % { detail: detail })
-    return nil
+    nil
   end
 
   def download_plugins(remote_environment_for_plugins)
-    begin
-      @handler.download_plugins(remote_environment_for_plugins)
-    rescue Puppet::Error => detail
-      if !Puppet[:ignore_plugin_errors] && Puppet[:usecacheonfailure]
-        @running_failure = true
-      else
-        raise detail
-      end
+    @handler.download_plugins(remote_environment_for_plugins)
+  rescue Puppet::Error => detail
+    if !Puppet[:ignore_plugin_errors] && Puppet[:usecacheonfailure]
+      @running_failure = true
+    else
+      raise detail
     end
   end
 end

data/lib/puppet/confine/feature.rb

@@ -4,7 +4,7 @@ require_relative '../../puppet/confine'
 
 class Puppet::Confine::Feature < Puppet::Confine
   def self.summarize(confines)
-    confines.collect { |c| c.values }.flatten.uniq.find_all { |value| !confines[0].pass?(value) }
+    confines.collect(&:values).flatten.uniq.find_all { |value| !confines[0].pass?(value) }
   end
 
   # Is the named feature available?

data/lib/puppet/confine/variable.rb

@@ -29,7 +29,7 @@ class Puppet::Confine::Variable < Puppet::Confine
   end
 
   def message(value)
-    "facter value '#{test_value}' for '#{self.name}' not in required list '#{values.join(",")}'"
+    "facter value '#{test_value}' for '#{name}' not in required list '#{values.join(',')}'"
   end
 
   # Compare the passed-in value to the retrieved value.

data/lib/puppet/confine.rb

@@ -31,7 +31,7 @@ class Puppet::Confine
           Puppet.warning("Could not load confine test '#{name}': #{detail}")
         end
         # Could not find file
-        if !Puppet[:always_retry_plugins]
+        unless Puppet[:always_retry_plugins]
           @tests[name] = nil
         end
       end
@@ -75,7 +75,7 @@ class Puppet::Confine
       end
     end
 
-    return true
+    true
   ensure
     reset
   end

data/lib/puppet/confine_collection.rb

@@ -22,7 +22,7 @@ class Puppet::ConfineCollection
         confine.name = test
         @confines << confine
       end
-      @confines[-1].label = self.label
+      @confines[-1].label = label
     end
   end
 

data/lib/puppet/confiner.rb

@@ -33,7 +33,7 @@ module Puppet::Confiner
   # @api private
   #
   def confine_collection
-    @confine_collection ||= Puppet::ConfineCollection.new(self.to_s)
+    @confine_collection ||= Puppet::ConfineCollection.new(to_s)
   end
 
   # Checks whether this implementation is suitable for the current platform (or returns a summary
@@ -43,6 +43,6 @@ module Puppet::Confiner
   # @api public
   #
   def suitable?(short = true)
-    return(short ? confine_collection.valid? : confine_collection.summary)
+    (short ? confine_collection.valid? : confine_collection.summary)
   end
 end

data/lib/puppet/daemon.rb

@@ -68,7 +68,7 @@ class Puppet::Daemon
       Puppet.debug("Finished closing streams for daemon mode")
     rescue => detail
       Puppet.err "Could not start #{Puppet.run_mode.name}: #{detail}"
-      Puppet::Util.replace_file("/tmp/daemonout", 0644) do |f|
+      Puppet::Util.replace_file("/tmp/daemonout", 0o644) do |f|
         f.puts "Could not start #{Puppet.run_mode.name}: #{detail}"
       end
       exit(12)
@@ -83,7 +83,7 @@ class Puppet::Daemon
   def reexec
     raise Puppet::DevError, _("Cannot reexec unless ARGV arguments are set") unless argv
 
-    command = $0 + " " + argv.join(" ")
+    command = $PROGRAM_NAME + " " + argv.join(" ")
     Puppet.notice "Restarting with '#{command}'"
     stop(:exit => false)
     exec(command)
@@ -115,7 +115,7 @@ class Puppet::Daemon
     end
 
     # extended signals not supported under windows
-    if !Puppet::Util::Platform.windows?
+    unless Puppet::Util::Platform.windows?
       signals = { :HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }
       signals.each do |signal, method|
         Signal.trap(signal) do

data/lib/puppet/datatypes.rb

@@ -128,12 +128,11 @@ module Puppet::DataTypes
     # 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_type(type_name, loader, &block)
-    rescue StandardError => e
-      raise ArgumentError, _("Data Type Load Error for type '%{type_name}': %{message}") % { type_name: type_name, message: e.message }
-    end
+
+    loader = block.binding.eval('loader_injected_arg if defined?(loader_injected_arg)')
+    create_loaded_type(type_name, loader, &block)
+  rescue StandardError => e
+    raise ArgumentError, _("Data Type Load Error for type '%{type_name}': %{message}") % { type_name: type_name, message: e.message }
   end
 
   def self.create_loaded_type(type_name, loader, &block)

data/lib/puppet/defaults.rb

@@ -77,7 +77,7 @@ module Puppet
   #   see the docs for Settings.define_settings
   ############################################################################################
 
-  AS_DURATION = %q{This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).}
+  AS_DURATION = 'This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).'
 
   # @api public
   # @param args [Puppet::Settings] the settings object to define default settings for
@@ -132,7 +132,7 @@ module Puppet
     :log_level => {
       :default    => 'notice',
       :type       => :enum,
-      :values     => ["debug","info","notice","warning","err","alert","emerg","crit"],
+      :values     => %w[debug info notice warning err alert emerg crit],
       :desc       => "Default logging level for messages from Puppet. Allowed values are:
 
         * debug
@@ -166,12 +166,18 @@ module Puppet
         values = munge(value)
         valid   = %w[deprecations undefined_variables undefined_resources]
         invalid = values - (values & valid)
-        if not invalid.empty?
+        unless invalid.empty?
           raise ArgumentError, _("Cannot disable unrecognized warning types '%{invalid}'.") % { invalid: invalid.join(',') } +
               ' ' + _("Valid values are '%{values}'.") % { values: valid.join(', ') }
         end
       end
     },
+    :skip_logging_catalog_request_destination => {
+      :default => false,
+      :type    => :boolean,
+      :desc    => "If you wish to suppress the notice of which compiler supplied the
+        catalog",
+    },
     :merge_dependency_warnings => {
       :default => false,
       :type    => :boolean,
@@ -489,7 +495,7 @@ module Puppet
     },
     :daemonize => {
         :type     => :boolean,
-        :default  => (!Puppet::Util::Platform.windows?),
+        :default  => !Puppet::Util::Platform.windows?,
         :desc     => "Whether to send the process into the background.  This defaults
           to true on POSIX systems, and to false on Windows (where Puppet
           currently cannot daemonize).",
@@ -501,7 +507,7 @@ module Puppet
                      end
     },
     :maximum_uid => {
-        :default  => 4294967290,
+        :default  => 4_294_967_290,
         :type     => :integer,
         :desc     => "The maximum allowed UID.  Some platforms use negative UIDs
           but then ship with tools that do not know how to handle signed ints,
@@ -650,7 +656,7 @@ module Puppet
     :http_proxy_password =>{
       :default    => "none",
       :hook       => proc do |value|
-        if value =~ /[@!# \/]/
+        if value =~ %r{[@!# /]}
           raise "Passwords set in the http_proxy_password setting must be valid as part of a URL, and any reserved characters must be URL-encoded. We received: #{value}"
         end
       end,
@@ -1104,7 +1110,7 @@ EOT
         values = munge(value)
 
         invalid = values - Puppet.valid_file_checksum_types
-        if not invalid.empty?
+        unless invalid.empty?
           raise ArgumentError, _("Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'") % {
             value: invalid.first, name: @name, allowed_values: Puppet.valid_file_checksum_types.join("', '")
           }
@@ -1298,7 +1304,7 @@ EOT
       :sourceaddress => {
         :default    => nil,
         :desc       => "The address the agent should use to initiate requests.",
-      },
+      }
     )
 
   settings.define_settings(:environment,

data/lib/puppet/environments.rb

@@ -35,11 +35,7 @@ module Puppet::Environments
     # @!macro loader_get_or_fail
     def get!(name)
       environment = get(name)
-      if environment
-        environment
-      else
-        raise EnvironmentNotFound, name
-      end
+      environment || raise(EnvironmentNotFound, name)
     end
 
     def clear_all
@@ -198,7 +194,7 @@ module Puppet::Environments
       if Puppet::FileSystem.symlink?(dir) && Puppet[:versioned_environment_dirs]
         dir = Pathname.new Puppet::FileSystem.expand_path(Puppet::FileSystem.readlink(dir))
       end
-      return dir
+      dir
     end
 
     # @!macro loader_search_paths
@@ -317,7 +313,7 @@ module Puppet::Environments
     end
 
     def clear_all
-      @loaders.each { |loader| loader.clear_all }
+      @loaders.each(&:clear_all)
     end
   end
 

data/lib/puppet/error.rb

@@ -28,7 +28,7 @@ module Puppet
 
       super(message, original)
 
-      @file = file unless (file.is_a?(String) && file.empty?)
+      @file = file unless file.is_a?(String) && file.empty?
       @line = line
       @pos = pos
 
@@ -41,7 +41,7 @@ module Puppet
 
     def to_s
       msg = super
-      @file = nil if (@file.is_a?(String) && @file.empty?)
+      @file = nil if @file.is_a?(String) && @file.empty?
       msg += Puppet::Util::Errors.error_location_with_space(@file, @line, @pos)
       msg
     end
@@ -98,7 +98,7 @@ module Puppet
     def self.from_issue_and_stack(issue, args = {})
       filename, line = Puppet::Pops::PuppetStack.top_of_stack
 
-      self.new(
+      new(
         issue.format(args),
         filename,
         line,

data/lib/puppet/external/dot.rb

@@ -100,17 +100,17 @@ module DOT
 
   # options for graph declaration
 
-  GRAPH_OPTS = [
-    'bgcolor',
-    'center', 'clusterrank', 'color', 'concentrate',
-    'fontcolor', 'fontname', 'fontsize',
-    'label', 'layerseq',
-    'margin', 'mclimit',
-    'nodesep', 'nslimit',
-    'ordering', 'orientation',
-    'page',
-    'rank', 'rankdir', 'ranksep', 'ratio',
-    'size'
+  GRAPH_OPTS = %w[
+    bgcolor
+    center clusterrank color concentrate
+    fontcolor fontname fontsize
+    label layerseq
+    margin mclimit
+    nodesep nslimit
+    ordering orientation
+    page
+    rank rankdir ranksep ratio
+    size
   ]
 
   # a root class for any element in dot notation
@@ -119,7 +119,7 @@ module DOT
     attr_accessor :name
 
     def initialize(params = {})
-      @label = params['name'] ? params['name'] : ''
+      @label = params['name'] || ''
     end
 
     def to_s
@@ -135,8 +135,8 @@ module DOT
 
     def initialize(params = {}, option_list = [])
       super(params)
-      @name   = params['name']   ? params['name']   : nil
-      @parent = params['parent'] ? params['parent'] : nil
+      @name   = params['name']   || nil
+      @parent = params['parent'] || nil
       @options = {}
       option_list.each { |i|
         @options[i] = params[i] if params[i]
@@ -161,11 +161,11 @@ module DOT
 
     def initialize(params = {})
       super(params)
-      @name = params['label'] ? params['label'] : ''
+      @name = params['label'] || ''
     end
 
     def to_s
-      (@name && @name != "" ? "<#{@name}>" : "") + "#{@label}"
+      (@name && @name != "" ? "<#{@name}>" : "") + @label.to_s
     end
   end
 
@@ -174,7 +174,7 @@ module DOT
   class DOTNode < DOTElement
     def initialize(params = {}, option_list = NODE_OPTS)
       super(params, option_list)
-      @ports = params['ports'] ? params['ports'] : []
+      @ports = params['ports'] || []
     end
 
     def each_port
@@ -196,16 +196,20 @@ module DOT
     def to_s(t = '')
       # This code is totally incomprehensible; it needs to be replaced!
 
-      label = @options['shape'] != 'record' && @ports.length == 0 ?
-          @options['label'] ?
-            t + $tab + "label = #{stringify(@options['label'])}\n" :
-            '' :
-          t + $tab + 'label = "' + " \\\n" +
-            t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
-            @ports.collect { |i|
-              t + $tab2 + i.to_s
-            }.join("| \\\n") + " \\\n" +
-            t + $tab + '"' + "\n"
+      label = if @options['shape'] != 'record' && @ports.length == 0
+                if @options['label']
+                  t + $tab + "label = #{stringify(@options['label'])}\n"
+                else
+                  ''
+                end
+              else
+                t + $tab + 'label = "' + " \\\n" +
+                  t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
+                  @ports.collect { |i|
+                    t + $tab2 + i.to_s
+                  }.join("| \\\n") + " \\\n" +
+                  t + $tab + '"' + "\n"
+              end
 
       t + "#{@name} [\n" +
         @options.to_a.filter_map { |i|
@@ -229,7 +233,7 @@ module DOT
   class DOTSubgraph < DOTElement
     def initialize(params = {}, option_list = GRAPH_OPTS)
       super(params, option_list)
-      @nodes      = params['nodes'] ? params['nodes'] : []
+      @nodes      = params['nodes'] || []
       @dot_string = 'graph'
     end
 
@@ -253,9 +257,11 @@ module DOT
       hdr = t + "#{@dot_string} #{@name} {\n"
 
       options = @options.to_a.filter_map { |name, val|
-        val && name != 'label' ?
-          t + $tab + "#{name} = #{val}" :
+        if val && name != 'label'
+          t + $tab + "#{name} = #{val}"
+        else
           name ? t + $tab + "#{name} = \"#{val}\"" : nil
+        end
       }.join("\n") + "\n"
 
       nodes = @nodes.collect { |i|
@@ -281,8 +287,8 @@ module DOT
 
     def initialize(params = {}, option_list = EDGE_OPTS)
       super(params, option_list)
-      @from = params['from'] ? params['from'] : nil
-      @to   = params['to'] ? params['to'] : nil
+      @from = params['from'] || nil
+      @to   = params['to'] || nil
     end
 
     def edge_link
@@ -292,9 +298,11 @@ module DOT
     def to_s(t = '')
       t + "#{@from} #{edge_link} #{to} [\n" +
         @options.to_a.filter_map { |i|
-          i[1] && i[0] != 'label' ?
-            t + $tab + "#{i[0]} = #{i[1]}" :
+          if i[1] && i[0] != 'label'
+            t + $tab + "#{i[0]} = #{i[1]}"
+          else
             i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
+          end
         }.join("\n") + "\n#{t}]\n"
     end
   end

data/lib/puppet/face/catalog/select.rb

@@ -44,7 +44,7 @@ Puppet::Face.define(:catalog, '0.0.1') do
       if value.nil? then
         _("no matching resources found")
       else
-        value.map { |x| x.to_s }.join("\n")
+        value.map(&:to_s).join("\n")
       end
     end
   end

data/lib/puppet/face/epp.rb

@@ -71,7 +71,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       status = true # no validation error yet
       files = args
       if files.empty?
-        if not STDIN.tty?
+        if !STDIN.tty?
           tmp = validate_template_string(STDIN.read)
           status &&= tmp
         else
@@ -194,7 +194,7 @@ Puppet::Face.define(:epp, '0.0.1') do
           buffer.print dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options, show_filename)
         end
 
-        if !missing_files.empty?
+        unless missing_files.empty?
           raise Puppet::Error, _("One or more file(s) specified did not exist:\n%{missing_files_list}") %
                                { missing_files_list: missing_files.collect { |f| "   #{f}" }.join("\n") }
         end
@@ -350,12 +350,10 @@ Puppet::Face.define(:epp, '0.0.1') do
           show_filename = args.count > 1
           file_nbr = 0
           args.each do |file|
-            begin
-              buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
-            rescue Puppet::ParseError => detail
-              Puppet.err(detail.message)
-              status = false
-            end
+            buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
+          rescue Puppet::ParseError => detail
+            Puppet.err(detail.message)
+            status = false
           end
         end
         raise Puppet::Error, _("error while rendering epp") unless status
@@ -417,7 +415,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       rescue => e
         Puppet.err(_("Could not load --values_file %{error}") % { error: e.message })
       end
-      if !(template_values.nil? || template_values.is_a?(Hash))
+      unless template_values.nil? || template_values.is_a?(Hash)
         Puppet.err(_("--values_file option must evaluate to a Hash or undef/nil, got: '%{template_class}'") % { template_class: template_values.class })
       end
     end

data/lib/puppet/face/help.rb

@@ -95,7 +95,7 @@ Puppet::Face.define(:help, '0.0.1') do
   end
 
   def render_application_help(applicationname)
-    return Puppet::Application[applicationname].help
+    Puppet::Application[applicationname].help
   rescue StandardError, LoadError => detail
     message = []
     message << _('Could not load help for the application %{application_name}.') % { application_name: applicationname }
@@ -107,7 +107,7 @@ Puppet::Face.define(:help, '0.0.1') do
 
   def render_face_help(facename, actionname, version)
     face, action = load_face_help(facename, actionname, version)
-    return template_for(face, action).result(binding)
+    template_for(face, action).result(binding)
   rescue StandardError, LoadError => detail
     message = []
     message << _('Could not load help for the face %{face_name}.') % { face_name: facename }
@@ -121,7 +121,7 @@ Puppet::Face.define(:help, '0.0.1') do
     face = Puppet::Face[facename.to_sym, version]
     if actionname
       action = face.get_action(actionname.to_sym)
-      if !action
+      unless action
         fail ArgumentError, _("Unable to load action %{actionname} from %{face}") % { actionname: actionname, face: face }
       end
     end
@@ -141,13 +141,13 @@ Puppet::Face.define(:help, '0.0.1') do
     template = (Pathname(__FILE__).dirname + "help" + name)
     erb = Puppet::Util.create_erb(template.read)
     erb.filename = template.to_s
-    return erb
+    erb
   end
 
   # Return a list of applications that are not simply just stubs for Faces.
   def legacy_applications
     Puppet::Application.available_application_names.reject do |appname|
-      (is_face_app?(appname)) or (exclude_from_docs?(appname))
+      is_face_app?(appname) or exclude_from_docs?(appname)
     end.sort
   end
 
@@ -160,9 +160,9 @@ Puppet::Face.define(:help, '0.0.1') do
     available_application_names_special_sort().inject([]) do |result, appname|
       next result if exclude_from_docs?(appname)
 
-      if (appname == COMMON || appname == SPECIALIZED || appname == BLANK)
+      if appname == COMMON || appname == SPECIALIZED || appname == BLANK
         result << appname
-      elsif (is_face_app?(appname))
+      elsif is_face_app?(appname)
         begin
           face = Puppet::Face[appname, :current]
           # Add deprecation message to summary if the face is deprecated
@@ -194,7 +194,7 @@ Puppet::Face.define(:help, '0.0.1') do
   BLANK = "\n"
   def available_application_names_special_sort
     full_list = Puppet::Application.available_application_names
-    a_list = full_list & %w{apply agent config help lookup module resource}
+    a_list = full_list & %w[apply agent config help lookup module resource]
     a_list = a_list.sort
     also_ran = full_list - a_list
     also_ran = also_ran.sort
@@ -207,13 +207,13 @@ Puppet::Face.define(:help, '0.0.1') do
     # depends on the implementation coincidence of how our pages are
     # formatted.  If we can't match the pattern we expect we return the empty
     # string to ensure we don't blow up in the summary. --daniel 2011-04-11
-    while line = help.shift do # rubocop:disable Lint/AssignmentInCondition
-      md = /^puppet-#{appname}\([^\)]+\) -- (.*)$/.match(line)
+    while line = help.shift # rubocop:disable Lint/AssignmentInCondition
+      md = /^puppet-#{appname}\([^)]+\) -- (.*)$/.match(line)
       if md
         return md[1]
       end
     end
-    return ''
+    ''
   end
   # This should absolutely be a private method, but for some reason it appears
   #  that you can't use the 'private' keyword inside of a Face definition.
@@ -221,7 +221,7 @@ Puppet::Face.define(:help, '0.0.1') do
   # private :horribly_extract_summary_from
 
   def exclude_from_docs?(appname)
-    %w{face_base indirection_base report status}.include? appname
+    %w[face_base indirection_base report status].include? appname
   end
   # This should absolutely be a private method, but for some reason it appears
   #  that you can't use the 'private' keyword inside of a Face definition.

data/lib/puppet/face/module/changes.rb

@@ -38,9 +38,7 @@ Puppet::Face.define(:module, '1.0.0') do
       else
         Puppet.warning _("%{count} files modified") % { count: return_value.size }
       end
-      return_value.map do |changed_file|
-        "#{changed_file}"
-      end.join("\n")
+      return_value.map(&:to_s).join("\n")
     end
   end
 end