puppet 3.3.2 → 3.4.0.rc1

data/lib/puppet/indirector/request.rb

@@ -37,16 +37,12 @@ class Puppet::Indirector::Request
     request
   end
 
-  def to_pson(*args)
+  def to_data_hash
     result = {
-      'document_type' => 'IndirectorRequest',
-      'data' => {
-        'type' => indirection_name,
-        'method' => method,
-        'key' => key
-      }
+      'type' => indirection_name,
+      'method' => method,
+      'key' => key
     }
-    data = result['data']
     attributes = {}
     OPTION_ATTRIBUTES.each do |key|
       next unless value = send(key)
@@ -57,10 +53,20 @@ class Puppet::Indirector::Request
       attributes[opt] = value
     end
 
-    data['attributes'] = attributes unless attributes.empty?
-    data['instance'] = instance if instance
+    result['attributes'] = attributes unless attributes.empty?
+    result['instance'] = instance if instance
+    result
+  end
 
-    result.to_pson(*args)
+  def to_pson_data_hash
+    {
+      'document_type' => 'IndirectorRequest',
+      'data' => to_data_hash,
+    }
+  end
+
+  def to_pson(*args)
+    to_pson_data_hash.to_pson(*args)
   end
 
   # Is this an authenticated request?

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

@@ -5,6 +5,11 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
 
   desc "Manipulate resources with the resource abstraction layer. Only used internally."
 
+  def allow_remote_requests?
+    Puppet.deprecation_warning("Accessing resources on the network is deprecated. See http://links.puppetlabs.com/deprecate-networked-resource")
+    super
+  end
+
   def find( request )
     # find by name
     res   = type(request).instances.find { |o| o.name == resource_name(request) }

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

@@ -1,6 +1,7 @@
 require 'puppet/indirector/status'
 require 'puppet/indirector/rest'
 
+# @deprecated
 class Puppet::Resource::Rest < Puppet::Indirector::REST
 
   desc "Maniuplate resources remotely? Undocumented."

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

@@ -6,4 +6,8 @@ class Puppet::Resource::StoreConfigs < Puppet::Indirector::StoreConfigs
 
   desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
 
+  def allow_remote_requests?
+    Puppet.deprecation_warning("Accessing resources on the network is deprecated. See http://links.puppetlabs.com/deprecate-networked-resource")
+    super
+  end
 end

data/lib/puppet/indirector/rest.rb

@@ -55,7 +55,8 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def network(request)
-    Puppet::Network::HTTP::Connection.new(request.server || self.class.server, request.port || self.class.port)
+    Puppet::Network::HttpPool.http_instance(request.server || self.class.server,
+                                            request.port || self.class.port)
   end
 
   def http_get(request, path, headers = nil, *args)

data/lib/puppet/indirector/ssl_file.rb

@@ -70,11 +70,11 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
   # Remove our file.
   def destroy(request)
     path = path(request.key)
-    return false unless FileTest.exist?(path)
+    return false unless Puppet::FileSystem::File.exist?(path)
 
     Puppet.notice "Removing file #{model} #{request.key} at '#{path}'"
     begin
-      File.unlink(path)
+      Puppet::FileSystem::File.unlink(path)
     rescue => detail
       raise Puppet::Error, "Could not remove #{request.key}: #{detail}"
     end
@@ -135,10 +135,10 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
   # which we'll be EOL'ing at some point.  This method was added at 20080702
   # and should be removed at some point.
   def rename_files_with_uppercase(file)
-    return file if FileTest.exist?(file)
+    return file if Puppet::FileSystem::File.exist?(file)
 
     dir, short = File.split(file)
-    return nil unless FileTest.exist?(dir)
+    return nil unless Puppet::FileSystem::File.exist?(dir)
 
     raise ArgumentError, "Tried to fix SSL files to a file containing uppercase" unless short.downcase == short
     real_file = Dir.entries(dir).reject { |f| f =~ /^\./ }.find do |other|
@@ -159,12 +159,12 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
   # the work or opening a filehandle manually.
   def write(name, path)
     if ca?(name) and ca_location
-      Puppet.settings.write(self.class.ca_setting) { |f| yield f }
+      Puppet.settings.setting(self.class.ca_setting).open('w') { |f| yield f }
     elsif file_location
-      Puppet.settings.write(self.class.file_setting) { |f| yield f }
+      Puppet.settings.setting(self.class.file_setting).open('w') { |f| yield f }
     elsif setting = self.class.directory_setting
       begin
-        Puppet.settings.writesub(setting, path) { |f| yield f }
+        Puppet.settings.setting(setting).open_file(path, 'w') { |f| yield f }
       rescue => detail
         raise Puppet::Error, "Could not write #{path} to #{setting}: #{detail}"
       end

