puppet 8.4.0-universal-darwin → 8.5.1-universal-darwin

data/lib/puppet/indirector/indirection.rb

@@ -129,7 +129,7 @@ class Puppet::Indirector::Indirection
     when :terminus_setting
       @terminus_setting = Puppet::ThreadLocal.new(value)
     else
-      raise(ArgumentError, _("The setting %{setting} is not a valid indirection setting.") % {setting: setting})
+      raise(ArgumentError, _("The setting %{setting} is not a valid indirection setting.") % { setting: setting })
     end
   end
 
@@ -162,7 +162,7 @@ class Puppet::Indirector::Indirection
       if setting
         self.terminus_class = Puppet.settings[setting]
       else
-        raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: self.name}
+        raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: self.name }
       end
     end
     @terminus_class.value
@@ -186,14 +186,14 @@ class Puppet::Indirector::Indirection
 
     unless Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
       raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{name}") %
-          { terminus_class: terminus_class, name: self.name }
+                           { terminus_class: terminus_class, name: self.name }
     end
   end
 
   # Expire a cached object, if one is cached.  Note that we don't actually
   # remove it, we expire it and write it back out to disk.  This way people
   # can still use the expired object if they want.
-  def expire(key, options={})
+  def expire(key, options = {})
     request = request(:expire, key, nil, options)
 
     return nil unless cache? && !request.ignore_cache_save?
@@ -215,7 +215,7 @@ class Puppet::Indirector::Indirection
 
   # Search for an instance in the appropriate terminus, caching the
   # results if caching is configured..
-  def find(key, options={})
+  def find(key, options = {})
     request = request(:find, key, nil, options)
     terminus = prepare(request)
 
@@ -258,7 +258,7 @@ class Puppet::Indirector::Indirection
 
   # Search for an instance in the appropriate terminus, and return a
   # boolean indicating whether the instance was found.
-  def head(key, options={})
+  def head(key, options = {})
     request = request(:head, key, nil, options)
     terminus = prepare(request)
 
@@ -269,7 +269,7 @@ class Puppet::Indirector::Indirection
 
   def find_in_cache(request)
     # See if our instance is in the cache and up to date.
-    cached = cache.find(request) if cache? && ! request.ignore_cache?
+    cached = cache.find(request) if cache? && !request.ignore_cache?
     return nil unless cached
 
     if cached.expired?
@@ -285,7 +285,7 @@ class Puppet::Indirector::Indirection
   end
 
   # Remove something via the terminus.
-  def destroy(key, options={})
+  def destroy(key, options = {})
     request = request(:destroy, key, nil, options)
     terminus = prepare(request)
 
@@ -300,7 +300,7 @@ class Puppet::Indirector::Indirection
   end
 
   # Search for more than one instance.  Should always return an array.
-  def search(key, options={})
+  def search(key, options = {})
     request = request(:search, key, nil, options)
     terminus = prepare(request)
 
@@ -319,7 +319,7 @@ class Puppet::Indirector::Indirection
 
   # Save the instance in the appropriate terminus.  This method is
   # normally an instance method on the indirected class.
-  def save(instance, key = nil, options={})
+  def save(instance, key = nil, options = {})
     request = request(:save, key, instance, options)
     terminus = prepare(request)
 
@@ -346,10 +346,10 @@ class Puppet::Indirector::Indirection
     unless terminus.authorized?(request)
       msg = if request.options.empty?
               _("Not authorized to call %{method} on %{description}") %
-                  { method: request.method, description: request.description }
+                { method: request.method, description: request.description }
             else
               _("Not authorized to call %{method} on %{description} with %{option}") %
-                  { method: request.method, description: request.description, option: request.options.inspect }
+                { method: request.method, description: request.description, option: request.options.inspect }
             end
       raise ArgumentError, msg
     end

data/lib/puppet/indirector/json.rb

@@ -16,7 +16,7 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     filename = path(request.key)
     FileUtils.mkdir_p(File.dirname(filename))
 
-    Puppet::FileSystem.replace_file(filename, 0660) {|f| f.print to_json(request.instance).force_encoding(Encoding::BINARY) }
+    Puppet::FileSystem.replace_file(filename, 0660) { |f| f.print to_json(request.instance).force_encoding(Encoding::BINARY) }
   rescue TypeError => detail
     Puppet.log_exception(detail, _("Could not save %{json} %{request}: %{detail}") % { json: self.name, request: request.key, detail: detail })
   end
