openvox 7.37.1 → 8.19.0

data/lib/puppet/file_serving/mount/pluginfacts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 # Find files in the modules' pluginfacts directories.
@@ -6,18 +8,16 @@ require_relative '../../../puppet/file_serving/mount'
 class Puppet::FileServing::Mount::PluginFacts < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    mod = request.environment.modules.find { |m|  m.pluginfact(relative_path) }
+    mod = request.environment.modules.find { |m| m.pluginfact(relative_path) }
     return nil unless mod
 
-    path = mod.pluginfact(relative_path)
-
-    path
+    mod.pluginfact(relative_path)
   end
 
   def search(relative_path, request)
     # We currently only support one kind of search on plugins - return
     # them all.
-    paths = request.environment.modules.find_all { |mod| mod.pluginfacts? }.collect { |mod| mod.plugin_fact_directory }
+    paths = request.environment.modules.find_all(&:pluginfacts?).collect(&:plugin_fact_directory)
     if paths.empty?
       # If the modulepath is valid then we still need to return a valid root
       # directory for the search, but make sure nothing inside it is

data/lib/puppet/file_serving/mount/plugins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 # Find files in the modules' plugins directories.
@@ -6,18 +8,16 @@ require_relative '../../../puppet/file_serving/mount'
 class Puppet::FileServing::Mount::Plugins < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    mod = request.environment.modules.find { |m|  m.plugin(relative_path) }
+    mod = request.environment.modules.find { |m| m.plugin(relative_path) }
     return nil unless mod
 
-    path = mod.plugin(relative_path)
-
-    path
+    mod.plugin(relative_path)
   end
 
   def search(relative_path, request)
     # We currently only support one kind of search on plugins - return
     # them all.
-    paths = request.environment.modules.find_all { |mod| mod.plugins? }.collect { |mod| mod.plugin_directory }
+    paths = request.environment.modules.find_all(&:plugins?).collect(&:plugin_directory)
     if paths.empty?
       # If the modulepath is valid then we still need to return a valid root
       # directory for the search, but make sure nothing inside it is

data/lib/puppet/file_serving/mount/scripts.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 require 'puppet/file_serving/mount'
 
 class Puppet::FileServing::Mount::Scripts < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(path, request)
     raise _("No module specified") if path.to_s.empty?
+
     module_name, relative_path = path.split("/", 2)
     mod = request.environment.module(module_name)
     return nil unless mod

data/lib/puppet/file_serving/mount/tasks.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 class Puppet::FileServing::Mount::Tasks < Puppet::FileServing::Mount
   def find(path, request)
     raise _("No task specified") if path.to_s.empty?
+
     module_name, task_path = path.split("/", 2)
     mod = request.environment.module(module_name)
     return nil unless mod

data/lib/puppet/file_serving/mount.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/logging'
 require_relative '../../puppet/file_serving'
 require_relative '../../puppet/file_serving/metadata'
@@ -16,9 +18,10 @@ class Puppet::FileServing::Mount
 
   # Create our object.  It must have a name.
   def initialize(name)
-    unless name =~ %r{^[-\w]+$}
+    unless name =~ /^[-\w]+$/
       raise ArgumentError, _("Invalid mount name format '%{name}'") % { name: name }
     end
+
     @name = name
 
     super()

data/lib/puppet/file_serving/terminus_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/file_serving'
 require_relative '../../puppet/file_serving/fileset'
 

data/lib/puppet/file_serving/terminus_selector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/file_serving'
 
 # This module is used to pick the appropriate terminus
@@ -16,7 +18,7 @@ module Puppet::FileServing::TerminusSelector
       else
         Puppet[:default_file_terminus]
       end
-    when "http","https"
+    when "http", "https"
       :http
     when nil
       if Puppet::Util.absolute_path?(request.key)

data/lib/puppet/file_serving.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Just a stub class.
 class Puppet::FileServing # :nodoc:
 end

data/lib/puppet/file_system/file_impl.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 # Abstract implementation of the Puppet::FileSystem
 #
 class Puppet::FileSystem::FileImpl
-
   def pathname(path)
     path.is_a?(Pathname) ? path : Pathname.new(path)
   end
