puppet 4.4.0-x86-mingw32 → 4.4.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b55c8ac8553a17f4ebbeeb986a4b7f7f37248ad
-  data.tar.gz: cb40b4dcdf3b210e27504e1debfb178bc6b3aae2
+  metadata.gz: a894af9a13f175e576f3c35bdd199e481b6b8296
+  data.tar.gz: a6f92f3879aeaf8ea9cf1b617625ef5c7ccecbec
 SHA512:
-  metadata.gz: 1b3506efaf7b8bce2ad0a8ee83b895af469c3ba48bb6d47dfe58feddc0af42918b82f7fdd214f2b6ef72e9bf3614af4cf9ef3f8494506d8fe079c577ecdf02c2
-  data.tar.gz: e2bd3412d8012bc7f5635ea8051b65317afc97b2052a7781bd7998e66fab14e10e395a94eea8b7397bf568ba7c577f897314e759b461e91d795624b59f20a3fe
+  metadata.gz: c582f33e90c5b07a2030dfcd50fe40dbfff77294d82125127a9fe363f383d60d9f18252c49bbd1db4aad93da8ec8638175193d8e89655c7d1f3f35ab95910906
+  data.tar.gz: 576729f2a5afa5e116283d9cbd8be306c77e761ccaae8df0e2ef9726d41d5a16bd6ee3eddee172a49d985ea053ac49da27fac0364fb1ce169e31d32ee62917f0

data/conf/puppet.conf

@@ -3,4 +3,4 @@
 # - https://docs.puppetlabs.com/puppet/latest/reference/config_important_settings.html
 # - https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
 # - https://docs.puppetlabs.com/puppet/latest/reference/config_file_main.html
-# - https://docs.puppetlabs.com/references/latest/configuration.html
+# - https://docs.puppetlabs.com/puppet/latest/reference/configuration.html

data/ext/redhat/puppet.spec.erb

@@ -181,12 +181,6 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
 # Create puppet modules directory for puppet module tool
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 
-# Install a NetworkManager dispatcher script to pickup changes to
-# # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085).
-mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
-cp -pr ext/puppet-nm-dispatcher \
-  %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name}
-
 # Masterhttp.log is created on server start and should be distributed
 # with correct permissions
 touch %{buildroot}%{_localstatedir}/log/puppet/masterhttp.log
