puppet 7.6.1-universal-darwin → 7.10.0-universal-darwin

data/lib/puppet/provider/user/windows_adsi.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 Puppet::Type.type(:user).provide :windows_adsi do
   desc "Local user management for Windows."

data/lib/puppet/reference/configuration.rb

@@ -43,7 +43,7 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
     # Leave out the section information; it was apparently confusing people.
     #str << "- **Section**: #{object.section}\n"
     unless val == ""
-      str << "- *Default*: #{val}\n"
+      str << "- *Default*: `#{val}`\n"
     end
     str << "\n"
   end

data/lib/puppet/reference/indirection.rb

@@ -1,7 +1,7 @@
-require 'puppet/indirector/indirection'
-require 'puppet/util/checksums'
-require 'puppet/file_serving/content'
-require 'puppet/file_serving/metadata'
+require_relative '../../puppet/indirector/indirection'
+require_relative '../../puppet/util/checksums'
+require_relative '../../puppet/file_serving/content'
+require_relative '../../puppet/file_serving/metadata'
 
 reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirection types and their terminus classes" do
   text = ""

data/lib/puppet/reference/report.rb

@@ -1,4 +1,4 @@
-require 'puppet/reports'
+require_relative '../../puppet/reports'
 
 report = Puppet::Util::Reference.newreference :report, :doc => "All available transaction reports" do
   Puppet::Reports.reportdocs

data/lib/puppet/reports.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/instance_loader'
+require_relative '../puppet/util/instance_loader'
 
 # This class is an implementation of a simple mechanism for loading and returning reports.
 # The intent is that a user registers a report by calling {register_report} and providing a code

data/lib/puppet/reports/http.rb

@@ -1,5 +1,5 @@
-require 'puppet'
-require 'puppet/network/http_pool'
+require_relative '../../puppet'
+require_relative '../../puppet/network/http_pool'
 require 'uri'
 
 Puppet::Reports.register_report(:http) do

data/lib/puppet/reports/log.rb

@@ -1,4 +1,4 @@
-require 'puppet/reports'
+require_relative '../../puppet/reports'
 
 Puppet::Reports.register_report(:log) do
   desc "Send all received logs to the local log destinations.  Usually

data/lib/puppet/reports/store.rb

@@ -1,6 +1,6 @@
-require 'puppet'
+require_relative '../../puppet'
 require 'fileutils'
-require 'puppet/util'
+require_relative '../../puppet/util'
 
 SEPARATOR = [Regexp.escape(File::SEPARATOR.to_s), Regexp.escape(File::ALT_SEPARATOR.to_s)].join
 

data/lib/puppet/resource.rb

@@ -1,6 +1,6 @@
-require 'puppet'
-require 'puppet/util/tagging'
-require 'puppet/parameter'
+require_relative '../puppet'
+require_relative '../puppet/util/tagging'
+require_relative '../puppet/parameter'
 
 # The simplest resource class.  Eventually it will function as the
 # base class for all resource-like behaviour.
@@ -22,7 +22,7 @@ class Puppet::Resource
   # @deprecated
   attr_accessor :validate_parameters
 
-  require 'puppet/indirector'
+  require_relative '../puppet/indirector'
   extend Puppet::Indirector
   indirects :resource, :terminus_class => :ral
 

data/lib/puppet/resource/catalog.rb

@@ -1,8 +1,8 @@
-require 'puppet/node'
-require 'puppet/indirector'
-require 'puppet/transaction'
-require 'puppet/util/tagging'
-require 'puppet/graph'
+require_relative '../../puppet/node'
+require_relative '../../puppet/indirector'
+require_relative '../../puppet/transaction'
+require_relative '../../puppet/util/tagging'
+require_relative '../../puppet/graph'
 require 'securerandom'
 
 # This class models a node catalog.  It is the thing meant to be passed

data/lib/puppet/resource/status.rb

@@ -1,6 +1,6 @@
 require 'time'
-require 'puppet/network/format_support'
-require 'puppet/util/psych_support'
+require_relative '../../puppet/network/format_support'
+require_relative '../../puppet/util/psych_support'
 
 module Puppet
   class Resource

data/lib/puppet/resource/type.rb

@@ -1,7 +1,7 @@
-require 'puppet/parser'
-require 'puppet/util/warnings'
-require 'puppet/util/errors'
-require 'puppet/parser/ast/leaf'
+require_relative '../../puppet/parser'
+require_relative '../../puppet/util/warnings'
+require_relative '../../puppet/util/errors'
+require_relative '../../puppet/parser/ast/leaf'
 
 # Puppet::Resource::Type represents nodes, classes and defined types.
 #