@@ -51,15 +52,15 @@ class Puppet::FileSystem::FileImpl
   def exclusive_open(path, mode, options = 'r', timeout = 300, &block)
     wait = 0.001 + (Kernel.rand / 1000)
     written = false
-    while !written
+    until written
       ::File.open(path, options, mode) do |rf|
-        if rf.flock(::File::LOCK_EX|::File::LOCK_NB)
-          Puppet.debug{ _("Locked '%{path}'") % { path: path } }
+        if rf.flock(::File::LOCK_EX | ::File::LOCK_NB)
+          Puppet.debug { _("Locked '%{path}'") % { path: path } }
           yield rf
           written = true
-          Puppet.debug{ _("Unlocked '%{path}'") % { path: path } }
+          Puppet.debug { _("Unlocked '%{path}'") % { path: path } }
         else
-          Puppet.debug{ "Failed to lock '%s' retrying in %.2f milliseconds" % [path, wait * 1000] }
+          Puppet.debug { "Failed to lock '%s' retrying in %.2f milliseconds" % [path, wait * 1000] }
           sleep wait
           timeout -= wait
           wait *= 2
@@ -162,9 +163,9 @@ class Puppet::FileSystem::FileImpl
       stat = lstat(path)
       gid = stat.gid
       uid = stat.uid
-      mode ||= stat.mode & 07777
+      mode ||= stat.mode & 0o7777
     rescue Errno::ENOENT
-      mode ||= 0640
+      mode ||= 0o640
     end
 
     tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(path), Puppet::FileSystem.dir_string(path))

data/lib/puppet/file_system/jruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/file_system/posix'
 
 class Puppet::FileSystem::JRuby < Puppet::FileSystem::Posix

data/lib/puppet/file_system/memory_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # An in-memory file abstraction. Commonly used with Puppet::FileSystem::File#overlay
 # @api private
 class Puppet::FileSystem::MemoryFile
@@ -54,6 +56,7 @@ class Puppet::FileSystem::MemoryFile
 
   def handle
     raise Errno::ENOENT unless exist?
+
     StringIO.new(@properties[:content] || '')
   end
 

data/lib/puppet/file_system/memory_impl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Puppet::FileSystem::MemoryImpl
   def initialize(*files)
     @files = files + all_children_of(files)
@@ -31,8 +33,10 @@ class Puppet::FileSystem::MemoryImpl
     path = path.path
     link = find(path)
     return Puppet::FileSystem::MemoryFile.a_missing_file(path) unless link
+
     source = link.source_path
     return Puppet::FileSystem::MemoryFile.a_missing_file(link) unless source
+
     find(source) || Puppet::FileSystem::MemoryFile.a_missing_file(source)
   end
 
@@ -70,7 +74,7 @@ class Puppet::FileSystem::MemoryImpl
     if block_given?
       yield handle
     else
-      return handle
+      handle
     end
   end
 

data/lib/puppet/file_system/path_pattern.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require_relative '../../puppet/error'
 
@@ -5,8 +7,8 @@ module Puppet::FileSystem
   class PathPattern
     class InvalidPattern < Puppet::Error; end
 
-    DOTDOT = '..'.freeze
-    ABSOLUTE_UNIX = /^\//
+    DOTDOT = '..'
+    ABSOLUTE_UNIX = %r{^/}
     ABSOLUTE_WINDOWS = /^[a-z]:/i
     CURRENT_DRIVE_RELATIVE_WINDOWS = /^\\/
 

data/lib/puppet/file_system/posix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
   def binread(path)
     path.binread
@@ -12,8 +14,8 @@ class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
   def compare_stream(path, stream)
     ::File.open(path, 'rb') do |this|
       bsize = stream_blksize(this, stream)
-      sa = "".force_encoding('ASCII-8BIT')
-      sb = "".force_encoding('ASCII-8BIT')
+      sa = String.new.force_encoding('ASCII-8BIT')
+      sb = String.new.force_encoding('ASCII-8BIT')
       loop do
         this.read(bsize, sa)
         stream.read(bsize, sb)
@@ -25,9 +27,11 @@ class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
   end
 
   private