@@ -197,9 +191,6 @@ touch %{buildroot}%{_localstatedir}/log/puppet/masterhttp.log
 %{_bindir}/puppet
 %{_bindir}/extlookup2hiera
 %{puppet_libdir}/*
-%dir %{_sysconfdir}/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet
 %if 0%{?_with_systemd}
 %{_unitdir}/puppet.service
 %{_unitdir}/puppetagent.service

data/ext/upload_facts.rb

@@ -58,7 +58,7 @@ is also a valid long argument.  For example, 'server' is a valid configuration
 parameter, so you can specify '--server <servername>' as an argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for
 the full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet agent with
 '--genconfig'.

data/lib/puppet/application/agent.rb

@@ -155,7 +155,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
 '--setting' and '--no-setting' pairs.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable settings. A commented list of all settings can also be
 generated by running puppet agent with '--genconfig'.
 

data/lib/puppet/application/apply.rb

@@ -74,7 +74,7 @@ valid setting, so you can specify '--tags <class>,<tag>'
 as an argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.

data/lib/puppet/application/cert.rb

@@ -164,7 +164,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet cert with
 '--genconfig'.

data/lib/puppet/application/filebucket.rb

@@ -73,7 +73,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.

data/lib/puppet/application/inspect.rb

@@ -48,7 +48,7 @@ OPTIONS
 Any configuration setting which is valid in the configuration file is
 also a valid long argument, e.g. '--server=master.domain.com'. See the
 configuration file documentation at
-https://docs.puppetlabs.com/references/latest/configuration.html for
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for
 the full list of acceptable settings.
 
 * --archive_files:
@@ -91,7 +91,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     set_log_level
 
     Puppet::Transaction::Report.indirection.terminus_class = :rest
-    Puppet::Resource::Catalog.indirection.terminus_class = :yaml
+    Puppet::Resource::Catalog.indirection.terminus_class = Puppet[:catalog_cache_terminus] || :json
   end
 
   def preinit

data/lib/puppet/application/lookup.rb

@@ -35,7 +35,7 @@ class Puppet::Application::Lookup < Puppet::Application
 
   option('--sort-merge-arrays')
 
-  option('--unpack-arrays') do |arg|
+  option('--unpack-arrays DELIMITER') do |arg|
     options[:unpack_arrays] = arg
   end
 
@@ -164,19 +164,19 @@ the puppet lookup function linked to above.
   removed. 'deep' Performs a deep merge on values of Array and Hash type. There
   are additional option flags that can be used with 'deep'.
 
-* --knock_out_prefix <PREFIX-STRING>
+* --knock-out-prefix <PREFIX-STRING>
   Can be used with the 'deep' merge strategy. Specify string value to signify
   prefix which deletes elements from existing element.
 
-* --sort_merged_arrays
+* --sort-merged-arrays
   Can be used with the 'deep' merge strategy. When this flag is used all
   merged arrays will be sorted.
 
-* --unpack_arrays <STRING-VALUE>
+* --unpack-arrays <STRING-VALUE>
   Can be used with the 'deep' merge strategy. Specify a string value used
   as a deliminator to join all array values and then split them again.
 
-* --merge_hash_arrays
+* --merge-hash-arrays
   Can be used with the 'deep' merge strategy. When this flag is used arrays
   and hashes will be merged.
 
@@ -272,11 +272,11 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
           'merge_hash_arrays' => !options[:merge_hash_arrays].nil?}
 
         if options[:prefix]
-          merge_options.merge({'prefix' => options[:prefix]})
+          merge_options.merge!({'knockout_prefix' => options[:prefix]})
         end
 
         if options[:unpack_arrays]
-          merge_options.merge({'unpack_arrays' => options[:unpack_arrays]})
+          merge_options.merge!({'unpack_arrays' => options[:unpack_arrays]})
         end
 
       else

data/lib/puppet/application/master.rb

@@ -61,7 +61,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
 '--setting' and '--no-setting' pairs.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable settings. A commented list of all settings can also be
 generated by running puppet master with '--genconfig'.
 

data/lib/puppet/application/resource.rb

@@ -72,7 +72,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.

data/lib/puppet/data_providers/hiera_interpolate.rb

@@ -19,20 +19,32 @@ module Puppet::DataProviders::HieraInterpolate
 
   private
 
+  EMPTY_INTERPOLATIONS = {
+    '' => true,
+    '::' => true,
+    '""' => true,
+    "''" => true,
+    '"::"' => true,
+    "'::'" => true
+  }.freeze
+
+  # Matches a key that is quoted using a matching pair of either single or double quotes.
+  QUOTED_KEY = /^(?:"([^"]+)"|'([^']+)')$/
+
   def interpolate_string(subject, lookup_invocation, allow_methods)
     lookup_invocation.with(:interpolate, subject) do
       subject.gsub(/%\{([^\}]*)\}/) do |match|
         expr = $1
         # Leading and trailing spaces inside an interpolation expression are insignificant
         expr.strip!
-        unless expr.empty? || expr == '::'
+        unless EMPTY_INTERPOLATIONS[expr]
           method_key, key = get_method_and_data(expr, allow_methods)
           is_alias = method_key == 'alias'
 
           # Alias is only permitted if the entire string is equal to the interpolate expression
           raise Puppet::DataBinding::LookupError, "'alias' interpolation is only permitted if the expression is equal to the entire string" if is_alias && subject != match
 
-          segments = key.split('.')
+          segments = split_key(key) { |problem| Puppet::DataBinding::LookupError.new("#{problem} in string: #{subject}") }
           value = interpolate_method(method_key).call(segments[0], lookup_invocation)
           value = qualified_lookup(segments.drop(1), value) if segments.size > 1
           value = lookup_invocation.check(key) { interpolate(value, lookup_invocation, allow_methods) }
@@ -76,7 +88,7 @@ module Puppet::DataProviders::HieraInterpolate
         'alias' => global_lookup, # same as 'lookup' but expression must be entire string. The result that is not subject to string substitution
         'scope' => scope_lookup,
         'literal' => lambda { |key, _| key }
-      }
+      }.freeze
     end
     interpolate_method = @@interpolate_methods[method_key]
     raise Puppet::DataBinding::LookupError, "Unknown interpolation method '#{method_key}'" unless interpolate_method
@@ -109,4 +121,35 @@ module Puppet::DataProviders::HieraInterpolate
     end
     [key, data]
   end
+
+  # Split key into segments. A segment may be a quoted string (both single and double quotes can
+  # be used) and the segment separator is the '.' character. Whitespace will be trimmed off on
+  # both sides of each segment. Whitespace within quotes are not trimmed.
+  #
+  # If the key cannot be parsed, this method will yield a string describing the problem to a one
+  # parameter block. The block must return an exception instance.
+  #
+  # @param key [String] the string to split
+  # @return Array<String> the array of segments
+  # @yieldparam problem [String] the problem, i.e. 'Syntax error'
+  # @yieldreturn [Exception] the exception to raise
+  def split_key(key)
+    segments = key.split(/(\s*"[^"]+"\s*|\s*'[^']+'\s*|[^'".]+)/)
+    if segments.empty?
+      # Only happens if the original key was an empty string
+      ''
+    elsif segments.shift == ''
+      count = segments.size
+      raise yield('Syntax error') unless count > 0
+
+      segments.keep_if { |seg| seg != '.' }
+      raise yield('Syntax error') unless segments.size * 2 == count + 1
+      segments.map! do |segment|
+        segment.strip!
+        segment.start_with?('"') || segment.start_with?("'") ? segment[1..-2] : segment
+      end
+    else
+      raise yield('Syntax error')
+    end
+  end
 end

data/lib/puppet/defaults.rb

@@ -1310,7 +1310,7 @@ EOT
         For control over logging destinations, see the `--logdest` command line
         option in the manual pages for puppet master, puppet agent, and puppet
         apply. You can see man pages by running `puppet <SUBCOMMAND> --help`,
-        or read them online at https://docs.puppetlabs.com/references/latest/man/."
+        or read them online at https://docs.puppetlabs.com/puppet/latest/reference/man/."
     },
     :server => {
       :default => "puppet",
@@ -1355,7 +1355,7 @@ EOT
         event _would_ have been sent.
 
         **Important note:**
-        [The `noop` metaparameter](https://docs.puppetlabs.com/references/latest/metaparameter.html#noop)
+        [The `noop` metaparameter](https://docs.puppetlabs.com/puppet/latest/reference/metaparameter.html#noop)
         allows you to apply individual resources in noop mode, and will override
         the global value of the `noop` setting. This means a resource with
         `noop => false` _will_ be changed if necessary, even when running puppet

data/lib/puppet/face/config.rb

@@ -9,7 +9,7 @@ Puppet::Face.define(:config, '0.0.1') do
 
   description "This subcommand can inspect and modify settings from Puppet's
     'puppet.conf' configuration file. For documentation about individual settings,
-    see https://docs.puppetlabs.com/references/latest/configuration.html."
+    see https://docs.puppetlabs.com/puppet/latest/reference/configuration.html."
 
   option "--section SECTION_NAME" do
     default_to { "main" }

data/lib/puppet/face/help/man.erb

@@ -23,7 +23,7 @@ settings, so you can specify `--server <servername>`, or
 `--run_mode <runmode>` as an argument.
 
 See the configuration file documentation at
-<https://docs.puppetlabs.com/references/stable/configuration.html> for the
+<https://docs.puppetlabs.com/puppet/latest/reference/configuration.html> for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 `--genconfig`.

data/lib/puppet/functions/hiera_include.rb

@@ -1,7 +1,7 @@
 require 'hiera/puppet_function'
 
 # Assigns classes to a node using an
-# [array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.htmlarray-merge)
+# [array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge)
 # that retrieves the value for a user-specified key from Hiera's data.
 #
 # The `hiera_include` function requires:
@@ -26,7 +26,7 @@ require 'hiera/puppet_function'
 #     searching the rest of the hierarchy.
 #
 # The function uses an
-# [array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.htmlarray-merge)
+# [array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge)
 # to retrieve the `classes` array, so every node gets every class from the hierarchy.
 #
 # @example Using `hiera_include`

data/lib/puppet/functions/inline_epp.rb

@@ -28,7 +28,7 @@
 # `inline_epp` function fails to pass any required parameter.
 #
 # An inline EPP template should be written as a single-quoted string or
-# [heredoc](puppet/latest/reference/lang_data_string.html#heredocs).
+# [heredoc](/puppet/latest/reference/lang_data_string.html#heredocs).
 # A double-quoted string is subject to expression interpolation before the string
 # is parsed as an EPP template.
 #

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

@@ -6,7 +6,7 @@ module Puppet::Parser::Functions
     :arity => -2,
     :doc => <<-DOC
 Assigns classes to a node using an
-[array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.htmlarray-merge)
+[array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge)
 that retrieves the value for a user-specified key from Hiera's data.
 
 The `hiera_include` function requires:
@@ -31,7 +31,7 @@ top of the hierarchy. This lets you temporarily modify the hierarchy for a singl
     searching the rest of the hierarchy.
 
 The function uses an
-[array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.htmlarray-merge)
+[array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge)
 to retrieve the `classes` array, so every node gets every class from the hierarchy.
 
 **Example**: Using `hiera_include`

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

@@ -29,7 +29,7 @@ parameter tag without default values. Puppet produces an error if the
 `inline_epp` function fails to pass any required parameter.
 
 An inline EPP template should be written as a single-quoted string or
-[heredoc](puppet/latest/reference/lang_data_string.html#heredocs).
+[heredoc](/puppet/latest/reference/lang_data_string.html#heredocs).
 A double-quoted string is subject to expression interpolation before the string
 is parsed as an EPP template.
 

data/lib/puppet/pops/types/type_mismatch_describer.rb

@@ -183,7 +183,7 @@ module Types
     end
 
     def hash
-      super.hash * 31 + key.hash
+      super.hash ^ key.hash
     end
   end
 
@@ -237,9 +237,7 @@ module Types
     end
 
     def hash
-      hash = super.hash
-      hash = hash * 31 + expected.hash
-      hash * 31 + actual.hash
+      [canonical_path, expected, actual].hash
     end
 
     def swap_expected(expected)

data/lib/puppet/pops/types/types.rb

@@ -324,7 +324,7 @@ class PTypeWithContainedType < PAnyType
   end
 
   def hash
-    self.class.hash * 31 * @type.hash
+    self.class.hash ^ @type.hash
   end
 
   def eql?(o)
@@ -637,7 +637,7 @@ class PNumericType < PScalarType
   end
 
   def hash
-    @from.hash * 31 + @to.hash
+    @from.hash ^ @to.hash
   end
 
   def eql?(o)
@@ -819,7 +819,7 @@ class PCollectionType < PAnyType
   end
 
   def hash
-    @element_type.hash * 31 + @size_type.hash
+    @element_type.hash ^ @size_type.hash
   end
 
   def iterable?(guard = nil)
@@ -958,7 +958,7 @@ class PStringType < PScalarType
   end
 
   def hash
-    @size_type.hash * 31 + @values.hash
+    @size_type.hash ^ @values.hash
   end
 
   def iterable?(guard = nil)
@@ -1151,7 +1151,7 @@ class PStructElement < TypedModelObject
   end
 
   def hash
-    value_type.hash * 31 + key_type.hash
+    value_type.hash ^ key_type.hash
   end
 
   def name
@@ -1437,7 +1437,7 @@ class PTupleType < PAnyType
   end
 
   def hash
-    @size_type.hash * 31 + @types.hash
+    @size_type.hash ^ @types.hash
   end
 
   def eql?(o)
@@ -1570,7 +1570,7 @@ class PCallableType < PAnyType
   end
 
   def hash
-    @param_types.hash * 31 + @block_type.hash
+    @param_types.hash ^ @block_type.hash
   end
 
   def eql?(o)
@@ -1717,7 +1717,7 @@ class PHashType < PCollectionType
   end
 
   def hash
-    @key_type.hash * 31 + super
+    super ^ @key_type.hash
   end
 
   def instance?(o)
@@ -2022,7 +2022,7 @@ class PRuntimeType < PAnyType
   end
 
   def hash
-    @runtime.hash * 31 + @runtime_type_name.hash
+    @runtime.hash ^ @runtime_type_name.hash
   end
 
   def eql?(o)
@@ -2092,7 +2092,7 @@ class PHostClassType < PCatalogEntryType
   end
 
   def hash
-    11 * @class_name.hash
+    11 ^ @class_name.hash
   end
   def eql?(o)
     self.class == o.class && @class_name == o.class_name
@@ -2124,7 +2124,7 @@ class PResourceType < PCatalogEntryType
   end
 
   def hash
-    @type_name.hash * 31 + @title.hash
+    @type_name.hash ^ @title.hash
   end
 
   def eql?(o)
@@ -2212,7 +2212,7 @@ class PTypeReferenceType < PAnyType
   end
 
   def hash
-    @name.hash * 31 + @parameters.hash
+    @name.hash ^ @parameters.hash
   end
 
   def eql?(o)

data/lib/puppet/provider/package/pip3.rb

@@ -12,6 +12,8 @@ Puppet::Type.type(:package).provide :pip3,
   These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
   or an array where each element is either a string or a hash."
 
+  has_feature :installable, :uninstallable, :upgradeable, :versionable, :install_options
+
   def self.cmd
     ["pip3"]
   end

data/lib/puppet/reference/providers.rb

@@ -91,7 +91,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
 
     ret << markdown_header(type.name.to_s + "_", 2)
 
-    ret << "[#{type.name}](https://docs.puppetlabs.com/references/stable/type.html##{type.name})\n\n"
+    ret << "[#{type.name}](https://docs.puppetlabs.com/puppet/latest/reference/type.html##{type.name})\n\n"
     ret << option("Default provider", default)
     ret << doctable(headers, table_data)
 

data/lib/puppet/resource/catalog.rb

@@ -102,6 +102,9 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     end
   end
 
+  # Add `resources` to the catalog after `other`. WARNING: adding
+  # multiple resources will produce the reverse ordering, e.g. calling
+  # `add_resource_after(A, [B,C])` will result in `[A,C,B]`.
   def add_resource_after(other, *resources)
     resources.each do |resource|
       other_title_key = title_key_for_ref(other.ref)
@@ -111,7 +114,6 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     end
   end
 
-
   def add_resource(*resources)
     resources.each do |resource|
       add_one_resource(resource)

data/lib/puppet/transaction.rb

@@ -275,30 +275,6 @@ class Puppet::Transaction
     resource_status(resource).failed_dependencies = failed.to_a
   end
 
-  # A general method for recursively generating new resources from a
-  # resource.
-  def generate_additional_resources(resource)
-    return unless resource.respond_to?(:generate)
-    begin
-      made = resource.generate
-    rescue => detail
-      resource.log_exception(detail, "Failed to generate additional resources using 'generate': #{detail}")
-    end
-    return unless made
-    made = [made] unless made.is_a?(Array)
-    made.uniq.each do |res|
-      begin
-        res.tag(*resource.tags)
-        @catalog.add_resource(res)
-        res.finish
-        add_conditional_directed_dependency(resource, res)
-        generate_additional_resources(res)
-      rescue Puppet::Resource::Catalog::DuplicateResourceError
-        res.info "Duplicate generated resource; skipping"
-      end
-    end
-  end
-
   # Should we ignore tags?
   def ignore_tags?
     ! @catalog.host_config?

data/lib/puppet/type.rb

@@ -1246,7 +1246,7 @@ class Type
       event _would_ have been sent.
 
       **Important note:**
-      [The `noop` setting](https://docs.puppetlabs.com/references/latest/configuration.html#noop)
+      [The `noop` setting](https://docs.puppetlabs.com/puppet/latest/reference/configuration.html#noop)
       allows you to globally enable or disable noop mode, but it will _not_ override
       the `noop` metaparameter on individual resources. That is, the value of the
       global `noop` setting will _only_ affect resources that do not have an explicit
@@ -1266,7 +1266,7 @@ class Type
       The value of this metaparameter must be the `name` of a `schedule`
       resource. This means you must declare a schedule resource, then
       refer to it by name; see
-      [the docs for the `schedule` type](https://docs.puppetlabs.com/references/latest/type.html#schedule)
+      [the docs for the `schedule` type](https://docs.puppetlabs.com/puppet/latest/reference/type.html#schedule)
       for more info.
 
           schedule { 'everyday':
@@ -1441,7 +1441,7 @@ class Type
           }
 
       Tags are useful for things like applying a subset of a host's configuration
-      with [the `tags` setting](/references/latest/configuration.html#tags)
+      with [the `tags` setting](/puppet/latest/reference/configuration.html#tags)
       (e.g. `puppet agent --test --tags bootstrap`)."
 
     munge do |tags|
@@ -1630,7 +1630,7 @@ class Type
       By default, all classes are declared in the `main` stage. To assign a class
       to a different stage, you must:
 
-      * Declare the new stage as a [`stage` resource](https://docs.puppetlabs.com/references/latest/type.html#stage).
+      * Declare the new stage as a [`stage` resource](https://docs.puppetlabs.com/puppet/latest/reference/type.html#stage).
       * Declare an order relationship between the new stage and the `main` stage.
       * Use the resource-like syntax to declare the class, and set the `stage`
         metaparameter to the name of the desired stage.

data/lib/puppet/type/file.rb

@@ -236,11 +236,9 @@ Puppet::Type.newtype(:file) do
 
   newparam(:links) do
     desc "How to handle links during file actions.  During file copying,
-      `follow` will copy the target file instead of the link, `manage`
-      will copy the link itself, and `ignore` will just pass it by.
-      When not copying, `manage` and `ignore` behave equivalently
-      (because you cannot really ignore links entirely during local
-      recursion), and `follow` will manage the file to which the link points."
+      `follow` will copy the target file instead of the link and `manage`
+      will copy the link itself. When not copying, `manage` will manage
+      the link, and `follow` will manage the file to which the link points."
 
     newvalues(:follow, :manage)
 

data/lib/puppet/type/file/content.rb

@@ -35,8 +35,8 @@ module Puppet
           }
 
       ...but for larger files, this attribute is more useful when combined with the
-      [template](https://docs.puppetlabs.com/references/latest/function.html#template)
-      or [file](https://docs.puppetlabs.com/references/latest/function.html#file)
+      [template](https://docs.puppetlabs.com/puppet/latest/reference/function.html#template)
+      or [file](https://docs.puppetlabs.com/puppet/latest/reference/function.html#file)
       function.
     EOT
 

data/lib/puppet/type/filebucket.rb

@@ -21,7 +21,7 @@ module Puppet
         puppet master's filebucket with the _desired_ content for each file,
         then instructs the agent to retrieve the content for a specific
         checksum. For more details,
-        [see the `static_compiler` section in the catalog indirection docs](https://docs.puppetlabs.com/references/latest/indirection.html#catalog).
+        [see the `static_compiler` section in the catalog indirection docs](https://docs.puppetlabs.com/puppet/latest/reference/indirection.html#catalog).
 
       To use a central filebucket for backups, you will usually want to declare
       a filebucket resource and a resource default for the `backup` attribute

data/lib/puppet/type/schedule.rb

@@ -2,7 +2,7 @@ module Puppet
   Type.newtype(:schedule) do
     @doc = <<-'EOT'
       Define schedules for Puppet. Resources can be limited to a schedule by using the
-      [`schedule`](https://docs.puppetlabs.com/references/latest/metaparameter.html#schedule)
+      [`schedule`](https://docs.puppetlabs.com/puppet/latest/reference/metaparameter.html#schedule)
       metaparameter.
 
       Currently, **schedules can only be used to stop a resource from being

data/lib/puppet/type/stage.rb

@@ -2,7 +2,7 @@ Puppet::Type.newtype(:stage) do
   desc "A resource type for creating new run stages.  Once a stage is available,
     classes can be assigned to it by declaring them with the resource-like syntax
     and using
-    [the `stage` metaparameter](https://docs.puppetlabs.com/references/latest/metaparameter.html#stage).
+    [the `stage` metaparameter](https://docs.puppetlabs.com/puppet/latest/reference/metaparameter.html#stage).
 
     Note that new stages are not useful unless you also declare their order
     in relation to the default `main` stage.

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '4.4.0'
+  PUPPETVERSION = '4.4.1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/integration/data_binding_spec.rb

@@ -58,27 +58,6 @@ describe "Data binding" do
     Puppet[:modulepath] = dir
   end
 
-  it "works with the puppet backend configured, although it can't use it for lookup" do
-    configure_hiera_for_puppet
-    create_manifest_in_module("testing", "binding.pp",
-                              <<-MANIFEST)
-    # lookup via the puppet backend to ensure it works
-    class testing::binding($value = hiera('variable')) {}
-    MANIFEST
-
-    create_manifest_in_module("testing", "data.pp",
-                              <<-MANIFEST)
-    class testing::data (
-    $variable = "the value"
-    ) { }
-    MANIFEST
-
-    catalog = compile_to_catalog("include testing::data")
-    resource = catalog.resource('Class[testing::data]')
-
-    expect(resource[:variable]).to eq("the value")
-  end
-
   context "with testing::binding and global data only" do
     it "looks up global data from hiera" do
       configure_hiera_for_one_tier(data)
@@ -205,19 +184,6 @@ describe "Data binding" do
     Puppet[:hiera_config] = hiera_config_file
   end
 
-  def configure_hiera_for_puppet
-    hiera_config_file = tmpfile("hiera.yaml")
-
-    File.open(hiera_config_file, 'w') do |f|
-      f.write("---
-        :logger: 'noop'
-        :backends: ['puppet']
-      ")
-    end
-
-    Puppet[:hiera_config] = hiera_config_file
-  end
-
   def create_manifest_in_module(module_name, name, manifest)
     module_dir = File.join(dir, module_name, 'manifests')
     FileUtils.mkdir_p(module_dir)

data/spec/unit/application/inspect_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 require 'puppet/application/inspect'
 require 'puppet/resource/catalog'
-require 'puppet/indirector/catalog/yaml'
+require 'puppet/indirector/catalog/json'
 require 'puppet/indirector/report/rest'
 require 'puppet/indirector/file_bucket_file/rest'
 
@@ -31,6 +31,17 @@ describe Puppet::Application::Inspect do
       Puppet[:report] = false
       expect { @inspect.setup }.to raise_error(/report=true/)
     end
+
+    it "should default to the json terminus class when catalog_cache_terminus is not set" do
+      Puppet::Resource::Catalog.indirection.expects(:terminus_class=).with(:json)
+      expect { @inspect.setup }.not_to raise_error
+    end
+
+    it "should respect the catalog_cache_terminus if set" do
+      Puppet[:catalog_cache_terminus] = :yaml
+      Puppet::Resource::Catalog.indirection.expects(:terminus_class=).with(:yaml)
+      expect { @inspect.setup }.not_to raise_error
+    end
   end
 
   describe "when executing", :uses_checksums => true do
@@ -42,13 +53,13 @@ describe Puppet::Application::Inspect do
     end
 
     it "should retrieve the local catalog" do
-      Puppet::Resource::Catalog::Yaml.any_instance.expects(:find).with {|request| request.key == Puppet[:certname] }.returns(Puppet::Resource::Catalog.new)
+      Puppet::Resource::Catalog::Json.any_instance.expects(:find).with {|request| request.key == Puppet[:certname] }.returns(Puppet::Resource::Catalog.new)
 
       @inspect.run_command
     end
 
     it "should save the report to REST" do
-      Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(Puppet::Resource::Catalog.new)
+      Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(Puppet::Resource::Catalog.new)
       Puppet::Transaction::Report::Rest.any_instance.expects(:save).with {|request| request.instance.host == Puppet[:certname] }
 
       @inspect.run_command
@@ -63,7 +74,7 @@ describe Puppet::Application::Inspect do
         file.close
         resource = Puppet::Resource.new(:file, file.path, :parameters => {:audit => "all"})
         catalog.add_resource(resource)
-        Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(catalog)
+        Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(catalog)
 
         events = nil
 
@@ -87,7 +98,7 @@ describe Puppet::Application::Inspect do
       file = Tempfile.new("foo")
       resource = Puppet::Resource.new(:file, file.path, :parameters => {:audit => "all"})
       catalog.add_resource(resource)
-      Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(catalog)
+      Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(catalog)
 
       events = nil
 
@@ -109,7 +120,7 @@ describe Puppet::Application::Inspect do
       file.close
       file.delete
       catalog.add_resource(resource)
-      Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(catalog)
+      Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(catalog)
 
       events = nil
 
@@ -130,7 +141,7 @@ describe Puppet::Application::Inspect do
         Puppet[:archive_files] = true
         Puppet[:archive_file_server] = "filebucketserver"
         @catalog = Puppet::Resource::Catalog.new
-        Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(@catalog)
+        Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(@catalog)
       end
 
       describe "when auditing files" do
@@ -236,7 +247,7 @@ describe Puppet::Application::Inspect do
         end
 
         @catalog = Puppet::Resource::Catalog.new
-        Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(@catalog)
+        Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(@catalog)
 
         Puppet::Transaction::Report::Rest.any_instance.expects(:save).with do |request|
           @report = request.instance

data/spec/unit/data_providers/hiera_interpolation_spec.rb

@@ -4,31 +4,41 @@ require 'puppet'
 require 'puppet/data_providers/hiera_config'
 require 'puppet/data_providers/hiera_interpolate'
 
-describe "Puppet::DataProviders::HieraInterpolate" do
+describe 'Puppet::DataProviders::HieraInterpolate' do
 
   let(:interpolator) { Class.new { include Puppet::DataProviders::HieraInterpolate }.new }
   let(:scope) { {} }
   let(:lookup_invocation) { Puppet::Pops::Lookup::Invocation.new(scope, {}, {}, nil) }
 
+  def expect_lookup(*keys)
+    keys.each { |key| Puppet::Pops::Lookup.expects(:lookup).with(key, nil, '', true, nil, lookup_invocation).returns(data[key]) }
+  end
+
   context 'when interpolating nested data' do
-    let(:nested_hash) { { 'a' => { 'aa' => "%{alias('aaa')}" } } }
+    let(:nested_hash) { {'a' => {'aa' => "%{alias('aaa')}"}} }
+
+    let(:data) {
+      {
+        'aaa' => {'b' => {'bb' => "%{alias('bbb')}"}},
+        'bbb' => ["%{alias('ccc')}"],
+        'ccc' => 'text'
+      }
+    }
 
     it 'produces a nested hash with arrays from nested aliases with hashes and arrays' do
-      Puppet::Pops::Lookup.expects(:lookup).with('aaa', nil, '', true, nil, lookup_invocation).returns({ 'b' => { 'bb' => "%{alias('bbb')}" } })
-      Puppet::Pops::Lookup.expects(:lookup).with('bbb', nil, '', true, nil, lookup_invocation).returns([ "%{alias('ccc')}" ])
-      Puppet::Pops::Lookup.expects(:lookup).with('ccc', nil, '', true, nil, lookup_invocation).returns('text')
-      expect(interpolator.interpolate(nested_hash, lookup_invocation, true)).to eq('a'=>{'aa'=>{'b'=>{'bb'=>['text']}}})
+      expect_lookup('aaa', 'bbb', 'ccc')
+      expect(interpolator.interpolate(nested_hash, lookup_invocation, true)).to eq('a' => {'aa' => {'b' => {'bb' => ['text']}}})
     end
   end
 
   context 'when there are empty interpolations %{} in data' do
 
-    let(:empty_interpolation) {'clown%{}shoe'}
-    let(:empty_interpolation_as_escape) {'clown%%{}{shoe}s'}
-    let(:only_empty_interpolation) {'%{}'}
-    let(:empty_namespace) {'%{::}'}
-    let(:whitespace1) {'%{ :: }'}
-    let(:whitespace2) {'%{   }'}
+    let(:empty_interpolation) { 'clown%{}shoe' }
+    let(:empty_interpolation_as_escape) { 'clown%%{}{shoe}s' }
+    let(:only_empty_interpolation) { '%{}' }
+    let(:empty_namespace) { '%{::}' }
+    let(:whitespace1) { '%{ :: }' }
+    let(:whitespace2) { '%{   }' }
 
     it 'should produce an empty string for the interpolation' do
       expect(interpolator.interpolate(empty_interpolation, lookup_invocation, true)).to eq('clownshoe')
@@ -54,4 +64,242 @@ describe "Puppet::DataProviders::HieraInterpolate" do
       expect(interpolator.interpolate(whitespace2, lookup_invocation, true)).to eq('')
     end
   end
+
+  context 'when there are quoted empty interpolations %{} in data' do
+
+    let(:empty_interpolation) { 'clown%{""}shoe' }
+    let(:empty_interpolation_as_escape) { 'clown%%{""}{shoe}s' }
+    let(:only_empty_interpolation) { '%{""}' }
+    let(:empty_namespace) { '%{"::"}' }
+    let(:whitespace1) { '%{ "::" }' }
+    let(:whitespace2) { '%{ ""  }' }
+
+    it 'should produce an empty string for the interpolation' do
+      expect(interpolator.interpolate(empty_interpolation, lookup_invocation, true)).to eq('clownshoe')
+    end
+
+    it 'the empty interpolation can be used as an escape mechanism' do
+      expect(interpolator.interpolate(empty_interpolation_as_escape, lookup_invocation, true)).to eq('clown%{shoe}s')
+    end
+
+    it 'the value can consist of only an empty escape' do
+      expect(interpolator.interpolate(only_empty_interpolation, lookup_invocation, true)).to eq('')
+    end
+
+    it 'the value can consist of an empty namespace %{"::"}' do
+      expect(interpolator.interpolate(empty_namespace, lookup_invocation, true)).to eq('')
+    end
+
+    it 'the value can consist of whitespace %{ "::" }' do
+      expect(interpolator.interpolate(whitespace1, lookup_invocation, true)).to eq('')
+    end
+
+    it 'the value can consist of whitespace %{ "" }' do
+      expect(interpolator.interpolate(whitespace2, lookup_invocation, true)).to eq('')
+    end
+  end
+
+
+  context 'when using dotted keys' do
+    let(:data) {
+      {
+        'a.b' => '(lookup) a dot b',
+        'a' => {
+          'd' => '(lookup) a dot d is a hash entry',
+          'd.x' => '(lookup) a dot d.x is a hash entry',
+          'd.z' => {
+            'g' => '(lookup) a dot d.z dot g is a hash entry'}
+        },
+        'a.x' => {
+          'd' => '(lookup) a.x dot d is a hash entry',
+          'd.x' => '(lookup) a.x dot d.x is a hash entry',
+          'd.z' => {
+            'g' => '(lookup) a.x dot d.z dot g is a hash entry'
+          }
+        },
+        'x.1' => '(lookup) x dot 1',
+      }
+    }
+
+    let(:scope) {
+      {
+        'a.b' => '(scope) a dot b',
+        'a' => {
+          'd' => '(scope) a dot d is a hash entry',
+          'd.x' => '(scope) a dot d.x is a hash entry',
+          'd.z' => {
+            'g' => '(scope) a dot d.z dot g is a hash entry'}
+        },
+        'a.x' => {
+          'd' => '(scope) a.x dot d is a hash entry',
+          'd.x' => '(scope) a.x dot d.x is a hash entry',
+          'd.z' => {
+            'g' => '(scope) a.x dot d.z dot g is a hash entry'
+          }
+        },
+        'x.1' => '(scope) x dot 1',
+      }
+    }
+
+    it 'should find an entry using a quoted interpolation' do
+      expect(interpolator.interpolate("a dot c: %{'a.b'}", lookup_invocation, true)).to eq('a dot c: (scope) a dot b')
+    end
+
+    it 'should find an entry using a quoted interpolation with method lookup' do
+      expect_lookup('a.b')
+      expect(interpolator.interpolate("a dot c: %{lookup(\"'a.b'\")}", lookup_invocation, true)).to eq('a dot c: (lookup) a dot b')
+    end
+
+    it 'should find an entry using a quoted interpolation with method alias' do
+      expect_lookup('a.b')
+      expect(interpolator.interpolate("%{alias(\"'a.b'\")}", lookup_invocation, true)).to eq('(lookup) a dot b')
+    end
+
+    it 'should use a dotted key to navigate into a structure when it is not quoted' do
+      expect(interpolator.interpolate('a dot e: %{a.d}', lookup_invocation, true)).to eq('a dot e: (scope) a dot d is a hash entry')
+    end
+
+    it 'should use a dotted key to navigate into a structure when when it is not quoted with method lookup' do
+      expect_lookup('a')
+      expect(interpolator.interpolate("a dot e: %{lookup('a.d')}", lookup_invocation, true)).to eq('a dot e: (lookup) a dot d is a hash entry')
+    end
+
+    it 'should use a mix of quoted and dotted keys to navigate into a structure containing dotted keys and quoted key is last' do
+      expect(interpolator.interpolate("a dot ex: %{a.'d.x'}", lookup_invocation, true)).to eq('a dot ex: (scope) a dot d.x is a hash entry')
+    end
+
+    it 'should use a mix of quoted and dotted keys to navigate into a structure containing dotted keys and quoted key is last and method is lookup' do
+      expect_lookup('a')
+      expect(interpolator.interpolate("a dot ex: %{lookup(\"a.'d.x'\")}", lookup_invocation, true)).to eq('a dot ex: (lookup) a dot d.x is a hash entry')
+    end
+
+    it 'should use a mix of quoted and dotted keys to navigate into a structure containing dotted keys and quoted key is first' do
+      expect(interpolator.interpolate("a dot xe: %{'a.x'.d}", lookup_invocation, true)).to eq('a dot xe: (scope) a.x dot d is a hash entry')
+    end
+
+    it 'should use a mix of quoted and dotted keys to navigate into a structure containing dotted keys and quoted key is first and method is lookup' do
+      expect_lookup('a.x')
+      expect(interpolator.interpolate("a dot xe: %{lookup(\"'a.x'.d\")}", lookup_invocation, true)).to eq('a dot xe: (lookup) a.x dot d is a hash entry')
+    end
+
+    it 'should use a mix of quoted and dotted keys to navigate into a structure containing dotted keys and quoted key is in the middle' do
+      expect(interpolator.interpolate("a dot xm: %{a.'d.z'.g}", lookup_invocation, true)).to eq('a dot xm: (scope) a dot d.z dot g is a hash entry')
+    end
+
+    it 'should use a mix of quoted and dotted keys to navigate into a structure containing dotted keys and quoted key is in the middle and method is lookup' do
+      expect_lookup('a')
+      expect(interpolator.interpolate("a dot xm: %{lookup(\"a.'d.z'.g\")}", lookup_invocation, true)).to eq('a dot xm: (lookup) a dot d.z dot g is a hash entry')
+    end
+
+    it 'should use a mix of several quoted and dotted keys to navigate into a structure containing dotted keys and quoted key is in the middle' do
+      expect(interpolator.interpolate("a dot xx: %{'a.x'.'d.z'.g}", lookup_invocation, true)).to eq('a dot xx: (scope) a.x dot d.z dot g is a hash entry')
+    end
+
+    it 'should use a mix of several quoted and dotted keys to navigate into a structure containing dotted keys and quoted key is in the middle and method is lookup' do
+      expect_lookup('a.x')
+      expect(interpolator.interpolate("a dot xx: %{lookup(\"'a.x'.'d.z'.g\")}", lookup_invocation, true)).to eq('a dot xx: (lookup) a.x dot d.z dot g is a hash entry')
+    end
+
+    it 'should find an entry using using a quoted interpolation on dotted key containing numbers' do
+      expect(interpolator.interpolate("x dot 2: %{'x.1'}", lookup_invocation, true)).to eq('x dot 2: (scope) x dot 1')
+    end
+
+    it 'should find an entry using using a quoted interpolation on dotted key containing numbers using method lookup' do
+      expect_lookup('x.1')
+      expect(interpolator.interpolate("x dot 2: %{lookup(\"'x.1'\")}", lookup_invocation, true)).to eq('x dot 2: (lookup) x dot 1')
+    end
+
+    it 'should not find a subkey when the dotted key is quoted' do
+      expect(interpolator.interpolate("a dot f: %{'a.d'}", lookup_invocation, true)).to eq('a dot f: ')
+    end
+
+    it 'should not find a subkey when the dotted key is quoted with method lookup' do
+      expect_lookup('a.d')
+      expect(interpolator.interpolate("a dot f: %{lookup(\"'a.d'\")}", lookup_invocation, true)).to eq('a dot f: ')
+    end
+  end
+
+  context 'when dealing with non alphanumeric characters' do
+    let(:data) {
+      {
+        'a key with whitespace' => 'value for a ws key',
+        'ws_key' => '%{alias("a key with whitespace")}',
+        '\#@!&%|' => 'not happy',
+        'angry' => '%{alias("\#@!&%|")}',
+        '!$\%!' => {
+          '\#@!&%|' => 'not happy at all'
+        },
+        'very_angry' => '%{alias("!$\%!.\#@!&%|")}',
+        'a key with' => {
+          'nested whitespace' => 'value for nested ws key',
+          ' untrimmed whitespace ' => 'value for untrimmed ws key'
+        }
+      }
+    }
+
+    it 'allows keys with white space' do
+      expect_lookup('ws_key', 'a key with whitespace')
+      expect(interpolator.interpolate("%{lookup('ws_key')}", lookup_invocation, true)).to eq('value for a ws key')
+    end
+
+    it 'allows keys with non alphanumeric characters' do
+      expect_lookup('angry', '\#@!&%|')
+      expect(interpolator.interpolate("%{lookup('angry')}", lookup_invocation, true)).to eq('not happy')
+    end
+
+    it 'allows dotted keys with non alphanumeric characters' do
+      expect_lookup('very_angry', '!$\%!')
+      expect(interpolator.interpolate("%{lookup('very_angry')}", lookup_invocation, true)).to eq('not happy at all')
+    end
+
+    it 'allows dotted keys with nested white space' do
+      expect_lookup('a key with')
+      expect(interpolator.interpolate("%{lookup('a key with.nested whitespace')}", lookup_invocation, true)).to eq('value for nested ws key')
+    end
+
+    it 'will trim each key element' do
+      expect_lookup('a key with')
+      expect(interpolator.interpolate("%{lookup(' a key with . nested whitespace ')}", lookup_invocation, true)).to eq('value for nested ws key')
+    end
+
+    it 'will not trim quoted key element' do
+      expect_lookup('a key with')
+      expect(interpolator.interpolate("%{lookup(' a key with .\" untrimmed whitespace \"')}", lookup_invocation, true)).to eq('value for untrimmed ws key')
+    end
+
+    it 'will not trim spaces outside of quoted key element' do
+      expect_lookup('a key with')
+      expect(interpolator.interpolate("%{lookup(' a key with .  \" untrimmed whitespace \"  ')}", lookup_invocation, true)).to eq('value for untrimmed ws key')
+    end
+  end
+
+  context 'when dealing with bad keys' do
+    it 'should produce an error when different quotes are used on either side' do
+      expect { interpolator.interpolate("%{'the.key\"}", lookup_invocation, true)}.to raise_error("Syntax error in string: %{'the.key\"}")
+    end
+
+    it 'should produce an if there is only one quote' do
+      expect { interpolator.interpolate("%{the.'key}", lookup_invocation, true)}.to raise_error("Syntax error in string: %{the.'key}")
+    end
+
+    it 'should produce an error for an empty segment' do
+      expect { interpolator.interpolate('%{the..key}', lookup_invocation, true)}.to raise_error("Syntax error in string: %{the..key}")
+    end
+
+    it 'should produce an error for an empty quoted segment' do
+      expect { interpolator.interpolate("%{the.''.key}", lookup_invocation, true)}.to raise_error("Syntax error in string: %{the.''.key}")
+    end
+
+    it 'should produce an error for an partly quoted segment' do
+      expect { interpolator.interpolate("%{the.'pa'key}", lookup_invocation, true)}.to raise_error("Syntax error in string: %{the.'pa'key}")
+    end
+
+    it 'should produce an error when different quotes are used on either side in a method argument' do
+      expect { interpolator.interpolate("%{lookup('the.key\")}", lookup_invocation, true)}.to raise_error("Syntax error in string: %{lookup('the.key\")}")
+    end
+
+    it 'should produce an error unless a known interpolation method is used' do
+      expect { interpolator.interpolate("%{flubber(\"hello\")}", lookup_invocation, true)}.to raise_error("Unknown interpolation method 'flubber'")
+    end
+  end
 end

data/spec/unit/provider/package/pip3_spec.rb

@@ -15,6 +15,14 @@ describe provider_class do
     XMLRPC::Client.stubs(:new2).returns(@client)
   end
 
+  describe 'provider features' do
+    it { is_expected.to be_installable }
+    it { is_expected.to be_uninstallable }
+    it { is_expected.to be_upgradeable }
+    it { is_expected.to be_versionable }
+    it { is_expected.to be_install_options }
+  end
+
   describe "parse" do
 
     it "should return a hash on valid input" do

data/spec/unit/provider/package/pip_spec.rb

@@ -14,6 +14,14 @@ describe provider_class do
     @client.stubs(:call).with('package_releases', 'fake_package').returns([])
   end
 
+  describe 'provider features' do
+    it { is_expected.to be_installable }
+    it { is_expected.to be_uninstallable }
+    it { is_expected.to be_upgradeable }
+    it { is_expected.to be_versionable }
+    it { is_expected.to be_install_options }
+  end
+
   describe "parse" do
 
     it "should return a hash on valid input" do

data/spec/unit/provider/service/systemd_spec.rb

@@ -42,7 +42,7 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     end
   end
 
-  [ 17, 18, 19, 20, 21 ].each do |ver|
+  [ 17, 18, 19, 20, 21, 22, 23 ].each do |ver|
     it "should be the default provider on fedora#{ver}" do
       Facter.stubs(:value).with(:osfamily).returns(:redhat)
       Facter.stubs(:value).with(:operatingsystem).returns(:fedora)

data/spec/unit/resource/catalog_spec.rb

@@ -296,6 +296,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog = Puppet::Resource::Catalog.new("host")
       @one = Puppet::Type.type(:notify).new :name => "one"
       @two = Puppet::Type.type(:notify).new :name => "two"
+      @three = Puppet::Type.type(:notify).new :name => "three"
       @dupe = Puppet::Type.type(:notify).new :name => "one"
     end
 
@@ -349,6 +350,32 @@ describe Puppet::Resource::Catalog, "when compiling" do
       expect(@catalog.resource("notify[one]", nil)).to equal(@one)
     end
 
+    it "adds resources before an existing resource" do
+      @catalog.add_resource(@one)
+      @catalog.add_resource_before(@one, @two, @three)
+
+      expect(@catalog.resources).to eq([@two, @three, @one])
+    end
+
+    it "raises if adding a resource before a resource not in the catalog" do
+      expect {
+        @catalog.add_resource_before(@one, @two)
+      }.to raise_error(ArgumentError, "Cannot add resource Notify[two] before Notify[one] because Notify[one] is not yet in the catalog")
+    end
+
+    it "adds resources after an existing resource in reverse order" do
+      @catalog.add_resource(@one)
+      @catalog.add_resource_after(@one, @two, @three)
+
+      expect(@catalog.resources).to eq([@one, @three, @two])
+    end
+
+    it "raises if adding a resource after a resource not in the catalog" do
+      expect {
+        @catalog.add_resource_after(@one, @two)
+      }.to raise_error(ArgumentError, "Cannot add resource Notify[two] after Notify[one] because Notify[one] is not yet in the catalog")
+    end
+
     describe 'with a duplicate resource' do
       def resource_at(type, name, file, line)
         resource = Puppet::Resource.new(type, name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1480,7 +1480,6 @@ files:
 - ext/osx/prototype.plist.erb
 - ext/osx/puppet.plist
 - ext/project_data.yaml
-- ext/puppet-nm-dispatcher
 - ext/puppet-test
 - ext/puppetlisten/puppetlisten.rb
 - ext/puppetlisten/puppetrun.rb

data/ext/puppet-nm-dispatcher

@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# Restart puppet on network changes to pickup changes to /etc/resolv.conf
-#
-# https://projects.puppetlabs.com/issues/2776
-# https://bugzilla.redhat.com/532085
-
-
-if [ -f "/bin/systemctl" ]  ; then
-  [[ $2 =~ ^(up|down)$ ]] && /bin/systemctl try-restart puppet.service || :
-else
-  [[ $2 =~ ^(up|down)$ ]] && /sbin/service puppet condrestart || :
-fi