@@ -50,7 +50,7 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
 
   private
 
-  def data_dir()
+  def data_dir
     Puppet.run_mode.server? ? Puppet[:server_datadir] : Puppet[:client_datadir]
   end
 

data/lib/puppet/indirector/msgpack.rb

@@ -9,7 +9,7 @@ require_relative '../../puppet/util'
 # implementations, since it is ~ 30 times faster
 class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
   def initialize(*args)
-    if ! Puppet.features.msgpack?
+    if !Puppet.features.msgpack?
       raise _("MessagePack terminus not supported without msgpack library")
     end
 
@@ -24,7 +24,7 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     filename = path(request.key)
     FileUtils.mkdir_p(File.dirname(filename))
 
-    Puppet::FileSystem.replace_file(filename, 0660) {|f| f.print to_msgpack(request.instance) }
+    Puppet::FileSystem.replace_file(filename, 0660) { |f| f.print to_msgpack(request.instance) }
   rescue TypeError => detail
     Puppet.log_exception(detail, _("Could not save %{name} %{request}: %{detail}") % { name: self.name, request: request.key, detail: detail })
   end

data/lib/puppet/indirector/node/exec.rb

@@ -35,7 +35,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
 
   # Proxy the execution, so it's easier to test.
   def execute(command, arguments)
-    Puppet::Util::Execution.execute(command,arguments)
+    Puppet::Util::Execution.execute(command, arguments)
   end
 
   # Turn our outputted objects into a Puppet::Node instance.
@@ -54,7 +54,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
 
   # Translate the yaml string into Ruby objects.
   def translate(name, output)
-    Puppet::Util::Yaml.safe_load(output, [Symbol]).inject({}) do |hash, data|
+    Puppet::Util::Yaml.safe_load(output, [Symbol]).each_with_object({}) do |data, hash|
       case data[0]
       when String
         hash[data[0].intern] = data[1]
@@ -63,8 +63,6 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
       else
         raise Puppet::Error, _("key is a %{klass}, not a string or symbol") % { klass: data[0].class }
       end
-
-      hash
     end
   rescue => detail
     raise Puppet::Error, _("Could not load external node results for %{name}: %{detail}") % { name: name, detail: detail }, detail.backtrace

data/lib/puppet/indirector/none.rb

@@ -8,4 +8,3 @@ class Puppet::Indirector::None < Puppet::Indirector::Terminus
     return nil
   end
 end
-

data/lib/puppet/indirector/report/json.rb

@@ -9,7 +9,7 @@ class Puppet::Transaction::Report::Json < Puppet::Indirector::JSON
   desc "Store last report as a flat file, serialized using JSON."
 
   # Force report to be saved there
-  def path(name,ext='.json')
+  def path(name, ext = '.json')
     Puppet[:lastrunreport]
   end
 

data/lib/puppet/indirector/report/msgpack.rb

@@ -7,7 +7,7 @@ class Puppet::Transaction::Report::Msgpack < Puppet::Indirector::Msgpack
   desc "Store last report as a flat file, serialized using MessagePack."
 
   # Force report to be saved there
-  def path(name,ext='.msgpack')
+  def path(name, ext = '.msgpack')
     Puppet[:lastrunreport]
   end
 end

data/lib/puppet/indirector/report/yaml.rb

@@ -9,7 +9,7 @@ class Puppet::Transaction::Report::Yaml < Puppet::Indirector::Yaml
   desc "Store last report as a flat file, serialized using YAML."
 
   # Force report to be saved there
-  def path(name,ext='.yaml')
+  def path(name, ext = '.yaml')
     Puppet[:lastrunreport]
   end
 

data/lib/puppet/indirector/request.rb

@@ -26,7 +26,7 @@ class Puppet::Indirector::Request
   # Is this an authenticated request?
   def authenticated?
     # Double negative, so we just get true or false
-    ! ! authenticated
+    !!authenticated
   end
 
   def environment
@@ -68,7 +68,7 @@ class Puppet::Indirector::Request
     self.indirection_name = indirection_name
     self.method = method
 