data/lib/puppet/indirector/terminus.rb

@@ -140,6 +140,10 @@ class Puppet::Indirector::Terminus
     self.class.name
   end
 
+  def allow_remote_requests?
+    true
+  end
+
   def terminus_type
     self.class.terminus_type
   end

data/lib/puppet/indirector/yaml.rb

@@ -6,7 +6,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
   # Read a given name's file in and convert it from YAML.
   def find(request)
     file = path(request.key)
-    return nil unless FileTest.exist?(file)
+    return nil unless Puppet::FileSystem::File.exist?(file)
 
     begin
       return Puppet::Util::Yaml.load_file(file)
@@ -24,7 +24,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     basedir = File.dirname(file)
 
     # This is quite likely a bad idea, since we're not managing ownership or modes.
-    Dir.mkdir(basedir) unless FileTest.exist?(basedir)
+    Dir.mkdir(basedir) unless Puppet::FileSystem::File.exist?(basedir)
 
     begin
       Puppet::Util::Yaml.dump(request.instance, file)
@@ -46,7 +46,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
 
   def destroy(request)
     file_path = path(request.key)
-    File.unlink(file_path) if File.exists?(file_path)
+    Puppet::FileSystem::File.unlink(file_path) if Puppet::FileSystem::File.exist?(file_path)
   end
 
   def search(request)

data/lib/puppet/interface/documentation.rb

@@ -1,19 +1,12 @@
 class Puppet::Interface
   # @api private
   module DocGen
+    require 'puppet/util/docs'
+
     # @api private
     def self.strip_whitespace(text)
