puppet 6.6.0-x64-mingw32 → 6.7.0-x64-mingw32

data/lib/puppet/module_tool.rb

@@ -31,7 +31,8 @@ module Puppet
     # Return the +username+ and +modname+ for a given +full_module_name+, or raise an
     # ArgumentError if the argument isn't parseable.
     def self.username_and_modname_from(full_module_name)
-      if matcher = full_module_name.match(FULL_MODULE_NAME_PATTERN)
+      matcher = full_module_name.match(FULL_MODULE_NAME_PATTERN)
+      if matcher
         return matcher.captures
       else
         raise ArgumentError, _("Not a valid full name: %{full_module_name}") % { full_module_name: full_module_name }

data/lib/puppet/module_tool/applications/application.rb

@@ -68,7 +68,8 @@ module Puppet::ModuleTool
       end
 
       def parse_filename(filename)
-        if match = /^((.*?)-(.*?))-(\d+\.\d+\.\d+.*?)$/.match(File.basename(filename, '.tar.gz'))
+        match = /^((.*?)-(.*?))-(\d+\.\d+\.\d+.*?)$/.match(File.basename(filename, '.tar.gz'))
+        if match
           module_name, author, shortname, version = match.captures
         else
           raise ArgumentError, _("Could not parse filename to obtain the username, module name and version.  (%{release_name})") % { release_name: @release_name }

data/lib/puppet/module_tool/applications/installer.rb

@@ -60,7 +60,8 @@ module Puppet::ModuleTool
         results = { :action => :install, :module_name => name, :module_version => version }
 
         begin
-          if installed_module = installed_modules[name]
+          installed_module = installed_modules[name]
+          if installed_module
             unless forced?
               if Puppet::Module.parse_range(version).include? installed_module.version
                 results[:result] = :noop
@@ -136,7 +137,8 @@ module Puppet::ModuleTool
           unless forced?
             # Check for module name conflicts.
             releases.each do |rel|
-              if installed_module = installed_modules_source.by_name[rel.name.split('-').last]
+              installed_module = installed_modules_source.by_name[rel.name.split('-').last]
+              if installed_module
                 next if installed_module.has_metadata? && installed_module.forge_name.tr('/', '-') == rel.name
 
                 if rel.name != name

data/lib/puppet/module_tool/applications/upgrader.rb

@@ -144,7 +144,8 @@ module Puppet::ModuleTool
           end
 
           releases.each do |rel|
-            if mod = installed_modules_source.by_name[rel.name.split('-').last]
+            mod = installed_modules_source.by_name[rel.name.split('-').last]
+            if mod
               next if mod.has_metadata? && mod.forge_name.tr('/', '-') == rel.name
 
               if rel.name != name
@@ -189,7 +190,8 @@ module Puppet::ModuleTool
 
           Puppet.notice _('Upgrading -- do not interrupt ...')
           releases.each do |release|
-            if installed = installed_modules[release.name]
+            installed = installed_modules[release.name]
+            if installed
               release.install(Pathname.new(installed.mod.modulepath))
             else
               release.install(dir)

data/lib/puppet/module_tool/contents_description.rb

@@ -43,7 +43,8 @@ module Puppet::ModuleTool
         end
 
         type_names.each do |name|
-          if type = Puppet::Type.type(name.to_sym)
+          type = Puppet::Type.type(name.to_sym)
+          if type
             type_hash = {:name => name, :doc => type.doc}
             type_hash[:properties] = attr_doc(type, :property)
             type_hash[:parameters] = attr_doc(type, :param)

data/lib/puppet/module_tool/metadata.rb

@@ -66,9 +66,8 @@ module Puppet::ModuleTool
       validate_name(name)
       validate_version_range(version_requirement) if version_requirement
 
-      if dup = @data['dependencies'].find { |d| d.full_module_name == name && d.version_requirement != version_requirement }
-        raise ArgumentError, _("Dependency conflict for %{module_name}: Dependency %{name} was given conflicting version requirements %{version_requirement} and %{dup_version}. Verify that there are no duplicates in the metadata.json.") % { module_name: full_module_name, name: name, version_requirement: version_requirement, dup_version: dup.version_requirement }
-      end
+      dup = @data['dependencies'].find { |d| d.full_module_name == name && d.version_requirement != version_requirement }
+      raise ArgumentError, _("Dependency conflict for %{module_name}: Dependency %{name} was given conflicting version requirements %{version_requirement} and %{dup_version}. Verify that there are no duplicates in the metadata.json.") % { module_name: full_module_name, name: name, version_requirement: version_requirement, dup_version: dup.version_requirement } if dup
 
       dep = Dependency.new(name, version_requirement, repository)
       @data['dependencies'].add(dep)

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -111,7 +111,8 @@ module Puppet::ModuleTool::Shared
       valid_versions = versions.select { |x| x[:semver].special == '' }
       valid_versions = versions if valid_versions.empty?
 