-    options = options.inject({}) { |hash, ary| hash[ary[0].to_sym] = ary[1]; hash }
+    options = options.each_with_object({}) { |ary, hash| hash[ary[0].to_sym] = ary[1]; }
 
     set_attributes(options)
 
@@ -87,7 +87,7 @@ class Puppet::Indirector::Request
       end
     end
 
-    @key = @instance.name if ! @key and @instance
+    @key = @instance.name if !@key and @instance
   end
 
   # Look up the indirection based on the name provided.

data/lib/puppet/indirector/resource/ral.rb

@@ -11,7 +11,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     false
   end
 
-  def find( request )
+  def find(request)
     # find by name
     res   = type(request).instances.find { |o| o.name == resource_name(request) }
     res ||= type(request).new(:name => resource_name(request), :audit => type(request).properties.collect { |s| s.name })
@@ -19,7 +19,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     res.to_resource
   end
 
-  def search( request )
+  def search(request)
     conditions = request.options.dup
     conditions[:name] = resource_name(request) if resource_name(request)
 
@@ -35,7 +35,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     end.sort_by(&:title)
   end
 
-  def save( request )
+  def save(request)
     # In RAL-land, to "save" means to actually try to change machine state
     res = request.instance
     ral_res = res.to_ral
@@ -53,16 +53,16 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
   # File["/etc/hosts"]. To handle, assume the type name does
   # _not_ have any slashes in it, and split only on the first.
 
-  def type_name( request )
+  def type_name(request)
     request.key.split('/', 2)[0]
   end
 
-  def resource_name( request )
+  def resource_name(request)
     name = request.key.split('/', 2)[1]
     name unless name == ""
   end
 
-  def type( request )
+  def type(request)
     Puppet::Type.type(type_name(request)) or raise Puppet::Error, _("Could not find type %{request_type}") % { request_type: type_name(request) }
   end
 end

data/lib/puppet/indirector/rest.rb

@@ -50,7 +50,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   # body, decompressed if necessary
   def parse_response(response)
     if response['content-type']
-      [ response['content-type'].gsub(/\s*;.*$/,''), response.body ]
+      [response['content-type'].gsub(/\s*;.*$/, ''), response.body]
     else
       raise _("No content type in http response; cannot parse")
     end

data/lib/puppet/indirector/yaml.rb

@@ -36,7 +36,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
   end
 
   # Return the path to a given node's file.
-  def path(name,ext='.yaml')
+  def path(name, ext = '.yaml')
     if name =~ Puppet::Indirector::BadNameRegexp then
       Puppet.crit(_("directory traversal detected in %{indirection}: %{name}") % { indirection: self.class, name: name.inspect })
       raise ArgumentError, _("invalid key")
@@ -52,7 +52,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
   end
 
   def search(request)
-    Dir.glob(path(request.key,'')).collect do |file|
+    Dir.glob(path(request.key, '')).collect do |file|
       load_file(file)
     end
   end

data/lib/puppet/info_service/class_information_service.rb

@@ -53,24 +53,22 @@ class Puppet::InfoService::ClassInformationService
   end
 
   def parse_file(f)
-    return {:error => _("The file %{f} does not exist") % { f: f }} unless Puppet::FileSystem.exist?(f)
+    return { :error => _("The file %{f} does not exist") % { f: f } } unless Puppet::FileSystem.exist?(f)
 
     begin
       parse_result = @parser.parse_file(f)
-      {:classes =>
-        parse_result.definitions.select {|d| d.is_a?(Puppet::Pops::Model::HostClassDefinition)}.map do |d|
-          {:name => d.name,
-           :params => d.parameters.map {|p| extract_param(p) }
-          }
-        end
-      }
+      { :classes =>
+        parse_result.definitions.select { |d| d.is_a?(Puppet::Pops::Model::HostClassDefinition) }.map do |d|
+          { :name => d.name,
+            :params => d.parameters.map { |p| extract_param(p) } }
+        end }
     rescue StandardError => e
-      {:error => e.message }
+      { :error => e.message }
     end
   end
 
   def extract_param(p)
-    extract_default(extract_type({:name => p.name}, p), p)
+    extract_default(extract_type({ :name => p.name }, p), p)
   end
 
   def extract_type(structure, p)

data/lib/puppet/info_service/plan_information_service.rb

