puppet 8.4.0 → 8.5.0

data/lib/puppet/parser/resource.rb

@@ -90,10 +90,9 @@ class Puppet::Parser::Resource < Puppet::Resource
   def exported=(value)
     if value
       @virtual = true
-      @exported = value
     else
-      @exported = value
     end
+    @exported = value
   end
 
   # Finish the evaluation by assigning defaults and scope tags
@@ -201,7 +200,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   # if we ever receive a parameter named 'tag', set
   # the resource tags with its value.
   def set_parameter(param, value = nil)
-    if ! param.is_a?(Puppet::Parser::Resource::Param)
+    if !param.is_a?(Puppet::Parser::Resource::Param)
       param = param.name if param.is_a?(Puppet::Pops::Resource::Param)
       param = Puppet::Parser::Resource::Param.new(
         :name => param, :value => value, :source => self.source
@@ -216,7 +215,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   alias []= set_parameter
 
   def to_hash
-    parse_title.merge(@parameters.reduce({}) do |result, (_, param)|
+    parse_title.merge(@parameters.each_with_object({}) do |(_, param), result|
       value = param.value
       value = (:undef == value) ? nil : value
 
@@ -224,14 +223,12 @@ class Puppet::Parser::Resource < Puppet::Resource
         case param.name
         when :before, :subscribe, :notify, :require
           if value.is_a?(Array)
-            value = value.flatten.reject {|v| v.nil? || :undef == v }
+            value = value.flatten.reject { |v| v.nil? || :undef == v }
           end
-          result[param.name] = value
         else
-          result[param.name] = value
         end
+        result[param.name] = value
       end
-      result
     end)
   end
 
@@ -301,19 +298,17 @@ class Puppet::Parser::Resource < Puppet::Resource
       msg = if current.source.to_s == ''
               if error_location_str.empty?
                 _("Parameter '%{name}' is already set on %{resource}; cannot redefine") %
-                    { name: param.name, resource: ref }
+                  { name: param.name, resource: ref }
               else
                 _("Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine") %
-                    { name: param.name, resource: ref, error_location: error_location_str }
+                  { name: param.name, resource: ref, error_location: error_location_str }
               end
+            elsif error_location_str.empty?
+              _("Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine") %
+                { name: param.name, resource: ref, source: current.source.to_s }
             else
-              if error_location_str.empty?
-                _("Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine") %
-                    { name: param.name, resource: ref, source: current.source.to_s }
-              else
-                _("Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine") %
-                    { name: param.name, resource: ref, source: current.source.to_s, error_location: error_location_str }
-              end
+              _("Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine") %
+                { name: param.name, resource: ref, source: current.source.to_s, error_location: error_location_str }
             end
       raise Puppet::ParseError.new(msg, param.file, param.line)
     end

data/lib/puppet/parser/scope.rb

@@ -75,7 +75,7 @@ class Puppet::Parser::Scope
   end
 
   class LocalScope < Ephemeral
-    def initialize(parent=nil)
+    def initialize(parent = nil)
       super parent
       @symbols = {}
     end
@@ -111,7 +111,7 @@ class Puppet::Parser::Scope
         if (v == :undef || v.nil?) && !include_undef
           target.delete(k)
         else
-          target[ k ] = v
+          target[k] = v
         end
       end
       target
@@ -260,7 +260,7 @@ class Puppet::Parser::Scope
     end
 
     def to_hash
-      Hash[@params.select {|_, access| access.assigned? }.map { |name, access| [name, access.value] }]
+      @params.select { |_, access| access.assigned? }.transform_values { |access| access.value }
     end
   end
 
@@ -271,7 +271,7 @@ class Puppet::Parser::Scope
   #
   def include?(name)
     catch(:undefined_variable) {
-      return ! self[name].nil?
+      return !self[name].nil?
     }
     false
   end
@@ -282,21 +282,21 @@ class Puppet::Parser::Scope
   #
   def exist?(name)
     # Note !! ensure the answer is boolean
-    !! if name =~ /^(.*)::(.+)$/
-         class_name = $1
-         variable_name = $2
-         return true if class_name == '' && BUILT_IN_VARS.include?(variable_name)
-
-         # lookup class, but do not care if it is not evaluated since that will result
-         # in it not existing anyway. (Tests may run with just scopes and no evaluated classes which
-         # will result in class_scope for "" not returning topscope).
-         klass = find_hostclass(class_name)
-         other_scope = klass.nil? ? nil : class_scope(klass)
-         if other_scope.nil?
-           class_name == '' ? compiler.topscope.exist?(variable_name) : false
-         else
-           other_scope.exist?(variable_name)
-         end
+    !!if name =~ /^(.*)::(.+)$/
+        class_name = $1
+        variable_name = $2
+        return true if class_name == '' && BUILT_IN_VARS.include?(variable_name)
+
+        # lookup class, but do not care if it is not evaluated since that will result
+        # in it not existing anyway. (Tests may run with just scopes and no evaluated classes which
+        # will result in class_scope for "" not returning topscope).
+        klass = find_hostclass(class_name)
+        other_scope = klass.nil? ? nil : class_scope(klass)
+        if other_scope.nil?
+          class_name == '' ? compiler.topscope.exist?(variable_name) : false
+        else
+          other_scope.exist?(variable_name)
+        end
     else # rubocop:disable Layout/ElseAlignment
       next_scope = inherited_scope || enclosing_scope
       effective_symtable(true).include?(name) || next_scope && next_scope.exist?(name) || BUILT_IN_VARS.include?(name)
@@ -349,7 +349,7 @@ class Puppet::Parser::Scope
     environment.known_resource_types.find_definition(name)
   end
 
-  def find_global_scope()
+  def find_global_scope
     # walk upwards until first found node_scope or top_scope
     if is_nodescope? || is_topscope?
       self
@@ -386,12 +386,12 @@ class Puppet::Parser::Scope
     #    @symtable = Ephemeral.new(nil, true)
     @symtable = LocalScope.new(nil)
 
-    @ephemeral = [ MatchScope.new(@symtable, nil) ]
+    @ephemeral = [MatchScope.new(@symtable, nil)]
 
     # All of the defaults set for types.  It's a hash of hashes,
     # with the first key being the type, then the second key being
     # the parameter.
-    @defaults = Hash.new { |dhash,type|
+    @defaults = Hash.new { |dhash, type|
       dhash[type] = {}
     }
 
@@ -436,7 +436,7 @@ class Puppet::Parser::Scope
 
     # first collect the values from the parents
     if parent
-      parent.lookupdefaults(type).each { |var,value|
+      parent.lookupdefaults(type).each { |var, value|
         values[var] = value
       }
     end
@@ -444,7 +444,7 @@ class Puppet::Parser::Scope
     # then override them with any current values
     # this should probably be done differently
     if @defaults.include?(type)
-      @defaults[type].each { |var,value|
+      @defaults[type].each { |var, value|
         values[var] = value
       }
     end
@@ -470,7 +470,7 @@ class Puppet::Parser::Scope
     krt.find_definition(name) || krt.find_hostclass(name)
   end
 
-  def undef_as(x,v)
+  def undef_as(x, v)
     if v.nil? or v == :undef
       x
     else
@@ -496,7 +496,7 @@ class Puppet::Parser::Scope
     # If name has '::' in it, it is resolved as a qualified variable
     unless (idx = name.index('::')).nil?
       # Always drop leading '::' if present as that is how the values are keyed.
-      return lookup_qualified_variable(idx == 0 ? name[2..-1] : name, options)
+      return lookup_qualified_variable(idx == 0 ? name[2..] : name, options)
     end
 
     # At this point, search is for a non qualified (simple) name
@@ -519,7 +519,7 @@ class Puppet::Parser::Scope
   #
   UNCAUGHT_THROW_EXCEPTION = defined?(UncaughtThrowError) ? UncaughtThrowError : ArgumentError
 
-  def variable_not_found(name, reason=nil)
+  def variable_not_found(name, reason = nil)
     # Built in variables and numeric variables always exist
     if BUILT_IN_VARS.include?(name) || name =~ Puppet::Pops::Patterns::NUMERIC_VAR_NAME
       return nil
@@ -533,11 +533,11 @@ class Puppet::Parser::Scope
         # do nothing
       when :warning
         Puppet.warn_once(UNDEFINED_VARIABLES_KIND, _("Variable: %{name}") % { name: name },
-                         _("Undefined variable '%{name}'; %{reason}") % { name: name, reason: reason } )
+                         _("Undefined variable '%{name}'; %{reason}") % { name: name, reason: reason })
       when :error
-        if Puppet.lookup(:avoid_hiera_interpolation_errors){false}
+        if Puppet.lookup(:avoid_hiera_interpolation_errors) { false }
           Puppet.warn_once(UNDEFINED_VARIABLES_KIND, _("Variable: %{name}") % { name: name },
-                           _("Interpolation failed with '%{name}', but compilation continuing; %{reason}") % { name: name, reason: reason } )
+                           _("Interpolation failed with '%{name}', but compilation continuing; %{reason}") % { name: name, reason: reason })
         else
           raise ArgumentError, _("Undefined variable '%{name}'; %{reason}") % { name: name, reason: reason }
         end
@@ -609,8 +609,8 @@ class Puppet::Parser::Scope
     # not found - search inherited scope for class
     leaf_index = fqn.rindex('::')
     unless leaf_index.nil?
-      leaf_name = fqn[ (leaf_index+2)..-1 ]
-      class_name = fqn[ 0, leaf_index ]
+      leaf_name = fqn[(leaf_index + 2)..]
+      class_name = fqn[0, leaf_index]
       begin
         qs = qualified_scope(class_name)
         unless qs.nil?
@@ -653,7 +653,7 @@ class Puppet::Parser::Scope
   end
 
   def has_enclosing_scope?
-    ! parent.nil?
+    !parent.nil?
   end
   private :has_enclosing_scope?
 
@@ -720,7 +720,7 @@ class Puppet::Parser::Scope
   # Merge all settings for the given _env_name_ into this scope
   # @param env_name [Symbol] the name of the environment
   # @param set_in_this_scope [Boolean] if the settings variables should also be set in this instance of scope
-  def merge_settings(env_name, set_in_this_scope=true)
+  def merge_settings(env_name, set_in_this_scope = true)
     settings = Puppet.settings
     table = effective_symtable(false)
     global_table = compiler.qualified_variables
@@ -743,13 +743,14 @@ class Puppet::Parser::Scope
   end
 
   def transform_setting(val)
-    if val.is_a?(String) || val.is_a?(Numeric) || true == val || false == val || nil == val
+    case val
+    when String, Numeric, true, false, nil
       val
-    elsif val.is_a?(Array)
-      val.map {|entry| transform_setting(entry) }
-    elsif val.is_a?(Hash)
+    when Array
+      val.map { |entry| transform_setting(entry) }
+    when Hash
       result = {}
-      val.each {|k,v| result[transform_setting(k)] = transform_setting(v) }
+      val.each { |k, v| result[transform_setting(k)] = transform_setting(v) }
       result
     else
       # not ideal, but required as there are settings values that are special
@@ -834,10 +835,10 @@ class Puppet::Parser::Scope
   def deep_freeze(object)
     case object
     when Array
-      object.each {|v| deep_freeze(v) }
+      object.each { |v| deep_freeze(v) }
       object.freeze
     when Hash
-      object.each {|k, v| deep_freeze(k); deep_freeze(v) }
+      object.each { |k, v| deep_freeze(k); deep_freeze(v) }
       object.freeze
     when NilClass, Numeric, TrueClass, FalseClass
       # do nothing
@@ -895,14 +896,14 @@ class Puppet::Parser::Scope
     env_path = nil
     env_path = environment.configuration.path_to_env unless (environment.nil? || environment.configuration.nil?)
     # check module paths first since they may be in the environment (i.e. they are longer)
-    module_path = environment.full_modulepath.detect {|m_path| path.start_with?(m_path) }
+    module_path = environment.full_modulepath.detect { |m_path| path.start_with?(m_path) }
     if module_path
-      path = "<module>" + path[module_path.length..-1]
+      path = "<module>" + path[module_path.length..]
     elsif env_path && path && path.start_with?(env_path)
-      path = "<env>" + path[env_path.length..-1]
+      path = "<env>" + path[env_path.length..]
     end
     # Make the output appear as "Scope(path, line)"
-    "Scope(#{[path, detail[1]].join(', ')})" 
+    "Scope(#{[path, detail[1]].join(', ')})"
   end
 
   alias_method :inspect, :to_s
@@ -965,7 +966,7 @@ class Puppet::Parser::Scope
   def without_ephemeral_scopes
     save_ephemeral = @ephemeral
     begin
-      @ephemeral = [ @symtable ]
+      @ephemeral = [@symtable]
       yield(self)
     ensure
       @ephemeral = save_ephemeral
@@ -1015,13 +1016,13 @@ class Puppet::Parser::Scope
     when Hash
       # Create local scope ephemeral and set all values from hash
       new_ephemeral(true)
-      match.each {|k,v| setvar(k, v, :file => file, :line => line, :ephemeral => true) }
+      match.each { |k, v| setvar(k, v, :file => file, :line => line, :ephemeral => true) }
       # Must always have an inner match data scope (that starts out as transparent)
       # In 3x slightly wasteful, since a new nested scope is created for a match
       # (TODO: Fix that problem)
       new_ephemeral(false)
     else
-      raise(ArgumentError,_("Invalid regex match data. Got a %{klass}") % { klass: match.class }) unless match.is_a?(MatchData)
+      raise(ArgumentError, _("Invalid regex match data. Got a %{klass}") % { klass: match.class }) unless match.is_a?(MatchData)
 
       # Create a match ephemeral and set values from match data
       new_match_scope(match)

data/lib/puppet/parser/script_compiler.rb

@@ -31,7 +31,7 @@ class Puppet::Parser::ScriptCompiler
   attr_reader :node_name
 
   def with_context_overrides(description = '', &block)
-    Puppet.override( @context_overrides , description, &block)
+    Puppet.override(@context_overrides, description, &block)
   end
 
   # Evaluates the configured setup for a script + code in an environment with modules
@@ -41,7 +41,7 @@ class Puppet::Parser::ScriptCompiler
     Puppet[:strict] = :error
 
     # TRANSLATORS, "For running script" is not user facing
-    Puppet.override( @context_overrides , "For running script") do
+    Puppet.override(@context_overrides, "For running script") do
       # TRANSLATORS "main" is a function name and should not be translated
       result = Puppet::Util::Profiler.profile(_("Script: Evaluated main"), [:script, :evaluate_main]) { evaluate_main }
       if block_given?
@@ -61,7 +61,7 @@ class Puppet::Parser::ScriptCompiler
   end
 
   # Constructs the overrides for the context
-  def context_overrides()
+  def context_overrides
     {
       :current_environment => environment,
       :global_scope => @topscope, # 4x placeholder for new global scope
@@ -73,7 +73,7 @@ class Puppet::Parser::ScriptCompiler
   # Create a script compiler for the given environment where errors are logged as coming
   # from the given node_name
   #
-  def initialize(environment, node_name, for_agent=false)
+  def initialize(environment, node_name, for_agent = false)
     @environment = environment
     @node_name = node_name
 
@@ -103,7 +103,7 @@ class Puppet::Parser::ScriptCompiler
   # or in the top scope itself (notably, the $settings:: namespace is initialized
   # as just a set of variables in that namespace - there is no named scope for 'settings'
   # when scripting.
-  # 
+  #
   # Keeping this method here to get specific error as being unsure if there are functions/logic
   # that will call this. The AbstractCompiler defines this method, but maybe it does not
   # have to (TODO).

data/lib/puppet/parser/templatewrapper.rb

@@ -33,7 +33,7 @@ class Puppet::Parser::TemplateWrapper
   # @api private
   def script_line
     identifier = Regexp.escape(@__file__ || "(erb)")
-    (caller.find { |l| l =~ /#{identifier}:/ }||"")[/:(\d+):/,1]
+    (caller.find { |l| l =~ /#{identifier}:/ } || "")[/:(\d+):/, 1]
   end
   private :script_line
 

data/lib/puppet/parser/type_loader.rb

@@ -20,7 +20,7 @@ class Puppet::Parser::TypeLoader
     modname, files = Puppet::Parser::Files.find_manifests_in_modules(pattern, environment)
     if files.empty?
       abspat = File.expand_path(pattern, dir)
-      file_pattern = abspat + (File.extname(abspat).empty? ? '.pp' : '' )
+      file_pattern = abspat + (File.extname(abspat).empty? ? '.pp' : '')
 
       files = Dir.glob(file_pattern).uniq.reject { |f| FileTest.directory?(f) }
       modname = nil
@@ -71,7 +71,7 @@ class Puppet::Parser::TypeLoader
         imported_types = import_from_modules(filename)
         result = imported_types.find { |t| t.type == type and t.name == fqname }
         if result
-          Puppet.debug {"Automatically imported #{fqname} from #{filename} into #{environment}"}
+          Puppet.debug { "Automatically imported #{fqname} from #{filename} into #{environment}" }
           return result
         end
       rescue TypeLoaderError
@@ -113,7 +113,7 @@ class Puppet::Parser::TypeLoader
       # for information and it should not abort.
       # There is currently one user in indirector/resourcetype/parser
       #
-      if Puppet.lookup(:squelch_parse_errors) {|| false }
+      if Puppet.lookup(:squelch_parse_errors) { false }
         begin
           loaded_asts << parse_file(file)
         rescue => e

data/lib/puppet/plugins.rb

@@ -8,4 +8,4 @@
 # @since Puppet 4.0.0
 #
 module Puppet::Plugins
-end
+end

data/lib/puppet/pops/adaptable.rb

@@ -197,4 +197,3 @@ module Adaptable
   end
 end
 end
-