data/lib/puppet/resource/type_collection.rb

@@ -1,7 +1,7 @@
-require 'puppet/parser/type_loader'
-require 'puppet/util/file_watcher'
-require 'puppet/util/warnings'
-require 'puppet/concurrent/lock'
+require_relative '../../puppet/parser/type_loader'
+require_relative '../../puppet/util/file_watcher'
+require_relative '../../puppet/util/warnings'
+require_relative '../../puppet/concurrent/lock'
 
 # @api private
 class Puppet::Resource::TypeCollection
@@ -61,6 +61,7 @@ class Puppet::Resource::TypeCollection
   def add_hostclass(instance)
     handle_hostclass_merge(instance)
     dupe_check(instance, @hostclasses) { |dupe| _("Class '%{klass}' is already defined%{error}; cannot redefine") % { klass: instance.name, error: dupe.error_context } }
+    dupe_check(instance, @nodes)       { |dupe| _("Node '%{klass}' is already defined%{error}; cannot be redefined as a class") % { klass: instance.name, error: dupe.error_context } }
     dupe_check(instance, @definitions) { |dupe| _("Definition '%{klass}' is already defined%{error}; cannot be redefined as a class") % { klass: instance.name, error: dupe.error_context } }
 
     @hostclasses[instance.name] = instance
@@ -93,6 +94,7 @@ class Puppet::Resource::TypeCollection
 
   def add_node(instance)
     dupe_check(instance, @nodes) { |dupe| _("Node '%{name}' is already defined%{error}; cannot redefine") % { name: instance.name, error: dupe.error_context } }
+    dupe_check(instance, @hostclasses) { |dupe| _("Class '%{klass}' is already defined%{error}; cannot be redefined as a node") % { klass: instance.name, error: dupe.error_context } }
 
     @node_list << instance
     @nodes[instance.name] = instance

data/lib/puppet/runtime.rb

@@ -1,4 +1,4 @@
-require 'puppet/http'
+require_relative '../puppet/http'
 require 'singleton'
 
 # Provides access to runtime implementations.

data/lib/puppet/scheduler.rb

@@ -1,8 +1,8 @@
 module Puppet::Scheduler
-  require 'puppet/scheduler/job'
-  require 'puppet/scheduler/splay_job'
-  require 'puppet/scheduler/scheduler'
-  require 'puppet/scheduler/timer'
+  require_relative 'scheduler/job'
+  require_relative 'scheduler/splay_job'
+  require_relative 'scheduler/scheduler'
+  require_relative 'scheduler/timer'
 
   module_function
 

data/lib/puppet/settings.rb

@@ -1,7 +1,7 @@
-require 'puppet'
+require_relative '../puppet'
 require 'getoptlong'
-require 'puppet/util/watched_file'
-require 'puppet/util/command_line/puppet_option_parser'
+require_relative '../puppet/util/watched_file'
+require_relative '../puppet/util/command_line/puppet_option_parser'
 require 'forwardable'
 require 'fileutils'
 require 'concurrent'
@@ -11,31 +11,31 @@ class Puppet::Settings
   extend Forwardable
   include Enumerable
 
-  require 'puppet/settings/errors'
-  require 'puppet/settings/base_setting'
-  require 'puppet/settings/string_setting'
-  require 'puppet/settings/enum_setting'
-  require 'puppet/settings/symbolic_enum_setting'
-  require 'puppet/settings/array_setting'
-  require 'puppet/settings/file_setting'
-  require 'puppet/settings/directory_setting'
-  require 'puppet/settings/file_or_directory_setting'
-  require 'puppet/settings/path_setting'
-  require 'puppet/settings/boolean_setting'
-  require 'puppet/settings/integer_setting'
-  require 'puppet/settings/port_setting'
-  require 'puppet/settings/terminus_setting'
-  require 'puppet/settings/duration_setting'
-  require 'puppet/settings/ttl_setting'
-  require 'puppet/settings/priority_setting'
-  require 'puppet/settings/autosign_setting'
-  require 'puppet/settings/config_file'
-  require 'puppet/settings/value_translator'
-  require 'puppet/settings/environment_conf'
-  require 'puppet/settings/server_list_setting'
-  require 'puppet/settings/http_extra_headers_setting'
-  require 'puppet/settings/certificate_revocation_setting'
-  require 'puppet/settings/alias_setting'
+  require_relative 'settings/errors'
+  require_relative 'settings/base_setting'
+  require_relative 'settings/string_setting'
+  require_relative 'settings/enum_setting'
+  require_relative 'settings/symbolic_enum_setting'
+  require_relative 'settings/array_setting'
+  require_relative 'settings/file_setting'
+  require_relative 'settings/directory_setting'
+  require_relative 'settings/file_or_directory_setting'
+  require_relative 'settings/path_setting'
+  require_relative 'settings/boolean_setting'
+  require_relative 'settings/integer_setting'
+  require_relative 'settings/port_setting'
+  require_relative 'settings/terminus_setting'
+  require_relative 'settings/duration_setting'
+  require_relative 'settings/ttl_setting'
+  require_relative 'settings/priority_setting'
+  require_relative 'settings/autosign_setting'
+  require_relative 'settings/config_file'
+  require_relative 'settings/value_translator'
+  require_relative 'settings/environment_conf'
+  require_relative 'settings/server_list_setting'
+  require_relative 'settings/http_extra_headers_setting'
+  require_relative 'settings/certificate_revocation_setting'
+  require_relative 'settings/alias_setting'
 
   # local reference for convenience
   PuppetOptionParser = Puppet::Util::CommandLine::PuppetOptionParser
