puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/util/profiler.rb

@@ -2,7 +2,7 @@ require 'benchmark'
 
 # A simple profiling callback system.
 #
-# @api private
+# @api public
 module Puppet::Util::Profiler
   require 'puppet/util/profiler/wall_clock'
   require 'puppet/util/profiler/object_counts'
@@ -11,22 +11,34 @@ module Puppet::Util::Profiler
   NONE = Puppet::Util::Profiler::None.new
 
   # Reset the profiling system to the original state
+  #
+  # @api private
   def self.clear
     @profiler = nil
   end
 
   # @return This thread's configured profiler
+  # @api private
   def self.current
     @profiler || NONE
   end
 
   # @param profiler [#profile] A profiler for the current thread
+  # @api private
   def self.current=(profiler)
     @profiler = profiler
   end
 
+  # Profile a block of code and log the time it took to execute.
+  #
+  # This outputs logs entries to the Puppet masters logging destination
+  # providing the time it took, a message describing the profiled code
+  # and a leaf location marking where the profile method was called
+  # in the profiled hierachy.
+  #
   # @param message [String] A description of the profiled event
   # @param block [Block] The segment of code to profile
+  # @api public
   def self.profile(message, &block)
     current.profile(message, &block)
   end

data/lib/puppet/util/pson.rb

@@ -8,6 +8,6 @@
 module Puppet::Util::Pson
   def pson_create(pson)
     raise ArgumentError, "No data provided in pson data" unless pson['data']
-    from_pson(pson['data'])
+    from_data_hash(pson['data'])
   end
 end

data/lib/puppet/util/queue/stomp.rb

@@ -17,7 +17,7 @@ class Puppet::Util::Queue::Stomp
     begin
       uri = URI.parse(Puppet[:queue_source])
     rescue => detail
-      raise ArgumentError, "Could not create Stomp client instance - queue source #{Puppet[:queue_source]} is invalid: #{detail}"
+      raise ArgumentError, "Could not create Stomp client instance - queue source #{Puppet[:queue_source]} is invalid: #{detail}", detail.backtrace
     end
     unless uri.scheme == "stomp"
       raise ArgumentError, "Could not create Stomp client instance - queue source #{Puppet[:queue_source]} is not a Stomp URL: #{detail}"
@@ -26,7 +26,7 @@ class Puppet::Util::Queue::Stomp
     begin
       self.stomp_client = Stomp::Client.new(uri.user, uri.password, uri.host, uri.port, true)
     rescue => detail
-      raise ArgumentError, "Could not create Stomp client instance with queue source #{Puppet[:queue_source]}: got internal Stomp client error #{detail}"
+      raise ArgumentError, "Could not create Stomp client instance with queue source #{Puppet[:queue_source]}: got internal Stomp client error #{detail}", detail.backtrace
     end
 
     # Identify the supported method for sending messages.

data/lib/puppet/util/rdoc.rb

@@ -47,7 +47,7 @@ module Puppet::Util::RDoc
   def manifestdoc(files)
     Puppet[:ignoreimport] = true
     files.select { |f| FileTest.file?(f) }.each do |f|
-      parser = Puppet::Parser::Parser.new(Puppet::Node::Environment.new(Puppet[:environment]))
+      parser = Puppet::Parser::Parser.new(Puppet.lookup(:environments).get(Puppet[:environment]))
       parser.file = f
       ast = parser.parse
       output(f, ast)

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -246,7 +246,7 @@ module Generators
     end
 
     def gen_composite_index(collection, template, filename)\
-      return if Puppet::FileSystem::File.exist?(filename)
+      return if Puppet::FileSystem.exist?(filename)
 
       template = TemplatePage.new(RDoc::Page::FR_INDEX_BODY, template)
       res1 = []

data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -24,20 +24,20 @@ module RDoc::PuppetParserCore
 
   # main entry point
   def scan
