puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/ssl/inventory.rb

@@ -35,13 +35,6 @@ class Puppet::SSL::Inventory
     end
   end
 
-  # Find the serial number for a given certificate.
-  def serial(name)
-    Puppet.deprecation_warning 'Inventory#serial is deprecated, use Inventory#serials instead.'
-    return nil unless Puppet::FileSystem.exist?(@path)
-    serials(name).first
-  end
-
   # Find all serial numbers for a given certificate. If none can be found, returns
   # an empty array.
   def serials(name)

data/lib/puppet/ssl/oids.rb

@@ -35,12 +35,81 @@ module Puppet::SSL::Oids
     ["1.3.6.1.4.1.34380.1.1.2", 'pp_instance_id', 'Puppet Node Instance ID'],
     ["1.3.6.1.4.1.34380.1.1.3", 'pp_image_name', 'Puppet Node Image Name'],
     ["1.3.6.1.4.1.34380.1.1.4", 'pp_preshared_key', 'Puppet Node Preshared Key'],
-
+    ["1.3.6.1.4.1.34380.1.1.5", 'pp_cost_center', 'Puppet Node Cost Center Name'],
+    ["1.3.6.1.4.1.34380.1.1.6", 'pp_product', 'Puppet Node Product Name'],
+    ["1.3.6.1.4.1.34380.1.1.7", 'pp_project', 'Puppet Node Project Name'],
+    ["1.3.6.1.4.1.34380.1.1.8", 'pp_application', 'Puppet Node Application Name'],
+    ["1.3.6.1.4.1.34380.1.1.9", 'pp_service', 'Puppet Node Service Name'],
+    ["1.3.6.1.4.1.34380.1.1.10", 'pp_employee', 'Puppet Node Employee Name'],
+    ["1.3.6.1.4.1.34380.1.1.11", 'pp_created_by', 'Puppet Node created_by Tag'],
+    ["1.3.6.1.4.1.34380.1.1.12", 'pp_environment', 'Puppet Node Environment Name'],
+    ["1.3.6.1.4.1.34380.1.1.13", 'pp_role', 'Puppet Node Role Name'],
+    ["1.3.6.1.4.1.34380.1.1.14", 'pp_software_version', 'Puppet Node Software Version'],
+    ["1.3.6.1.4.1.34380.1.1.15", 'pp_department', 'Puppet Node Department Name'],
+    ["1.3.6.1.4.1.34380.1.1.16", 'pp_cluster', 'Puppet Node Cluster Name'],
+    ["1.3.6.1.4.1.34380.1.1.17", 'pp_provisioner', 'Puppet Node Provisioner Name'],
+    
     ["1.3.6.1.4.1.34380.1.2", 'ppPrivCertExt', 'Puppet Private Certificate Extension'],
   ]
 
-  PUPPET_OIDS.each do |oid_defn|
-    OpenSSL::ASN1::ObjectId.register(*oid_defn)
+  # Register our custom Puppet OIDs with OpenSSL so they can be used as CSR
+  # extensions. Without registering these OIDs, OpenSSL will fail when it
+  # encounters such an extension in a CSR.
+  def self.register_puppet_oids()
+    PUPPET_OIDS.each do |oid_defn|
+      OpenSSL::ASN1::ObjectId.register(*oid_defn)
+    end
+  end
+
+  # Parse and load custom OID mapping file that enables custom OIDs to be resolved
+  # into user-friendly names.
+  #
+  # @param custom_oid_file [String] File to obtain custom OIDs mapping from
+  # @param map_key [String] Hash key in which custom OIDs mapping is stored
+  #
+  # @example Custom OID mapping file
+  # ---
+  # oid_mapping:
+  #  '1.3.6.1.4.1.34380.1.2.1.1':
+  #    shortname : 'myshortname'
+  #    longname  : 'Long name'
+  #  '1.3.6.1.4.1.34380.1.2.1.2':
+  #    shortname: 'myothershortname'
+  #    longname: 'Other Long name'
+  def self.load_custom_oid_file(custom_oid_file, map_key='oid_mapping')
+    if File.exists?(custom_oid_file) && File.readable?(custom_oid_file)
+      mapping = nil
+      begin
+        mapping = YAML.load_file(custom_oid_file)
+      rescue => err
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': #{err}", err.backtrace
+      end
+
+      unless mapping.has_key?(map_key)
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': no such index '#{map_key}'"
+      end
+
+      unless mapping[map_key].is_a?(Hash)
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': data under index '#{map_key}' must be a Hash"
+      end
+
+      oid_defns = []
+      mapping[map_key].keys.each do |oid|
+        shortname, longname = mapping[map_key][oid].values_at("shortname","longname")
+        if shortname.nil? || longname.nil?
+          raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': incomplete definition of oid '#{oid}'"
+        end
+        oid_defns << [oid, shortname, longname]
+      end
+
+      begin
+        oid_defns.each do |oid_defn|
+          OpenSSL::ASN1::ObjectId.register(*oid_defn)
+        end
+      rescue => err
+        raise ArgumentError, "Error registering ssl custom OIDs mapping from file '#{custom_oid_file}': #{err}", err.backtrace
+      end
+    end
   end
 
   # Determine if the first OID contains the second OID

