puppet 8.4.0-x64-mingw32 → 8.5.0-x64-mingw32

data/lib/puppet/relationship.rb

@@ -28,7 +28,7 @@ class Puppet::Relationship
 
   def event=(event)
     # TRANSLATORS 'NONE' should not be translated
-    raise ArgumentError, _("You must pass a callback for non-NONE events") if event != :NONE and ! callback
+    raise ArgumentError, _("You must pass a callback for non-NONE events") if event != :NONE and !callback
 
     @event = event
   end
@@ -36,7 +36,7 @@ class Puppet::Relationship
   def initialize(source, target, options = {})
     @source, @target = source, target
 
-    options = (options || {}).inject({}) { |h,a| h[a[0].to_sym] = a[1]; h }
+    options = (options || {}).each_with_object({}) { |a, h| h[a[0].to_sym] = a[1]; }
     [:callback, :event].each do |option|
       value = options[option]
       send(option.to_s + "=", value) if value

data/lib/puppet/reports/log.rb

@@ -13,4 +13,3 @@ Puppet::Reports.register_report(:log) do
     end
   end
 end
-

data/lib/puppet/reports/store.rb

@@ -19,7 +19,7 @@ Puppet::Reports.register_report(:store) do
 
     dir = File.join(Puppet[:reportdir], host)
 
-    if ! Puppet::FileSystem.exist?(dir)
+    if !Puppet::FileSystem.exist?(dir)
       FileUtils.mkdir_p(dir)
       FileUtils.chmod_R(0750, dir)
     end
@@ -53,7 +53,7 @@ Puppet::Reports.register_report(:store) do
 
     if Puppet::FileSystem.exist?(dir)
       Dir.entries(dir).each do |file|
-        next if ['.','..'].include?(file)
+        next if ['.', '..'].include?(file)
 
         file = File.join(dir, file)
         Puppet::FileSystem.unlink(file) if File.file?(file)

data/lib/puppet/resource/catalog.rb

@@ -85,11 +85,11 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   # Returns [typename, title] when given a String with "Type[title]".
   # Returns [nil, nil] if '[' ']' not detected.
   #
-  def title_key_for_ref( ref )
+  def title_key_for_ref(ref)
     s = ref.index('[')
     e = ref.rindex(']')
     if s && e && e > s
-      a = [ref[0, s], ref[s+1, e-s-1]]
+      a = [ref[0, s], ref[s + 1, e - s - 1]]
     else
       a = [nil, nil]
     end
@@ -102,7 +102,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       idx = @resources.index(other_title_key)
       if idx.nil?
         raise ArgumentError, _("Cannot add resource %{resource_1} before %{resource_2} because %{resource_2} is not yet in the catalog") %
-            { resource_1: resource.ref, resource_2: other.ref }
+                             { resource_1: resource.ref, resource_2: other.ref }
       end
       add_one_resource(resource, idx)
     end
@@ -117,9 +117,9 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       idx = @resources.index(other_title_key)
       if idx.nil?
         raise ArgumentError, _("Cannot add resource %{resource_1} after %{resource_2} because %{resource_2} is not yet in the catalog") %
-            { resource_1: resource.ref, resource_2: other.ref }
+                             { resource_1: resource.ref, resource_2: other.ref }
       end
-      add_one_resource(resource, idx+1)
+      add_one_resource(resource, idx + 1)
     end
   end
 
@@ -136,7 +136,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     adjacent(resource, :direction => :in)[0]
   end
 
-  def add_one_resource(resource, idx=-1)
+  def add_one_resource(resource, idx = -1)
     title_key = title_key_for_ref(resource.ref)
     if @resource_table[title_key]
       fail_on_duplicate_type_and_title(resource, title_key)
@@ -167,7 +167,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     # The alias setting logic checks, and does not error if the alias is set to an already set alias
     # for the same resource (i.e. it is ok if alias == title
     explicit_aliases = [resource[:alias]].flatten.compact
