puppet 8.2.0-x86-mingw32 → 8.4.0-x86-mingw32

data/lib/puppet/indirector/file_content/file.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/direct_file_server'

data/lib/puppet/indirector/file_content/file_server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/file_server'

data/lib/puppet/indirector/file_content/rest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/rest'

data/lib/puppet/indirector/file_content/selector.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/code'

data/lib/puppet/indirector/file_content.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A stub class, so our constants work.
 class Puppet::Indirector::FileContent # :nodoc:
 end

data/lib/puppet/indirector/file_metadata/file.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/direct_file_server'

data/lib/puppet/indirector/file_metadata/file_server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/file_server'

data/lib/puppet/indirector/file_metadata/http.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/http_metadata'
 require_relative '../../../puppet/indirector/generic_http'
 require_relative '../../../puppet/indirector/file_metadata'

data/lib/puppet/indirector/file_metadata/rest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/rest'

data/lib/puppet/indirector/file_metadata/selector.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/code'

data/lib/puppet/indirector/file_metadata.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A stub class, so our constants work.
 class Puppet::Indirector::FileMetadata # :nodoc:
 end

data/lib/puppet/indirector/file_server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_serving/configuration'
 require_relative '../../puppet/file_serving/fileset'
 require_relative '../../puppet/file_serving/terminus_helper'
@@ -30,6 +31,7 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
     # if not.
     path = mount.find(relative_path, request)
     return nil unless path
+
     path2instance(request, path)
   end
 

data/lib/puppet/indirector/generic_http.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_serving/terminus_helper'
 
 class Puppet::Indirector::GenericHttp < Puppet::Indirector::Terminus

data/lib/puppet/indirector/hiera.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require 'hiera/scope'
 
@@ -9,9 +10,10 @@ require 'hiera/scope'
 class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   def initialize(*args)
     if ! Puppet.features.hiera?
-      #TRANSLATORS "Hiera" is the name of a code library and should not be translated
+      # TRANSLATORS "Hiera" is the name of a code library and should not be translated
       raise _("Hiera terminus not supported without hiera library")
     end
+
     super
   end
 
@@ -42,8 +44,7 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   # @return [Symbol,Hash,nil] The Hiera 'resolution_type'
   def convert_merge(merge)
     case merge
-    when nil
-    when 'first'
+    when nil, 'first'
       # Nil is OK. Defaults to Hiera :priority
       nil
     when Puppet::Pops::MergeStrategy
@@ -69,7 +70,7 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
         convert_merge(strategy)
       end
     else
-      #TRANSLATORS "merge" is a parameter name and should not be translated
+      # TRANSLATORS "merge" is a parameter name and should not be translated
       raise Puppet::DataBinding::LookupError, _("Unrecognized value for request 'merge' parameter: '%{merge}'") % { merge: merge }
     end
   end

data/lib/puppet/indirector/indirection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/docs'
 require_relative '../../puppet/util/profiler'
 require_relative '../../puppet/indirector/envelope'
@@ -33,12 +34,14 @@ class Puppet::Indirector::Indirection
   def self.model(name)
     match = @@indirections.find { |i| i.name == name }
     return nil unless match
+
     match.model
   end
 
   # Create and return our cache terminus.
   def cache
     raise Puppet::DevError, _("Tried to cache when no cache class was set") unless cache_class
+
     terminus(cache_class)
   end
 
@@ -64,8 +67,9 @@ class Puppet::Indirector::Indirection
 
   # Set the time-to-live for instances created through this indirection.
   def ttl=(value)
-    #TRANSLATORS "TTL" stands for "time to live" and refers to a duration of time
+    # TRANSLATORS "TTL" stands for "time to live" and refers to a duration of time
     raise ArgumentError, _("Indirection TTL must be an integer") unless value.is_a?(Integer)
+
     @ttl = value
   end
 
