puppet 3.3.2 → 3.4.0.rc1

data/lib/puppet/resource/status.rb

@@ -1,10 +1,12 @@
 require 'time'
+require 'puppet/network/format_support'
 
 module Puppet
   class Resource
     class Status
       include Puppet::Util::Tagging
       include Puppet::Util::Logging
+      include Puppet::Network::FormatSupport
 
       attr_accessor :resource, :node, :file, :line, :current_values, :status, :evaluation_time
 
@@ -65,7 +67,7 @@ module Puppet
         # will always be accompanied by an event with some explanatory power.  This
         # is useful for reporting/diagnostics/etc.  So synthesize an event here
         # with the exception detail as the message.
-        add_event(@real_resource.event(:status => "failure", :message => detail.to_s))
+        add_event(@real_resource.event(:name => :resource_error, :status => "failure", :message => detail.to_s))
       end
 
       def initialize(resource)
@@ -100,7 +102,7 @@ module Puppet
         @evaluation_time = data['evaluation_time']
         @change_count = data['change_count']
         @out_of_sync_count = data['out_of_sync_count']
-        @tags = data['tags']
+        @tags = Puppet::Util::TagSet.new(data['tags'])
         @time = data['time']
         @time = Time.parse(@time) if @time.is_a? String
         @out_of_sync = data['out_of_sync']
@@ -113,7 +115,7 @@ module Puppet
         end
       end
 
-      def to_pson
+      def to_data_hash
         {
           'title' => @title,
           'file' => @file,
@@ -131,7 +133,11 @@ module Puppet
           'change_count' => @change_count,
           'out_of_sync_count' => @out_of_sync_count,
           'events' => @events,
-        }.to_pson
+        }
+      end
+
+      def to_pson(*args)
+        to_data_hash.to_pson(*args)
       end
 
       def to_yaml_properties

data/lib/puppet/run.rb

@@ -94,11 +94,15 @@ class Puppet::Run
     new(options)
   end
 
-  def to_pson
+  def to_data_hash
     {
       :options => @options,
       :background => @background,
       :status => @status
-    }.to_pson
+    }
+  end
+
+  def to_pson(*args)
+    to_data_hash.to_pson(*args)
   end
 end

data/lib/puppet/settings.rb

@@ -1,5 +1,4 @@
 require 'puppet'
-require 'sync'
 require 'getoptlong'
 require 'puppet/util/watched_file'
 require 'puppet/util/command_line/puppet_option_parser'
@@ -18,6 +17,7 @@ class Puppet::Settings
   require 'puppet/settings/boolean_setting'
   require 'puppet/settings/terminus_setting'
   require 'puppet/settings/duration_setting'
+  require 'puppet/settings/priority_setting'
   require 'puppet/settings/config_file'
   require 'puppet/settings/value_translator'
 
@@ -74,9 +74,6 @@ class Puppet::Settings
     @created = []
     @searchpath = nil
 
-    # Mutex-like thing to protect @values
-    @sync = Sync.new
-
     # Keep track of set values.
     @values = Hash.new { |hash, key| hash[key] = {} }
 
@@ -95,6 +92,12 @@ class Puppet::Settings
     @config_file_parser = Puppet::Settings::ConfigFile.new(@translate)
   end
 
+  # @param name [Symbol] The name of the setting to fetch
+  # @return [Puppet::Settings::BaseSetting] The setting object
+  def setting(name)
+    @config[name]
+  end
+
   # Retrieve a config value
   def [](param)
     value(param)
@@ -135,9 +138,7 @@ class Puppet::Settings
 
   # Remove all set values, potentially skipping cli values.
   def clear
-    @sync.synchronize do
-      unsafe_clear
-    end
+    unsafe_clear
   end
 
   # Remove all set values, potentially skipping cli values.
@@ -170,9 +171,7 @@ class Puppet::Settings
   # this method must be called to clear out the caches so that updated
   # objects will be returned.
   def flush_cache
-    @sync.synchronize do
-      unsafe_flush_cache
-    end
+    unsafe_flush_cache
   end
 
   def unsafe_flush_cache
@@ -507,9 +506,7 @@ class Puppet::Settings
 
   # Parse the configuration file.  Just provides thread safety.
   def parse_config_files
-    @sync.synchronize do
-      unsafe_parse(which_configuration_file)
-    end
+    unsafe_parse(which_configuration_file)
 
     call_hooks_deferred_to_application_initialization :ignore_interpolation_dependency_errors => true
   end
@@ -552,7 +549,7 @@ class Puppet::Settings
   def unsafe_parse(file)
     # build up a single data structure that contains the values from all of the parsed files.
     data = {}
-    if FileTest.exist?(file)
+    if Puppet::FileSystem::File.exist?(file)
       begin
         file_data = parse_file(file)
 
@@ -636,6 +633,7 @@ class Puppet::Settings
       :terminus   => TerminusSetting,
       :duration   => DurationSetting,
       :enum       => EnumSetting,
+      :priority   => PrioritySetting,
   }
 
   # Create a new setting.  The value is passed in because it's used to determine