@@ -8,7 +8,7 @@ class Puppet::InfoService::PlanInformationService
     env = Puppet.lookup(:environments).get!(environment_name)
     env.modules.map do |mod|
       mod.plans.map do |plan|
-        {:module => {:name => plan.module.name}, :name => plan.name}
+        { :module => { :name => plan.module.name }, :name => plan.name }
       end
     end.flatten
   end
@@ -20,7 +20,7 @@ class Puppet::InfoService::PlanInformationService
     pup_module = Puppet::Module.find(module_name, environment_name)
     if pup_module.nil?
       raise Puppet::Module::MissingModule, _("Module %{module_name} not found in environment %{environment_name}.") %
-                                            {module_name: module_name, environment_name: environment_name}
+                                           { module_name: module_name, environment_name: environment_name }
     end
 
     plan = pup_module.plans.find { |t| t.name == plan_name }
@@ -30,7 +30,7 @@ class Puppet::InfoService::PlanInformationService
 
     begin
       plan.validate
-      {:metadata => plan.metadata, :files => plan.files}
+      { :metadata => plan.metadata, :files => plan.files }
     rescue Puppet::Module::Plan::Error => err
       { :metadata => nil, :files => [], :error => err.to_h }
     end

data/lib/puppet/info_service/task_information_service.rb

@@ -12,7 +12,7 @@ class Puppet::InfoService::TaskInformationService
         # If any task is malformed continue to list other tasks in module
         begin
           task.validate
-          {:module => {:name => task.module.name}, :name => task.name, :metadata => task.metadata}
+          { :module => { :name => task.module.name }, :name => task.name, :metadata => task.metadata }
         rescue Puppet::Module::Task::Error => err
           Puppet.log_exception(err)
           nil
@@ -28,7 +28,7 @@ class Puppet::InfoService::TaskInformationService
     pup_module = Puppet::Module.find(module_name, environment_name)
     if pup_module.nil?
       raise Puppet::Module::MissingModule, _("Module %{module_name} not found in environment %{environment_name}.") %
-                                            {module_name: module_name, environment_name: environment_name}
+                                           { module_name: module_name, environment_name: environment_name }
     end
 
     task = pup_module.tasks.find { |t| t.name == task_name }
@@ -38,7 +38,7 @@ class Puppet::InfoService::TaskInformationService
 
     begin
       task.validate
-      {:metadata => task.metadata, :files => task.files}
+      { :metadata => task.metadata, :files => task.files }
     rescue Puppet::Module::Task::Error => err
       { :metadata => nil, :files => [], :error => err.to_h }
     end

data/lib/puppet/interface/action.rb

@@ -100,7 +100,7 @@ class Puppet::Interface::Action
             else
               # TRANSLATORS 'set_rendering_method_for' and 'Proc' should not be translated
               _("The second argument to set_rendering_method_for must be a Proc, not %{class_name}") %
-                  { class_name: proc.class.name }
+                { class_name: proc.class.name }
             end
       raise ArgumentError, msg
     end
@@ -109,15 +109,15 @@ class Puppet::Interface::Action
       msg = if proc.arity < 0 then
               # TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
               _("The when_rendering method for the %{face} face %{name} action takes either just one argument,"\
-                  " the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
-                  " when_invoked block, not a variable number") %
-                  { face: @face.name, name: name, arg_count: @positional_arg_count }
+                " the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
+                " when_invoked block, not a variable number") %
+                { face: @face.name, name: name, arg_count: @positional_arg_count }
             else
               # TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
               _("The when_rendering method for the %{face} face %{name} action takes either just one argument,"\
-                  " the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
-                  " when_invoked block, not %{string}") %
-                  { face: @face.name, name: name, arg_count: @positional_arg_count, string: proc.arity.to_s }
+                " the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
+                " when_invoked block, not %{string}") %
+                { face: @face.name, name: name, arg_count: @positional_arg_count, string: proc.arity.to_s }
             end
       raise ArgumentError, msg
     end
@@ -132,7 +132,7 @@ class Puppet::Interface::Action
     # retrieve it, to rotate through the dance of getting a suitable method
     # object out of the whole process. --daniel 2011-04-18
     @when_rendering[type] =