+
   def stream_blksize(*streams)
     streams.each do |s|
       next unless s.respond_to?(:stat)
+
       size = blksize(s.stat)
       return size if size
     end
@@ -38,6 +42,7 @@ class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
     s = st.blksize
     return nil unless s
     return nil if s == 0
+
     s
   end
 

data/lib/puppet/file_system/uniquefile.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require_relative '../../puppet/file_system'
 require 'delegate'
 require 'tmpdir'
@@ -25,9 +28,9 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def initialize(basename, *rest)
-    create_tmpname(basename, *rest) do |tmpname, n, opts|
-      mode = File::RDWR|File::CREAT|File::EXCL
-      perm = 0600
+    create_tmpname(basename, *rest) do |tmpname, _n, opts|
+      mode = File::RDWR | File::CREAT | File::EXCL
+      perm = 0o600
       if opts
         mode |= opts.delete(:mode) || 0
         opts[:perm] = perm
@@ -39,7 +42,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
         @tmpfile = File.open(tmpname, mode, opts)
         @tmpname = tmpname
       end
-      @mode = mode & ~(File::CREAT|File::EXCL)
+      @mode = mode & ~(File::CREAT | File::EXCL)
       perm or opts.freeze
       @opts = opts
     end
@@ -55,15 +58,13 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def _close
-    begin
-      @tmpfile.close if @tmpfile
-    ensure
-      @tmpfile = nil
-    end
+    @tmpfile.close if @tmpfile
+  ensure
+    @tmpfile = nil
   end
   protected :_close
 
-  def close(unlink_now=false)
+  def close(unlink_now = false)
     if unlink_now
       close!
     else
@@ -78,6 +79,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
 
   def unlink
     return unless @tmpname
+
     begin
       File.unlink(@tmpname)
     rescue Errno::ENOENT
@@ -99,17 +101,17 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
 
   def make_tmpname(prefix_suffix, n)
     case prefix_suffix
-      when String
-        prefix = prefix_suffix
-        suffix = ""
-      when Array
-        prefix = prefix_suffix[0]
-        suffix = prefix_suffix[1]
-      else
-        raise ArgumentError, _("unexpected prefix_suffix: %{value}") % { value: prefix_suffix.inspect }
+    when String
+      prefix = prefix_suffix
+      suffix = ""
+    when Array
+      prefix = prefix_suffix[0]
+      suffix = prefix_suffix[1]
+    else
+      raise ArgumentError, _("unexpected prefix_suffix: %{value}") % { value: prefix_suffix.inspect }
     end
     t = Time.now.strftime("%Y%m%d")
-    path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+    path = "#{prefix}#{t}-#{$PROCESS_ID}-#{rand(0x100000000).to_s(36)}"
     path << "-#{n}" if n
     path << suffix
   end
@@ -139,28 +141,29 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def try_convert_to_hash(h)
-    begin
-      h.to_hash
-    rescue NoMethodError
-      nil
-    end
+    h.to_hash
+  rescue NoMethodError
+    nil
   end
 
   @@systmpdir ||= defined?(Etc.systmpdir) ? Etc.systmpdir : '/tmp'
 
   def tmpdir
     tmp = '.'
-    for dir in [ Puppet::Util.get_env('TMPDIR'), Puppet::Util.get_env('TMP'), Puppet::Util.get_env('TEMP'), @@systmpdir, '/tmp']
+    [ENV.fetch('TMPDIR', nil), ENV.fetch('TMP', nil), ENV.fetch('TEMP', nil), @@systmpdir, '/tmp'].each do |dir|
       stat = File.stat(dir) if dir
-      if stat && stat.directory? && stat.writable?
-        tmp = dir
-        break
-      end rescue nil
+      begin
+        if stat && stat.directory? && stat.writable?
+          tmp = dir
+          break
+        end
+      rescue
+        nil
+      end
     end
     File.expand_path(tmp)
   end
 
-
   class << self
     # yields with locking for +tmpname+ and returns the result of the
     # block.
@@ -184,5 +187,4 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
       Dir.rmdir(*args)
     end
   end
-
 end