@@ -692,7 +690,7 @@ class Puppet::Settings
     return @files if @files
     @files = []
     [main_config_file, user_config_file].each do |path|
-      if FileTest.exist?(path)
+      if Puppet::FileSystem::File.exist?(path)
         @files << Puppet::Util::WatchedFile.new(path)
       end
     end
@@ -713,11 +711,9 @@ class Puppet::Settings
 
   def reuse
     return unless defined?(@used)
-    @sync.synchronize do # yay, thread-safe
-      new = @used
-      @used = []
-      self.use(*new)
-    end
+    new = @used
+    @used = []
+    self.use(*new)
   end
 
   # The order in which to search for values.
@@ -788,12 +784,8 @@ class Puppet::Settings
 
     setting.handle(value) if setting.has_hook? and not options[:dont_trigger_handles]
 
-    @sync.synchronize do # yay, thread-safe
-
-      @values[type][param] = value
-      unsafe_flush_cache
-
-    end
+    @values[type][param] = value
+    unsafe_flush_cache
 
     value
   end
@@ -927,29 +919,27 @@ Generated on #{Time.now}.
   # you can 'use' a section as many times as you want.
   def use(*sections)
     sections = sections.collect { |s| s.to_sym }
-    @sync.synchronize do # yay, thread-safe
-      sections = sections.reject { |s| @used.include?(s) }
+    sections = sections.reject { |s| @used.include?(s) }
 
-      return if sections.empty?
+    return if sections.empty?
 
-      begin
-        catalog = to_catalog(*sections).to_ral
-      rescue => detail
-        Puppet.log_and_raise(detail, "Could not create resources for managing Puppet's files and directories in sections #{sections.inspect}: #{detail}")
-      end
+    begin
+      catalog = to_catalog(*sections).to_ral
+    rescue => detail
+      Puppet.log_and_raise(detail, "Could not create resources for managing Puppet's files and directories in sections #{sections.inspect}: #{detail}")
+    end
 
-      catalog.host_config = false
-      catalog.apply do |transaction|
-        if transaction.any_failed?
-          report = transaction.report
-          failures = report.logs.find_all { |log| log.level == :err }
-          raise "Got #{failures.length} failure(s) while initializing: #{failures.collect { |l| l.to_s }.join("; ")}"
-        end
+    catalog.host_config = false
+    catalog.apply do |transaction|
+      if transaction.any_failed?
+        report = transaction.report
+        failures = report.logs.find_all { |log| log.level == :err }
+        raise "Got #{failures.length} failure(s) while initializing: #{failures.collect { |l| l.to_s }.join("; ")}"
       end
-
-      sections.each { |s| @used << s }
-      @used.uniq!
     end
+
+    sections.each { |s| @used << s }
+    @used.uniq!
   end
 
   def valid?(param)
@@ -974,9 +964,7 @@ Generated on #{Time.now}.
       each_source(environment) do |source|
         # Look for the value.  We have to test the hash for whether
         # it exists, because the value might be false.
-        @sync.synchronize do
-          return @values[source][param] if @values[source].include?(param)
-        end
+        return @values[source][param] if @values[source].include?(param)
       end
       return nil
   end
@@ -1033,70 +1021,6 @@ Generated on #{Time.now}.
     val
   end
 
-  # Open a file with the appropriate user, group, and mode
-  def write(default, *args, &bloc)
-    obj = get_config_file_default(default)
-    writesub(default, value(obj.name), *args, &bloc)
-  end
-
-  # Open a non-default file under a default dir with the appropriate user,
-  # group, and mode
-  def writesub(default, file, *args, &bloc)
-    obj = get_config_file_default(default)
-    chown = nil
-    if Puppet.features.root?
-      chown = [obj.owner, obj.group]
-    else
-      chown = [nil, nil]
-    end
-
-    Puppet::Util::SUIDManager.asuser(*chown) do
-      mode = obj.mode ? obj.mode.to_i : 0640
-      args << "w" if args.empty?
-
-      args << mode
-
-      # Update the umask to make non-executable files
-      Puppet::Util.withumask(File.umask ^ 0111) do
-        File.open(file, *args) do |file|
-          yield file
-        end
-      end
-    end
-  end
-
-  def readwritelock(default, *args, &bloc)
-    file = value(get_config_file_default(default).name)
-    tmpfile = file + ".tmp"
-    sync = Sync.new
-    raise Puppet::DevError, "Cannot create #{file}; directory #{File.dirname(file)} does not exist" unless FileTest.directory?(File.dirname(tmpfile))
-
-    sync.synchronize(Sync::EX) do
-      File.open(file, ::File::CREAT|::File::RDWR, 0600) do |rf|
-        rf.lock_exclusive do
-          if File.exist?(tmpfile)
-            raise Puppet::Error, ".tmp file already exists for #{file}; Aborting locked write. Check the .tmp file and delete if appropriate"
-          end
-
-          # If there's a failure, remove our tmpfile
-          begin
-            writesub(default, tmpfile, *args, &bloc)
-          rescue
-            File.unlink(tmpfile) if FileTest.exist?(tmpfile)
-            raise
-          end
-
-          begin
-            File.rename(tmpfile, file)
-          rescue => detail
-            Puppet.err "Could not rename #{file} to #{tmpfile}: #{detail}"
-            File.unlink(tmpfile) if FileTest.exist?(tmpfile)
-          end
-        end
-      end
-    end
-  end
-
   private
 
   def get_config_file_default(default)
