puppet 6.6.0-x86-mingw32 → 6.7.0-x86-mingw32

data/lib/puppet/parser/files.rb

@@ -14,7 +14,8 @@ module Puppet::Parser::Files
   def find_manifests_in_modules(pattern, environment)
     module_name, file_pattern = split_file_path(pattern)
 
-    if mod = environment.module(module_name)
+    mod = environment.module(module_name)
+    if mod
       [mod.name, mod.match_manifests(file_pattern)]
     else
       [nil, []]

data/lib/puppet/parser/functions.rb

@@ -232,7 +232,8 @@ module Puppet::Parser::Functions
   def self.function(name, environment = Puppet.lookup(:current_environment))
     name = name.intern
 
-    unless func = get_function(name, environment)
+    func = get_function(name, environment)
+    unless func
       autoloader.delegatee.load(name, environment)
       func = get_function(name, environment)
     end

data/lib/puppet/parser/relationship.rb

@@ -36,7 +36,8 @@ class Puppet::Parser::Relationship
     target_ref = canonical_ref(target)
     rel_param = param_name
 
-    unless source_resource = catalog.resource(*source_ref)
+    source_resource = catalog.resource(*source_ref)
+    unless source_resource
       raise ArgumentError, _("Could not find resource '%{source}' for relationship on '%{target}'") % { source: source.to_s, target: target.to_s }
     end
     unless catalog.resource(*target_ref)

data/lib/puppet/parser/resource.rb

@@ -56,7 +56,8 @@ class Puppet::Parser::Resource < Puppet::Resource
   def add_edge_to_stage
     return unless self.class?
 
-    unless stage = catalog.resource(:stage, self[:stage] || (scope && scope.resource && scope.resource[:stage]) || :main)
+    stage = catalog.resource(:stage, self[:stage] || (scope && scope.resource && scope.resource[:stage]) || :main)
+    unless stage
       raise ArgumentError, _("Could not find stage %{stage} specified by %{resource}") % { stage: self[:stage] || :main, resource: self }
     end
 
@@ -298,7 +299,8 @@ class Puppet::Parser::Resource < Puppet::Resource
 
         # evaluate mappings in that scope
         resource_type.arguments.keys.each do |name|
-          if expr = blueprint[:mappings][name]
+          expr = blueprint[:mappings][name]
+          if expr
             # Explicit mapping
             value = expr.safeevaluate(cns_scope)
           else
@@ -348,7 +350,8 @@ class Puppet::Parser::Resource < Puppet::Resource
   def override_parameter(param)
     # This can happen if the override is defining a new parameter, rather
     # than replacing an existing one.
-    (set_parameter(param) and return) unless current = @parameters[param.name]
+    current = @parameters[param.name]
+    (set_parameter(param) and return) unless current
 
     # Parameter is already set - if overriding with a default - simply ignore the setting of the default value
     return if scope.is_default?(type, param.name, param.value)

data/lib/puppet/parser/scope.rb

@@ -1,4 +1,3 @@
-
 # The scope class, which handles storing and retrieving variables and types and
 # such.
 require 'forwardable'
@@ -652,8 +651,10 @@ class Puppet::Parser::Scope
   private :has_enclosing_scope?
 
   def qualified_scope(classname)
-    raise _("class %{classname} could not be found") % { classname: classname }     unless klass = find_hostclass(classname)
-    raise _("class %{classname} has not been evaluated") % { classname: classname } unless kscope = class_scope(klass)
+    klass = find_hostclass(classname)
+    raise _("class %{classname} could not be found") % { classname: classname }     unless klass
+    kscope = class_scope(klass)
+    raise _("class %{classname} has not been evaluated") % { classname: classname } unless kscope
     kscope
   end
   private :qualified_scope
@@ -881,7 +882,8 @@ 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)
-    if 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]
     elsif env_path && path && path.start_with?(env_path)
       path = "<env>" + path[env_path.length..-1]

data/lib/puppet/parser/templatewrapper.rb

@@ -61,7 +61,8 @@ class Puppet::Parser::TemplateWrapper
 
   # @api private
   def file=(filename)