-      @face.__send__( :__add_method, __render_method_name_for(type), proc)
+      @face.__send__(:__add_method, __render_method_name_for(type), proc)
   end
 
   # @return [void]
@@ -284,12 +284,12 @@ class Puppet::Interface::Action
       conflict = get_option(name)
       if conflict
         raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict}") %
-            { option: option, conflict: conflict }
+                             { option: option, conflict: conflict }
       else
         conflict = @face.get_option(name)
         if conflict
           raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict} on %{face}") %
-              { option: option, conflict: conflict, face: @face }
+                               { option: option, conflict: conflict, face: @face }
         end
       end
     end
@@ -365,9 +365,9 @@ class Puppet::Interface::Action
     end
 
     unless overlap.empty?
-      overlap_list = overlap.map {|k, v| "(#{k}, #{v.sort.join(', ')})" }.join(", ")
+      overlap_list = overlap.map { |k, v| "(#{k}, #{v.sort.join(', ')})" }.join(", ")
       raise ArgumentError, _("Multiple aliases for the same option passed: %{overlap_list}") %
-          { overlap_list: overlap_list }
+                           { overlap_list: overlap_list }
     end
 
     unless unknown.empty?
@@ -377,7 +377,7 @@ class Puppet::Interface::Action
 
     # Inject default arguments and check for missing mandating options.
     missing = []
-    options.map {|x| get_option(x) }.each do |option|
+    options.map { |x| get_option(x) }.each do |option|
       name = option.name
       next if result.has_key? name
 

data/lib/puppet/interface/action_builder.rb

@@ -135,7 +135,7 @@ class Puppet::Interface::ActionBuilder
     formats = Puppet::Network::FormatHandler.formats
     unless formats.include? value
       raise ArgumentError, _("%{value} is not a valid rendering format: %{formats_list}") %
-          { value: value.inspect, formats_list: formats.sort.join(", ")}
+                           { value: value.inspect, formats_list: formats.sort.join(", ") }
     end
 
     @action.render_as = value

data/lib/puppet/interface/action_manager.rb

@@ -13,7 +13,7 @@ module Puppet::Interface::ActionManager
   # the methods on {Puppet::Interface::ActionBuilder}.
   # @param name [Symbol] The name that will be used to invoke the
   #   action
-  # @overload action(name, {|| block})
+  # @overload action(name, { block })
   # @return [void]
   # @api public
   # @dsl Faces
@@ -78,7 +78,7 @@ module Puppet::Interface::ActionManager
   # @return [Puppet::Interface::Action]
   # @api private
   def get_default_action
-    default = actions.map {|x| get_action(x) }.select {|x| x.default }
+    default = actions.map { |x| get_action(x) }.select { |x| x.default }
     if default.length > 1
       raise "The actions #{default.map(&:name).join(", ")} cannot all be default"
     end

data/lib/puppet/interface/documentation.rb

@@ -34,14 +34,14 @@ class Puppet::Interface
       # without as methods.  When we are 1.9 only (hah!) you can totally
       # replace this with some up-and-up define_method. --daniel 2011-04-29
       module_eval(<<-EOT, __FILE__, __LINE__ + 1)
-        def #{name}(value = nil)
-          self.#{name} = value unless value.nil?
-          @#{name}
-        end
-
-        def #{name}=(value)
-          @#{name} = Puppet::Interface::DocGen.strip_whitespace(#{get_arg})
-        end
+        def #{name}(value = nil)                 # def attribute(value=nil)
+          self.#{name} = value unless value.nil? #   self.attribute = value unless value.nil?
+          @#{name}                               #   @value
+        end                                      # end
+
+        def #{name}=(value)                                                 # def attribute=(value)
+          @#{name} = Puppet::Interface::DocGen.strip_whitespace(#{get_arg}) #   @value = Puppet::Interface::DocGen.strip_whitespace(#{get_arg})
+        end                                                                 # end
       EOT
     end
   end
@@ -79,7 +79,7 @@ class Puppet::Interface
 
         options.each do |option|
           option = get_option(option)
-          wrap = option.required? ? %w{ < > } : %w{ [ ] }
+          wrap = option.required? ? %w{< >} : %w{[ ]}
 
           s.group(0, *wrap) do
             option.optparse.each do |item|
@@ -96,7 +96,7 @@ class Puppet::Interface
         end
 
         display_global_options.sort.each do |option|
