puppet 6.6.0 → 6.7.0

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

@@ -34,7 +34,8 @@ class TypeParser
   #
   def parse(string, context = nil)
     # quick "peephole" optimization of common data types
-    if t = self.class.opt_type_map[string]
+    t = self.class.opt_type_map[string]
+    if t
       return t
     end
     model = @parser.parse_string(string)
@@ -276,7 +277,8 @@ class TypeParser
   # @api private
   def interpret_QualifiedReference(name_ast, context)
     name = name_ast.value
-    if found = self.class.type_map[name]
+    found = self.class.type_map[name]
+    if found
       found
     else
       loader = loader_from_context(name_ast, context)

data/lib/puppet/pops/validation.rb

@@ -425,7 +425,8 @@ module Validation
     def prune(&block)
       removed = []
       @diagnostics.delete_if do |d|
-        if should_remove = yield(d)
+        should_remove = yield(d)
+        if should_remove
           removed << d
         end
         should_remove

data/lib/puppet/pops/validation/checker4_0.rb

@@ -512,7 +512,8 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   end
 
   def internal_check_no_idem_last(o)
-    if violator = ends_with_idem(o.body)
+    violator = ends_with_idem(o.body)
+    if violator
       acceptor.accept(Issues::IDEM_NOT_ALLOWED_LAST, violator, {:container => o}) unless resource_without_title?(violator)
     end
   end
@@ -731,7 +732,8 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     # Check that hostnames are valid hostnames (or regular expressions)
     hostname(o.host_matches, o)
     top(o)
-    if violator = ends_with_idem(o.body)
+    violator = ends_with_idem(o.body)
+    if violator
       acceptor.accept(Issues::IDEM_NOT_ALLOWED_LAST, violator, {:container => o}) unless resource_without_title?(violator)
     end
     unless o.parent.nil?
@@ -917,7 +919,8 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   def hostname_ConcatenatedString(o, semantic)
     # Puppet 3.1. only accepts a concatenated string without interpolated expressions
-    if the_expr = o.segments.index {|s| s.is_a?(Model::TextExpression) }
+    the_expr = o.segments.index {|s| s.is_a?(Model::TextExpression) }
+    if the_expr
       acceptor.accept(Issues::ILLEGAL_HOSTNAME_INTERPOLATION, o.segments[the_expr].expr)
     elsif o.segments.size() != 1
       # corner case, bad model, concatenation of several plain strings

data/lib/puppet/pops/visitor.rb

@@ -36,7 +36,8 @@ class Visitor
     if @max_args
       raise "Visitor Error: Too many arguments passed. max = #{@max_args}" unless args.length <= @max_args
     end
-    if method_name = @cache[thing.class]
+    method_name = @cache[thing.class]
+    if method_name
       return receiver.send(method_name, thing, *args)
     else
       thing.class.ancestors().each do |ancestor|
@@ -57,7 +58,8 @@ class Visitor
     if @max_args
       raise "Visitor Error: Too many arguments passed. max = #{@max_args}" unless args.length <= @max_args
     end
-    if method_name = @cache[clazz]
+    method_name = @cache[clazz]
+    if method_name
       return receiver.send(method_name, clazz, *args)
     else
       clazz.ancestors().each do |ancestor|
@@ -76,7 +78,8 @@ class Visitor
   # (This is ~30% faster than calling the general method)
   #
   def visit_this_0(receiver, thing)
-    if method_name = @cache[thing.class]
+    method_name = @cache[thing.class]
+    if method_name
       return receiver.send(method_name, thing)
     end
     visit_this(receiver, thing, NO_ARGS)
@@ -86,7 +89,8 @@ class Visitor
   # (This is ~30% faster than calling the general method)
   #
   def visit_this_1(receiver, thing, arg)
-    if method_name = @cache[thing.class]
+    method_name = @cache[thing.class]
+    if method_name
       return receiver.send(method_name, thing, arg)
     end
     visit_this(receiver, thing, [arg])
@@ -96,7 +100,8 @@ class Visitor
   # (This is ~30% faster than calling the general method)
   #
   def visit_this_2(receiver, thing, arg1, arg2)