-      unless version = valid_versions.last
+      version = valid_versions.last
+      unless version
         req_module   = @module_name
         req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
         raise NoVersionsSatisfyError,

data/lib/puppet/network/authconfig.rb

@@ -54,7 +54,8 @@ module Puppet
       right = @rights.newright(acl[:acl])
       right.allow(acl[:allow] || "*")
 
-      if method = acl[:method]
+      method = acl[:method]
+      if method
         method = [method] unless method.is_a?(Array)
         method.each { |m| right.restrict_method(m) }
       end
@@ -65,7 +66,8 @@ module Puppet
     # raise an Puppet::Network::AuthorizedError if the request
     # is denied.
     def check_authorization(method, path, params)
-      if authorization_failure_exception = @rights.is_request_forbidden_and_why?(method, path, params)
+      authorization_failure_exception = @rights.is_request_forbidden_and_why?(method, path, params)
+      if authorization_failure_exception
         Puppet.warning(_("Denying access: %{authorization_failure_exception}") % { authorization_failure_exception: authorization_failure_exception })
         raise authorization_failure_exception
       end

data/lib/puppet/network/authstore.rb

@@ -29,7 +29,8 @@ module Puppet
       # yay insecure overrides
       return true if globalallow?
 
-      if decl = declarations.find { |d| d.match?(name, ip) }
+      decl = declarations.find { |d| d.match?(name, ip) }
+      if decl
         return decl.result
       end
 

data/lib/puppet/network/formats.rb

@@ -105,7 +105,8 @@ Puppet::Network::FormatHandler.create_serialized_formats(:pson, :weight => 10, :
   # If they pass class information, we want to ignore it.
   # This is required for compatibility with Puppet 3.x
   def data_to_instance(klass, data)
-    if data.is_a?(Hash) and d = data['data']
+    d = data['data'] if data.is_a?(Hash)
+    if d
       data = d
     end
     return data if data.is_a?(klass)

data/lib/puppet/network/http/api/indirected_routes.rb

@@ -124,7 +124,8 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
 
   # Execute our find.
   def do_find(indirection, key, params, request, response)
-    unless result = indirection.find(key, params)
+    result = indirection.find(key, params)
+    unless result
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new(_("Could not find %{value0} %{key}") % { value0: indirection.name, key: key }, Puppet::Network::HTTP::Issues::RESOURCE_NOT_FOUND)
     end
 
@@ -245,10 +246,11 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
     raise Puppet::Network::HTTP::Error::HTTPMethodNotAllowedError.new(
       _("No support for http method %{http_method}") % { http_method: http_method }) unless METHOD_MAP[http_method]
 
-    unless method = METHOD_MAP[http_method][plurality(indirection)]
-      raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
+      method = METHOD_MAP[http_method][plurality(indirection)]
+      unless method
+        raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
         _("No support for plurality %{indirection} for %{http_method} operations") % { indirection: plurality(indirection), http_method: http_method })
-    end
+      end
 
     method
   end

data/lib/puppet/network/http/handler.rb

@@ -105,7 +105,8 @@ module Puppet::Network::HTTP::Handler
   end
 
   def find_route_or_raise(request)