-          wrap = %w{ [ ] }
+          wrap = %w{[ ]}
           s.group(0, *wrap) do
             type = Puppet.settings.setting(option).default
             type ||= Puppet.settings.setting(option).type.to_s.upcase
@@ -228,12 +228,12 @@ class Puppet::Interface
     def author=(value)
       # I think it's a bug that this ends up being the exposed
       # version of `author` on ActionBuilder
-      if Array(value).any? {|x| x =~ /\n/ } then
+      if Array(value).any? { |x| x =~ /\n/ } then
         # TRANSLATORS 'author' is an attribute name and should not be translated
         raise ArgumentError, _('author should be a single line; use multiple statements')
       end
 
-      @authors = Array(value).map{|x| Puppet::Interface::DocGen.strip_whitespace(x) }
+      @authors = Array(value).map { |x| Puppet::Interface::DocGen.strip_whitespace(x) }
     end
     alias :authors= :author=
 
@@ -292,7 +292,7 @@ class Puppet::Interface
     def copyright_years=(value)
       years = munge_copyright_year value
       years = (years.is_a?(Array) ? years : [years])
-        .sort_by do |x| x.is_a?(Range) ? x.first : x end
+              .sort_by do |x| x.is_a?(Range) ? x.first : x end
 
       @copyright_years = years.map do |year|
         if year.is_a? Range then
@@ -316,7 +316,7 @@ class Puppet::Interface
         if fault then
           # TRANSLATORS 'copyright' is an attribute name and should not be translated
           raise ArgumentError, _("copyright with a year %{value} is very strange; did you accidentally add or subtract two years?") %
-              { value: fault }
+                               { value: fault }
         end
 
         input
@@ -329,7 +329,7 @@ class Puppet::Interface
           else
             found = part.split(/-/)
             if found
-              unless found.length == 2 and found.all? {|x| x.strip =~ /^\d+$/ }
+              unless found.length == 2 and found.all? { |x| x.strip =~ /^\d+$/ }
                 # TRANSLATORS 'copyright' is an attribute name and should not be translated
                 raise ArgumentError, _("%{value} is not a good copyright year or range") % { value: part.inspect }
               end

data/lib/puppet/interface/face_collection.rb

@@ -11,9 +11,9 @@ module Puppet::Interface::FaceCollection
       names = @loader.files_to_load(Puppet.lookup(:current_environment)).map do |fn|
         ::File.basename(fn, '.rb')
       end.uniq
-      names.each {|name| self[name, :current]}
+      names.each { |name| self[name, :current] }
     end
-    @faces.keys.select {|name| @faces[name].length > 0 }
+    @faces.keys.select { |name| @faces[name].length > 0 }
   end
 
   def self.[](name, version)
@@ -34,7 +34,7 @@ module Puppet::Interface::FaceCollection
       # ...we need to search for it bound to an o{lder,ther} version.  Since
       # we load all actions when the face is first references, this will be in
       # memory in the known set of versions of the face.
-      (@faces[name].keys - [ :current ]).sort.reverse_each do |vers|
+      (@faces[name].keys - [:current]).sort.reverse_each do |vers|
         action = @faces[name][vers].get_action(action_name)
         break if action
       end
@@ -48,7 +48,7 @@ module Puppet::Interface::FaceCollection
     return nil unless @faces.has_key? name
     return @faces[name][:current] if pattern == :current
 
-    versions = @faces[name].keys - [ :current ]
+    versions = @faces[name].keys - [:current]
     range = pattern.is_a?(SemanticPuppet::Version) ? SemanticPuppet::VersionRange.new(pattern, pattern) : SemanticPuppet::VersionRange.parse(pattern)
     found = find_matching(range, versions)
     return @faces[name][found]
@@ -133,7 +133,7 @@ module Puppet::Interface::FaceCollection
     unless name.to_s =~ /^[-_a-z][-_a-z0-9]*$/i then
       # TRANSLATORS 'face' refers to a programming API in Puppet
       raise ArgumentError, _("%{name} (%{class_name}) is not a valid face name") %
-          { name: name.inspect, class_name: name.class }
+                           { name: name.inspect, class_name: name.class }
     end
 
     name.to_s.downcase.split(/[-_]/).join('_').to_sym