-    explicit_aliases.each {| given_alias | self.alias(resource, given_alias) }
+    explicit_aliases.each { |given_alias| self.alias(resource, given_alias) }
 
     # Skip creating uniqueness key alias and checking collisions for non-isomorphic resources.
     return unless resource.respond_to?(:isomorphic?) and resource.isomorphic?
@@ -205,11 +205,11 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       msg = if resource_declaration.empty?
               # TRANSLATORS 'alias' should not be translated
               _("Cannot alias %{resource} to %{key}; resource %{newref} already declared") %
-                  { resource: ref, key: key.inspect, newref: newref.inspect }
+                { resource: ref, key: key.inspect, newref: newref.inspect }
             else
               # TRANSLATORS 'alias' should not be translated
               _("Cannot alias %{resource} to %{key} at %{resource_declaration}; resource %{newref} already declared") %
-                  { resource: ref, key: key.inspect, resource_declaration: resource_declaration, newref: newref.inspect }
+                { resource: ref, key: key.inspect, resource_declaration: resource_declaration, newref: newref.inspect }
             end
       msg += Puppet::Util::Errors.error_location_with_space(existing.file, existing.line)
       raise ArgumentError, msg
@@ -395,7 +395,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   end
 
   def resource_refs
-    resource_keys.collect{ |type, name| name.is_a?( String ) ? "#{type}[#{name}]" : nil}.compact
+    resource_keys.filter_map { |type, name| name.is_a?(String) ? "#{type}[#{name}]" : nil }
   end
 
   def resource_keys
@@ -411,7 +411,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def self.from_data_hash(data)
     result = new(data['name'], Puppet::Node::Environment::NONE)
 
-    result.tag(*data['tags']) if data['tags'] 
+    result.tag(*data['tags']) if data['tags']
     result.version = data['version'] if data['version']
     result.code_id = data['code_id'] if data['code_id']
     result.catalog_uuid = data['catalog_uuid'] if data['catalog_uuid']
@@ -435,14 +435,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
         source = result.resource(edge.source)
         unless source
           raise ArgumentError, _("Could not intern from data: Could not find relationship source %{source} for %{target}") %
-              { source: edge.source.inspect, target: edge.target.to_s }
+                               { source: edge.source.inspect, target: edge.target.to_s }
         end
         edge.source = source
 
         target = result.resource(edge.target)
         unless target
           raise ArgumentError, _("Could not intern from data: Could not find relationship target %{target} for %{source}") %
-              { target: edge.target.inspect, source: edge.source.to_s }
+                               { target: edge.target.inspect, source: edge.source.to_s }
         end
         edge.target = target
 
@@ -452,16 +452,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
     result.add_class(*data['classes']) if data['classes']
 
-    result.metadata = data['metadata'].inject({}) { |h, (k, v)| h[k] = Puppet::FileServing::Metadata.from_data_hash(v); h } if data['metadata']
+    result.metadata = data['metadata'].transform_values { |v| Puppet::FileServing::Metadata.from_data_hash(v); } if data['metadata']
 
     recursive_metadata = data['recursive_metadata']
     if recursive_metadata
-      result.recursive_metadata = recursive_metadata.inject({}) do |h, (title, source_to_meta_hash)|
-        h[title] = source_to_meta_hash.inject({}) do |inner_h, (source, metas)|
-          inner_h[source] = metas.map {|meta| Puppet::FileServing::Metadata.from_data_hash(meta)}
-          inner_h
+      result.recursive_metadata = recursive_metadata.transform_values do |source_to_meta_hash|
+        source_to_meta_hash.transform_values do |metas|
+          metas.map { |meta| Puppet::FileServing::Metadata.from_data_hash(meta) }
         end
-        h
       end
     end
 
@@ -469,13 +467,11 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   end
 
   def to_data_hash