-    unless @__file__ = Puppet::Parser::Files.find_template(filename, scope.compiler.environment)
+    @__file__ = Puppet::Parser::Files.find_template(filename, scope.compiler.environment)
+    unless @__file__
       raise Puppet::ParseError, _("Could not find template '%{filename}'") % { filename: filename }
     end
   end

data/lib/puppet/parser/type_loader.rb

@@ -66,7 +66,8 @@ class Puppet::Parser::TypeLoader
     files_to_try_for(fqname).each do |filename|
       begin
         imported_types = import_from_modules(filename)
-        if result = imported_types.find { |t| t.type == type and t.name == fqname }
+        result = imported_types.find { |t| t.type == type and t.name == fqname }
+        if result
           Puppet.debug {"Automatically imported #{fqname} from #{filename} into #{environment}"}
           return result
         end

data/lib/puppet/pops/adaptable.rb

@@ -94,11 +94,8 @@ module Adaptable
     #
     def self.adapt(o, &block)
       attr_name = self_attr_name
-      adapter = if o.instance_variable_defined?(attr_name) && value = o.instance_variable_get(attr_name)
-        value
-      else
-        associate_adapter(create_adapter(o), o)
-      end
+      value = o.instance_variable_get(attr_name) if o.instance_variable_defined?(attr_name)
+      adapter = value || associate_adapter(create_adapter(o), o)
       if block_given?
         case block.arity
           when 1

data/lib/puppet/pops/evaluator/collectors/exported_collector.rb

@@ -44,7 +44,8 @@ class Puppet::Pops::Evaluator::Collectors::ExportedCollector < Puppet::Pops::Eva
       found_resources = found.map {|x| x.is_a?(Puppet::Parser::Resource) ? x : x.to_resource(@scope)}
 
       found_resources.each do |item|
-        if existing = @scope.findresource(item.resource_type, item.title)
+        existing = @scope.findresource(item.resource_type, item.title)
+        if existing
           unless existing.collector_id == item.collector_id
             raise Puppet::ParseError,
               _("A duplicate resource was found while collecting exported resources, with the type and title %{title}") % { title: item.ref }

data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb

@@ -16,7 +16,8 @@ class Puppet::Pops::Evaluator::Collectors::FixedSetCollector < Puppet::Pops::Eva
   def collect
     resolved = []
     result = @resources.reduce([]) do |memo, ref|
-      if res = @scope.findresource(ref.to_s)
+      res = @scope.findresource(ref.to_s)
+      if res
         res.virtual = false
         memo << res
         resolved << ref

data/lib/puppet/pops/evaluator/runtime3_resource_support.rb

@@ -97,7 +97,8 @@ module Runtime3ResourceSupport
     end
 
     loader = scope.compiler.loaders.private_environment_loader
-    if loaded = loader.load(:resource_type_pp, type_name)
+    loaded = loader.load(:resource_type_pp, type_name)
+    if loaded
       return loaded
     end
 

data/lib/puppet/pops/evaluator/runtime3_support.rb

@@ -252,7 +252,8 @@ module Runtime3Support
     if v.is_a?(Numeric)
       return v
     end
-    unless n = Utils.to_n(v)
+    n = Utils.to_n(v)
+    unless n
       fail(Issues::NOT_NUMERIC, o, {:value => v})
     end
     # this point is reached if there was a conversion
@@ -276,7 +277,8 @@ module Runtime3Support
     # and it does not defined the visibility of functions from a ruby function's perspective. Instead,
     # this is done from the perspective of the environment.
     loader = loaders.private_environment_loader
-    if loader && func = loader.load(:function, name)
+    func = loader.load(:function, name) if loader
+    if func
       Puppet::Util::Profiler.profile(name, [:functions, name]) do
         return func.call(scope, *args, &block)
       end
@@ -299,7 +301,8 @@ module Runtime3Support
     # 'ruby -wc' thinks that _func is unused, because the only reference to it
     # is inside of the Kernel.eval string below. By prefixing it with the
     # underscore, we let Ruby know to not worry about whether it's unused or not.