-    environment = Puppet::Node::Environment.new
-    @known_resource_types = environment.known_resource_types
-    unless environment.known_resource_types.watching_file?(@input_file_name)
+    environment = Puppet.lookup(:environments).get(Puppet[:environment])
+    known_resource_types = environment.known_resource_types
+    unless known_resource_types.watching_file?(@input_file_name)
       Puppet.info "rdoc: scanning #{@input_file_name}"
       if @input_file_name =~ /\.pp$/
         @parser = Puppet::Parser::Parser.new(environment)
         @parser.file = @input_file_name
         @parser.parse.instantiate('').each do |type|
-          @known_resource_types.add type
+          known_resource_types.add type
         end
       end
     end
 
-    scan_top_level(@top_level)
+    scan_top_level(@top_level, environment)
     @top_level
   end
 
@@ -76,7 +76,7 @@ module RDoc::PuppetParserCore
   # if it does, it returns the module name, otherwise if we are sure
   # it is part of the global manifest path, "__site__" is returned.
   # And finally if this path couldn't be mapped anywhere, nil is returned.
-  def split_module(path)
+  def split_module(path, environment)
     # find a module
     fullpath = File.expand_path(path)
     Puppet.debug "rdoc: testing #{fullpath}"
@@ -84,7 +84,7 @@ module RDoc::PuppetParserCore
       modpath = $1
       name = $2
       Puppet.debug "rdoc: module #{name} into #{modpath} ?"
-      Puppet::Node::Environment.new.modulepath.each do |mp|
+      environment.modulepath.each do |mp|
         if File.identical?(modpath,mp)
           Puppet.debug "rdoc: found module #{name}"
           return name
@@ -95,7 +95,7 @@ module RDoc::PuppetParserCore
       # there can be paths we don't want to scan under modules
       # imagine a ruby or manifest that would be distributed as part as a module
       # but we don't want those to be hosted under <site>
-      Puppet::Node::Environment.new.modulepath.each do |mp|
+      environment.modulepath.each do |mp|
         # check that fullpath is a descendant of mp
         dirname = fullpath
         previous = dirname
@@ -111,7 +111,7 @@ module RDoc::PuppetParserCore
   end
 
   # create documentation for the top level +container+
-  def scan_top_level(container)
+  def scan_top_level(container, environment)
     # use the module README as documentation for the module
     comment = ""
     %w{README README.rdoc}.each do |rfile|
@@ -121,7 +121,7 @@ module RDoc::PuppetParserCore
     look_for_directives_in(container, comment) unless comment.empty?
 
     # infer module name from directory
-    name = split_module(@input_file_name)
+    name = split_module(@input_file_name, environment)
     if name.nil?
       # skip .pp files that are not in manifests directories as we can't guarantee they're part
       # of a module or the global configuration.
@@ -140,7 +140,7 @@ module RDoc::PuppetParserCore
     mod.add_comment(comment, @input_file_name)
 
     if @input_file_name =~ /\.pp$/
-      parse_elements(mod)
+      parse_elements(mod, environment.known_resource_types)
     elsif @input_file_name =~ /\.rb$/
       parse_plugins(mod)
     end
@@ -218,7 +218,7 @@ module RDoc::PuppetParserCore
             container.add_resource(RDoc::PuppetResource.new(type, title, stmt.doc, param))
           end
         rescue => detail
-          raise Puppet::ParseError, "impossible to parse resource in #{stmt.file} at line #{stmt.line}: #{detail}"
+          raise Puppet::ParseError, "impossible to parse resource in #{stmt.file} at line #{stmt.line}: #{detail}", detail.backtrace
         end
       end
     end
@@ -252,7 +252,7 @@ module RDoc::PuppetParserCore
 
     cls.add_comment(comment, klass.file)
   rescue => detail
-    raise Puppet::ParseError, "impossible to parse class '#{name}' in #{klass.file} at line #{klass.line}: #{detail}"
+    raise Puppet::ParseError, "impossible to parse class '#{name}' in #{klass.file} at line #{klass.line}: #{detail}", detail.backtrace
   end
 
   # create documentation for a node