-    metadata_hash = metadata.inject({}) { |h, (k, v)| h[k] = v.to_data_hash; h }
-    recursive_metadata_hash = recursive_metadata.inject({}) do |h, (title, source_to_meta_hash)|
-      h[title] = source_to_meta_hash.inject({}) do |inner_h, (source, metas)|
-        inner_h[source] = metas.map {|meta| meta.to_data_hash}
-        inner_h
+    metadata_hash = metadata.transform_values { |v| v.to_data_hash; }
+    recursive_metadata_hash = recursive_metadata.transform_values do |source_to_meta_hash|
+      source_to_meta_hash.transform_values do |metas|
+        metas.map { |meta| meta.to_data_hash }
       end
-      h
     end
 
     {
@@ -490,8 +486,8 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       'edges' => edges.map { |e| e.to_data_hash },
       'classes' => classes,
     }.merge(metadata_hash.empty? ?
-      {} : {'metadata' => metadata_hash}).merge(recursive_metadata_hash.empty? ?
-        {} : {'recursive_metadata' => recursive_metadata_hash})
+      {} : { 'metadata' => metadata_hash }).merge(recursive_metadata_hash.empty? ?
+        {} : { 'recursive_metadata' => recursive_metadata_hash })
   end
 
   # Convert our catalog into a RAL catalog.
@@ -512,7 +508,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     # environment set in the catalog (if it is set)
     # See PUP-3755
     if environment_instance
-      Puppet.override({:current_environment => environment_instance}) do
+      Puppet.override({ :current_environment => environment_instance }) do
         to_catalog :to_resource, &block
       end
     else
@@ -540,11 +536,11 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     # https://puppet.com/docs/puppet/latest/configuration.html#resourcefile
     resourcefile = Puppet.settings.setting(:resourcefile)
     Puppet::FileSystem.open(resourcefile.value, resourcefile.mode.to_i(8), "w:UTF-8") do |f|
-      to_print = resources.map do |resource|
+      to_print = resources.filter_map do |resource|
         next unless resource.managed?
 
         "#{resource.ref.downcase}"
-      end.compact
+      end
       f.puts to_print.join("\n")
     end
   rescue => detail

data/lib/puppet/resource/status.rb

@@ -110,7 +110,7 @@ module Puppet
       # Provide a boolean method for each of the states.
       STATES.each do |attr|
         define_method("#{attr}?") do
-          !! send(attr)
+          !!send(attr)
         end
       end
 
@@ -121,9 +121,10 @@ module Puppet
 
       def add_event(event)
         @events << event
-        if event.status == 'failure'
+        case event.status
+        when 'failure'
           self.failed = true
-        elsif event.status == 'success'
+        when 'success'
           @change_count += 1
           @changed = true
         end

data/lib/puppet/resource/type.rb

@@ -153,7 +153,7 @@ class Puppet::Resource::Type
   # classes and nodes.  No parameters are be supplied--if this is a
   # parameterized class, then all parameters take on their default
   # values.
-  def ensure_in_catalog(scope, parameters=nil)
+  def ensure_in_catalog(scope, parameters = nil)
     resource_type =
       case type
       when :definition
@@ -175,7 +175,7 @@ class Puppet::Resource::Type
       resource = scope.catalog.resource(resource_type, name)
       return resource unless resource.nil?
     elsif parameters.is_a?(Hash)
-      parameters = parameters.map {|k, v| Puppet::Parser::Resource::Param.new(:name => k, :value => v, :source => self)}
+      parameters = parameters.map { |k, v| Puppet::Parser::Resource::Param.new(:name => k, :value => v, :source => self) }
     end
     resource = Puppet::Parser::Resource.new(resource_type, name, :scope => scope, :source => self, :parameters => parameters)
     instantiate_resource(scope, resource)
@@ -196,7 +196,7 @@ class Puppet::Resource::Type
 
   def name
     if type == :node && name_is_regex?