-    if loader && _func = loader.load(:function, name)
+    _func = loader.load(:function, name) if loader
+    if _func
       Puppet::Util::Profiler.profile(name, [:functions, name]) do
         # Add stack frame when calling. See Puppet::Pops::PuppetStack
         return Kernel.eval('_func.call(scope, *args, &block)'.freeze, Kernel.binding, file || '', line)
@@ -415,7 +418,8 @@ module Runtime3Support
       # The defaults must be looked up in the scope where the resource was created (not in the given
       # scope where the lookup takes place.
       resource_scope = resource.scope
-      if val.nil? && resource_scope && defaults = resource_scope.lookupdefaults(resource.type)
+      defaults = resource_scope.lookupdefaults(resource.type) if val.nil? && resource_scope
+      if defaults
         # NOTE: 3x resource keeps defaults as hash using symbol for name as key to Parameter which (again) holds
         # name and value.
         # NOTE: meta parameters that are unset ends up here, and there are no defaults for those encoded

data/lib/puppet/pops/loader/base_loader.rb

@@ -69,7 +69,8 @@ class BaseLoader < Loader
   #
   def set_entry(typed_name, value, origin = nil)
     # It is never ok to redefine in the very same loader unless redefining a 'not found'
-    if entry = @named_values[typed_name]
+    entry = @named_values[typed_name]
+    if entry
       fail_redefine(entry) unless entry.value.nil?
     end
 
@@ -106,7 +107,8 @@ class BaseLoader < Loader
   #
   def promote_entry(named_entry)
     typed_name = named_entry.typed_name
-    if entry = @named_values[typed_name] then fail_redefine(entry); end
+    entry = @named_values[typed_name]
+    if entry then fail_redefine(entry); end
     @named_values[typed_name] = named_entry
   end
 

data/lib/puppet/pops/loader/dependency_loader.rb

@@ -34,7 +34,8 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
   #
   def find(typed_name)
     if typed_name.qualified?
-      if l = index()[typed_name.name_parts[0]]
+      l = index()[typed_name.name_parts[0]]
+      if l
         l.load_typed(typed_name)
       else
         # no module entered as dependency with name matching first segment of wanted name
@@ -69,7 +70,8 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
 
   def loaded_entry_in_dependency(typed_name, check_dependencies)
     if typed_name.qualified?
-      if l = index[typed_name.name_parts[0]]
+      l = index[typed_name.name_parts[0]]
+      if l
         l.loaded_entry(typed_name)
       else
         # no module entered as dependency with name matching first segment of wanted name

data/lib/puppet/pops/loader/gem_support.rb

@@ -26,7 +26,8 @@ module Puppet::Pops::Loader::GemSupport
   # TODO: FIND by name raises exception Gem::LoadError with list of all gems on the path
   #
   def gem_dir_from_uri(uri)
-    unless spec = Gem::Specification.find_by_name(uri.hostname)
+    spec = Gem::Specification.find_by_name(uri.hostname)
+    unless spec
       raise ArgumentError, _("Gem not found %{uri}") % { uri: uri }
     end
     # if path given append that, else append given subdir
@@ -41,7 +42,8 @@ module Puppet::Pops::Loader::GemSupport
   # TODO: FIND by name raises exception Gem::LoadError with list of all gems on the path
   #
   def gem_dir_from_name(gem_name)
-    unless spec = Gem::Specification.find_by_name(gem_name)
+    spec = Gem::Specification.find_by_name(gem_name)
+    unless spec
       raise ArgumentError, _("Gem not found '%{gem_name}'") % { gem_name: gem_name }
     end
     spec.full_gem_path

data/lib/puppet/pops/loader/loader.rb

@@ -69,7 +69,8 @@ class Loader
   # @api public
   #
   def load(type, name)
-    if result = load_typed(TypedName.new(type, name.to_s))
+    result = load_typed(TypedName.new(type, name.to_s))
+    if result
       result.value
     end
   end
@@ -108,7 +109,8 @@ class Loader
   # @api private
   #
   def [](typed_name)