data/lib/puppet/file_system/windows.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/file_system/posix'
 require_relative '../../puppet/util/windows'
 
@@ -9,7 +11,8 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     # PUP-6959 mode is explicitly ignored until it can be implemented
     # Ruby on Windows uses mode for setting file attributes like read-only and
     # archived, not for setting permissions like POSIX
-    raise TypeError.new('mode must be specified as an Integer') if mode && !mode.is_a?(Numeric)
+    raise TypeError, 'mode must be specified as an Integer' if mode && !mode.is_a?(Numeric)
+
     ::File.open(path, options, nil, &block)
   end
 
@@ -17,7 +20,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     # ensure `nil` values behave like underlying File.expand_path
     string_path = ::File.expand_path(path.nil? ? nil : path_string(path), dir_string)
     # if no tildes, nothing to expand, no need to call Windows API, return original string
-    return string_path if !string_path.index('~')
+    return string_path unless string_path.index('~')
 
     begin
       # no need to do existence check up front as GetLongPathName implies that check is performed
@@ -25,15 +28,15 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
       string_path = Puppet::Util::Windows::File.get_long_pathname(string_path)
     rescue Puppet::Util::Windows::Error => e
       # preserve original File.expand_path behavior for file / path not found by returning string
-      raise if (e.code != Puppet::Util::Windows::File::ERROR_FILE_NOT_FOUND &&
-        e.code != Puppet::Util::Windows::File::ERROR_PATH_NOT_FOUND)
+      raise if e.code != Puppet::Util::Windows::File::ERROR_FILE_NOT_FOUND &&
+               e.code != Puppet::Util::Windows::File::ERROR_PATH_NOT_FOUND
     end
 
     string_path
   end
 
   def exist?(path)
-    return Puppet::Util::Windows::File.exist?(path)
+    Puppet::Util::Windows::File.exist?(path)
   end
 
   def symlink(path, dest, options = {})
@@ -58,7 +61,8 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def symlink?(path)
-    return false if ! Puppet.features.manages_symlinks?
+    return false unless Puppet.features.manages_symlinks?
+
     Puppet::Util::Windows::File.symlink?(path)
   end
 
@@ -68,22 +72,30 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def unlink(*file_names)
-    if ! Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       return ::File.unlink(*file_names)
     end
 
     file_names.each do |file_name|
       file_name = file_name.to_s # handle PathName
-      stat = Puppet::Util::Windows::File.stat(file_name) rescue nil
+      stat = begin
+        Puppet::Util::Windows::File.stat(file_name)
+      rescue
+        nil
+      end
 
       # sigh, Ruby + Windows :(
       if !stat
-        ::File.unlink(file_name) rescue Dir.rmdir(file_name)
+        begin
+          ::File.unlink(file_name)
+        rescue
+          Dir.rmdir(file_name)
+        end
       elsif stat.ftype == 'directory'
         if Puppet::Util::Windows::File.symlink?(file_name)
           Dir.rmdir(file_name)
         else
-          raise Errno::EPERM.new(file_name)
+          raise Errno::EPERM, file_name
         end
       else
         ::File.unlink(file_name)
@@ -98,9 +110,10 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def lstat(path)
-    if ! Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       return Puppet::Util::Windows::File.stat(path)
     end
+
     Puppet::Util::Windows::File.lstat(path)
   end
 
@@ -109,8 +122,8 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def read_preserve_line_endings(path)
-    contents = path.read( :mode => 'rb', :encoding => 'bom|utf-8')
-    contents = path.read( :mode => 'rb', :encoding => "bom|#{Encoding::default_external.name}") unless contents.valid_encoding?
+    contents = path.read(:mode => 'rb', :encoding => 'bom|utf-8')
+    contents = path.read(:mode => 'rb', :encoding => "bom|#{Encoding.default_external.name}") unless contents.valid_encoding?
     contents = path.read unless contents.valid_encoding?
 
     contents
@@ -128,14 +141,14 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     end
 
     current_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_user_name)
-    current_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name) unless current_sid
+    current_sid ||= Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name)
 
     dacl = case mode
-           when 0644
+           when 0o644
              dacl = secure_dacl(current_sid)
              dacl.allow(Puppet::Util::Windows::SID::BuiltinUsers, FILE_READ)
              dacl