-      "__node_regexp__#{@name.source.downcase.gsub(/[^-\w:.]/,'').sub(/^\.+/,'')}"
+      "__node_regexp__#{@name.source.downcase.gsub(/[^-\w:.]/, '').sub(/^\.+/, '')}"
     else
       @name
     end
@@ -210,7 +210,7 @@ class Puppet::Resource::Type
     return nil unless parent
 
     @parent_type ||= scope.environment.known_resource_types.send("find_#{type}", parent) ||
-      fail(Puppet::ParseError, _("Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}") % { parent: parent, parent_type: type, env: scope.environment })
+                     fail(Puppet::ParseError, _("Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}") % { parent: parent, parent_type: type, env: scope.environment })
   end
 
   # Validate and set any arguments passed by the resource as variables in the scope.
@@ -232,12 +232,12 @@ class Puppet::Resource::Type
 
     if @type == :hostclass
       scope[TITLE] = resource.title.to_s.downcase
-      scope[NAME] =  resource.name.to_s.downcase
+      scope[NAME] = resource.name.to_s.downcase
     else
       scope[TITLE] = resource.title
-      scope[NAME] =  resource.name
+      scope[NAME] = resource.name
     end
-    scope.class_set(self.name,scope) if hostclass? || node?
+    scope.class_set(self.name, scope) if hostclass? || node?
 
     param_hash = scope.with_parameter_scope(resource.to_s, arguments.keys) do |param_scope|
       # Assign directly to the parameter scope to avoid scope parameter validation at this point. It
@@ -251,7 +251,7 @@ class Puppet::Resource::Type
     validate_resource_hash(resource, param_hash)
 
     # Assign parameter values to current scope
-    param_hash.each { |param, value| exceptwrap { scope[param] = value }}
+    param_hash.each { |param, value| exceptwrap { scope[param] = value } }
   end
 
   # Lookup and inject parameters from external scope
@@ -306,11 +306,10 @@ class Puppet::Resource::Type
     # recreated as a Sensitive in order to perform correct type checking.
     sensitives = Set.new(resource.sensitive_parameters)
     validate_resource_hash(resource,
-                           Hash[resource.parameters.map do |name, value|
+                           resource.parameters.to_h do |name, value|
                              value_to_validate = sensitives.include?(name) ? Puppet::Pops::Types::PSensitiveType::Sensitive.new(value.value) : value.value
                              [name.to_s, value_to_validate]
-                           end
-                         ])
+                           end)
   end
 
   # Check whether a given argument is valid.

data/lib/puppet/resource/type_collection.rb

@@ -83,11 +83,11 @@ class Puppet::Resource::TypeCollection
   end
 
   # Replaces the known settings with a new instance (that must be named 'settings').
-  # This is primarily needed for testing purposes. Also see PUP-5954 as it makes 
+  # This is primarily needed for testing purposes. Also see PUP-5954 as it makes
   # it illegal to merge classes other than the '' (main) class. Prior to this change
   # settings where always merged rather than being defined from scratch for many testing scenarios
   # not having a complete side effect free setup for compilation.
-  # 
+  #
   def replace_settings(instance)
     @hostclasses['settings'] = instance
   end
@@ -192,11 +192,11 @@ class Puppet::Resource::TypeCollection
     @environment.lock.synchronize do
       @lock.synchronize do
         # Name is always absolute, but may start with :: which must be removed
-        fqname = (name[0,2] == COLON_COLON ? name[2..-1] : name)
+        fqname = (name[0, 2] == COLON_COLON ? name[2..] : name)
 
         result = send(type, fqname)
         unless result
-          if @notfound[ fqname ] && Puppet[ :ignoremissingtypes ]
+          if @notfound[fqname] && Puppet[:ignoremissingtypes]
             # do not try to autoload if we already tried and it wasn't conclusive
             # as this is a time consuming operation. Warn the user.
             # Check first if debugging is on since the call to debug_once is expensive