-    if found = get_entry(typed_name)
+    found = get_entry(typed_name)
+    if found
       found.value
     else
       nil

data/lib/puppet/pops/loader/loader_paths.rb

@@ -397,7 +397,8 @@ module LoaderPaths
     def effective_paths(type)
       smart_paths = @smart_paths
       loader = @loader
-      unless effective_paths = smart_paths[type]
+      effective_paths = smart_paths[type]
+      unless effective_paths
         # type not yet processed, does the various directories for the type exist ?
         # Get the relative dirs for the type
         paths_for_type = LoaderPaths.relative_paths_for_type(type, loader)

data/lib/puppet/pops/loader/static_loader.rb

@@ -44,7 +44,7 @@ class StaticLoader < Loader
 
   def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY)
     # Static loader only contains runtime types
-    return EMPTY_ARRAY unless type == :type && name_authority == name_authority = Pcore::RUNTIME_NAME_AUTHORITY
+    return EMPTY_ARRAY unless type == :type && name_authority == name_authority = Pcore::RUNTIME_NAME_AUTHORITY #rubocop:disable Lint/AssignmentInCondition
 
     typed_names = type == :type && name_authority == Pcore::RUNTIME_NAME_AUTHORITY ? @loaded.keys : EMPTY_ARRAY
     block_given? ? typed_names.select { |tn| yield(tn) } : typed_names

data/lib/puppet/pops/lookup/interpolation.rb

@@ -135,7 +135,8 @@ module Interpolation
   end
 
   def get_method_and_data(data, allow_methods)