@@ -277,7 +277,7 @@ module RDoc::PuppetParserCore
 
     n.add_comment(comment, node.file)
   rescue => detail
-    raise Puppet::ParseError, "impossible to parse node '#{name}' in #{node.file} at line #{node.line}: #{detail}"
+    raise Puppet::ParseError, "impossible to parse node '#{name}' in #{node.file} at line #{node.line}: #{detail}", detail.backtrace
   end
 
   # create documentation for a define
@@ -318,15 +318,15 @@ module RDoc::PuppetParserCore
     meth.document_self = true
     meth.singleton = false
   rescue => detail
-    raise Puppet::ParseError, "impossible to parse definition '#{name}' in #{define.file} at line #{define.line}: #{detail}"
+    raise Puppet::ParseError, "impossible to parse definition '#{name}' in #{define.file} at line #{define.line}: #{detail}", detail.backtrace
   end
 
   # Traverse the AST tree and produce code-objects node
   # that contains the documentation
-  def parse_elements(container)
+  def parse_elements(container, known_resource_types)
     Puppet.debug "rdoc: scanning manifest"
 
-    @known_resource_types.hostclasses.values.sort { |a,b| a.name <=> b.name }.each do |klass|
+    known_resource_types.hostclasses.values.sort { |a,b| a.name <=> b.name }.each do |klass|
       name = klass.name
       if klass.file == @input_file_name
         unless name.empty?
@@ -339,13 +339,13 @@ module RDoc::PuppetParserCore
       end
     end
 
-    @known_resource_types.definitions.each do |name, define|
+    known_resource_types.definitions.each do |name, define|
       if define.file == @input_file_name
         document_define(name,define,container)
       end
     end
 
-    @known_resource_types.nodes.each do |name, node|
+    known_resource_types.nodes.each do |name, node|
       if node.file == @input_file_name
         document_node(name.to_s,node,container)
       end

data/lib/puppet/util/reference.rb

@@ -46,7 +46,7 @@ class Puppet::Util::Reference
     # There used to be an attempt to use secure_open / replace_file to secure
     # the target, too, but that did nothing: the race was still here.  We can
     # get exactly the same benefit from running this effort:
-    Puppet::FileSystem::File.unlink('/tmp/puppetdoc.tex') rescue nil
+    Puppet::FileSystem.unlink('/tmp/puppetdoc.tex') rescue nil
     output = %x{#{cmd}}
     unless $CHILD_STATUS == 0
       $stderr.puts "rst2latex failed"

data/lib/puppet/util/resource_template.rb

@@ -44,7 +44,7 @@ class Puppet::Util::ResourceTemplate
   end
 
   def initialize(file, resource)
-    raise ArgumentError, "Template #{file} does not exist" unless Puppet::FileSystem::File.exist?(file)
+    raise ArgumentError, "Template #{file} does not exist" unless Puppet::FileSystem.exist?(file)
     @file = file
     @resource = resource
   end

data/lib/puppet/util/retryaction.rb

@@ -23,7 +23,7 @@ module Puppet::Util::RetryAction
       # catch the excptions we care about and retry.
       # All others fail hard
 
-      raise RetryException::RetriesExceeded if parameters[:retries] == 0
+      raise RetryException::RetriesExceeded, "#{parameters[:retries]} exceeded", e.backtrace if parameters[:retries] == 0
 
       if (not parameters[:retry_exceptions].keys.empty?) and parameters[:retry_exceptions].keys.include?(e.class)
         Puppet.info("Caught exception #{e.class}:#{e}")

data/lib/puppet/util/selinux.rb

@@ -148,7 +148,7 @@ module Puppet::Util::SELinux
   def selinux_label_support?(file)
     fstype = find_fs(file)
     return false if fstype.nil?
-    filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs']
+    filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs', 'btrfs']
     filesystems.include?(fstype)
   end
 
@@ -216,7 +216,7 @@ module Puppet::Util::SELinux
   #
   # @return [File::Stat] File.lstat result
   def file_lstat(path)
-    Puppet::FileSystem::File.new(path).lstat
+    Puppet::FileSystem.lstat(path)
   end
   private :file_lstat
 end

data/lib/puppet/util/storage.rb

@@ -45,7 +45,7 @@ class Puppet::Util::Storage
     Puppet.settings.use(:main) unless FileTest.directory?(Puppet[:statedir])
     filename = Puppet[:statefile]
 
-    unless Puppet::FileSystem::File.exist?(filename)
+    unless Puppet::FileSystem.exist?(filename)
       self.init if @@state.nil?
       return
     end
@@ -62,7 +62,7 @@ class Puppet::Util::Storage
         begin
           File.rename(filename, filename + ".bad")
         rescue
-          raise Puppet::Error, "Could not rename corrupt #{filename}; remove manually"
+          raise Puppet::Error, "Could not rename corrupt #{filename}; remove manually", detail.backtrace
         end
       end
     end
@@ -80,7 +80,7 @@ class Puppet::Util::Storage
   def self.store
     Puppet.debug "Storing state"
 
-    Puppet.info "Creating state file #{Puppet[:statefile]}" unless Puppet::FileSystem::File.exist?(Puppet[:statefile])
+    Puppet.info "Creating state file #{Puppet[:statefile]}" unless Puppet::FileSystem.exist?(Puppet[:statefile])
 
     Puppet::Util.benchmark(:debug, "Stored state") do
       Puppet::Util::Yaml.dump(@@state, Puppet[:statefile])

data/lib/puppet/util/symbolic_file_mode.rb

@@ -128,7 +128,7 @@ module SymbolicFileMode
           rest = ''
         end
 
-        raise Puppet::Error, "#{e}#{rest} in symbolic mode #{modification.inspect}"
+        raise Puppet::Error, "#{e}#{rest} in symbolic mode #{modification.inspect}", e.backtrace
       end
     end
 

data/lib/puppet/util/tag_set.rb

@@ -1,6 +1,9 @@
 require 'set'
+require 'puppet/network/format_support'
 
 class Puppet::Util::TagSet < Set
+  include Puppet::Network::FormatSupport
+
   def self.from_yaml(yaml)
     self.new(YAML.load(yaml))
   end
@@ -9,18 +12,27 @@ class Puppet::Util::TagSet < Set
     @hash.keys.to_yaml
   end
 
-  def self.from_pson(data)
+  def self.from_data_hash(data)
     self.new(data)
   end
 
+  def self.from_pson(data)
+    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
+    self.from_data_hash(data)
+  end
+
+  def to_data_hash
+    to_a
+  end
+
   def to_pson(*args)
-    to_a.to_pson
+    to_data_hash.to_pson
   end
 
   # this makes puppet serialize it as an array for backwards
   # compatibility
   def to_zaml(z)
-    to_a.to_zaml(z)
+    to_data_hash.to_zaml(z)
   end
 
   def join(*args)

data/lib/puppet/util/tagging.rb

@@ -1,20 +1,24 @@
 require 'puppet/util/tag_set'
 
 module Puppet::Util::Tagging
+  ValidTagRegex = /^\w[-\w:.]*$/
+
   # Add a tag to our current list.  These tags will be added to all
   # of the objects contained in this scope.
   def tag(*ary)
     @tags ||= new_tags
 
-    qualified = []
-
-    ary.collect { |tag| tag.to_s.downcase }.each do |tag|
-      fail(Puppet::ParseError, "Invalid tag #{tag.inspect}") unless valid_tag?(tag)
-      qualified << tag if tag.include?("::")
-      @tags << tag unless @tags.include?(tag)
+    ary.each do |tag|
+      name = tag.to_s.downcase
+      if name =~ ValidTagRegex
+        @tags << name
+        name.split("::").each do |section|
+          @tags << section
+        end
+      else
+        fail(Puppet::ParseError, "Invalid tag #{name}")
+      end
     end
-
-    handle_qualified_tags( qualified )
   end
 
   # Are we tagged with the provided tag?
@@ -41,15 +45,6 @@ module Puppet::Util::Tagging
 
   private
 
-  def handle_qualified_tags(qualified)
-    qualified.each do |name|
-      name.split("::").each do |tag|
-        @tags << tag unless @tags.include?(tag)
-      end
-    end
-  end
-
-  ValidTagRegex = /^\w[-\w:.]*$/
   def valid_tag?(tag)
     tag.is_a?(String) and tag =~ ValidTagRegex
   end

data/lib/puppet/util/watched_file.rb

@@ -26,7 +26,7 @@ class Puppet::Util::WatchedFile
   end
 
   # Allow this to be used as the name of the file being watched in various
-  # other methods (such as Puppet::FileSystem::File.exist?)
+  # other methods (such as Puppet::FileSystem.exist?)
   def to_str
     @filename
   end

data/lib/puppet/util/watcher.rb

@@ -7,7 +7,7 @@ module Puppet::Util::Watcher
     def self.file_ctime_change_watcher(filename)
       Puppet::Util::Watcher::ChangeWatcher.watch(lambda do
         begin
-          Puppet::FileSystem::File.new(filename).stat.ctime
+          Puppet::FileSystem.stat(filename).ctime
         rescue Errno::ENOENT, Errno::ENOTDIR
           :absent
         end

data/lib/puppet/util/windows/error.rb

@@ -7,8 +7,8 @@ class Puppet::Util::Windows::Error < Puppet::Error
 
   attr_reader :code
 
-  def initialize(message, code = GetLastError.call)
-    super(message + ":  #{get_last_error(code)}")
+  def initialize(message, code = GetLastError.call, original = nil)
+    super(message + ":  #{get_last_error(code)}", original)
 
     @code = code
   end

data/lib/puppet/util/windows/file.rb

@@ -171,8 +171,9 @@ module Puppet::Util::Windows::File
 
     return out_buffer if result
     raise Puppet::Util::Windows::Error.new(
-      "DeviceIoControl(#{handle}, #{io_control_code}, #{in_buffer}, #{in_buffer.size}, " +
-      "#{out_buffer}, #{out_buffer.size}")
+      "DeviceIoControl(#{handle}, #{io_control_code}, " +
+      "#{in_buffer}, #{in_buffer ? in_buffer.size : ''}, " +
+      "#{out_buffer}, #{out_buffer ? out_buffer.size : ''}")
   end
 
   FILE_ATTRIBUTE_REPARSE_POINT = 0x400
@@ -218,14 +219,23 @@ module Puppet::Util::Windows::File
   def stat(file_name)
     file_name = file_name.to_s # accomodate PathName or String
     stat = File.stat(file_name)
+    singleton_class = class << stat; self; end
+    target_path = file_name
+
     if symlink?(file_name)
-      link_ftype = File.stat(readlink(file_name)).ftype
+      target_path = readlink(file_name)
+      link_ftype = File.stat(target_path).ftype
+
       # sigh, monkey patch instance method for instance, and close over link_ftype
-      singleton_class = class << stat; self; end
       singleton_class.send(:define_method, :ftype) do
         link_ftype
       end
     end
+
+    singleton_class.send(:define_method, :mode) do
+      Puppet::Util::Windows::Security.get_mode(target_path)
+    end
+
     stat
   end
   module_function :stat
@@ -234,6 +244,12 @@ module Puppet::Util::Windows::File
     file_name = file_name.to_s # accomodate PathName or String
     # monkey'ing around!
     stat = File.lstat(file_name)
+
+    singleton_class = class << stat; self; end
+    singleton_class.send(:define_method, :mode) do
+      Puppet::Util::Windows::Security.get_mode(file_name)
+    end
+
     if symlink?(file_name)
       def stat.ftype
         "link"