-    if route = @routes.find { |r| r.matches?(request) }
+    route = @routes.find { |r| r.matches?(request) }
+    if route
       return route
     else
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new(

data/lib/puppet/network/http/request.rb

@@ -20,7 +20,8 @@ Puppet::Network::HTTP::Request = Struct.new(:headers, :params, :method, :path, :
   end
 
   def formatter
-    if header = headers['content-type']
+    header = headers['content-type']
+    if header
       header.gsub!(/\s*;.*$/,'') # strip any charset
       format = Puppet::Network::FormatHandler.mime(header)
 

data/lib/puppet/network/http/route.rb

@@ -83,7 +83,8 @@ class Puppet::Network::HTTP::Route
     end
 
     subrequest = request.route_into(match(request.routing_path).to_s)
-    if chained_route = @chained.find { |route| route.matches?(subrequest) }
+    chained_route = @chained.find { |route| route.matches?(subrequest) }
+    if chained_route
       chained_route.process(subrequest, response)
     end
   end

data/lib/puppet/network/resolver.rb

@@ -71,7 +71,7 @@ module Puppet::Network
         each_srv_record(domain, :puppet, &block)
       else
         each_priority(records) do |recs|
-          while next_rr = recs.delete(find_weighted_server(recs))
+          while next_rr = recs.delete(find_weighted_server(recs)) #rubocop:disable Lint/AssignmentInCondition
             Puppet.debug "Yielding next server of #{next_rr.target.to_s}:#{next_rr.port}"
             yield next_rr.target.to_s, next_rr.port
           end
@@ -125,7 +125,8 @@ module Puppet::Network
     # @return [Boolean] true if the entry has expired, false otherwise.
     #                  Always returns true if the record had no TTL.
     def expired?(service_name)
-      if entry = @record_cache[service_name]
+      entry = @record_cache[service_name]
+      if entry
         return Time.now > (entry.resolution_time + entry.ttl)
       else
         return true

data/lib/puppet/network/rights.rb

@@ -39,7 +39,8 @@ class Rights
       # an acl can return :dunno, which means "I'm not qualified to answer your question,
       # please ask someone else". This is used when for instance an acl matches, but not for the
       # current rest method, where we might think some other acl might be more specific.
-      if match = acl.match?(name)
+      match = acl.match?(name)
+      if match
         args[:match] = match
         if (res = acl.allowed?(args[:node], args[:ip], args)) != :dunno
           # return early if we're allowed

data/lib/puppet/node.rb

@@ -61,7 +61,8 @@ class Puppet::Node
     if @environment
       @environment
     else
-      if env = parameters[ENVIRONMENT]
+      env = parameters[ENVIRONMENT]
+      if env
         self.environment = env
       elsif environment_name
         self.environment = environment_name
@@ -101,7 +102,8 @@ class Puppet::Node
     raise ArgumentError, _("Node names cannot be nil") unless name
     @name = name
 
-    if classes = options[:classes]
+    classes = options[:classes]
+    if classes
       if classes.is_a?(String)
         @classes = [classes]
       else
@@ -117,7 +119,8 @@ class Puppet::Node
 
     @server_facts = {}
 
-    if env = options[:environment]
+    env = options[:environment]
+    if env
       self.environment = env
     end
 
@@ -187,7 +190,8 @@ class Puppet::Node
     names += split_name(name) if name.include?(".")
 
     # First, get the fqdn
-    unless fqdn = parameters["fqdn"]
+    fqdn = parameters["fqdn"]
+    unless fqdn
       if parameters["hostname"] and parameters["domain"]
         fqdn = parameters["hostname"] + "." + parameters["domain"]
       else

data/lib/puppet/pal/catalog_compiler.rb

@@ -27,7 +27,7 @@ module Pal
     # @example Get resulting catalog as pretty printed Json
     #   Puppet::Pal.in_environment(...) do |pal|
     #     pal.with_catalog_compiler(...) do |compiler|
-    #       compiler.with_json_encoding {| encoder | encoder.encode
+    #       compiler.with_json_encoding { |encoder| encoder.encode }
     #     end
     #   end
     #
@@ -37,6 +37,13 @@ module Pal
       yield JsonCatalogEncoder.new(catalog, pretty: pretty, exclude_virtual: exclude_virtual)
     end
 
+    # Returns a hash representation of the compiled catalog.
+    #
+    # @api public
+    def catalog_data_hash
+      catalog.to_data_hash
+    end
+
     # Evaluates an AST obtained from `parse_string` or `parse_file` in topscope.
     # If the ast is a `Puppet::Pops::Model::Program` (what is returned from the `parse` methods, any definitions
     # in the program (that is, any function, plan, etc. that is defined will be made available for use).

data/lib/puppet/pal/compiler.rb

@@ -41,7 +41,8 @@ module Pal
     #
     def function_signature(function_name)
       loader = internal_compiler.loaders.private_environment_loader
-      if func = loader.load(:function, function_name)
+      func = loader.load(:function, function_name)
+      if func
         return FunctionSignature.new(func.class)
       end
       # Could not find function

data/lib/puppet/pal/pal_impl.rb

@@ -176,6 +176,10 @@ module Pal
       end
     end
 
+    # We need to make sure to set these back when we're done
+    previous_tasks_value = Puppet[:tasks]
+    previous_code_value = Puppet[:code]
+
     Puppet[:tasks] = false
     # After the assertions, if code_string is non nil - it has the highest precedence
     Puppet[:code] = code_string unless code_string.nil?
@@ -183,6 +187,10 @@ module Pal
     # If manifest_file is nil, the #main method will use the env configured manifest
     # to do things in the block while a Script Compiler is in effect
     main(manifest_file, facts, variables, :catalog, &block)
+  ensure
+    # Clean up after ourselves
+    Puppet[:tasks] = previous_tasks_value
+    Puppet[:code] = previous_code_value
   end
 
   # Defines the context in which to perform puppet operations (evaluation, etc)

data/lib/puppet/pal/script_compiler.rb

@@ -8,7 +8,8 @@ module Pal
     #
     def plan_signature(plan_name)
       loader = internal_compiler.loaders.private_environment_loader
-      if func = loader.load(:plan, plan_name)
+      func = loader.load(:plan, plan_name)
+      if func
         return PlanSignature.new(func)
       end
       # Could not find plan
@@ -40,7 +41,8 @@ module Pal
     #
     def task_signature(task_name)
       loader = internal_compiler.loaders.private_environment_loader
-      if task = loader.load(:task, task_name)
+      task = loader.load(:task, task_name)
+      if task
         return TaskSignature.new(task)
       end
       # Could not find task

data/lib/puppet/parameter.rb

@@ -110,11 +110,13 @@ class Puppet::Parameter
 
       unless defined?(@addeddocvals)
         @doc = Puppet::Util::Docs.scrub(@doc)
-        if vals = value_collection.doc
+        vals = value_collection.doc
+        if vals
           @doc << "\n\n#{vals}"
         end
 
-        if features = self.required_features
+        features = self.required_features
+        if features
           @doc << "\n\nRequires features #{features.flatten.collect { |f| f.to_s }.join(" ")}."
         end
         @addeddocvals = true

data/lib/puppet/parameter/value_collection.rb

@@ -18,9 +18,8 @@ class Puppet::Parameter::ValueCollection
   #
   def aliasvalue(name, other)
     other = other.to_sym
-    unless value = match?(other)
-      raise Puppet::DevError, _("Cannot alias nonexistent value %{value}") % { value: other }
-    end
+    value = match?(other)
+    raise Puppet::DevError, _("Cannot alias nonexistent value %{value}") % { value: other } unless value
 
     value.alias(name)
   end
@@ -35,7 +34,8 @@ class Puppet::Parameter::ValueCollection
       unless values.empty?
         @doc << "Valid values are "
         @doc << @strings.collect do |value|
-          if aliases = value.aliases and ! aliases.empty?
+          aliases = value.aliases
+          if aliases && ! aliases.empty?
             "`#{value.name}` (also called `#{aliases.join(", ")}`)"
           else
             "`#{value.name}`"
@@ -81,9 +81,8 @@ class Puppet::Parameter::ValueCollection
   #
   def match?(test_value)
     # First look for normal values
-    if value = @strings.find { |v| v.match?(test_value) }
-      return value
-    end
+    value = @strings.find { |v| v.match?(test_value) }
+    return value if value
 
     # Then look for a regex match
     @regexes.find { |v| v.match?(test_value) }
@@ -100,7 +99,8 @@ class Puppet::Parameter::ValueCollection
   def munge(value)
     return value if empty?
 
-    if instance = match?(value)
+    instance = match?(value)
+    if instance
       if instance.regex?
         return value
       else

data/lib/puppet/parser/ast/pops_bridge.rb

@@ -176,7 +176,8 @@ class Puppet::Parser::AST::PopsBridge
       # reused and we may reenter without a scope (which is fine). A debug message is then output in case
       # there is the need to track down the odd corner case. See {#obtain_scope}.
       #
-      if scope = obtain_scope
+      scope = obtain_scope
+      if scope
         typed_parameters.each do |p|
           result[p.name] =  @@evaluator.evaluate(scope, p.type_expr)
         end

data/lib/puppet/parser/compiler.rb

@@ -61,7 +61,8 @@ class Puppet::Parser::Compiler
   # Store a resource override.
   def add_override(override)
     # If possible, merge the override in immediately.
-    if resource = @catalog.resource(override.ref)
+    resource = @catalog.resource(override.ref)
+    if resource
       resource.merge(override)
     else
       # Otherwise, store the override for later; these
@@ -493,7 +494,8 @@ class Puppet::Parser::Compiler
     # Now see if we can find the node.
     astnode = nil
     @node.names.each do |name|
-      break if astnode = krt.node(name.to_s.downcase)
+      astnode = krt.node(name.to_s.downcase)
+      break if astnode
     end
 
     unless (astnode ||= krt.node("default"))
@@ -627,7 +629,8 @@ class Puppet::Parser::Compiler
 
     resources.each do |resource|
       # Add in any resource overrides.
-      if overrides = resource_overrides(resource)
+      overrides = resource_overrides(resource)
+      if overrides
         overrides.each do |over|
           resource.merge(over)
         end
@@ -645,7 +648,8 @@ class Puppet::Parser::Compiler
   protected :finish
 
   def add_resource_metaparams
-    unless main = catalog.resource(:class, :main)
+    main = catalog.resource(:class, :main)
+    unless main
       #TRANSLATORS "main" is a function name and should not be translated
       raise _("Couldn't find main")
     end
@@ -655,7 +659,8 @@ class Puppet::Parser::Compiler
     end
     data = {}
     catalog.walk(main, :out) do |source, target|
-      if source_data = data[source] || metaparams_as_data(source, names)
+      source_data = data[source] || metaparams_as_data(source, names)
+      if source_data
         # only store anything in the data hash if we've actually got
         # data
         data[source] ||= source_data