-    if method_name = @cache[thing.class]
+    method_name = @cache[thing.class]
+    if method_name
       return receiver.send(method_name, thing, arg1, arg2)
     end
     visit_this(receiver, thing, [arg1, arg2])
@@ -106,7 +111,8 @@ class Visitor
   # (This is ~30% faster than calling the general method)
   #
   def visit_this_3(receiver, thing, arg1, arg2, arg3)
-    if method_name = @cache[thing.class]
+    method_name = @cache[thing.class]
+    if method_name
       return receiver.send(method_name, thing, arg1, arg2, arg3)
     end
     visit_this(receiver, thing, [arg1, arg2, arg3])

data/lib/puppet/property.rb

@@ -123,9 +123,8 @@ class Puppet::Property < Puppet::Parameter
   # @api private
   #
   def self.value_name(name)
-    if value = value_collection.match?(name)
-      value.name
-    end
+    value = value_collection.match?(name)
+    value.name if value
   end
 
   # Returns the value of the given option (set when a valid value with the given "name" was defined).
@@ -137,9 +136,8 @@ class Puppet::Property < Puppet::Parameter
   # @api private
   #
   def self.value_option(name, option)
-    if value = value_collection.value(name)
-      value.send(option)
-    end
+    value = value_collection.value(name)
+    value.send(option) if value
   end
 
   # Defines a new valid value for this property.
@@ -255,9 +253,9 @@ class Puppet::Property < Puppet::Parameter
   # @see Puppet::Type#event
   def event(options = {})
     attrs = { :name => event_name, :desired_value => should, :property => self, :source_description => path }.merge(options)
-    if should and value = self.class.value_collection.match?(should)
-      attrs[:invalidate_refreshes] = true if value.invalidate_refreshes
-    end
+    value = self.class.value_collection.match?(should) if should
+    
+    attrs[:invalidate_refreshes] = true if value && value.invalidate_refreshes 
     attrs[:redacted] = @sensitive
     resource.event attrs
   end
@@ -486,7 +484,8 @@ class Puppet::Property < Puppet::Parameter
   def set(value)
     # Set a name for looking up associated options like the event.
     name = self.class.value_name(value)
-    if method = self.class.value_option(name, :method) and self.respond_to?(method)
+    method = self.class.value_option(name, :method)
+    if method && self.respond_to?(method)
       begin
         self.send(method)
       rescue Puppet::Error
@@ -498,12 +497,15 @@ class Puppet::Property < Puppet::Parameter
         Puppet.log_exception(detail, error.message)
         raise error
       end
-    elsif block = self.class.value_option(name, :block)
-      # FIXME It'd be better here to define a method, so that
-      # the blocks could return values.
-      self.instance_eval(&block)
     else
-      call_provider(value)
+      block = self.class.value_option(name, :block)
+      if block
+        # FIXME It'd be better here to define a method, so that
+        # the blocks could return values.
+        self.instance_eval(&block)
+      else
+        call_provider(value)
+      end
     end
   end
 
@@ -585,7 +587,8 @@ class Puppet::Property < Puppet::Parameter
   # @api private
   #
   def validate_features_per_value(value)
-    if features = self.class.value_option(self.class.value_name(value), :required_features)
+    features = self.class.value_option(self.class.value_name(value), :required_features)
+    if features
       features = Array(features)
       needed_features = features.collect { |f| f.to_s }.join(", ")
       unless provider.satisfies?(features)

data/lib/puppet/property/ensure.rb

@@ -77,7 +77,8 @@ class Puppet::Property::Ensure < Puppet::Property
     # to get checked, which means that those other properties do not have
     # @is values set.  This seems to be the source of quite a few bugs,
     # although they're mostly logging bugs, not functional ones.
-    if prov = @resource.provider and prov.respond_to?(:exists?)
+    prov = @resource.provider
+    if prov && prov.respond_to?(:exists?)
       result = prov.exists?
     elsif @resource.respond_to?(:exists?)
       result = @resource.exists?

data/lib/puppet/property/keyvalue.rb

@@ -107,7 +107,8 @@ module Puppet
       #
       def retrieve
         #ok, some 'convention' if the keyvalue property is named properties, provider should implement a properties method
