puppet 3.5.0.rc3 → 3.5.1.rc1

data/lib/puppet.rb

@@ -177,8 +177,17 @@ module Puppet
     environments = settings[:environmentpath]
     modulepath = Puppet::Node::Environment.split_path(settings[:basemodulepath])
 
-    loaders = Puppet::Environments::Directories.from_path(environments, modulepath)
-    loaders << Puppet::Environments::Legacy.new
+    if environments.empty?
+      loaders = [Puppet::Environments::Legacy.new]
+    else
+      loaders = Puppet::Environments::Directories.from_path(environments, modulepath)
+      # in case the configured environment (used for the default sometimes)
+      # doesn't exist
+      loaders << Puppet::Environments::StaticPrivate.new(
+        Puppet::Node::Environment.create(Puppet[:environment].to_sym,
+                                         [],
+                                         Puppet::Node::Environment::NO_MANIFEST))
+    end
 
     {
       :environments => Puppet::Environments::Combined.new(*loaders)

data/lib/puppet/defaults.rb

@@ -197,8 +197,9 @@ module Puppet
           this provides the default environment for nodes we know nothing about."
     },
     :environmentpath => {
-      :default => "$confdir/environments",
-      :desc    => "A path of environment directories",
+      :default => "",
+      :desc    => "A search path for environment directories, as a list of directories separated by the system
+        path separator character.",
       :type    => :path,
     },
     :diff_args => {

data/lib/puppet/environments.rb

@@ -60,6 +60,22 @@ module Puppet::Environments
     end
   end
 
+  # A source of unlisted pre-defined environments.
+  #
+  # Used only for internal bootstrapping environments which are not relevant
+  # to an end user (such as the fall back 'configured' environment).
+  #
+  # @api private
+  class StaticPrivate < Static
+
+    # Unlisted
+    #
+    # @!macro loader_list
+    def list
+      []
+    end
+  end
+
   # Old-style environments that come either from explicit stanzas in
   # puppet.conf or from dynamic environments created from use of `$environment`
   # in puppet.conf.

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

@@ -64,8 +64,12 @@ class Puppet::Network::HTTP::API::V1
     method = indirection_method(http_method, indirection)
 
     configured_environment = Puppet.lookup(:environments).get(environment)
-    configured_environment = configured_environment.override_from_commandline(Puppet.settings)
-    params[:environment] = configured_environment
+    if configured_environment.nil?
+      raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Could not find #{environment}", Puppet::Network::HTTP::Issues::ENVIRONMENT_NOT_FOUND)
+    else
+      configured_environment = configured_environment.override_from_commandline(Puppet.settings)
+      params[:environment] = configured_environment
+    end
 
     params.delete(:bucket_path)
 

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

@@ -2,6 +2,7 @@ module Puppet::Network::HTTP::Issues
   NO_INDIRECTION_REMOTE_REQUESTS = :NO_INDIRECTION_REMOTE_REQUESTS
   HANDLER_NOT_FOUND = :HANDLER_NOT_FOUND
   RESOURCE_NOT_FOUND = :RESOURCE_NOT_FOUND
+  ENVIRONMENT_NOT_FOUND = :ENVIRONMENT_NOT_FOUND
   RUNTIME_ERROR = :RUNTIME_ERROR
   MISSING_HEADER_FIELD = :MISSING_HEADER_FIELD
   UNSUPPORTED_FORMAT = :UNSUPPORTED_FORMAT

data/lib/puppet/node/environment.rb

@@ -22,9 +22,10 @@ end
 # logging functions. Logging functions are attached to the 'root' environment
 # when {Puppet::Parser::Functions.reset} is called.
 class Puppet::Node::Environment
-
   include Puppet::Util::Cacher
 
+  NO_MANIFEST = :no_manifest
+
   # @api private
   def self.seen
     @seen ||= {}
@@ -72,16 +73,17 @@ class Puppet::Node::Environment
   #
   # @param name [Symbol] the name of the
   # @param modulepath [Array<String>] the list of paths from which to load modules
-  # @param manifest [String] the path to the manifest for the environment
+  # @param manifest [String] the path to the manifest for the environment or
+  # the constant Puppet::Node::Environment::NO_MANIFEST if there is none.
   # @return [Puppet::Node::Environment]
   #
   # @api public
-  def self.create(name, modulepath, manifest)
+  def self.create(name, modulepath, manifest = NO_MANIFEST)
     obj = self.allocate
     obj.send(:initialize,
              name,
              expand_dirs(extralibs() + modulepath),
-             File.expand_path(manifest))
+             manifest == NO_MANIFEST ? manifest : File.expand_path(manifest))
     obj
   end
 