@@ -206,7 +206,7 @@ class Puppet::Resource::TypeCollection
           else
             fqname = munge_name(fqname)
             result = loader.try_load_fqname(type, fqname)
-            @notfound[ fqname ] = result.nil?
+            @notfound[fqname] = result.nil?
           end
         end
         result

data/lib/puppet/resource.rb

@@ -130,15 +130,15 @@ class Puppet::Resource
     unless params.empty?
       data['parameters'] =
         Puppet::Pops::Serialization::ToDataConverter
-          .convert(params,
-                   {
-                     :rich_data => Puppet.lookup(:rich_data),
-                     :symbol_as_string => true,
-                     :local_reference => false,
-                     :type_by_reference => true,
-                     :message_prefix => ref,
-                     :semantic => self
-                   })
+        .convert(params,
+                 {
+                   :rich_data => Puppet.lookup(:rich_data),
+                   :symbol_as_string => true,
+                   :local_reference => false,
+                   :type_by_reference => true,
+                   :message_prefix => ref,
+                   :semantic => self
+                 })
     end
 
     data['sensitive_parameters'] = sensitive_parameters.map(&:to_s) unless sensitive_parameters.empty?
@@ -147,7 +147,7 @@ class Puppet::Resource
 
   def self.value_to_json_data(value)
     if value.is_a?(Array)
-      value.map{|v| value_to_json_data(v) }
+      value.map { |v| value_to_json_data(v) }
     elsif value.is_a?(Hash)
       result = {}
       value.each_pair { |k, v| result[value_to_json_data(k)] = value_to_json_data(v) }
@@ -220,15 +220,15 @@ class Puppet::Resource
 
   # Iterate over each param/value pair, as required for Enumerable.
   def each
-    parameters.each { |p,v| yield p, v }
+    parameters.each { |p, v| yield p, v }
   end
 
   def include?(parameter)
-    super || parameters.keys.include?( parameter_name(parameter) )
+    super || parameters.keys.include?(parameter_name(parameter))
   end
 
   %w{exported virtual strict}.each do |m|
-    define_method(m+"?") do
+    define_method(m + "?") do
       self.send(m)
     end
   end
@@ -282,9 +282,10 @@ class Puppet::Resource
       @title = src.title
 
       src.to_hash.each do |p, v|
-        if v.is_a?(Puppet::Resource)
+        case v
+        when Puppet::Resource
           v = v.copy_as_resource
-        elsif v.is_a?(Array)
+        when Array
           # flatten resource references arrays
           v = v.flatten if v.flatten.find { |av| av.is_a?(Puppet::Resource) }
           v = v.collect do |av|
@@ -300,8 +301,8 @@ class Puppet::Resource
       if type.is_a?(Hash)
         # TRANSLATORS 'Puppet::Resource.new' should not be translated
         raise ArgumentError, _("Puppet::Resource.new does not take a hash as the first argument.") + ' ' +
-          _("Did you mean (%{type}, %{title}) ?") %
-              { type: (type[:type] || type["type"]).inspect, title: (type[:title] || type["title"]).inspect }
+                             _("Did you mean (%{type}, %{title}) ?") %
+                             { type: (type[:type] || type["type"]).inspect, title: (type[:title] || type["title"]).inspect }
       end
 
       # In order to avoid an expensive search of 'known_resource_types" and
@@ -444,7 +445,7 @@ class Puppet::Resource
   def to_hierayaml
     # Collect list of attributes to align => and move ensure first
     attr = parameters.keys
-    attr_max = attr.inject(0) { |max,k| k.to_s.length > max ? k.to_s.length : max }
+    attr_max = attr.inject(0) { |max, k| k.to_s.length > max ? k.to_s.length : max }
 
     attr.sort!
     if attr.first != :ensure && attr.include?(:ensure)