-        if key_hash = provider.send(name) and key_hash != :absent
+        key_hash = provider.send(name) if provider
+        if key_hash && key_hash != :absent
           return key_hash
         else
           return :absent

data/lib/puppet/property/list.rb

@@ -45,7 +45,8 @@ module Puppet
 
       def retrieve
         #ok, some 'convention' if the list property is named groups, provider should implement a groups method
-        if provider and tmp = provider.send(name) and tmp != :absent
+        tmp = provider.send(name) if provider
+        if tmp && tmp != :absent
           return tmp.split(delimiter)
         else
           return :absent

data/lib/puppet/provider.rb

@@ -138,11 +138,10 @@ class Puppet::Provider
   def self.command(name)
     name = name.intern
 
-    if defined?(@commands) and command = @commands[name]
-      # nothing
-    elsif superclass.respond_to? :command and command = superclass.command(name)
-      # nothing
-    else
+    command = @commands[name] if defined?(@commands)    
+    command = superclass.command(name) if !command && superclass.respond_to?(:command)
+
+    unless command
       raise Puppet::DevError, _("No command %{command} defined for provider %{provider}") % { command: name, provider: self.name }
     end
 
@@ -466,11 +465,13 @@ class Puppet::Provider
     if param.is_a?(Class)
       klass = param
     else
-      unless klass = resource_type.attrclass(param)
+      klass = resource_type.attrclass(param)
+      unless klass
         raise Puppet::DevError, _("'%{parameter_name}' is not a valid parameter for %{resource_type}") % { parameter_name: param, resource_type: resource_type.name }
       end
     end
-    return true unless features = klass.required_features
+    features = klass.required_features
+    return true unless features
 
     !!satisfies?(*features)
   end
@@ -546,7 +547,8 @@ class Puppet::Provider
   # @raise [Puppet::DevError] if no resource is set, or no name defined.
   #
   def name
-    if n = @property_hash[:name]
+    n = @property_hash[:name]
+    if n
       return n
     elsif self.resource
       resource.name

data/lib/puppet/provider/exec.rb

@@ -82,11 +82,14 @@ class Puppet::Provider::Exec < Puppet::Provider
   def extractexe(command)
     if command.is_a? Array
       command.first
-    elsif match = /^"([^"]+)"|^'([^']+)'/.match(command)
-      # extract whichever of the two sides matched the content.
-      match[1] or match[2]
     else
-      command.split(/ /)[0]
+      match = /^"([^"]+)"|^'([^']+)'/.match(command)
+      if match
+        # extract whichever of the two sides matched the content.
+        match[1] or match[2]
+      else
+        command.split(/ /)[0]
+      end
     end
   end
 

data/lib/puppet/provider/file/posix.rb

@@ -53,7 +53,8 @@ Puppet::Type.type(:file).provide :posix do
   end
 
   def owner
-    unless stat = resource.stat
+    stat = resource.stat
+    unless stat
       return :absent
     end
 
@@ -86,7 +87,8 @@ Puppet::Type.type(:file).provide :posix do
   end
 
   def group
-    return :absent unless stat = resource.stat
+    stat = resource.stat
+    return :absent unless stat
 
     currentvalue = stat.gid
 
@@ -117,7 +119,8 @@ Puppet::Type.type(:file).provide :posix do
   end
 
   def mode
-    if stat = resource.stat
+    stat = resource.stat
+    if stat
       return (stat.mode & 007777).to_s(8).rjust(4, '0')
     else
       return :absent

data/lib/puppet/provider/group/groupadd.rb

@@ -73,7 +73,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
       cmd = [command(:add)]
     end
 
-    if gid = @resource.should(:gid)
+    gid = @resource.should(:gid)
+    if gid
       unless gid == :absent
         cmd << flag(:gid) << gid
       end

data/lib/puppet/provider/group/ldap.rb

@@ -24,9 +24,11 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
   provider = self
   manager.generates(:gidNumber).with do
     largest = 500
-    if existing = provider.manager.search
-        existing.each do |hash|
-        next unless value = hash[:gid]
+    existing = provider.manager.search
+    if existing
+      existing.each do |hash|
+        value = hash[:gid]
+        next unless value
         num = value[0].to_i
         largest = num if num > largest
       end