@@ -459,7 +461,9 @@ class Puppet::Node::Environment
       file = self.manifest
       # if the manifest file is a reference to a directory, parse and combine all .pp files in that
       # directory
-      if File.directory?(file)
+      if file == NO_MANIFEST
+        Puppet::Parser::AST::Hostclass.new('')
+      elsif File.directory?(file)
         parse_results = Dir.entries(file).find_all { |f| f =~ /\.pp$/ }.sort.map do |pp_file|
           parser.file = File.join(file, pp_file)
           parser.parse

data/lib/puppet/pops/parser/interpolation_support.rb

@@ -44,8 +44,9 @@ module Puppet::Pops::Parser::InterpolationSupport
           break
         else
           # false $ variable start
-          text += value
+          text += terminator
           value,terminator = slurp_dqstring()
+          text += value
           after = scn.pos
         end
       end
@@ -84,8 +85,9 @@ module Puppet::Pops::Parser::InterpolationSupport
           break
         else
           # false $ variable start
+          text += terminator
+          value,terminator = slurp_dqstring
           text += value
-          value,terminator = self.send(slurpfunc)
           after = scn.pos
         end
       end
@@ -127,8 +129,9 @@ module Puppet::Pops::Parser::InterpolationSupport
           break
         else
           # false $ variable start
-          text += value
+          text += terminator
           value,terminator = slurp_uqstring()
+          text += value
           after = scn.pos
         end
       end
@@ -166,8 +169,9 @@ module Puppet::Pops::Parser::InterpolationSupport
           break
         else
           # false $ variable start
-          text += value
+          text += terminator
           value,terminator = slurp_uqstring
+          text += value
           after = scn.pos
         end
       end

data/lib/puppet/provider/yumrepo/inifile.rb

@@ -18,7 +18,9 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
         if valid_property?(key)
           # We strip the values here to handle cases where distros set values
           # like enabled = 1 with spaces.
-          attributes_hash[key] = value.strip
+          attributes_hash[key] = value
+        elsif key == :name
+          attributes_hash[:descr] = value
         end
       end
       instances << new(attributes_hash)
@@ -132,7 +134,7 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
   def create
     @property_hash[:ensure] = :present
 
-    new_section = section(@resource[:name])
+    new_section = current_section
 
     # We fetch a list of properties from the type, then iterate
     # over them, avoiding ensure.  We're relying on .should to
@@ -140,19 +142,25 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     # and if so we set it in the virtual inifile.
     PROPERTIES.each do |property|
       next if property == :ensure
+
+
       if value = @resource.should(property)
-        new_section[property.to_s] = value
-        @property_hash[property] = value
+        self.send("#{property}=", value)
       end
     end
   end
 
+  # @return [Boolean] Returns true if ensure => present.
+  def exists?
+    @property_hash[:ensure] == :present
+  end
+
   # We don't actually destroy the file here, merely mark it for
   # destruction in the section.
   # @return [void]
   def destroy
     # Flag file for deletion on flush.
-    section(@resource[:name]).destroy=(true)
+    current_section.destroy=(true)
 
     @property_hash.clear
   end
@@ -162,26 +170,58 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     self.class.store
   end
 
-  # @return [void]
-  def section(name)
-    self.class.section(name)
-  end
-
-  # Create all of our setters.
-  mk_resource_methods
+  # Generate setters and getters for our INI properties.
   PROPERTIES.each do |property|
