puppet 3.7.3 → 3.7.4

data/Gemfile

@@ -60,6 +60,10 @@ end
 group(:extra) do
   gem "rack", "~> 1.4", :require => false
   gem "activerecord", '~> 3.2', :require => false
+  # this pin for i18n should *not* be in the puppet-4+ branches
+  # it's solely here because activerecord pulls in i18n and i18n
+  # was recently updated to require 1.9.3 which breaks 1.8.7 specs
+  gem "i18n", '~> 0.6.11', :require => false
   gem "couchrest", '~> 1.0', :require => false
   gem "net-ssh", '~> 2.1', :require => false
   gem "puppetlabs_spec_helper", :require => false

data/ext/build_defaults.yaml

@@ -26,8 +26,8 @@ build_msi:
     repo: 'git://github.com/puppetlabs/hiera.git'
   sys:
     ref:
-      x86: 'cbe94f4cafb0f78d587e8addcf723bc671af7cca'
-      x64: '417378f607340d211fbfef89a96e6639bef1bfb1'
+      x86: '57068e7b7c87288c51ff39d96c80cfb509a42091'
+      x64: '531319f5c121e98990772e018eb9781bf7dc6316'
     repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
 apt_host: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'

data/ext/project_data.yaml

@@ -28,7 +28,7 @@ gem_platform_dependencies:
   x86-mingw32:
     gem_runtime_dependencies:
       # Pinning versions that require native extensions
-      ffi: '1.9.3'
+      ffi: '~> 1.9.5'
       win32-dir: '~> 0.4.9'
       win32-eventlog: '~> 0.6.1'
       win32-process: '~> 0.7.4'
@@ -38,7 +38,7 @@ gem_platform_dependencies:
       minitar: '~> 0.5.4'
   x64-mingw32:
     gem_runtime_dependencies:
-      ffi: '1.9.3'
+      ffi: '~> 1.9.5'
       win32-dir: '~> 0.4.9'
       win32-eventlog: '~> 0.6.1'
       win32-process: '~> 0.7.4'

data/lib/puppet.rb