@@ -36,7 +38,8 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
 
   # Convert a group name to an id.
   def self.name2id(group)
-    return nil unless result = manager.search("cn=#{group}") and result.length > 0
+    result = manager.search("cn=#{group}")
+    return nil unless result and result.length > 0
 
     # Only use the first result.
     group = result[0]

data/lib/puppet/provider/group/pw.rb

@@ -18,13 +18,15 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
   def addcmd
     cmd = [command(:pw), "groupadd", @resource[:name]]
 
-    if gid = @resource.should(:gid)
+    gid = @resource.should(:gid)
+    if gid
       unless gid == :absent
         cmd << flag(:gid) << gid
       end
     end
 
-    if members = @resource.should(:members)
+    members = @resource.should(:members)
+    if members
       unless members == :absent
         if members.is_a?(Array)
           members = members.join(",")

data/lib/puppet/provider/ldap.rb

@@ -10,7 +10,8 @@ class Puppet::Provider::Ldap < Puppet::Provider
 
   # Look up all instances at our location.  Yay.
   def self.instances
-    return [] unless list = manager.search
+    list = manager.search
+    return [] unless list
 
     list.collect { |entry| new(entry) }
   end
@@ -29,7 +30,8 @@ class Puppet::Provider::Ldap < Puppet::Provider
   # Query all of our resources from ldap.
   def self.prefetch(resources)
     resources.each do |name, resource|
-      if result = manager.find(name)
+      result = manager.find(name)
+      if result
         result[:ensure] = :present
         resource.provider = new(result)
       else
@@ -45,7 +47,8 @@ class Puppet::Provider::Ldap < Puppet::Provider
   def create
     @property_hash[:ensure] = :present
     self.class.resource_type.validproperties.each do |property|
-      if val = resource.should(property)
+      val = resource.should(property)
+      if val
         if property.to_s == 'gid'
           self.gid = val
         else
@@ -126,7 +129,8 @@ class Puppet::Provider::Ldap < Puppet::Provider
   # LAK:NOTE This is normally not used, because we rely on prefetching.
   def query
     # Use the module function.
-    unless attributes = manager.find(name)
+    attributes = manager.find(name)
+    unless attributes
       @ldap_properties = {}
       return nil
     end

data/lib/puppet/provider/nameservice.rb

@@ -26,7 +26,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       objects = []
       begin
         method = Puppet::Etc.method(:"get#{section}ent")
-        while ent = method.call
+        while ent = method.call #rubocop:disable Lint/AssignmentInCondition
           objects << new(:name => ent.name, :canonical_name => ent.canonical_name, :ensure => :present)
         end
       ensure
@@ -61,7 +61,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       names = []
       Puppet::Etc.send("set#{section()}ent")
       begin
-        while ent = Puppet::Etc.send("get#{section()}ent")
+        while ent = Puppet::Etc.send("get#{section()}ent") #rubocop:disable Lint/AssignmentInCondition
           names << ent.name
           yield ent.name if block_given?
         end
@@ -124,7 +124,8 @@ class Puppet::Provider::NameService < Puppet::Provider
     if id_generators[@resource.class.name] == field
       return self.class.autogen_id(field, @resource.class.name)
     else
-      if value = self.class.autogen_default(field)
+      value = self.class.autogen_default(field)
+      if value
         return value
       elsif respond_to?("autogen_#{field}")
         return send("autogen_#{field}")
@@ -214,7 +215,8 @@ class Puppet::Provider::NameService < Puppet::Provider
   end
 
   def munge(name, value)
-    if block = self.class.option(name, :munge) and block.is_a? Proc
+    block = self.class.option(name, :munge)
+    if block and block.is_a? Proc
       block.call(value)
     else
       value
@@ -222,7 +224,8 @@ class Puppet::Provider::NameService < Puppet::Provider
   end
 
   def unmunge(name, value)
-    if block = self.class.option(name, :unmunge) and block.is_a? Proc
+    block = self.class.option(name, :unmunge)
+    if block and block.is_a? Proc
       block.call(value)
     else
       value