-    # Exclude ensure, as we don't need to create an ensure=
+    # The ensure property uses #create, #exists, and #destroy we can't generate
+    # meaningful setters and getters for this
     next if property == :ensure
-    # Builds the property= method.
-    define_method("#{property.to_s}=") do |value|
-      section(@property_hash[:name])[property.to_s] = value
-      @property_hash[property] = value
+
+    define_method(property) do
+      get_property(property)
+    end
+
+    define_method("#{property}=") do |value|
+      set_property(property, value)
     end
   end
 
-  # @return [Boolean] Returns true if ensure => present.
-  def exists?
-    @property_hash[:ensure] == :present
+  # Map the yumrepo 'descr' type property to the 'name' INI property.
+  def descr
+    if ! @property_hash.has_key?(:descr)
+      @property_hash[:descr] = current_section['name']
+    end
+    value = @property_hash[:descr]
+    value.nil? ? :absent : value
+  end
+
+  def descr=(value)
+    value = (value == :absent ? nil : value)
+    current_section['name'] = value
+    @property_hash[:descr] = value
+  end
+
+  private
+
+  def get_property(property)
+    if ! @property_hash.has_key?(property)
+      @property_hash[property] = current_section[property.to_s]
+    end
+    value = @property_hash[property]
+    value.nil? ? :absent : value
   end
 
+  def set_property(property, value)
+    value = (value == :absent ? nil : value)
+    current_section[property.to_s] = value
+    @property_hash[property] = value
+  end
+
+  # @return [void]
+  def section(name)
+    self.class.section(name)
+  end
+
+  def current_section
+    self.class.section(self.name)
+  end
 end

data/lib/puppet/test/test_helper.rb

@@ -37,19 +37,12 @@ module Puppet::Test
     # @return nil
     def self.initialize()
       owner = Process.pid
-      @environmentdir = Dir.mktmpdir('environments')
       Puppet.push_context(Puppet.base_context({
-        :environmentpath => @environmentdir,
+        :environmentpath => "",
         :basemodulepath => "",
         :manifest => "/dev/null"
       }), "Initial for specs")
       Puppet::Parser::Functions.reset
-
-      ObjectSpace.define_finalizer(Puppet.lookup(:environments), proc {
-        if Process.pid == owner
-          FileUtils.rm_rf(@environmentdir)
-        end
-      })
     end
 
     # Call this method once, when beginning a test run--prior to running

data/lib/puppet/type/yumrepo.rb

@@ -18,9 +18,11 @@ Puppet::Type.newtype(:yumrepo) do
   # Doc string for properties that can be made 'absent'
   ABSENT_DOC="Set this to `absent` to remove it from the file completely."
   # False can be false/0/no and True can be true/1/yes in yum.
-  YUM_BOOLEAN=/(True|False|0|1|No|Yes)/
+  YUM_BOOLEAN=/(True|False|0|1|No|Yes)/i
   YUM_BOOLEAN_DOC="Valid values are: False/0/No or True/1/Yes."
 
+  VALID_SCHEMES = %w[file http https ftp]
+
   newparam(:name, :namevar => true) do
     desc "The name of the repository.  This corresponds to the
      `repositoryid` parameter in `yum.conf(5)`."
@@ -46,8 +48,12 @@ Puppet::Type.newtype(:yumrepo) do
 
     newvalues(/.*/, :absent)
     validate do |value|
+      next if value.to_s == 'absent'
       parsed = URI.parse(value)
-      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
+
+      unless VALID_SCHEMES.include?(parsed.scheme)
+        raise "Must be a valid URL"
+      end
     end
   end
 
@@ -56,8 +62,16 @@ Puppet::Type.newtype(:yumrepo) do
 
     newvalues(/.*/, :absent)
     validate do |value|