@@ -197,7 +197,7 @@ module Puppet
     end
 
     {
-      :environments => Puppet::Environments::Cached.new(*loaders),
+      :environments => Puppet::Environments::Cached.new(Puppet::Environments::Combined.new(*loaders)),
       :http_pool => proc {
         require 'puppet/network/http'
         Puppet::Network::HTTP::NoCachePool.new

data/lib/puppet/configurer.rb

@@ -87,14 +87,16 @@ class Puppet::Configurer
       download_plugins(remote_environment_for_plugins)
     end
 
+    facts_hash = {}
     if Puppet::Resource::Catalog.indirection.terminus_class == :rest
       # This is a bit complicated.  We need the serialized and escaped facts,
       # and we need to know which format they're encoded in.  Thus, we
       # get a hash with both of these pieces of information.
       #
       # facts_for_uploading may set Puppet[:node_name_value] as a side effect
-      return facts_for_uploading
+      facts_hash = facts_for_uploading
     end
+    facts_hash
   end
 
   def prepare_and_retrieve_catalog(options, query_options)
@@ -195,9 +197,6 @@ class Puppet::Configurer
       Puppet.push_context({:current_environment => local_node_environment}, "Local node environment for configurer transaction")
 
       query_options = get_facts(options) unless query_options
-
-      # get_facts returns nil during puppet apply
-      query_options ||= {}
       query_options[:transaction_uuid] = @transaction_uuid
 
       unless catalog = prepare_and_retrieve_catalog(options, query_options)
@@ -216,6 +215,10 @@ class Puppet::Configurer
         Puppet.warning "Local environment: \"#{@environment}\" doesn't match server specified environment \"#{catalog.environment}\", restarting agent run with environment \"#{catalog.environment}\""
         @environment = catalog.environment
         report.environment = @environment
+
+        query_options = get_facts(options)
+        query_options[:transaction_uuid] = @transaction_uuid
+
         return nil unless catalog = prepare_and_retrieve_catalog(options, query_options)
         tries += 1
       end

data/lib/puppet/environments.rb

@@ -25,6 +25,21 @@ module Puppet::Environments
     end
   end
 
+  # Provide any common methods that loaders should have. It requires that any
+  # classes that include this module implement get
+  # @api private
+  module EnvironmentLoader
+    # @!macro loader_get_or_fail
+    def get!(name)
+      environment = get(name)
+      if environment
+        environment
+      else
+        raise EnvironmentNotFound, name
+      end
+    end
+  end
+
   # @!macro [new] loader_search_paths
   #   A list of indicators of where the loader is getting its environments from.
   #   @return [Array<String>] The URIs of the load locations
@@ -62,6 +77,7 @@ module Puppet::Environments
   # @api private
   class Static
     include EnvironmentCreator
+    include EnvironmentLoader
 
     def initialize(*environments)
       @environments = environments
@@ -84,14 +100,6 @@ module Puppet::Environments
       end
     end
 
-    # @!macro loader_get_or_fail
-    def get!(name)
-      if !environment = get(name)
-        raise EnvironmentNotFound, name
-      end
-      environment
-    end
-
     # Returns a basic environment configuration object tied to the environment's
     # implementation values.  Will not interpolate.
     #
@@ -186,6 +194,8 @@ module Puppet::Environments
   #
   # @api private
   class Directories
+    include EnvironmentLoader
+
     def initialize(environment_dir, global_module_path)
       @environment_dir = environment_dir
       @global_module_path = global_module_path
@@ -212,51 +222,49 @@ module Puppet::Environments
     def list
       valid_directories.collect do |envdir|
         name = Puppet::FileSystem.basename_string(envdir).intern
-
-        setting_values = Puppet.settings.values(name, Puppet.settings.preferred_run_mode)
-        env = Puppet::Node::Environment.create(
-          name,
-          Puppet::Node::Environment.split_path(setting_values.interpolate(:modulepath)),
-          setting_values.interpolate(:manifest),
-          setting_values.interpolate(:config_version)
-        )
-        env.watching = false
-        env
+        create_environment(name)
       end
     end
 
     # @!macro loader_get
     def get(name)
-      list.find { |env| env.name == name.intern }
-    end
-
-    # @!macro loader_get_or_fail
-    def get!(name)
-      if !environment = get(name)
-        raise EnvironmentNotFound, name
+      if valid_directory?(File.join(@environment_dir, name.to_s))
+        create_environment(name)
       end
-      environment
     end
 
     # @!macro loader_get_conf
     def get_conf(name)
-      valid_directories.each do |envdir|
-        envname = Puppet::FileSystem.basename_string(envdir)
-        if envname == name.to_s
-          return Puppet::Settings::EnvironmentConf.load_from(envdir, @global_module_path)
-        end
+      envdir = File.join(@environment_dir, name.to_s)
+      if valid_directory?(envdir)
+        return Puppet::Settings::EnvironmentConf.load_from(envdir, @global_module_path)
       end
       nil
     end
 
     private
 
+    def create_environment(name, setting_values = nil)
+      env_symbol = name.intern
+      setting_values = Puppet.settings.values(env_symbol, Puppet.settings.preferred_run_mode)
+      Puppet::Node::Environment.create(
+        env_symbol,
+        Puppet::Node::Environment.split_path(setting_values.interpolate(:modulepath)),
+        setting_values.interpolate(:manifest),
+        setting_values.interpolate(:config_version)
+      )
+    end
+
+    def valid_directory?(envdir)
+      name = Puppet::FileSystem.basename_string(envdir)
+      Puppet::FileSystem.directory?(envdir) &&
+         Puppet::Node::Environment.valid_name?(name)
+    end
+
     def valid_directories
       if Puppet::FileSystem.directory?(@environment_dir)
         Puppet::FileSystem.children(@environment_dir).select do |child|
-          name = Puppet::FileSystem.basename_string(child)
-          Puppet::FileSystem.directory?(child) &&
-             Puppet::Node::Environment.valid_name?(name)
+          valid_directory?(child)
         end
       else
         []
@@ -267,6 +275,8 @@ module Puppet::Environments
   # Combine together multiple loaders to act as one.
   # @api private
   class Combined
+    include EnvironmentLoader
+
     def initialize(*loaders)
       @loaders = loaders
     end
@@ -291,16 +301,6 @@ module Puppet::Environments
       nil
     end
 
-    # @!macro loader_get_or_fail
-    def get!(name)
-      @loaders.each do |loader|
-        if env = loader.get(name)
-          return env
-        end
-      end
-      raise EnvironmentNotFound, name
-    end
-
     # @!macro loader_get_conf
     def get_conf(name)
       @loaders.each do |loader|
@@ -313,7 +313,9 @@ module Puppet::Environments
 
   end
 
-  class Cached < Combined
+  class Cached
+    include EnvironmentLoader
+
     INFINITY = 1.0 / 0.0
 
     class DefaultCacheExpirationService
@@ -336,17 +338,28 @@ module Puppet::Environments
       @cache_expiration_service || DefaultCacheExpirationService.new
     end
 
-    def initialize(*loaders)
-      super
+    def initialize(loader)
+      @loader = loader
       @cache = {}
       @cache_expiration_service = Puppet::Environments::Cached.cache_expiration_service
     end
 
+    # @!macro loader_list
+    def list
+      @loader.list
+    end
+
+    # @!macro loader_search_paths
+    def search_paths
+      @loader.search_paths
+    end
+
+    # @!macro loader_get
     def get(name)
       evict_if_expired(name)
       if result = @cache[name]
         return result.value
-      elsif (result = super(name))
+      elsif (result = @loader.get(name))
         @cache[name] = entry(result)
         result
       end
@@ -364,13 +377,17 @@ module Puppet::Environments
       @cache = {}
     end
 
-    # This implementation evicts the cache, and always gets the current configuration of the environment
-    # TODO: While this is wasteful since it needs to go on a search for the conf, it is too disruptive to optimize
+    # This implementation evicts the cache, and always gets the current
+    # configuration of the environment
+    #
+    # TODO: While this is wasteful since it
+    # needs to go on a search for the conf, it is too disruptive to optimize
     # this.
     #
+    # @!macro loader_get_conf
     def get_conf(name)
       evict_if_expired(name)
-      super name
+      @loader.get_conf(name)
     end
 
     # Creates a suitable cache entry given the time to live for one environment

data/lib/puppet/functions/scanf.rb

@@ -0,0 +1,46 @@
+# Scans a string and returns an array of one or more converted values as directed by a given format string.args
+# See the documenation of Ruby's String::scanf method for details about the supported formats (which
+# are similar but not identical to the formats used in Puppet's `sprintf` function.
+#
+# This function takes two mandatory arguments: the first is the String to convert, and the second
+# the format String. A parameterized block may optionally be given, which is called with the result
+# that is produced by scanf if no block is present, the result of the block is then returned by
+# the function.
+#
+# The result of the scan is an Array, with each sucessfully scanned and transformed value.args The scanning
+# stops if a scan is unsuccesful and the scanned result up to that point is returned. If there was no
+# succesful scan at all, the result is an empty Array. The optional code block is typically used to
+# assert that the scan was succesful, and either produce the same input, or perform unwrapping of
+# the result
+#
+# @example scanning an integer in string form (result is an array with
+#   integer, or empty if  unsuccessful)
+#    "42".scanf("%i")
+#
+# @example scanning and processing resulting array to assert result and unwrap
+#
+#     "42".scanf("%i") |$x| {
+#       unless $x[0] =~ Integer {
+#         fail "Expected a well formed integer value, got '$x[0]'"
+#       }
+#       $x[0]
+#     }
+#
+# @since 3.7.4
+Puppet::Functions.create_function(:scanf) do
+  require 'scanf'
+
+  dispatch :scanf do
+    param 'String', 'data'
+    param 'String', 'format'
+    optional_block_param
+  end
+
+  def scanf(data, format, block=nil)
+    result = data.scanf(format)
+    if !block.nil?
+      result = block.call({}, result)
+    end
+    result
+  end
+end

data/lib/puppet/network/http/webrick/rest.rb

@@ -79,6 +79,9 @@ class Puppet::Network::HTTP::WEBrickREST < WEBrick::HTTPServlet::AbstractServlet
       response.body = result
       response["content-length"] = result.stat.size if result.is_a?(File)
     end
+    if RUBY_VERSION[0,3] == "1.8"
+      response["connection"] = 'close'
+    end
   end
 
   # Retrieve node/cert/ip information from the request object.

data/lib/puppet/parser/ast/pops_bridge.rb

@@ -24,7 +24,8 @@ class Puppet::Parser::AST::PopsBridge
     end
 
     def evaluate(scope)
-      @@evaluator.evaluate(scope, @value)
+      object = @@evaluator.evaluate(scope, @value)
+      @@evaluator.convert_to_3x(object, scope)
     end
 
     # Adapts to 3x where top level constructs needs to have each to iterate over children. Short circuit this

data/lib/puppet/parser/compiler.rb

@@ -31,7 +31,7 @@ class Puppet::Parser::Compiler
       raise(Puppet::Error, errmsg.join(' '))
     end
 
-    new(node).compile.to_resource
+    new(node).compile {|resulting_catalog| resulting_catalog.to_resource }
   rescue => detail
     message = "#{detail} on node #{node.name}"
     Puppet.log_exception(detail, message)
@@ -140,7 +140,11 @@ class Puppet::Parser::Compiler
 
       fail_on_unevaluated
 
-      @catalog
+      if block_given?
+        yield @catalog
+      else
+        @catalog
+      end
     end
   end
 
@@ -443,7 +447,11 @@ class Puppet::Parser::Compiler
   # look for resources, because we want to consider those to be
   # parse errors.
   def fail_on_unevaluated_resource_collections
-    remaining = @collections.collect(&:resources).flatten.compact
+    if Puppet[:parser] == 'future'
+      remaining = @collections.collect(&:unresolved_resources).flatten.compact
+    else
+      remaining = @collections.collect(&:resources).flatten.compact
+    end
 
     if !remaining.empty?
       raise Puppet::ParseError, "Failed to realize virtual resources #{remaining.join(', ')}"

data/lib/puppet/parser/functions/realize.rb

@@ -6,9 +6,14 @@ Puppet::Parser::Functions::newfunction(:realize, :arity => -2, :doc => "Make a v
     bother with a full collection.  It is slightly faster than a collection,
     and, of course, is a bit shorter.  You must pass the object using a
     reference; e.g.: `realize User[luke]`." ) do |vals|
-    coll = Puppet::Parser::Collector.new(self, :nomatter, nil, nil, :virtual)
+
     vals = [vals] unless vals.is_a?(Array)
-    coll.resources = vals.flatten
+    if Puppet[:parser] == 'future'
+      coll = Puppet::Pops::Evaluator::Collectors::FixedSetCollector.new(self, vals.flatten)
+    else
+      coll = Puppet::Parser::Collector.new(self, :nomatter, nil, nil, :virtual)
+      coll.resources = vals.flatten
+    end
 
     compiler.add_collection(coll)
 end

data/lib/puppet/parser/functions/scanf.rb

@@ -0,0 +1,35 @@
+Puppet::Parser::Functions::newfunction(
+  :scanf,
+  :type => :rvalue,
+  :arity => 2,
+  :doc => <<-DOC
+Scans a string and returns an array of one or more converted values as directed by a given format string.args
+See the documenation of Ruby's String::scanf method for details about the supported formats (which
+are similar but not identical to the formats used in Puppet's `sprintf` function.
+
+This function takes two mandatory arguments: the first is the String to convert, and the second
+the format String. A parameterized block may optionally be given, which is called with the result
+that is produced by scanf if no block is present, the result of the block is then returned by
+the function.
+
+The result of the scan is an Array, with each sucessfully scanned and transformed value.args The scanning
+stops if a scan is unsuccesful and the scanned result up to that point is returned. If there was no
+succesful scan at all, the result is an empty Array. The optional code block is typically used to
+assert that the scan was succesful, and either produce the same input, or perform unwrapping of
+the result
+
+
+      "42".scanf("%i")
+      "42".scanf("%i") |$x| {
+        unless $x[0] =~ Integer {
+          fail "Expected a well formed integer value, got '$x[0]'"
+        }
+        $x[0]
+      }
+
+- since 3.7.4
+- note requires `parser = future`
+DOC
+) do |args|
+  function_fail(["scanf() is only available when parser/evaluator future is in effect"])
+end