@@ -81,7 +85,7 @@ class Puppet::Indirector::Indirection
 
   # Generate the full doc string.
   def doc
-    text = String.new
+    text = ''.dup
 
     text << scrub(@doc) << "\n\n" if @doc
 
@@ -101,6 +105,7 @@ class Puppet::Indirector::Indirection
     @doc = doc
 
     raise(ArgumentError, _("Indirection %{name} is already defined") % { name: @name }) if @@indirections.find { |i| i.name == @name }
+
     @@indirections << self
 
     @indirected_class = indirected_class
@@ -178,6 +183,7 @@ class Puppet::Indirector::Indirection
     unless terminus_class and terminus_class.to_s != ""
       raise ArgumentError, _("Invalid terminus name %{terminus_class}") % { terminus_class: terminus_class.inspect }
     end
+
     unless Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
       raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{name}") %
           { terminus_class: terminus_class, name: self.name }
@@ -265,6 +271,7 @@ class Puppet::Indirector::Indirection
     # See if our instance is in the cache and up to date.
     cached = cache.find(request) if cache? && ! request.ignore_cache?
     return nil unless cached
+
     if cached.expired?
       Puppet.info _("Not using expired %{indirection} for %{request} from cache; expired at %{expiration}") % { indirection: self.name, request: request.key, expiration: cached.expiration }
       return nil
@@ -300,8 +307,10 @@ class Puppet::Indirector::Indirection
     result = terminus.search(request)
     if result
       raise Puppet::DevError, _("Search results from terminus %{terminus_name} are not an array") % { terminus_name: terminus.name } unless result.is_a?(Array)
+
       result.each do |instance|
         next unless instance.respond_to? :expiration
+
         instance.expiration ||= self.expiration
       end
       return result
@@ -368,6 +377,7 @@ class Puppet::Indirector::Indirection
     unless klass
       raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{indirection}") % { terminus_class: terminus_class, indirection: self.name }
     end
+
     klass.new
   end
 end

data/lib/puppet/indirector/json.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util'
 
@@ -26,7 +27,8 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     unless detail.is_a? Errno::ENOENT
       raise Puppet::Error, _("Could not destroy %{json} %{request}: %{detail}") % { json: self.name, request: request.key, detail: detail }, detail.backtrace
     end
-    1                           # emulate success...
+
+    1 # emulate success...
   end
 
   def search(request)

data/lib/puppet/indirector/memory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 
 # Manage a memory-cached list of instances.
@@ -13,6 +14,7 @@ class Puppet::Indirector::Memory < Puppet::Indirector::Terminus
 
   def destroy(request)
     raise ArgumentError.new(_("Could not find %{request} to destroy") % { request: request.key }) unless @instances.include?(request.key)
+
     @instances.delete(request.key)
   end
 

data/lib/puppet/indirector/msgpack.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util'
 
@@ -11,6 +12,7 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     if ! Puppet.features.msgpack?
       raise _("MessagePack terminus not supported without msgpack library")
     end
+
     super
   end
 
@@ -33,7 +35,8 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     unless detail.is_a? Errno::ENOENT
       raise Puppet::Error, _("Could not destroy %{name} %{request}: %{detail}") % { name: self.name, request: request.key, detail: detail }, detail.backtrace
     end
-    1                           # emulate success...
+
+    1 # emulate success...
   end
 
   def search(request)
@@ -63,7 +66,7 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     rescue Errno::ENOENT
       return nil
     rescue => detail
-      #TRANSLATORS "MessagePack" is a program name and should not be translated
+      # TRANSLATORS "MessagePack" is a program name and should not be translated
       raise Puppet::Error, _("Could not read MessagePack data for %{indirection} %{key}: %{detail}") % { indirection: indirection.name, key: key, detail: detail }, detail.backtrace
     end
 

data/lib/puppet/indirector/node/exec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/exec'
 