-      text.gsub!(/[ \t\f]+$/, '')
-
-      # We need to identify an indent: the minimum number of whitespace
-      # characters at the start of any line in the text.
-      indent = text.split(/\n/).map {|x| x.index(/[^\s]/) }.compact.min
-
-      if indent > 0 then
-        text.gsub!(/^[ \t\f]{0,#{indent}}/, '')
-      end
-
-      return text
+      # I don't want no...
+      Puppet::Util::Docs.scrub(text)
     end
 
     # The documentation attributes all have some common behaviours; previously

data/lib/puppet/module.rb

@@ -20,6 +20,7 @@ class Puppet::Module
     "files" => "files",
     "templates" => "templates",
     "plugins" => "lib",
+    "pluginfacts" => "facts.d",
   }
 
   # Find and return the +module+ that +path+ belongs to. If +path+ is
@@ -53,10 +54,14 @@ class Puppet::Module
   def has_metadata?
     return false unless metadata_file
 
-    return false unless FileTest.exist?(metadata_file)
-
-    metadata = PSON.parse File.read(metadata_file)
+    return false unless Puppet::FileSystem::File.exist?(metadata_file)
 
+    begin
+      metadata =  PSON.parse(File.read(metadata_file))
+    rescue PSON::PSONError => e
+      Puppet.debug("#{name} has an invalid and unparsable metadata.json file.  The parse error: #{e.message}")
+      return false
+    end
 
     return metadata.is_a?(Hash) && !metadata.keys.empty?
   end
@@ -66,7 +71,7 @@ class Puppet::Module
     # we have files of a given type.
     define_method(type +'?') do
       type_subpath = subpath(location)
-      unless FileTest.exist?(type_subpath)
+      unless Puppet::FileSystem::File.exist?(type_subpath)
         Puppet.debug("No #{type} found in subpath '#{type_subpath}' " +
                          "(file / directory does not exist)")
         return false
@@ -89,7 +94,7 @@ class Puppet::Module
         full_path = subpath(location)
       end
 
-      return nil unless FileTest.exist?(full_path)
+      return nil unless Puppet::FileSystem::File.exist?(full_path)
       return full_path
     end
 
@@ -148,7 +153,7 @@ class Puppet::Module
   end
 
   def all_manifests
-    return [] unless File.exists?(manifests)
+    return [] unless Puppet::FileSystem::File.exist?(manifests)
 
     Dir.glob(File.join(manifests, '**', '*.{rb,pp}'))
   end
@@ -169,6 +174,14 @@ class Puppet::Module
     subpath("lib")
   end
 
+  def plugin_fact_directory
+    subpath("facts.d")
+  end
+
+  def has_external_facts?
+    File.directory?(plugin_fact_directory)
+  end
+
   def supports(name, version = nil)
     @supports ||= []
     @supports << [name, version]

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

@@ -60,7 +60,7 @@ module Puppet::ModuleTool
           when *Puppet::ModuleTool::ARTIFACTS
             next
           else
-            FileUtils.cp_r path, build_path
+            FileUtils.cp_r path, build_path, :preserve => true
           end
         end
       end

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

@@ -32,7 +32,7 @@ module Puppet::ModuleTool
           if is_module_package?(@name)
             @source = :filesystem
             @filename = File.expand_path(@name)
-            raise MissingPackageError, :requested_package => @filename unless File.exist?(@filename)
+            raise MissingPackageError, :requested_package => @filename unless Puppet::FileSystem::File.exist?(@filename)
 
             parsed = parse_filename(@filename)
             @module_name = parsed[:module_name]

data/lib/puppet/module_tool/checksums.rb

@@ -16,7 +16,7 @@ module Puppet::ModuleTool
 
     # Return checksum for the +Pathname+.
     def checksum(pathname)
-      return Digest::MD5.hexdigest(IO.binread(pathname))
+      return Digest::MD5.hexdigest(Puppet::FileSystem::File.new(pathname).binread)
     end
 
     # Return checksums for object's +Pathname+, generate if it's needed.

data/lib/puppet/module_tool/dependency.rb

@@ -15,12 +15,16 @@ module Puppet::ModuleTool
       @repository = repository ? Puppet::Forge::Repository.new(repository) : nil
     end
 
-    # Return PSON representation of this data.
-    def to_pson(*args)
+    def to_data_hash
       result = { :name => @full_module_name }
       result[:version_requirement] = @version_requirement if @version_requirement && ! @version_requirement.nil?
       result[:repository] = @repository.to_s if @repository && ! @repository.nil?
-      result.to_pson(*args)
+      result
+    end
+
+    # Return PSON representation of this data.
+    def to_pson(*args)
+      to_data_hash.to_pson(*args)
     end
   end
 end

data/lib/puppet/module_tool/metadata.rb

@@ -129,7 +129,7 @@ module Puppet::ModuleTool
       end
     end
 
-    def to_hash()
+    def to_data_hash()
       return extra_metadata.merge({
         'name'         => @full_module_name,
         'version'      => @version,
@@ -145,9 +145,13 @@ module Puppet::ModuleTool
       })
     end
 
+    def to_hash()
+      to_data_hash
+    end
+
     # Return the PSON record representing this instance.
     def to_pson(*args)
-      return to_hash.to_pson(*args)
+      return to_data_hash.to_pson(*args)
     end
   end
 end

data/lib/puppet/module_tool/tar.rb

@@ -4,7 +4,8 @@ module Puppet::ModuleTool::Tar
   require 'puppet/module_tool/tar/mini'
 
   def self.instance(module_name)
-    if Facter.value('osfamily') == 'Solaris' && Puppet::Util.which('gtar') && ! Puppet::Util::Platform.windows?
+    gtar_platforms = ['Solaris', 'OpenBSD']
+    if gtar_platforms.include?(Facter.value('osfamily')) && Puppet::Util.which('gtar')
       Solaris.new
     elsif Puppet::Util.which('tar') && ! Puppet::Util::Platform.windows?
       Gnu.new

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

@@ -1,8 +1,12 @@
 class Puppet::ModuleTool::Tar::Gnu
+  def initialize(command = "tar")
+    @command = command
+  end
+
   def unpack(sourcefile, destdir, owner)
-    Puppet::Util::Execution.execute("tar xzf #{sourcefile} --no-same-permissions --no-same-owner -C #{destdir}")
+    Puppet::Util::Execution.execute("#{@command} xzf #{sourcefile} --no-same-owner -C #{destdir}")
     Puppet::Util::Execution.execute("find #{destdir} -type d -exec chmod 755 {} +")
-    Puppet::Util::Execution.execute("find #{destdir} -type f -exec chmod 644 {} +")
+    Puppet::Util::Execution.execute("find #{destdir} -type f -exec chmod a-wst {} +")
     Puppet::Util::Execution.execute("chown -R #{owner} #{destdir}")
   end
 

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

@@ -7,6 +7,8 @@ class Puppet::ModuleTool::Tar::Mini
     Zlib::GzipReader.open(sourcefile) do |reader|
       Archive::Tar::Minitar.unpack(reader, destdir) do |action, name, stats|
         case action
+        when :file_done
+          File.chmod(0444, "#{destdir}/#{name}")
         when :dir, :file_start
           validate_entry(destdir, name)
           Puppet.debug("extracting #{destdir}/#{name}")

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

@@ -1,8 +1,5 @@
 class Puppet::ModuleTool::Tar::Solaris < Puppet::ModuleTool::Tar::Gnu
-  def unpack(sourcefile, destdir, owner)
-    Puppet::Util::Execution.execute("gtar xzf #{sourcefile} --no-same-permissions --no-same-owner -C #{destdir}")
-    Puppet::Util::Execution.execute("find #{destdir} -type d -exec chmod 755 {} +")
-    Puppet::Util::Execution.execute("find #{destdir} -type f -exec chmod 644 {} +")
-    Puppet::Util::Execution.execute("chown -R #{owner} #{destdir}")
+  def initialize
+    super("gtar")
   end
 end

data/lib/puppet/network/authconfig.rb

@@ -3,8 +3,6 @@ require 'puppet/network/rights'
 module Puppet
   class ConfigurationError < Puppet::Error; end
   class Network::AuthConfig
-
-    extend MonitorMixin
     attr_accessor :rights
 
     DEFAULT_ACL = [

data/lib/puppet/network/authentication.rb

@@ -14,7 +14,7 @@ module Puppet::Network::Authentication
     certs << Puppet::SSL::CertificateAuthority.instance.host.certificate if Puppet::SSL::CertificateAuthority.ca?
 
     # Always check the host cert if we have one, this will be the agent or master cert depending on the run mode
-    certs << Puppet::SSL::Host.localhost.certificate if FileTest.exist?(Puppet[:hostcert])
+    certs << Puppet::SSL::Host.localhost.certificate if Puppet::FileSystem::File.exist?(Puppet[:hostcert])
 
     # Remove nil values for caller convenience
     certs.compact.each do |cert|

data/lib/puppet/network/authstore.rb

@@ -82,21 +82,20 @@ module Puppet
     end
 
     def interpolate(match)
-      Thread.current[:declarations] = @declarations.collect { |ace| ace.interpolate(match) }.sort
+      @modified_declarations = @declarations.collect { |ace| ace.interpolate(match) }.sort
     end
 
     def reset_interpolation
-      Thread.current[:declarations] = nil
+      @modified_declarations = nil
     end
 
     private
 
-    # returns our ACEs list, but if we have a modification of it
-    # in our current thread, let's return it
-    # this is used if we want to override the this purely immutable list
-    # by a modified version in a multithread safe way.
+    # Returns our ACEs list, but if we have a modification of it, let's return
+    # it. This is used if we want to override the this purely immutable list
+    # by a modified version.
     def declarations
-      Thread.current[:declarations] || @declarations
+      @modified_declarations || @declarations
     end
 
     # Store the results of a pattern into our hash.  Basically just

data/lib/puppet/network/format.rb

@@ -1,10 +1,9 @@
-require 'puppet/provider'
-require 'puppet/provider/confiner'
+require 'puppet/confiner'
 
 # A simple class for modeling encoding formats for moving
 # instances around the network.
 class Puppet::Network::Format
-  include Puppet::Provider::Confiner
+  include Puppet::Confiner
 
   attr_reader :name, :mime
   attr_accessor :intern_method, :render_method, :intern_multiple_method, :render_multiple_method, :weight, :required_methods, :extension

data/lib/puppet/network/format_handler.rb

@@ -5,6 +5,8 @@ require 'puppet/network/format'
 module Puppet::Network::FormatHandler
   class FormatError < Puppet::Error; end
 
+  ALL_MEDIA_TYPES = '*/*'.freeze
+
   @formats = {}
 
   def self.create(*args, &block)
@@ -70,24 +72,20 @@ module Puppet::Network::FormatHandler
   #   that generally conforms to an HTTP Accept header. Any quality specifiers
   #   are ignored and instead the formats are simply in strict preference order
   #   (most preferred is first)
-  # @param supported [Array<Symbol>] the names of the supported formats (order
-  #   does not matter)
+  # @param supported [Array<Symbol>] the names of the supported formats (the
+  #   most preferred format is first)
   # @return [Puppet::Network::Format, nil] the most suitable format
   # @api private
   def self.most_suitable_format_for(accepted, supported)
     format_name = accepted.collect do |accepted|
       accepted.to_s.sub(/;q=.*$/, '')
     end.collect do |accepted|
-      begin
-        if accepted == '*/*'
-          formats
-        else
-          format_to_canonical_name(accepted)
-        end
-      rescue ArgumentError
-        nil
+      if accepted == ALL_MEDIA_TYPES
+        supported.first
+      else
+        format_to_canonical_name_or_nil(accepted)
       end
-    end.flatten.find do |accepted|
+    end.find do |accepted|
       supported.include?(accepted)
     end
 
@@ -95,6 +93,13 @@ module Puppet::Network::FormatHandler
       format_for(format_name)
     end
   end
+
+  # @api private
+  def self.format_to_canonical_name_or_nil(format)
+    format_to_canonical_name(format)
+  rescue ArgumentError
+    nil
+  end
 end
 
 require 'puppet/network/formats'