puppet 7.28.0-x86-mingw32 → 8.0.1-x86-mingw32

data/lib/puppet/module.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/util/logging'
 require_relative 'module/task'
 require_relative 'module/plan'
@@ -214,7 +215,9 @@ class Puppet::Module
 
   def read_metadata
     md_file = metadata_file
-    md_file.nil? ? {} : Puppet::Util::Json.load(File.read(md_file, :encoding => 'utf-8'))
+    return {} if md_file.nil?
+    content = File.read(md_file, :encoding => 'utf-8')
+    content.empty? ? {} : Puppet::Util::Json.load(content)
   rescue Errno::ENOENT
     {}
   rescue Puppet::Util::Json::ParseError => e

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'net/http'
 require_relative '../../../puppet/util/json'
 require_relative '../../../puppet/util/colors'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/json'
 require_relative '../../../puppet/module_tool/checksums'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'open-uri'
 require 'pathname'
 require 'fileutils'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool
   module Applications
     class Uninstaller < Application

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'tmpdir'
 require_relative '../../../puppet/util/json'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 
 require_relative '../../../puppet/forge'

data/lib/puppet/module_tool/applications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool

data/lib/puppet/module_tool/checksums.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'digest/md5'
 require_relative '../../puppet/network/format_support'
 

data/lib/puppet/module_tool/contents_description.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool

data/lib/puppet/module_tool/dependency.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/network/format_support'
 

data/lib/puppet/module_tool/errors/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
   class ModuleToolError < Puppet::Error
     def v(version)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
 
   class InstallError < ModuleToolError; end

data/lib/puppet/module_tool/errors/shared.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
 
   class NoVersionsSatisfyError < ModuleToolError

data/lib/puppet/module_tool/errors/uninstaller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
 
   class UninstallError < ModuleToolError; end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
 
   class UpgradeError < ModuleToolError

data/lib/puppet/module_tool/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool

data/lib/puppet/module_tool/install_directory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/module_tool/errors'
 

data/lib/puppet/module_tool/installed_modules.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 
 require_relative '../../puppet/forge'

data/lib/puppet/module_tool/local_tarball.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'tmpdir'
 

data/lib/puppet/module_tool/metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/network/format_support'
 require 'uri'

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Shared
 
   include Puppet::ModuleTool::Errors

data/lib/puppet/module_tool/tar/gnu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'shellwords'
 
 class Puppet::ModuleTool::Tar::Gnu

data/lib/puppet/module_tool/tar/mini.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::ModuleTool::Tar::Mini
   def unpack(sourcefile, destdir, _)
     Zlib::GzipReader.open(sourcefile) do |reader|

data/lib/puppet/module_tool/tar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/util'
 

data/lib/puppet/module_tool.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 # Load standard libraries
 require 'pathname'
 require 'fileutils'
@@ -69,7 +70,7 @@ module Puppet
     # Builds a formatted tree from a list of node hashes containing +:text+
     # and +:dependencies+ keys.
     def self.format_tree(nodes, level = 0)
-      str = ''
+      str = String.new
       nodes.each_with_index do |node, i|
         last_node = nodes.length - 1 == i
         deps = node[:dependencies] || []

data/lib/puppet/network/authconfig.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   class Network::AuthConfig
     def self.authprovider_class=(_)

data/lib/puppet/network/authorization.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Network
   module Authorization
     class << self

data/lib/puppet/network/client_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Network # :nodoc:
   # A struct-like class for passing around a client request.  It's mostly
   # just used for validation and authorization.

data/lib/puppet/network/format.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/confiner'
 
 # A simple class for modeling encoding formats for moving

data/lib/puppet/network/format_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'yaml'
 require_relative '../../puppet/network'
 require_relative '../../puppet/network/format'
@@ -5,7 +6,7 @@ require_relative '../../puppet/network/format'
 module Puppet::Network::FormatHandler
   class FormatError < Puppet::Error; end
 
-  ALL_MEDIA_TYPES = '*/*'.freeze
+  ALL_MEDIA_TYPES = '*/*'
 
   @formats = {}
 

data/lib/puppet/network/format_support.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/network/format_handler'
 
 # Provides network serialization support when included

data/lib/puppet/network/formats.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/network/format_handler'
 require_relative '../../puppet/util/json'
 
@@ -87,6 +88,8 @@ end
 
 # PSON is deprecated
 Puppet::Network::FormatHandler.create_serialized_formats(:pson, :weight => 10, :required_methods => [:render_method, :intern_method], :intern_method => :from_data_hash) do
+  confine :feature => :pson
+
   def intern(klass, text)
     data_to_instance(klass, PSON.parse(text))
   end