@@ -452,10 +453,12 @@ class Puppet::Resource
       attr.unshift(:ensure)
     end
 
+    # rubocop:disable Lint/FormatParameterMismatch
     attributes = attr.collect { |k|
       v = parameters[k]
       "    %-#{attr_max}s: %s\n" % [k, Puppet::Parameter.format_value_for_display(v)]
     }.join
+    # rubocop:enable Lint/FormatParameterMismatch
 
     "  %s:\n%s" % [self.title, attributes]
   end
@@ -470,7 +473,7 @@ class Puppet::Resource
 
     res = {}
     res['ensure'] = value if value
-    res.merge!(Hash[params.sort])
+    res.merge!(params.sort.to_h)
 
     return { h['title'] => res }
   end
@@ -479,7 +482,7 @@ class Puppet::Resource
   def to_manifest
     # Collect list of attributes to align => and move ensure first
     attr = parameters.keys
-    attr_max = attr.inject(0) { |max,k| k.to_s.length > max ? k.to_s.length : max }
+    attr_max = attr.inject(0) { |max, k| k.to_s.length > max ? k.to_s.length : max }
 
     attr.sort!
     if attr.first != :ensure && attr.include?(:ensure)
@@ -487,12 +490,14 @@ class Puppet::Resource
       attr.unshift(:ensure)
     end
 
+    # rubocop:disable Lint/FormatParameterMismatch
     attributes = attr.collect { |k|
       v = parameters[k]
       "  %-#{attr_max}s => %s,\n" % [k, Puppet::Parameter.format_value_for_display(v)]
     }.join
+    # rubocop:enable Lint/FormatParameterMismatch
 