data/lib/puppet/ssl/validator/default_validator.rb

@@ -23,7 +23,6 @@ class Puppet::SSL::Validator::DefaultValidator #< class Puppet::SSL::Validator
   def initialize(
       ssl_configuration = Puppet::SSL::Configuration.new(
                                         Puppet[:localcacert], {
-                                          :ca_chain_file => Puppet[:ssl_client_ca_chain],
                                           :ca_auth_file  => Puppet[:ssl_client_ca_auth]
                                         }),
       ssl_host = Puppet::SSL::Host.localhost)

data/lib/puppet/status.rb

@@ -22,11 +22,6 @@ class Puppet::Status
     end
   end
 
-  def self.from_pson(pson)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(pson)
-  end
-
   def name
     "status"
   end

data/lib/puppet/syntax_checkers.rb

@@ -0,0 +1,3 @@
+# A name space for syntax checkers provided by Puppet.
+module Puppet::SyntaxCheckers
+end

data/lib/{puppetx/puppetlabs → puppet}/syntax_checkers/json.rb

@@ -1,7 +1,7 @@
 # A syntax checker for JSON.
 # @api public
-require 'puppetx/puppet/syntax_checker'
-class Puppetx::Puppetlabs::SyntaxCheckers::Json < Puppetx::Puppet::SyntaxChecker
+require 'puppet/syntax_checkers'
+class Puppet::SyntaxCheckers::Json < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 
   # Checks the text for JSON syntax issues and reports them to the given acceptor.
   # This implementation is abstract, it raises {NotImplementedError} since a subclass should have implemented the

data/lib/puppet/test/test_helper.rb

@@ -49,13 +49,21 @@ module Puppet::Test
       #
       @@reentry_count ||= 0
 
+      @environmentpath = Dir.mktmpdir('environments')
+      Dir.mkdir("#{@environmentpath}/production")
       owner = Process.pid
       Puppet.push_context(Puppet.base_context({
-        :environmentpath => "",
+        :environmentpath => @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(@environmentpath)
+        end
+      })
+      Puppet::SSL::Oids.register_puppet_oids
     end
 
     # Call this method once, when beginning a test run--prior to running
@@ -128,7 +136,6 @@ module Puppet::Test
         "Context for specs")
 
       Puppet::Parser::Functions.reset
-      Puppet::Node::Environment.clear
       Puppet::Application.clear!
       Puppet::Util::Profiler.clear
 
@@ -173,15 +180,6 @@ module Puppet::Test
         $old_env.each {|k, v| ENV[k] = v }
       end
 
-
-      # Some tests can cause us to connect, in which case the lingering
-      # connection is a resource that can cause unexpected failure in later
-      # tests, as well as sharing state accidentally.
-      # We're testing if ActiveRecord::Base is defined because some test cases
-      # may stub Puppet.features.rails? which is how we should normally
-      # introspect for this functionality.
-      ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
-
       # Restore the load_path late, to avoid messing with stubs from the test.
       $LOAD_PATH.clear
       $old_load_path.each {|x| $LOAD_PATH << x }