-      parsed = URI.parse(value)
-      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
+      next if value.to_s == 'absent'
+
+      value.split(/\s+/).each do |uri|
+
+        parsed = URI.parse(uri)
+
+        unless VALID_SCHEMES.include?(parsed.scheme)
+          raise "Must be a valid URL"
+        end
+      end
     end
   end
 
@@ -92,8 +106,16 @@ Puppet::Type.newtype(:yumrepo) do
 
     newvalues(/.*/, :absent)
     validate do |value|
-      parsed = URI.parse(value)
-      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
+      next if value.to_s == 'absent'
+
+      value.split(/\s+/).each do |uri|
+
+        parsed = URI.parse(uri)
+
+        unless VALID_SCHEMES.include?(parsed.scheme)
+          raise "Must be a valid URL"
+        end
+      end
     end
   end
 
@@ -104,8 +126,12 @@ Puppet::Type.newtype(:yumrepo) do
 
     newvalues(/.*/, :absent)
     validate do |value|
+      next if value.to_s == 'absent'
       parsed = URI.parse(value)
-      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
+
+      unless VALID_SCHEMES.include?(parsed.scheme)
+        raise "Must be a valid URL"
+      end
     end
   end
 
@@ -202,8 +228,12 @@ Puppet::Type.newtype(:yumrepo) do
 
     newvalues(/.*/, :absent)
     validate do |value|
+      next if value.to_s == 'absent'
       parsed = URI.parse(value)
-      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
+
+      unless VALID_SCHEMES.include?(parsed.scheme)
+        raise "Must be a valid URL"
+      end
     end
   end
 
@@ -262,8 +292,12 @@ Puppet::Type.newtype(:yumrepo) do
 
     newvalues(/.*/, :absent)
     validate do |value|
+      next if value.to_s == 'absent'
       parsed = URI.parse(value)
-      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
+
+      unless VALID_SCHEMES.include?(parsed.scheme)
+        raise "Must be a valid URL"
+      end
     end
   end
 

data/lib/puppet/util/inifile.rb

@@ -9,6 +9,7 @@
 # The parsing tries to stay close to python's ConfigParser
 
 require 'puppet/util/filetype'
+require 'puppet/error'
 
 module Puppet::Util::IniConfig
   # A section in a .ini file
@@ -24,10 +25,17 @@ module Puppet::Util::IniConfig
       @destroy = false
     end
 
-    # Has this section been modified since it's been read in
-    # or written back to disk
+    # Does this section need to be updated in/removed from the associated file?
+    #
+    # @note This section is dirty if a key has been modified _or_ if the
+    #   section has been modified so the associated file can be rewritten
+    #   without this section.
     def dirty?
-      @dirty
+      @dirty or @destroy
+    end
+
+    def mark_dirty
+      @dirty = true
     end
 
     # Should only be used internally
@@ -69,13 +77,17 @@ module Puppet::Util::IniConfig
     # Format the section as text in the way it should be
     # written to file
     def format
-      text = "[#{name}]\n"
-      @entries.each do |entry|
-        if entry.is_a?(Array)
-          key, value = entry
-          text << "#{key}=#{value}\n" unless value.nil?
-        else
-          text << entry
+      if @destroy
+        text = ""
+      else
+        text = "[#{name}]\n"
+        @entries.each do |entry|
+          if entry.is_a?(Array)
+            key, value = entry
+            text << "#{key}=#{value}\n" unless value.nil?
+          else
+            text << entry
+          end
         end
       end
       text
@@ -91,128 +103,239 @@ module Puppet::Util::IniConfig
 
   end
 