@@ -153,7 +156,7 @@ Puppet::Network::FormatHandler.create(:console,
 
     # Simple hash to table
     if datum.is_a?(Hash) && datum.keys.all? { |x| x.is_a?(String) || x.is_a?(Numeric) }
-      output = ''
+      output = String.new
       column_a = datum.empty? ? 2 : datum.map{ |k,v| k.to_s.length }.max + 2
       datum.sort_by { |k,v| k.to_s } .each do |key, value|
         output << key.to_s.ljust(column_a)
@@ -166,7 +169,7 @@ Puppet::Network::FormatHandler.create(:console,
 
     # Print one item per line for arrays
     if datum.is_a? Array
-      output = ''
+      output = String.new
       datum.each do |item|
         output << item.to_s
         output << "\n"
@@ -224,7 +227,7 @@ Puppet::Network::FormatHandler.create(:flat,
   end
 
   def construct_output(data)
-    output = ''
+    output = String.new
     data.each do |key, value|
       output << "#{key}=#{value}"
       output << "\n"

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../puppet/network/http/api/indirection_type'
 
 class Puppet::Network::HTTP::API::IndirectedRoutes

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Network::HTTP::API::IndirectionType
 
   INDIRECTION_TYPE_MAP = {

data/lib/puppet/network/http/api/master/v3/environments.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../../../puppet/network/http/api/master'
 require_relative '../../../../../../puppet/network/http/api/server/v3/environments'
 

data/lib/puppet/network/http/api/master/v3.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../../puppet/network/http/api/master'
 require_relative '../../../../../puppet/network/http/api/server/v3'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../puppet/network/http/api/server'
 
 Puppet::Network::HTTP::API::Master = Puppet::Network::HTTP::API::Server

data/lib/puppet/network/http/api/server/v3/environments.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../../../puppet/util/json'
 
 module Puppet

data/lib/puppet/network/http/api/server/v3.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'v3/environments'
 require_relative '../../../../../puppet/network/http/api/indirected_routes'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   module Network
     module HTTP

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Network::HTTP::API
   require_relative '../../../puppet/version'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/http'
 
 # This will be raised if too many redirects happen for a given HTTP request

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/json'
 
 module Puppet::Network::HTTP::Error

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Network::HTTP
 end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Network::HTTP::Issues
   NO_INDIRECTION_REMOTE_REQUESTS = :NO_INDIRECTION_REMOTE_REQUESTS
   HANDLER_NOT_FOUND = :HANDLER_NOT_FOUND

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

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 class Puppet::Network::HTTP::MemoryResponse
   attr_reader :code, :type, :body
 
   def initialize
-    @body = ""
+    @body = String.new
   end
 
   def respond_with(code, type, body)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Network::HTTP::Request = Struct.new(:headers, :params, :method, :path, :routing_path, :client_cert, :body) do
   def self.from_hash(hash)
     symbol_members = members.collect(&:intern)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Network::HTTP::Response
   def initialize(handler, response)
     @handler = handler

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Network::HTTP::Route
   MethodNotAllowedHandler = lambda do |req, res|
     raise Puppet::Network::HTTP::Error::HTTPMethodNotAllowedError.new("method #{req.method} not allowed for route #{req.path}", Puppet::Network::HTTP::Issues::UNSUPPORTED_METHOD)

data/lib/puppet/network/http.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This module is used to handle puppet REST requests in puppetserver.
 module Puppet::Network::HTTP
   HEADER_ENABLE_PROFILING = "X-Puppet-Profiling"

data/lib/puppet/network/http_pool.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/network/http/connection'
 
 module Puppet::Network; end

data/lib/puppet/network/uri.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This module holds funtions for network URI's
 module Puppet::Network::Uri
   # Mask credentials in given URI or address as string. Resulting string will

data/lib/puppet/network.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Just a stub, so we can correctly scope other classes.
 module Puppet::Network # :nodoc:
 end

data/lib/puppet/node/environment.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/util'
 require 'monitor'
 require_relative '../../puppet/parser/parser_factory'
@@ -549,8 +550,8 @@ class Puppet::Node::Environment
 
   # not private so it can be called in tests
   def self.extralibs()
-    if Puppet::Util.get_env('PUPPETLIB')
-      split_path(Puppet::Util.get_env('PUPPETLIB'))
+    if ENV['PUPPETLIB']
+      split_path(ENV['PUPPETLIB'])
     else
       []
     end
@@ -591,12 +592,10 @@ class Puppet::Node::Environment
       if file == NO_MANIFEST
         empty_parse_result
       elsif File.directory?(file)
-        # JRuby does not properly perform Dir.glob operations with wildcards, (see PUP-11788 and https://github.com/jruby/jruby/issues/7836).
-        # We sort the results because Dir.glob order is inconsistent in Ruby < 3 (see PUP-10115).
-        parse_results = Puppet::FileSystem::PathPattern.absolute(File.join(file, '**/*')).glob.select {|globbed_file| globbed_file.end_with?('.pp')}.sort.map do | file_to_parse |
-                          parser.file = file_to_parse
-                          parser.parse
-                        end
+        parse_results = Puppet::FileSystem::PathPattern.absolute(File.join(file, '**/*.pp')).glob.sort.map do | file_to_parse |
+          parser.file = file_to_parse
+          parser.parse
+          end
         # Use a parser type specific merger to concatenate the results
         Puppet::Parser::AST::Hostclass.new('', :code => Puppet::Parser::ParserFactory.code_merger.concatenate(parse_results))
       else

data/lib/puppet/node/facts.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'time'
 
 require_relative '../../puppet/node'

data/lib/puppet/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/indirector'
 
 # A class for managing nodes, including their facts and environment.
@@ -21,7 +22,7 @@ class Puppet::Node
 
   attr_reader :server_facts
 
-  ENVIRONMENT = 'environment'.freeze
+  ENVIRONMENT = 'environment'
 
   def initialize_from_hash(data)
     @name       = data['name']       || (raise ArgumentError, _("No name provided in serialized data"))

data/lib/puppet/pal/catalog_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
 module Pal
   # A CatalogCompiler is a compiler that builds a catalog of resources and dependencies as a side effect of

data/lib/puppet/pal/compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
 module Pal
 

data/lib/puppet/pal/function_signature.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
 module Pal
   # A FunctionSignature is returned from `function_signature`. Its purpose is to answer questions about the function's parameters

data/lib/puppet/pal/json_catalog_encoder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The JsonCatalogEncoder is a wrapper around a catalog produced by the Pal::CatalogCompiler.with_json_encoding
 # method.
 # It allows encoding the entire catalog or an individual resource as Rich Data Json.

data/lib/puppet/pal/pal_api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   require_relative '../../puppet/parser/script_compiler'
   require_relative '../../puppet/parser/catalog_compiler'

data/lib/puppet/pal/pal_impl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Puppet as a Library "PAL"
 
 # Yes, this requires all of puppet for now because 'settings' and many other things...

data/lib/puppet/pal/plan_signature.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
 module Pal
   # A PlanSignature is returned from `plan_signature`. Its purpose is to answer questions about the plans's parameters

data/lib/puppet/pal/script_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
 module Pal
 

data/lib/puppet/pal/task_signature.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
 module Pal
   # A TaskSignature is returned from `task_signature`. Its purpose is to answer questions about the task's parameters

data/lib/puppet/parameter/boolean.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/coercion'
 
 # This specialized {Puppet::Parameter} handles Boolean options, accepting lots

data/lib/puppet/parameter/package_options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/parameter'
 
 # This specialized {Puppet::Parameter} handles munging of package options.

data/lib/puppet/parameter/path.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/parameter'
 
 # This specialized {Puppet::Parameter} handles validation and munging of paths.

data/lib/puppet/parameter/value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/parameter/value_collection'
 
 # Describes an acceptable value for a parameter or property.

data/lib/puppet/parameter/value_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/parameter/value'
 
 # A collection of values and regular expressions, used for specifying allowed values
@@ -30,7 +31,7 @@ class Puppet::Parameter::ValueCollection
   #
   def doc
     unless defined?(@doc)
-      @doc = ""
+      @doc = String.new
       unless values.empty?
         @doc << "Valid values are "
         @doc << @strings.collect do |value|

data/lib/puppet/parameter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/util/logging'
 require_relative '../puppet/util/docs'
 

data/lib/puppet/parser/abstract_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Puppet::Parser::AbstractCompiler
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Evaluates contained expressions, produce result of the last
 #
 class Puppet::Parser::AST::BlockExpression < Puppet::Parser::AST::Branch

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The parent class of all AST objects that contain other AST objects.
 # Everything but the really simple objects descend from this.  It is
 # important to note that Branch objects contain other AST objects only --

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/parser/ast/top_level_construct'
 
 class Puppet::Parser::AST::Hostclass < Puppet::Parser::AST::TopLevelConstruct

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The base class for all of the leaves of the parse trees.  These
 # basically just have types and values.  Both of these parameters
 # are simple values, not AST objects.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Parser::AST::Node < Puppet::Parser::AST::TopLevelConstruct
   attr_accessor :names, :context
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/parser/ast/top_level_construct'
 require_relative '../../../puppet/pops'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Instruction for Resource instantiation.
 # Instantiates resources of both native and user defined types.
 #

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A simple container for a parameter for an object.  Consists of a
 # title and a set of parameters.
 #

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The AST object for the parameters inside resource expressions
 #
 class Puppet::Parser::AST::ResourceParam < Puppet::Parser::AST::Branch