@@ -199,6 +197,7 @@ module Puppet::Test
       {
           :logdir     => "/dev/null",
           :confdir    => "/dev/null",
+          :codedir    => "/dev/null",
           :vardir     => "/dev/null",
           :rundir     => "/dev/null",
           :hiera_config => "/dev/null",

data/lib/puppet/transaction.rb

@@ -212,13 +212,13 @@ class Puppet::Transaction
   def eval_resource(resource, ancestor = nil)
     if skip?(resource)
       resource_status(resource).skipped = true
+      resource.debug("Resource is being skipped, unscheduling all events")
+      event_manager.dequeue_all_events_for_resource(resource)
     else
       resource_status(resource).scheduled = true
       apply(resource, ancestor)
+      event_manager.process_events(resource)
     end
-
-    # Check to see if there are any events queued for this resource
-    event_manager.process_events(resource)
   end
 
   def failed?(resource)
@@ -284,7 +284,7 @@ class Puppet::Transaction
 
   def resources_by_provider(type_name, provider_name)
     unless @resources_by_provider
-      @resources_by_provider = Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = {} } }
+      @resources_by_provider = Hash.new { |h, k| h[k] = Hash.new { |h1, k1| h1[k1] = {} } }
 
       @catalog.vertices.each do |resource|
         if resource.class.attrclass(:provider)
@@ -305,7 +305,7 @@ class Puppet::Transaction
     Puppet.debug "Prefetching #{provider_class.name} resources for #{type_name}"
     begin
       provider_class.prefetch(resources)
-    rescue => detail
+    rescue LoadError, Puppet::MissingCommand => detail
       Puppet.log_exception(detail, "Could not prefetch #{type_name} provider '#{provider_class.name}': #{detail}")
     end
     @prefetched_providers[type_name][provider_class.name] = true
@@ -350,10 +350,6 @@ class Puppet::Transaction
     resource.appliable_to_host? && resource.appliable_to_device?
   end
 
-  def split_qualified_tags?
-    false
-  end
-
   # Is this resource tagged appropriately?
   def missing_tags?(resource)
     return false if ignore_tags?
@@ -362,6 +358,13 @@ class Puppet::Transaction
     not resource.tagged?(*tags)
   end
 
+  # These two methods are only made public to enable the existing spec tests to run
+  # under rspec 3 (apparently rspec 2 didn't enforce access controls?). Please do not
+  # treat these as part of a public API.
+  # Possible future improvement: rewrite to not require access to private methods.
+  public :skip?
+  public :missing_tags?
+
 end
 
 require 'puppet/transaction/report'

data/lib/puppet/transaction/event.rb

@@ -25,11 +25,6 @@ class Puppet::Transaction::Event
     obj
   end
 
-  def self.from_pson(data)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(data)
-  end
-
   def initialize(options = {})
     @audited = false
 
@@ -88,6 +83,10 @@ class Puppet::Transaction::Event
     message
   end
 