@@ -1166,9 +1090,7 @@ Generated on #{Time.now}.
   def set_metadata(meta)
     meta.each do |var, values|
       values.each do |param, value|
-        @sync.synchronize do # yay, thread-safe
-          @config[var].send(param.to_s + "=", value)
-        end
+        @config[var].send(param.to_s + "=", value)
       end
     end
   end
@@ -1177,11 +1099,9 @@ Generated on #{Time.now}.
   #
   # @return nil
   def clear_everything_for_tests()
-    @sync.synchronize do
-      unsafe_clear(true, true)
-      @global_defaults_initialized = false
-      @app_defaults_initialized = false
-    end
+    unsafe_clear(true, true)
+    @global_defaults_initialized = false
+    @app_defaults_initialized = false
   end
   private :clear_everything_for_tests
 

data/lib/puppet/settings/base_setting.rb

@@ -2,17 +2,13 @@ require 'puppet/settings/errors'
 
 # The base setting type
 class Puppet::Settings::BaseSetting
-  attr_accessor :name, :section, :default, :call_on_define, :call_hook
-  attr_reader :desc, :short
+  attr_accessor :name, :desc, :section, :default, :call_on_define, :call_hook
+  attr_reader :short
 
   def self.available_call_hook_values
     [:on_define_and_write, :on_initialize_and_write, :on_write_only]
   end
 
-  def desc=(value)
-    @desc = value.gsub(/^\s*/, '')
-  end
-
   def call_on_define
     Puppet.deprecation_warning "call_on_define has been deprecated.  Please use call_hook_on_define?"
     call_hook_on_define?
@@ -130,10 +126,12 @@ class Puppet::Settings::BaseSetting
 
   # Convert the object to a config statement.
   def to_config
-    str = @desc.gsub(/^/, "# ") + "\n"
+    require 'puppet/util/docs'
+    # Scrub any funky indentation; comment out description.
+    str = Puppet::Util::Docs.scrub(@desc).gsub(/^/, "# ") + "\n"
 
     # Add in a statement about the default.
-    str += "# The default value is '#{default(true)}'.\n" if default(true)
+    str << "# The default value is '#{default(true)}'.\n" if default(true)
 
     # If the value has not been overridden, then print it out commented
     # and unconverted, so it's clear that that's the default and how it
@@ -146,8 +144,9 @@ class Puppet::Settings::BaseSetting
       line = "# #{@name} = #{@default}"
     end
 
-    str += line + "\n"
+    str << (line + "\n")
 
+    # Indent
     str.gsub(/^/, "    ")
   end
 

data/lib/puppet/settings/directory_setting.rb

@@ -2,4 +2,12 @@ class Puppet::Settings::DirectorySetting < Puppet::Settings::FileSetting
   def type
     :directory
   end
+
+  # @api private
+  def open_file(filename, option = 'r', &block)
+    file = Puppet::FileSystem::File.new(filename)
+    controlled_access do |mode|
+      file.open(mode, option, &block)
+    end
+  end
 end

data/lib/puppet/settings/file_setting.rb

@@ -128,7 +128,7 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     # Make sure the paths are fully qualified.
     path = File.expand_path(path)
 
-    return nil unless type == :directory or create_files? or File.exist?(path)
+    return nil unless type == :directory or create_files? or Puppet::FileSystem::File.exist?(path)
     return nil if path =~ /^\/dev/ or path =~ /^[A-Z]:\/dev/i
 
     resource = Puppet::Resource.new(:file, path)
@@ -178,8 +178,42 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     }
   end
 
+  # @api private
+  def exclusive_open(option = 'r', &block)
+    controlled_access do |mode|
+      file.exclusive_open(mode, option, &block)
+    end
+  end
+
+  # @api private
+  def open(option = 'r', &block)
+    controlled_access do |mode|
+      file.open(mode, option, &block)
+    end
+  end
+
 private
+  def file
+    Puppet::FileSystem::File.new(value)
+  end
+
   def unknown_value(parameter, value)
     raise SettingError, "The #{parameter} parameter for the setting '#{name}' must be either 'root' or 'service', not '#{value}'"
   end
+
+  def controlled_access(&block)
+    chown = nil
+    if Puppet.features.root?
+      chown = [owner, group]
+    else
+      chown = [nil, nil]
+    end
+
+    Puppet::Util::SUIDManager.asuser(*chown) do
+      # Update the umask to make non-executable files
+      Puppet::Util.withumask(File.umask ^ 0111) do
+        yield mode ? mode.to_i : 0640
+      end
+    end
+  end
 end