@@ -868,7 +868,11 @@ class Puppet::Settings
     if self[:user]
       user = Puppet::Type.type(:user).new :name => self[:user], :audit => :ensure
 
-      @service_user_available = user.exists?
+      if user.suitable?
+        @service_user_available = user.exists?
+      else
+        raise Puppet::Error, (_("Cannot manage owner permissions, because the provider for '%{name}' is not functional") % { name: user })
+      end
     else
       @service_user_available = false
     end
@@ -880,7 +884,11 @@ class Puppet::Settings
     if self[:group]
       group = Puppet::Type.type(:group).new :name => self[:group], :audit => :ensure
 
-      @service_group_available = group.exists?
+      if group.suitable?
+        @service_group_available = group.exists?
+      else
+        raise Puppet::Error, (_("Cannot manage group permissions, because the provider for '%{name}' is not functional") % { name: group })
+      end
     else
       @service_group_available = false
     end
@@ -889,9 +897,16 @@ class Puppet::Settings
   # Allow later inspection to determine if the setting was set on the
   # command line, or through some other code path.  Used for the
   # `dns_alt_names` option during cert generate. --daniel 2011-10-18
-  def set_by_cli?(param)
+  #
+  # @param param [String, Symbol] the setting to look up
+  # @return [Object, nil] the value of the setting or nil if unset
+  def set_by_cli(param)
     param = param.to_sym
-    !@value_sets[:cli].lookup(param).nil?
+    @value_sets[:cli].lookup(param)
+  end
+
+  def set_by_cli?(param)
+    !!set_by_cli(param)
   end
 
   # Get values from a search path entry.
@@ -924,9 +939,13 @@ class Puppet::Settings
     end
   end
 
-  # Allow later inspection to determine if the setting was set by user
-  # config, rather than a default setting.
-  def set_in_section?(param, section)
+  # Allow later inspection to determine if the setting was set in a specific
+  # section
+  #
+  # @param param [String, Symbol] the setting to look up
+  # @param section [Symbol] the section in which to look up the setting
+  # @return [Object, nil] the value of the setting or nil if unset
+  def set_in_section(param, section)
     param = param.to_sym
     vals = searchpath_values(SearchPathElement.new(section, :section))
     if vals
@@ -934,6 +953,10 @@ class Puppet::Settings
     end
   end
 
+  def set_in_section?(param, section)
+    !!set_in_section(param, section)
+  end
+
   # Patches the value for a param in a section.
   # This method is required to support the use case of unifying --dns-alt-names and
   # --dns_alt_names in the certificate face. Ideally this should be cleaned up.

data/lib/puppet/settings/autosign_setting.rb

@@ -1,4 +1,4 @@
-require 'puppet/settings/base_setting'
+require_relative '../../puppet/settings/base_setting'
 
 # A specialization of the file setting to allow boolean values.
 #

data/lib/puppet/settings/base_setting.rb

@@ -1,5 +1,5 @@
 require 'set'
-require 'puppet/settings/errors'
+require_relative '../../puppet/settings/errors'
 
 # The base setting type
 class Puppet::Settings::BaseSetting
@@ -145,7 +145,7 @@ class Puppet::Settings::BaseSetting
 
   # Convert the object to a config statement.
   def to_config