-    if match = data.match(/^(\w+)\((?:["]([^"]+)["]|[']([^']+)['])\)$/)
+    match = data.match(/^(\w+)\((?:["]([^"]+)["]|[']([^']+)['])\)$/)
+    if match
       fail(Issues::HIERA_INTERPOLATION_METHOD_SYNTAX_NOT_ALLOWED) unless allow_methods
       key = match[1].to_sym
       data = match[2] || match[3] # double or single qouted

data/lib/puppet/pops/model/factory.rb

@@ -835,7 +835,8 @@ class Factory
   end
 
   def self.NUMBER(name_or_numeric)
-    if n_radix = Utils.to_n_with_radix(name_or_numeric)
+    n_radix = Utils.to_n_with_radix(name_or_numeric)
+    if n_radix
       val, radix = n_radix
       if val.is_a?(Float)
         new(LiteralFloat, val)
@@ -853,7 +854,8 @@ class Factory
   # Convert input string to either a qualified name, a LiteralInteger with radix, or a LiteralFloat
   #
   def self.QNAME_OR_NUMBER(name)
-    if n_radix = Utils.to_n_with_radix(name)
+    n_radix = Utils.to_n_with_radix(name)
+    if n_radix
       val, radix = n_radix
       if val.is_a?(Float)
         new(LiteralFloat, val)

data/lib/puppet/pops/parser/epp_support.rb

@@ -44,7 +44,8 @@ module EppSupport
 
     # This is the lexer's main loop
     until queue.empty? && scn.eos? do
-      if token = queue.shift || lex_token
+      token = queue.shift || lex_token
+      if token
         yield [ ctx[:after] = token[0], token[1] ]
       end
     end

data/lib/puppet/pops/parser/heredoc_support.rb

@@ -85,7 +85,8 @@ module HeredocSupport
     while !scn.eos? do
       one_line = scn.scan_until(/(?:\n|\z)/)
       raise eof_error unless one_line
-      if md = one_line.match(endline_pattern)
+      md = one_line.match(endline_pattern)
+      if md
         leading      = md[1]
         has_margin   = md[2] == '|'
         remove_break = md[3] == '-'

data/lib/puppet/pops/parser/interpolation_support.rb

@@ -37,7 +37,8 @@ module Puppet::Pops::Parser::InterpolationSupport
         enqueue_until count
         break
       when '$'
-        if varname = scn.scan(PATTERN_VARIABLE)
+        varname = scn.scan(PATTERN_VARIABLE)
+        if varname
           # The $ is counted towards the variable
           enqueue_completed([:DQPRE, text, after-before-1], before)
           enqueue_completed([:VARIABLE, varname, scn.pos - after + 1], after - 1)
@@ -78,7 +79,8 @@ module Puppet::Pops::Parser::InterpolationSupport
         enqueue_until count
         break
       when '$'
-        if varname = scn.scan(PATTERN_VARIABLE)
+        varname = scn.scan(PATTERN_VARIABLE)
+        if varname
           # The $ is counted towards the variable
           enqueue_completed([:DQMID, text, after-before-1], before)
           enqueue_completed([:VARIABLE, varname, scn.pos - after + 1], after - 1)
@@ -122,7 +124,8 @@ module Puppet::Pops::Parser::InterpolationSupport
         enqueue_until count
         break
       when '$'
-        if varname = scn.scan(PATTERN_VARIABLE)
+        varname = scn.scan(PATTERN_VARIABLE)
+        if varname
           # The $ is counted towards the variable
           enqueue_completed([:DQPRE, text, after-before-1], before)
           enqueue_completed([:VARIABLE, varname, scn.pos - after + 1], after - 1)
@@ -162,7 +165,8 @@ module Puppet::Pops::Parser::InterpolationSupport
         enqueue_until count
         break
       when '$'
-        if varname = scn.scan(PATTERN_VARIABLE)
+        varname = scn.scan(PATTERN_VARIABLE)
+        if varname
           # The $ is counted towards the variable
           enqueue_completed([:DQMID, text, after-before-1], before)
           enqueue_completed([:VARIABLE, varname, scn.pos - after + 1], after - 1)
@@ -190,7 +194,8 @@ module Puppet::Pops::Parser::InterpolationSupport
     scn.skip(self.class::PATTERN_WS)
     queue_size = queue.size
     until scn.eos? do
-      if token = lex_token
+      token = lex_token
+      if token
         if token.equal?(queue_base)
           # A nested #interpolate_dq call shifted the queue_base token from the @token_queue. It must
           # be put back since it is intended for the top level #interpolate_dq call only.

data/lib/puppet/pops/parser/lexer2.rb

@@ -355,7 +355,8 @@ class Lexer2
         else
           before = scn.pos
           # regexp position is a regexp, else a div
-          if regexp_acceptable? && value = scn.scan(PATTERN_REGEX)
+          value = scn.scan(PATTERN_REGEX) if regexp_acceptable?
+          if value
             # Ensure an escaped / was not matched
             while escaped_end(value)
               more = scn.scan_until(PATTERN_REGEX_END)
@@ -452,7 +453,8 @@ class Lexer2
       '$' => lambda do
         scn = @scanner
         before = scn.pos
-        if value = scn.scan(PATTERN_DOLLAR_VAR)
+        value = scn.scan(PATTERN_DOLLAR_VAR)
+        if value
           emit_completed([:VARIABLE, value[1..-1].freeze, scn.pos - before], before)
         else
           # consume the $ and let higher layer complain about the error instead of getting a syntax error
@@ -703,7 +705,8 @@ class Lexer2
 
     # This is the lexer's main loop
     until queue.empty? && scn.eos? do
-      if token = queue.shift || selector[scn.peek(1)].call
+      token = queue.shift || selector[scn.peek(1)].call
+      if token
         ctx[:after] = token[0]
         yield token
       end

data/lib/puppet/pops/parser/locator.rb

@@ -177,7 +177,8 @@ class Locator
         # use cache
         return @prev_line
       end
-      if line_nbr = ary_bsearch_i(line_index, offset)
+      line_nbr = ary_bsearch_i(line_index, offset)
+      if line_nbr
         # cache
         @prev_offset = offset
         @prev_line = line_nbr

data/lib/puppet/pops/types/type_calculator.rb

@@ -464,7 +464,7 @@ class TypeCalculator
   # Produces the superclasses of the given class, including the class
   def superclasses(c)
     result = [c]
-    while s = c.superclass
+    while s = c.superclass #rubocop:disable Lint/AssignmentInCondition
       result << s
       c = s
     end