-  # A logical .ini-file that can be spread across several physical
-  # files. For each physical file, call #read with the filename
-  class File
-    def initialize
-      @files = {}
+  class PhysicalFile
+
+    # @!attribute [r] filetype
+    #   @api private
+    #   @return [Puppet::Util::FileType::FileTypeFlat]
+    attr_reader :filetype
+
+    # @!attribute [r] contents
+    #   @api private
+    #   @return [Array<String, Puppet::Util::IniConfig::Section>]
+    attr_reader :contents
+
+    # @!attribute [rw] destroy_empty
+    #   Whether empty files should be removed if no sections are defined.
+    #   Defaults to false
+    attr_accessor :destroy_empty
+
+    # @!attribute [rw] file_collection
+    #   @return [Puppet::Util::IniConfig::FileCollection]
+    attr_accessor :file_collection
+
+    def initialize(file, options = {})
+      @file = file
+      @contents = []
+      @filetype = Puppet::Util::FileType.filetype(:flat).new(file)
+
+      @destroy_empty = options.fetch(:destroy_empty, false)
     end
 
-    # Add the contents of the file with name FILE to the
-    # already existing sections
-    def read(file)
-      text = Puppet::Util::FileType.filetype(:flat).new(file).read
-      raise "Could not find #{file}" if text.nil?
+    # Read and parse the on-disk file associated with this object
+    def read
+      text = @filetype.read
+      if text.nil?
+        raise IniParseError, "Cannot read nonexistent file #{@file.inspect}"
+      end
+      parse(text)
+    end
+
+    INI_COMMENT = Regexp.union(
+      /^\s*$/,
+      /^[#;]/,
+      /^\s*rem\s/i
+    )
+    INI_CONTINUATION = /^[ \t\r\n\f]/
+    INI_SECTION_NAME = /^\[([^\]]+)\]/
+    INI_PROPERTY     = /^\s*([^\s=]+)\s*\=(.*)$/
 
+    # @api private
+    def parse(text)
       section = nil   # The name of the current section
       optname = nil   # The name of the last option in section
-      line = 0
-      @files[file] = []
+      line_num = 0
+
       text.each_line do |l|
-        line += 1
-        if l.strip.empty? || "#;".include?(l[0,1]) ||
-            (l.split(nil, 2)[0].downcase == "rem" && l[0,1].downcase == "r")
+        line_num += 1
+        if l.match(INI_COMMENT)
           # Whitespace or comment
           if section.nil?
-            @files[file] << l
+            @contents << l
           else
             section.add_line(l)
           end
-        elsif " \t\r\n\f".include?(l[0,1]) && section && optname
+        elsif l.match(INI_CONTINUATION) && section && optname
           # continuation line
           section[optname] += "\n#{l.chomp}"
-        elsif l =~ /^\[([^\]]+)\]/
+        elsif (match = l.match(INI_SECTION_NAME))
           # section heading
-          section.mark_clean unless section.nil?
-          section = add_section($1, file)
+          section.mark_clean if section
+
+          section_name = match[1]
+
+          section = add_section(section_name)
           optname = nil
-        elsif l =~ /^\s*([^\s=]+)\s*\=(.*)$/
+        elsif (match = l.match(INI_PROPERTY))
           # We allow space around the keys, but not the values
           # For the values, we don't know if space is significant
+          key = match[1]
+          val = match[2]
+
           if section.nil?
-            raise "#{file}:#{line}:Key/value pair outside of a section for key #{$1}"
-          else
-            section[$1] = $2
-            optname = $1
+            raise IniParseError.new("Property with key #{key.inspect} outside of a section")
           end
+
+          section[key] = val
+          optname = key
         else
-          raise "#{file}:#{line}: Can't parse '#{l.chomp}'"
+          raise IniParseError.new("Can't parse line '#{l.chomp}'", @file, line_num)
         end
       end
       section.mark_clean unless section.nil?
     end
 
-    # Store all modifications made to sections in this file back
-    # to the physical files. If no modifications were made to
-    # a physical file, nothing is written
-    def store
-      @files.each do |file, lines|
-        text = ""
-        dirty = false
-        destroy = false
-        lines.each do |l|
-          if l.is_a?(Section)
-            destroy ||= l.destroy?
-            dirty ||= l.dirty?
-            text << l.format
-            l.mark_clean
-          else
-            text << l
-          end
-        end
-        # We delete the file and then remove it from the list of files.
-        if destroy
-          ::File.unlink(file)
-          @files.delete(file)
+    # @return [Array<Puppet::Util::IniConfig::Section>] All sections defined in
+    #   this file.
+    def sections
+      @contents.select { |entry| entry.is_a? Section }
+    end
+
+    # @return [Puppet::Util::IniConfig::Section, nil] The section with the
+    #   given name if it exists, else nil.
+    def get_section(name)
+      @contents.find { |entry| entry.is_a? Section and entry.name == name }
+    end
+
+    def format
+      text = ""
+
+      @contents.each do |content|
+        if content.is_a? Section
+          text << content.format
         else