@@ -10,6 +11,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
   def command
     command = Puppet[:external_nodes]
     raise ArgumentError, _("You must set the 'external_nodes' parameter to use the external node terminus") unless command != _("none")
+
     command.split
   end
 
@@ -64,8 +66,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
 
       hash
     end
-
   rescue => detail
-      raise Puppet::Error, _("Could not load external node results for %{name}: %{detail}") % { name: name, detail: detail }, detail.backtrace
+    raise Puppet::Error, _("Could not load external node results for %{name}: %{detail}") % { name: name, detail: detail }, detail.backtrace
   end
 end

data/lib/puppet/indirector/node/json.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/json'
 
 class Puppet::Node::Json < Puppet::Indirector::JSON
   desc "Store node information as flat files, serialized using JSON,
     or deserialize stored JSON nodes."
-
 end

data/lib/puppet/indirector/node/memory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/memory'
 

data/lib/puppet/indirector/node/msgpack.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/msgpack'
 

data/lib/puppet/indirector/node/plain.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/plain'
 

data/lib/puppet/indirector/node/rest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/rest'
 

data/lib/puppet/indirector/node/store_configs.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/store_configs'
 require_relative '../../../puppet/node'
 
 class Puppet::Node::StoreConfigs < Puppet::Indirector::StoreConfigs
-
   desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
-
 end

data/lib/puppet/indirector/node/yaml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/yaml'
 

data/lib/puppet/indirector/none.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 
 # A none terminus type, meant to always return nil

data/lib/puppet/indirector/plain.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 
 # An empty terminus type, meant to just return empty objects.

data/lib/puppet/indirector/report/json.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/json'
 

data/lib/puppet/indirector/report/msgpack.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/msgpack'
 

data/lib/puppet/indirector/report/processor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/code'
 require_relative '../../../puppet/reports'
@@ -49,6 +50,7 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
 
   def processors(&blk)
     return [] if Puppet[:reports] == "none"
+
     reports.each do |name|
       mod = Puppet::Reports.report(name)
       if mod

data/lib/puppet/indirector/report/rest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/rest'
 require 'semantic_puppet'
 

data/lib/puppet/indirector/report/yaml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/yaml'
 

data/lib/puppet/indirector/request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cgi'
 require 'uri'
 require_relative '../../puppet/indirector'
@@ -36,11 +37,11 @@ class Puppet::Indirector::Request
 
   def environment=(env)
     @environment =
-    if env.is_a?(Puppet::Node::Environment)
-      env
-    else
-      Puppet.lookup(:environments).get!(env)
-    end
+      if env.is_a?(Puppet::Node::Environment)
+        env
+      else
+        Puppet.lookup(:environments).get!(env)
+      end
   end
 
   # LAK:NOTE This is a messy interface to the cache, and it's only
@@ -101,6 +102,7 @@ class Puppet::Indirector::Request
   def model
     ind = indirection
     raise ArgumentError, _("Could not find indirection '%{indirection}'") % { indirection: indirection_name } unless ind
+
     ind.model
   end
 

data/lib/puppet/indirector/resource/ral.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/resource/validator'
 
 class Puppet::Resource::Ral < Puppet::Indirector::Code

data/lib/puppet/indirector/resource/store_configs.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/store_configs'
 require_relative '../../../puppet/indirector/resource/validator'
 

data/lib/puppet/indirector/resource/validator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Resource::Validator
   def validate_key(request)
     type, title = request.key.split('/', 2)

data/lib/puppet/indirector/rest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Access objects via REST
 class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def find(request)

data/lib/puppet/indirector/store_configs.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Indirector::StoreConfigs < Puppet::Indirector::Terminus
   def initialize
     super

data/lib/puppet/indirector/terminus.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector'
 require_relative '../../puppet/indirector/errors'
 require_relative '../../puppet/indirector/indirection'