+  def inspect
+    %Q(#<#{self.class.name} @name="#{@name.inspect}" @message="#{@message.inspect}">)
+  end
+
   def to_yaml_properties
     YAML_ATTRIBUTES & super
   end

data/lib/puppet/transaction/event_manager.rb

@@ -1,7 +1,21 @@
 require 'puppet/transaction'
 
+# This class stores, routes, and responds to events generated while evaluating
+# a transaction.
+#
+# @api private
 class Puppet::Transaction::EventManager
-  attr_reader :transaction, :events
+
+  # @!attribute [r] transaction
+  #   @return [Puppet::Transaction] The transaction associated with this event manager.
+  attr_reader :transaction
+
+  # @!attribute [r] events
+  #   @todo Determine if this instance variable is used for anything aside from testing.
+  #   @return [Array<Puppet::Transaction::Events>] A list of events that can be
+  #     handled by the target resouce. Events that cannot be handled by the
+  #     target resource will be discarded.
+  attr_reader :events
 
   def initialize(transaction)
     @transaction = transaction
@@ -28,8 +42,12 @@ class Puppet::Transaction::EventManager
     end
   end
 
-  # Queue events for other resources to respond to.  All of these events have
+  # Queues events for other resources to respond to.  All of these events have
   # to be from the same resource.
+  #
+  # @param resource [Puppet::Type] The resource generating the given events
+  # @param events [Array<Puppet::Transaction::Event>] All events generated by this resource
+  # @return [void]
   def queue_events(resource, events)
     #@events += events
 
@@ -63,9 +81,17 @@ class Puppet::Transaction::EventManager
     dequeue_events_for_resource(resource, :refresh) if events.detect { |e| e.invalidate_refreshes }
   end
 
+  def dequeue_all_events_for_resource(target)
+    callbacks = @event_queues[target]
+    if callbacks && !callbacks.empty?
+      target.info "Unscheduling all events on #{target}"
+      @event_queues[target] = {}
+    end
+  end
+
   def dequeue_events_for_resource(target, callback)
     target.info "Unscheduling #{callback} on #{target}"
-    @event_queues[target][callback] = {} if @event_queues[target]
+    @event_queues[target][callback] = [] if @event_queues[target]
   end
 
   def queue_events_for_resource(source, target, callback, events)
@@ -96,8 +122,28 @@ class Puppet::Transaction::EventManager
 
   private
 
+  # Should the callback for this resource be invoked?
+  # @param resource [Puppet::Type] The resource to be refreshed
+  # @param events [Array<Puppet::Transaction::Event>] A list of events
+  #   associated with this callback and resource.
+  # @return [true, false] Whether the callback should be run.
+  def process_callback?(resource, events)
+    !(events.all? { |e| e.status == "noop" } || resource.noop?)
+  end
+
+  # Processes callbacks for a given resource.
+  #
+  # @param resource [Puppet::Type] The resource receiving the callback.
+  # @param callback [Symbol] The name of the callback method that will be invoked.
+  # @param events [Array<Puppet::Transaction::Event>] A list of events
+  #   associated with this callback and resource.
+  # @return [true, false] Whether the callback was successfully run.
   def process_callback(resource, callback, events)
-    process_noop_events(resource, callback, events) and return false unless events.detect { |e| e.status != "noop" }
+    if !process_callback?(resource, events)
+      process_noop_events(resource, callback, events)
+      return false
+    end
+
     resource.send(callback)
 
     if not resource.is_a?(Puppet::Type.type(:whit))
@@ -117,6 +163,5 @@ class Puppet::Transaction::EventManager
 
     # And then add an event for it.
     queue_events(resource, [resource.event(:status => "noop", :name => :noop_restart)])
-    true # so the 'and if' works
   end
 end

data/lib/puppet/transaction/report.rb

@@ -103,11 +103,6 @@ class Puppet::Transaction::Report
     obj
   end
 
-  def self.from_pson(data)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(data)
-  end
-
   def as_logging_destination(&block)
     Puppet::Util::Log.with_destination(self, &block)
   end
@@ -127,8 +122,8 @@ class Puppet::Transaction::Report
   def add_metric(name, hash)
     metric = Puppet::Util::Metric.new(name)
 
-    hash.each do |name, value|
-      metric.newvalue(name, value)
+    hash.each do |metric_name, value|
+      metric.newvalue(metric_name, value)
     end
 
     @metrics[metric.name] = metric
@@ -286,8 +281,8 @@ class Puppet::Transaction::Report
     @metrics.each do |name, metric|
       key = metric.name.to_s
       report[key] = {}
-      metric.values.each do |name, label, value|
-        report[key][name.to_s] = value
+      metric.values.each do |metric_name, label, value|
+        report[key][metric_name.to_s] = value
       end
       report[key]["total"] = 0 unless key == "time" or report[key].include?("total")
     end
@@ -324,7 +319,7 @@ class Puppet::Transaction::Report
   end
 
   def self.default_format
-    Puppet[:report_serialization_format].intern
+    :pson
   end
 
   private

data/lib/puppet/transaction/resource_harness.rb

@@ -108,6 +108,12 @@ class Puppet::Transaction::ResourceHarness
     end
   end
 
+  # allow_changes? is only made public to enable the existing spec tests to run
+  # under rspec 3 (apparently rspec 2 didn't enforce access controls?). Please do not
+  # treat this as part of a public API.
+  # Possible future improvement: rewrite to not require access to private methods.
+  public :allow_changes?
+
   def sync_if_needed(param, context)
     historical_value = context.historical_values[param.name]
     current_value = context.current_values[param.name]
@@ -170,8 +176,7 @@ class Puppet::Transaction::ResourceHarness
   # For audit purposes, this code special cases this comparison, and compares
   # the two objects by their second and microsecond components. tv_sec is the
   # number of seconds since the epoch, and tv_usec is only the microsecond
-  # portion of time.  This compare satisfies compatibility requirements for
-  # Ruby 1.8.7, where to_r does not exist on the Time class.
+  # portion of time.
   def are_audited_values_equal(a, b)
     a == b || (a.is_a?(Time) && b.is_a?(Time) && a.tv_sec == b.tv_sec && a.tv_usec == b.tv_usec)
   end

data/lib/puppet/type.rb

@@ -61,8 +61,8 @@ module Puppet
 #     their name, and these resources are said to be non-isomorphic.
 #
 # @note The Type class deals with multiple concerns; some methods provide an internal DSL for convenient definition
-#   of types, other methods deal with various aspects while running; wiring up a resource (expressed in Puppet DSL
-#   or Ruby DSL) with its _resource type_ (i.e. an instance of Type) to enable validation, transformation of values
+#   of types, other methods deal with various aspects while running; wiring up a resource (expressed in Puppet DSL)
+#   with its _resource type_ (i.e. an instance of Type) to enable validation, transformation of values
 #   (munge/unmunge), etc. Lastly, Type is also responsible for dealing with Providers; the concrete implementations
 #   of the behavior that constitutes how a particular Type behaves on a particular type of system (e.g. how
 #   commands are executed on a flavor of Linux, on Windows, etc.). This means that as you are reading through the
@@ -930,13 +930,8 @@ class Type
 
   # Removes this object (FROM WHERE?)
   # @todo removes if from where?
-  # @overload remove(rmdeps)
-  #   @deprecated Use remove()
-  #   @param rmdeps [Boolean] intended to indicate that all subscriptions should also be removed, ignored.
-  # @overload remove()
   # @return [void]
-  #
-  def remove(rmdeps = true)
+  def remove()
     # This is hackish (mmm, cut and paste), but it works for now, and it's
     # better than warnings.
     @parameters.each do |name, obj|
@@ -1011,15 +1006,15 @@ class Type
       end
     end
 
-    properties.each { |property|
-      unless is.include? property
+    properties.each { |prop|
+      unless is.include? prop
         raise Puppet::DevError,
-          "The is value is not in the is array for '#{property.name}'"
+          "The is value is not in the is array for '#{prop.name}'"
       end
 
-      propis = is[property]
-      unless property.safe_insync?(propis)
-        property.debug("Not in sync: #{propis.inspect} vs #{property.should.inspect}")
+      propis = is[prop]
+      unless prop.safe_insync?(propis)
+        prop.debug("Not in sync: #{propis.inspect} vs #{prop.should.inspect}")
         insync = false
       #else
       #    property.debug("In sync")
@@ -1384,7 +1379,7 @@ class Type
           }
 
           File['sshdconfig'] {
-            mode => 644,
+            mode => '0644',
           }
 
       There's no way here for the Puppet parser to know that these two stanzas
@@ -1422,14 +1417,13 @@ class Type
           file {'/etc/hosts':
             ensure => file,
             source => 'puppet:///modules/site/hosts',
-            mode   => 0644,
+            mode   => '0644',
             tag    => ['bootstrap', 'minimumrun', 'mediumrun'],
           }
 
       Tags are useful for things like applying a subset of a host's configuration
       with [the `tags` setting](/references/latest/configuration.html#tags)
-      (e.g. `puppet agent --test --tags bootstrap`) or filtering alerts with
-      [the `tagmail` report processor](http://docs.puppetlabs.com/references/latest/report.html#tagmail)."
+      (e.g. `puppet agent --test --tags bootstrap`)."
 
     munge do |tags|
       tags = [tags] unless tags.is_a? Array
@@ -1935,14 +1929,32 @@ class Type
   ###############################
   # All of the relationship code.
 
-  # Adds a block producing a single name (or list of names) of the given resource type name to autorequire.
-  # Resources in the catalog that have the named type and a title that is included in the result will be linked
-  # to the calling resource as a requirement.
+  # Adds a block producing a single name (or list of names) of the given
+  # resource type name to autorelate.
+  #
+  # The four relationship types require, before, notify, and subscribe are all
+  # supported.
+  #
+  # Be *careful* with notify and subscribe as they may have unintended
+  # consequences.
+  #
+  # Resources in the catalog that have the named type and a title that is
+  # included in the result will be linked to the calling resource as a
+  # requirement.
   #
   # @example Autorequire the files File['foo', 'bar']
   #   autorequire( 'file', {|| ['foo', 'bar'] })
   #
-  # @param name [String] the name of a type of which one or several resources should be autorequired e.g. "file"
+  # @example Autobefore the files File['foo', 'bar']
+  #   autobefore( 'file', {|| ['foo', 'bar'] })
+  #
+  # @example Autosubscribe the files File['foo', 'bar']
+  #   autosubscribe( 'file', {|| ['foo', 'bar'] })
+  #
+  # @example Autonotify the files File['foo', 'bar']
+  #   autonotify( 'file', {|| ['foo', 'bar'] })
+  #
+  # @param name [String] the name of a type of which one or several resources should be autorelated e.g. "file"
   # @yield [ ] a block returning list of names of given type to auto require
   # @yieldreturn [String, Array<String>] one or several resource names for the named type
   # @return [void]
@@ -1954,6 +1966,21 @@ class Type
     @autorequires[name] = block
   end
 
+  def self.autobefore(name, &block)
+    @autobefores ||= {}
+    @autobefores[name] = block
+  end
+
+  def self.autosubscribe(name, &block)
+    @autosubscribes ||= {}
+    @autosubscribes[name] = block
+  end
+
+  def self.autonotify(name, &block)
+    @autonotifies ||= {}
+    @autonotifies[name] = block
+  end
+
   # Provides iteration over added auto-requirements (see {autorequire}).
   # @yieldparam type [String] the name of the type to autoriquire an instance of
   # @yieldparam block [Proc] a block producing one or several dependencies to auto require (see {autorequire}).
@@ -1966,7 +1993,43 @@ class Type
     }
   end
 
-  # Adds dependencies to the catalog from added autorequirements.
+  # Provides iteration over added auto-requirements (see {autobefore}).
+  # @yieldparam type [String] the name of the type to autoriquire an instance of
+  # @yieldparam block [Proc] a block producing one or several dependencies to auto require (see {autobefore}).
+  # @yieldreturn [void]
+  # @return [void]
+  def self.eachautobefore
+    @autobefores ||= {}
+    @autobefores.each { |type,block|
+      yield(type, block)
+    }
+  end
+
+  # Provides iteration over added auto-requirements (see {autosubscribe}).
+  # @yieldparam type [String] the name of the type to autoriquire an instance of
+  # @yieldparam block [Proc] a block producing one or several dependencies to auto require (see {autosubscribe}).
+  # @yieldreturn [void]
+  # @return [void]
+  def self.eachautosubscribe
+    @autosubscribes ||= {}
+    @autosubscribes.each { |type,block|
+      yield(type, block)
+    }
+  end
+
+  # Provides iteration over added auto-requirements (see {autonotify}).
+  # @yieldparam type [String] the name of the type to autoriquire an instance of
+  # @yieldparam block [Proc] a block producing one or several dependencies to auto require (see {autonotify}).
+  # @yieldreturn [void]
+  # @return [void]
+  def self.eachautonotify
+    @autonotifies ||= {}
+    @autonotifies.each { |type,block|
+      yield(type, block)
+    }
+  end
+
+  # Adds dependencies to the catalog from added autorelations.
   # See {autorequire} for how to add an auto-requirement.
   # @todo needs details - see the param rel_catalog, and type of this param
   # @param rel_catalog [Puppet::Resource::Catalog, nil] the catalog to
@@ -1974,12 +2037,15 @@ class Type
   #   type instance was added to a catalog)
   # @raise [Puppet::DevError] if there is no catalog
   #
-  def autorequire(rel_catalog = nil)
+  def autorelation(rel_type, rel_catalog = nil)
     rel_catalog ||= catalog
     raise(Puppet::DevError, "You cannot add relationships without a catalog") unless rel_catalog
 
     reqs = []
-    self.class.eachautorequire { |type, block|
+
+    auto_rel = "eachauto#{rel_type}".to_sym
+
+    self.class.send(auto_rel) { |type, block|
       # Ignore any types we can't find, although that would be a bit odd.
       next unless Puppet::Type.type(type)
 
@@ -1991,19 +2057,39 @@ class Type
       list.each { |dep|
         # Support them passing objects directly, to save some effort.
         unless dep.is_a? Puppet::Type
-          # Skip autorequires that we aren't managing
+          # Skip autorelation that we aren't managing
           unless dep = rel_catalog.resource(type, dep)
             next
           end
         end
 
-        reqs << Puppet::Relationship.new(dep, self)
+        if [:require, :subscribe].include?(rel_type)
+          reqs << Puppet::Relationship.new(dep, self)
+        else
+          reqs << Puppet::Relationship.new(self, dep)
+        end
       }
     }
 
     reqs
   end
 
+  def autorequire(rel_catalog = nil)
+    autorelation(:require, rel_catalog)
+  end
+
+  def autobefore(rel_catalog = nil)
+    autorelation(:before, rel_catalog)
+  end
+
+  def autosubscribe(rel_catalog = nil)
+    autorelation(:subscribe, rel_catalog)
+  end
+
+  def autonotify(rel_catalog = nil)
+    autorelation(:notify, rel_catalog)
+  end
+
   # Builds the dependencies associated with this resource.
   #
   # @return [Array<Puppet::Relationship>] list of relationships to other resources
@@ -2448,5 +2534,3 @@ class Type
   end
 end
 end
-
-require 'puppet/provider'