-          if dirty
-            Puppet::Util::FileType.filetype(:flat).new(file).write(text)
-            return file
-          end
+          text << content
         end
       end
+
+      text
+    end
+
+    def store
+      if @destroy_empty and (sections.empty? or sections.all?(&:destroy?))
+        ::File.unlink(@file)
+      elsif sections.any?(&:dirty?)
+        text = self.format
+        @filetype.write(text)
+      end
+      sections.each(&:mark_clean)
+    end
+
+    # Create a new section and store it in the file contents
+    #
+    # @api private
+    # @param name [String] The name of the section to create
+    # @return [Puppet::Util::IniConfig::Section]
+    def add_section(name)
+      if section_exists?(name)
+        raise IniParseError.new("Section #{name.inspect} is already defined, cannot redefine", @file)
+      end
+
+      section = Section.new(name, @file)
+      @contents << section
+
+      section
+    end
+
+    private
+
+    def section_exists?(name)
+      if self.get_section(name)
+        true
+      elsif @file_collection and @file_collection.get_section(name)
+        true
+      else
+        false
+      end
+    end
+  end
+
+  class FileCollection
+
+    attr_reader :files
+
+    def initialize
+      @files = {}
+    end
+
+    # Read and parse a file and store it in the collection. If the file has
+    # already been read it will be destroyed and re-read.
+    def read(file)
+      new_physical_file(file).read
+    end
+
+    def store
+      @files.values.each do |file|
+        file.store
+      end
     end
 
-    # Execute BLOCK, passing each section in this file
-    # as an argument
     def each_section(&block)
-      @files.each do |file, list|
-        list.each do |entry|
-          yield(entry) if entry.is_a?(Section)
+      @files.values.each do |file|
+        file.sections.each do |section|
+          yield section
         end
       end
     end
 
-    # Execute BLOCK, passing each file constituting this inifile
-    # as an argument
     def each_file(&block)
-      @files.keys.each do |file|
-        yield(file)
+      @files.keys.each do |path|
+        yield path
       end
     end
 
-    # Return the Section with the given name or nil
-    def [](name)
-      name = name.to_s
-      each_section do |section|
-        return section if section.name == name
+    def get_section(name)
+      sect = nil
+      @files.values.each do |file|
+        if (current = file.get_section(name))
+          sect = current
+        end
       end
-      nil
+      sect
     end
+    alias [] get_section
 
-    # Return true if the file contains a section with name NAME
     def include?(name)
-      ! self[name].nil?
+      !! get_section(name)
     end
 
-    # Add a section to be stored in FILE when store is called
     def add_section(name, file)
-      raise "A section with name #{name} already exists" if include?(name)
-      result = Section.new(name, file)
-      @files[file] ||= []
-      @files[file] << result
-      result
+      get_physical_file(file).add_section(name)
+    end
+
+    private
+
+    # Return a file if it's already been defined, create a new file if it hasn't
+    # been defined.
+    def get_physical_file(file)
+      if @files[file]
+        @files[file]
+      else
+        new_physical_file(file)
+      end
+    end
+
+    # Create a new physical file and set required attributes on that file.
+    def new_physical_file(file)
+      @files[file] = PhysicalFile.new(file)
+      @files[file].file_collection = self
+      @files[file]
     end
   end
-end
 
+  File = FileCollection
+
+  class IniParseError < Puppet::Error
+    include Puppet::ExternalFileError
+  end
+end