-    escaped = self.title.gsub(/'/,"\\\\'")
+    escaped = self.title.gsub(/'/, "\\\\'")
     "%s { '%s':\n%s}" % [self.type.to_s.downcase, escaped, attributes]
   end
 
@@ -503,8 +508,8 @@ class Puppet::Resource
   # Convert our resource to a RAL resource instance. Creates component
   # instances for resource types that are not of a compilable_type kind. In case
   # the resource doesn’t exist and it’s compilable_type kind, raise an error.
-  # There are certain cases where a resource won't be in a catalog, such as 
-  # when we create a resource directly by using Puppet::Resource.new(...), so we 
+  # There are certain cases where a resource won't be in a catalog, such as
+  # when we create a resource directly by using Puppet::Resource.new(...), so we
   # must check its kind before deciding whether the catalog format is of an older
   # version or not.
   def to_ral
@@ -525,7 +530,7 @@ class Puppet::Resource
     # this is potential namespace conflict
     # between the notion of an "indirector name"
     # and a "resource name"
-    [ type, title ].join('/')
+    [type, title].join('/')
   end
 
   def missing_arguments
@@ -584,11 +589,11 @@ class Puppet::Resource
 
   def self.extract_type_and_title(argtype, argtitle)
     if (argtype.nil? || argtype == :component || argtype == :whit) &&
-          argtitle =~ /^([^\[\]]+)\[(.+)\]$/m                  then [ $1,                 $2            ]
+       argtitle =~ /^([^\[\]]+)\[(.+)\]$/m                  then [$1, $2]
     elsif argtitle.nil? && argtype.is_a?(String) &&
-          argtype =~ /^([^\[\]]+)\[(.+)\]$/m                   then [ $1,                 $2            ]
-    elsif argtitle                                             then [ argtype,            argtitle      ]
-    elsif argtype.is_a?(Puppet::Type)                          then [ argtype.class.name, argtype.title ]
+          argtype =~ /^([^\[\]]+)\[(.+)\]$/m                   then [$1,                 $2]
+    elsif argtitle                                             then [argtype,            argtitle]
+    elsif argtype.is_a?(Puppet::Type)                          then [argtype.class.name, argtype.title]
     else  raise ArgumentError, _("No title provided and %{type} is not a valid resource reference") % { type: argtype.inspect } # rubocop:disable Lint/ElseLayout
     end
   end
@@ -640,9 +645,9 @@ class Puppet::Resource
     type = resource_type
     if type.respond_to?(:title_patterns) && !type.title_patterns.nil?
       type.title_patterns.each do |regexp, symbols_and_lambdas|
-        captures = regexp.match(title.to_s)  
+        captures = regexp.match(title.to_s)
         if captures
-          symbols_and_lambdas.zip(captures[1..-1]).each do |symbol_and_lambda,capture|
+          symbols_and_lambdas.zip(captures[1..]).each do |symbol_and_lambda, capture|
             symbol, proc = symbol_and_lambda
             # Many types pass "identity" as the proc; we might as well give
             # them a shortcut to delivering that without the extra cost.

data/lib/puppet/scheduler/scheduler.rb

@@ -2,7 +2,7 @@
 
 module Puppet::Scheduler
   class Scheduler
-    def initialize(timer=Puppet::Scheduler::Timer.new)
+    def initialize(timer = Puppet::Scheduler::Timer.new)
       @timer = timer
     end
 

data/lib/puppet/scheduler.rb

@@ -8,7 +8,7 @@ module Puppet::Scheduler
 
   module_function
 
-  def create_job(interval, splay=false, splay_limit=0, &block)
+  def create_job(interval, splay = false, splay_limit = 0, &block)
     if splay
       Puppet::Scheduler::SplayJob.new(interval, splay_limit, &block)
     else

data/lib/puppet/settings/base_setting.rb

@@ -109,7 +109,7 @@ class Puppet::Settings::BaseSetting
       method = param.to_s + "="
       unless self.respond_to? method
         raise ArgumentError, _("%{class_name} (setting '%{setting}') does not accept %{parameter}") %
-            { class_name: self.class, setting: args[:name], parameter: param }
+                             { class_name: self.class, setting: args[:name], parameter: param }
       end
 
       self.send(method, value)
@@ -201,7 +201,7 @@ class Puppet::Settings::BaseSetting
     unless [:completely, :allowed_on_commandline].include?(deprecation)
       # TRANSLATORS 'deprecated' is a Puppet setting and ':completely' and ':allowed_on_commandline' are possible values and should not be translated
       raise ArgumentError, _("Unsupported deprecated value '%{deprecation}'.") % { deprecation: deprecation } +
-          ' ' + _("Supported values for deprecated are ':completely' or ':allowed_on_commandline'")
+                           ' ' + _("Supported values for deprecated are ':completely' or ':allowed_on_commandline'")
     end
     @deprecated = deprecation
   end

data/lib/puppet/settings/boolean_setting.rb

@@ -13,7 +13,7 @@ class Puppet::Settings::BooleanSetting < Puppet::Settings::BaseSetting
 
   def optparse_args
     if short
-      ["--[no-]#{name}", "-#{short}", desc, :NONE ]
+      ["--[no-]#{name}", "-#{short}", desc, :NONE]
     else
       ["--[no-]#{name}", desc, :NONE]
     end

data/lib/puppet/settings/config_file.rb

@@ -85,10 +85,10 @@ class Puppet::Settings::ConfigFile
       if !allowed_section_names.empty? && !allowed_section_names.include?(section.name)
         error_location_str = Puppet::Util::Errors.error_location(file, section.line_number)
         message = _("Illegal section '%{name}' in config file at %{error_location}.") %
-            { name: section.name, error_location: error_location_str }
+                  { name: section.name, error_location: error_location_str }
         # TRANSLATORS 'puppet.conf' is the name of the puppet configuration file and should not be translated.
         message += ' ' + _("The only valid puppet.conf sections are: [%{allowed_sections_list}].") %
-            { allowed_sections_list: allowed_section_names.join(", ") }
+                         { allowed_sections_list: allowed_section_names.join(", ") }
         message += ' ' + _("Please use the directory environments feature to specify environments.")
         message += ' ' + _("(See https://puppet.com/docs/puppet/latest/environments_about.html)")
         raise(Puppet::Error, message)

data/lib/puppet/settings/duration_setting.rb

@@ -22,10 +22,9 @@ class Puppet::Settings::DurationSetting < Puppet::Settings::BaseSetting
 
   # Convert the value to an integer, parsing numeric string with units if necessary.
   def munge(value)
-    case
-    when value.is_a?(Integer) || value.nil?
+    if value.is_a?(Integer) || value.nil?
       value
-    when (value.is_a?(String) and value =~ FORMAT)
+    elsif (value.is_a?(String) and value =~ FORMAT)
       $1.to_i * UNITMAP[$2 || 's']
     else
       raise Puppet::Settings::ValidationError, _("Invalid duration format '%{value}' for parameter: %{name}") % { value: value.inspect, name: @name }

data/lib/puppet/settings/environment_conf.rb

@@ -69,7 +69,7 @@ class Puppet::Settings::EnvironmentConf
       if environment_conf_manifest && fallback_manifest_directory != environment_conf_manifest
         # TRANSLATORS 'disable_per_environment_manifest' is a setting and 'environment.conf' is a file name and should not be translated
         message = _("The 'disable_per_environment_manifest' setting is true, but the environment located at %{path_to_env} has a manifest setting in its environment.conf of '%{environment_conf}' which does not match the default_manifest setting '%{puppet_conf}'.") %
-            { path_to_env: @path_to_env, environment_conf: environment_conf_manifest, puppet_conf: puppet_conf_manifest }
+                  { path_to_env: @path_to_env, environment_conf: environment_conf_manifest, puppet_conf: puppet_conf_manifest }
         message += ' ' + _("If this environment is expecting to find modules in '%{environment_conf}', they will not be available!") % { environment_conf: environment_conf_manifest }
         Puppet.err(message)
       end
@@ -100,7 +100,7 @@ class Puppet::Settings::EnvironmentConf
   def modulepath
     default_modulepath = [File.join(@path_to_env, "modules")] + @global_module_path
     get_setting(:modulepath, default_modulepath) do |modulepath|
-      path = modulepath.kind_of?(String) ?
+      path = modulepath.is_a?(String) ?
         modulepath.split(File::PATH_SEPARATOR) :
         modulepath
       path.map { |p| expand_glob(absolute(p)) }.flatten.join(File::PATH_SEPARATOR)
@@ -143,7 +143,8 @@ class Puppet::Settings::EnvironmentConf
         _("Invalid sections in environment.conf at '%{path_to_conf_file}'. Environment conf may not have sections. The following sections are being ignored: '%{sections}'") % {
           path_to_conf_file: path_to_conf_file,
           sections: (section_keys - [:main]).join(',')
-        })
+        }
+      )
       valid = false
     end
 
@@ -155,7 +156,8 @@ class Puppet::Settings::EnvironmentConf
         _("Invalid settings in environment.conf at '%{path_to_conf_file}'. The following unknown setting(s) are being ignored: %{ignored_settings}") % {
           path_to_conf_file: path_to_conf_file,
           ignored_settings: extraneous_settings.join(', ')
-        })
+        }
+      )
       valid = false
     end
 

data/lib/puppet/settings/errors.rb

@@ -4,9 +4,9 @@
 require_relative '../../puppet/error'
 
 class Puppet::Settings
-  class SettingsError < Puppet::Error ; end
-  class ValidationError < SettingsError ; end
-  class InterpolationError < SettingsError ; end
+  class SettingsError < Puppet::Error; end
+  class ValidationError < SettingsError; end
+  class InterpolationError < SettingsError; end
 
   class ParseError < SettingsError
     include Puppet::ExternalFileError