-           when 0660, 0640, 0600, 0440
+           when 0o660, 0o640, 0o600, 0o440
              secure_dacl(current_sid)
            when nil
              get_dacl_from_file(path) || secure_dacl(current_sid)
@@ -143,7 +156,6 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
              raise ArgumentError, "#{mode} is invalid: Only modes 0644, 0640, 0660, and 0440 are allowed"
            end
 
-
     tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(path), Puppet::FileSystem.dir_string(path))
     begin
       tempdacl = Puppet::Util::Windows::AccessControlList.new
@@ -168,7 +180,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     when ACCESS_DENIED, SHARING_VIOLATION, LOCK_VIOLATION
       raise Errno::EACCES.new(path_string(path), e)
     else
-      raise SystemCallError.new(e.message)
+      raise SystemCallError, e.message
     end
   end
 
@@ -200,14 +212,13 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def raise_if_symlinks_unsupported
-    if ! Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       msg = _("This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required.")
-      raise Puppet::Util::Windows::Error.new(msg)
+      raise Puppet::Util::Windows::Error, msg
     end
 
-    if ! Puppet::Util::Windows::Process.process_privilege_symlink?
+    unless Puppet::Util::Windows::Process.process_privilege_symlink?
       Puppet.warning _("The current user does not have the necessary permission to manage symlinks.")
     end
   end
-
 end

data/lib/puppet/file_system.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::FileSystem
   require_relative '../puppet/util'
   require_relative 'file_system/path_pattern'
@@ -8,8 +10,8 @@ module Puppet::FileSystem
 
   # create instance of the file system implementation to use for the current platform
   @impl = if Puppet::Util::Platform.windows?
-           require_relative 'file_system/windows'
-           Puppet::FileSystem::Windows
+            require_relative 'file_system/windows'
+            Puppet::FileSystem::Windows
           elsif Puppet::Util::Platform.jruby?
             require_relative 'file_system/jruby'
             Puppet::FileSystem::JRuby
@@ -286,7 +288,7 @@ module Puppet::FileSystem
   # @api public
   #
   def self.unlink(*paths)
-    @impl.unlink(*(paths.map {|p| assert_path(p) }))
+    @impl.unlink(*(paths.map { |p| assert_path(p) }))
   end
 
   # @return [File::Stat] object for the named file.

data/lib/puppet/forge/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 require_relative '../../puppet/forge'
@@ -7,7 +9,6 @@ class Puppet::Forge
   #
   # Provides methods for reading files from local cache, filesystem or network.
   class Cache
-
     # Instantiate new cache for the +repository+ instance.
     def initialize(repository, options = {})
       @repository = repository
@@ -37,12 +38,12 @@ class Puppet::Forge
 
     # Return contents of file at the given URI's +uri+.
     def read_retrieve(uri)
-      return uri.read
+      uri.read
     end
 
     # Return Pathname for repository's cache directory, create it if needed.
     def path
-      (self.class.base_path + @repository.cache_key).tap{ |o| o.mkpath }
+      (self.class.base_path + @repository.cache_key).tap(&:mkpath)
     end
 
     # Return the base Pathname for all the caches.

data/lib/puppet/forge/errors.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/json'
 require_relative '../../puppet/error'
 require_relative '../../puppet/forge'
 
 # Puppet::Forge specific exceptions
 module Puppet::Forge::Errors
-
   # This exception is the parent for all Forge API errors
   class ForgeError < Puppet::Error
     # This is normally set by the child class, but if it is not this will
@@ -12,7 +13,7 @@ module Puppet::Forge::Errors
     #
     # @return [String] the multiline version of the error message
     def multiline
-      self.message
+      message
     end
   end
 
@@ -101,7 +102,6 @@ module Puppet::Forge::Errors
     #
     # @return [String] the multiline version of the error message
     def multiline
-
       message = []
       message << _('Request to Puppet Forge failed.')
       message << _('  The server being queried was %{uri}') % { uri: @uri }
@@ -110,5 +110,4 @@ module Puppet::Forge::Errors
       message.join("\n")
     end
   end
-
 end