@@ -52,6 +53,7 @@ class Puppet::Indirector::Terminus
       if longname =~ /#<Class/
         raise Puppet::DevError, _("Terminus subclasses must have associated constants")
       end
+
       names = longname.split("::")
 
       # Convert everything to a lower-case symbol, converting camelcase to underscore word separation.
@@ -72,6 +74,7 @@ class Puppet::Indirector::Terminus
 
       # This subclass is specifically associated with an indirection.
       raise("Invalid name #{longname}") unless names.length > 0
+
       processed_name = names.pop.sub(/^[A-Z]/) { |i| i.downcase }.gsub(/[A-Z]/) { |i| "_#{i.downcase}" }
 
       if processed_name.empty?
@@ -98,7 +101,7 @@ class Puppet::Indirector::Terminus
 
     # Convert a short name to a constant.
     def name2const(name)
-      name.to_s.capitalize.sub(/_(.)/) { |i| $1.upcase }
+      name.to_s.capitalize.sub(/_(.)/) { |_i| $1.upcase }
     end
 
     # Register a class, probably autoloaded.

data/lib/puppet/indirector/yaml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util/yaml'
 

data/lib/puppet/indirector.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage indirections to termini.  They are organized in terms of indirections -
 # - e.g., configuration, node, file, certificate -- and each indirection has one
 # or more terminus types defined.  The indirection is configured via the
@@ -37,6 +38,7 @@ module Puppet::Indirector
   # to override it.
   def indirects(indirection, options = {})
     raise(ArgumentError, _("Already handling indirection for %{current}; cannot also handle %{next}") % { current: @indirection.name, next: indirection }) if @indirection
+
     # populate this class with the various new methods
     extend ClassMethods
     include Puppet::Indirector::Envelope

data/lib/puppet/info_service/class_information_service.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/pops/evaluator/json_strict_literal_evaluator'
 
 class Puppet::InfoService::ClassInformationService
-
   def initialize
     @file_to_result = {}
     @parser = Puppet::Pops::Parser::EvaluatingParser.new()
@@ -45,7 +45,7 @@ class Puppet::InfoService::ClassInformationService
   end
 
   def result_of(f)
-    entry =  @file_to_result[f]
+    entry = @file_to_result[f]
     if entry.nil?
       @file_to_result[f] = entry = parse_file(f)
     end
@@ -59,7 +59,7 @@ class Puppet::InfoService::ClassInformationService
       parse_result = @parser.parse_file(f)
       {:classes =>
         parse_result.definitions.select {|d| d.is_a?(Puppet::Pops::Model::HostClassDefinition)}.map do |d|
-          {:name   => d.name,
+          {:name => d.name,
            :params => d.parameters.map {|p| extract_param(p) }
           }
         end
@@ -75,6 +75,7 @@ class Puppet::InfoService::ClassInformationService
 
   def extract_type(structure, p)
     return structure if p.type_expr.nil?
+
     structure[:type] = typeexpr_to_string(p.type_expr)
     structure
   end
@@ -82,6 +83,7 @@ class Puppet::InfoService::ClassInformationService
   def extract_default(structure, p)
     value_expr = p.value
     return structure if value_expr.nil?
+
     default_value = value_as_literal(value_expr)
     structure[:default_literal] = default_value unless default_value.nil?
     structure[:default_source] = extract_value_source(value_expr)

data/lib/puppet/info_service/plan_information_service.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::InfoService::PlanInformationService
   require_relative '../../puppet/module'
 

data/lib/puppet/info_service/task_information_service.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::InfoService::TaskInformationService
   require_relative '../../puppet/module'
 
@@ -13,7 +14,7 @@ class Puppet::InfoService::TaskInformationService
           task.validate
           {:module => {:name => task.module.name}, :name => task.name, :metadata => task.metadata}
         rescue Puppet::Module::Task::Error => err
-          Puppet.log_exception(err, 'Failed to validate task')
+          Puppet.log_exception(err)
           nil
         end
       end