-    require 'puppet/util/docs'
+    require_relative '../../puppet/util/docs'
     # Scrub any funky indentation; comment out description.
     str = Puppet::Util::Docs.scrub(@desc).gsub(/^/, "# ") + "\n"
 

data/lib/puppet/settings/certificate_revocation_setting.rb

@@ -1,4 +1,4 @@
-require 'puppet/settings/base_setting'
+require_relative '../../puppet/settings/base_setting'
 
 class Puppet::Settings::CertificateRevocationSetting < Puppet::Settings::BaseSetting
 

data/lib/puppet/settings/config_file.rb

@@ -1,4 +1,4 @@
-require 'puppet/settings/ini_file'
+require_relative '../../puppet/settings/ini_file'
 
 ##
 # @api private
@@ -98,14 +98,7 @@ private
 
   def parse_setting(setting, section)
     var = setting.name.intern
-
-    # We don't want to munge modes, because they're specified in octal, so we'll
-    # just leave them as a String, since Puppet handles that case correctly.
-    if var == :mode
-      value = setting.value
-    else
-      value = @value_converter[setting.value]
-    end
+    value = @value_converter[setting.value]
 
     # Check to see if this is a file argument and it has extra options
     begin

data/lib/puppet/settings/errors.rb

@@ -1,5 +1,5 @@
 # Exceptions for the settings module
-require 'puppet/error'
+require_relative '../../puppet/error'
 
 class Puppet::Settings
   class SettingsError < Puppet::Error ; end

data/lib/puppet/settings/priority_setting.rb

@@ -1,12 +1,12 @@
-require 'puppet/settings/base_setting'
+require_relative '../../puppet/settings/base_setting'
 
 # A setting that represents a scheduling priority, and evaluates to an
 # OS-specific priority level.
 class Puppet::Settings::PrioritySetting < Puppet::Settings::BaseSetting
   PRIORITY_MAP =
     if Puppet::Util::Platform.windows?
-      require 'puppet/util/windows/process'
-      require 'puppet/ffi/windows/constants'
+      require_relative '../../puppet/util/windows/process'
+      require_relative '../../puppet/ffi/windows/constants'
       {
         :high    => Puppet::FFI::Windows::Constants::HIGH_PRIORITY_CLASS,
         :normal  => Puppet::FFI::Windows::Constants::NORMAL_PRIORITY_CLASS,

data/lib/puppet/settings/value_translator.rb

@@ -5,7 +5,6 @@ class Puppet::Settings::ValueTranslator
     return case value
       when /^false$/i; false
       when /^true$/i; true
-      when /^\d+$/i; Integer(value)
       when true; true
       when false; false
       else

data/lib/puppet/ssl.rb

@@ -1,6 +1,6 @@
 # Just to make the constants work out.
-require 'puppet'
-require 'puppet/ssl/openssl_loader'
+require_relative '../puppet'
+require_relative 'ssl/openssl_loader'
 
 # Responsible for bootstrapping an agent's certificate and private key, generating
 # SSLContexts for use in making HTTPS connections, and handling CSR attributes and
@@ -11,13 +11,13 @@ require 'puppet/ssl/openssl_loader'
 module Puppet::SSL
   CA_NAME = "ca".freeze
 
-  require 'puppet/ssl/oids'
-  require 'puppet/ssl/error'
-  require 'puppet/ssl/ssl_context'
-  require 'puppet/ssl/verifier'
-  require 'puppet/ssl/ssl_provider'
-  require 'puppet/ssl/state_machine'
-  require 'puppet/ssl/certificate'
-  require 'puppet/ssl/certificate_request'
-  require 'puppet/ssl/certificate_request_attributes'
+  require_relative 'ssl/oids'
+  require_relative 'ssl/error'
+  require_relative 'ssl/ssl_context'
+  require_relative 'ssl/verifier'
+  require_relative 'ssl/ssl_provider'
+  require_relative 'ssl/state_machine'
+  require_relative 'ssl/certificate'
+  require_relative 'ssl/certificate_request'
+  require_relative 'ssl/certificate_request_attributes'
 end

data/lib/puppet/ssl/base.rb

@@ -1,6 +1,6 @@
-require 'puppet/ssl/openssl_loader'
-require 'puppet/ssl'
-require 'puppet/ssl/digest'
+require_relative '../../puppet/ssl/openssl_loader'
+require_relative '../../puppet/ssl'
+require_relative '../../puppet/ssl/digest'
 
 # The base class for wrapping SSL instances.
 class Puppet::SSL::Base