diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb
index bdd11fcc5..e47501791 100644
--- a/lib/puppet/resource.rb
+++ b/lib/puppet/resource.rb
@@ -1,279 +1,285 @@
 require 'puppet'
 require 'puppet/util/tagging'
 #require 'puppet/resource/reference'
 require 'puppet/util/pson'
 
 # The simplest resource class.  Eventually it will function as the
 # base class for all resource-like behaviour.
 class Puppet::Resource
     include Puppet::Util::Tagging
     extend Puppet::Util::Pson
     include Enumerable
     attr_accessor :file, :line, :catalog, :exported, :virtual
     attr_writer :type, :title
 
     require 'puppet/indirector'
     extend Puppet::Indirector
     indirects :resource, :terminus_class => :ral
 
     ATTRIBUTES = [:file, :line, :exported]
 
     def self.from_pson(pson)
         raise ArgumentError, "No resource type provided in pson data" unless type = pson['type']
         raise ArgumentError, "No resource title provided in pson data" unless title = pson['title']
 
         resource = new(type, title)
 
         if params = pson['parameters']
             params.each { |param, value| resource[param] = value }
         end
 
         if tags = pson['tags']
             tags.each { |tag| resource.tag(tag) }
         end
 
         ATTRIBUTES.each do |a|
             if value = pson[a.to_s]
                 resource.send(a.to_s + "=", value)
             end
         end
 
         resource.exported ||= false
 
         resource
     end
 
     def to_pson_data_hash
         data = ([:type, :title, :tags] + ATTRIBUTES).inject({}) do |hash, param|
             next hash unless value = self.send(param)
             hash[param.to_s] = value
             hash
         end
 
         data["exported"] ||= false
 
         params = self.to_hash.inject({}) do |hash, ary|
             param, value = ary
 
             # Don't duplicate the title as the namevar
             next hash if param == namevar and value == title
             hash[param] = value
             hash
         end
 
         data["parameters"] = params unless params.empty?
 
         data
     end
 
     def to_pson(*args)
         to_pson_data_hash.to_pson(*args)
     end
 
     # Proxy these methods to the parameters hash.  It's likely they'll
     # be overridden at some point, but this works for now.
     %w{has_key? keys length delete empty? <<}.each do |method|
         define_method(method) do |*args|
             @parameters.send(method, *args)
         end
     end
 
     # Set a given parameter.  Converts all passed names
     # to lower-case symbols.
     def []=(param, value)
         @parameters[parameter_name(param)] = value
     end
 
     # Return a given parameter's value.  Converts all passed names
     # to lower-case symbols.
     def [](param)
         @parameters[parameter_name(param)]
     end
 
     # Compatibility method.
     def builtin?
         builtin_type?
     end
 
     # Is this a builtin resource type?
     def builtin_type?
         @reference.builtin_type?
     end
 
     # Iterate over each param/value pair, as required for Enumerable.
     def each
         @parameters.each { |p,v| yield p, v }
     end
 
     def include?(parameter)
         super || @parameters.keys.include?( parameter_name(parameter) )
     end
 
     %w{exported virtual}.each do |m|
         define_method(m+"?") do
             self.send(m)
         end
     end
 
     # Create our resource.
-    def initialize(type, title, parameters = {})
-        @reference = Puppet::Resource::Reference.new(type, title)
+    def initialize(type, title, attributes = {})
         @parameters = {}
 
-        parameters.each do |param, value|
+        (attributes[:parameters] || {}).each do |param, value|
             self[param] = value
         end
 
+        attributes.each do |attr, value|
+            next if attr == :parameters
+            send(attr.to_s + "=", value)
+        end
+
+        @reference = Puppet::Resource::Reference.new(type, title)
+
         tag(@reference.type)
         tag(@reference.title) if valid_tag?(@reference.title)
     end
 
     # Provide a reference to our resource in the canonical form.
     def ref
         @reference.to_s
     end
 
     # Get our title information from the reference, since it will canonize it for us.
     def title
         @reference.title
     end
 
     # Get our type information from the reference, since it will canonize it for us.
     def type
         @reference.type
     end
 
     # Produce a simple hash of our parameters.
     def to_hash
         result = @parameters.dup
         unless result.include?(namevar)
             result[namevar] = title
         end
         result
     end
 
     def to_s
         return ref
     end
 
     # Convert our resource to Puppet code.
     def to_manifest
         "%s { '%s':\n%s\n}" % [self.type.to_s.downcase, self.title,
              @parameters.collect { |p, v|
                  if v.is_a? Array
                      "    #{p} => [\'#{v.join("','")}\']"
                  else
                      "    #{p} => \'#{v}\'"
                  end
              }.join(",\n")
             ]
     end
 
     def to_ref
         ref
     end
 
     # Convert our resource to a RAL resource instance.  Creates component
     # instances for resource types that don't exist.
     def to_ral
         if typeklass = Puppet::Type.type(self.type)
             return typeklass.new(self)
         else
             return Puppet::Type::Component.new(self)
         end
     end
 
     # Translate our object to a backward-compatible transportable object.
     def to_trans
         if @reference.builtin_type?
             result = to_transobject
         else
             result = to_transbucket
         end
 
         result.file = self.file
         result.line = self.line
 
         return result
     end
 
     # Create an old-style TransObject instance, for builtin resource types.
     def to_transobject
         # Now convert to a transobject
         result = Puppet::TransObject.new(@reference.title, @reference.type)
         to_hash.each do |p, v|
             if v.is_a?(Puppet::Resource::Reference)
                 v = v.to_trans_ref
             elsif v.is_a?(Array)
                 v = v.collect { |av|
                     if av.is_a?(Puppet::Resource::Reference)
                         av = av.to_trans_ref
                     end
                     av
                 }
             end
 
             # If the value is an array with only one value, then
             # convert it to a single value.  This is largely so that
             # the database interaction doesn't have to worry about
             # whether it returns an array or a string.
             result[p.to_s] = if v.is_a?(Array) and v.length == 1
                               v[0]
                           else
                               v
                           end
         end
 
         result.tags = self.tags
 
         return result
     end
 
     def name
         # this is potential namespace conflict
         # between the notion of an "indirector name"
         # and a "resource name"
         [ type, title ].join('/')
     end
 
     def to_resource
         self
     end
 
     private
 
     # Produce a canonical method name.
     def parameter_name(param)
         param = param.to_s.downcase.to_sym
         if param == :name and n = namevar()
             param = namevar
         end
         param
     end
 
     # The namevar for our resource type. If the type doesn't exist,
     # always use :name.
     def namevar
         if t = resource_type
             t.namevar
         else
             :name
         end
     end
 
     # Retrieve the resource type.
     def resource_type
         Puppet::Type.type(type)
     end
 
     # Create an old-style TransBucket instance, for non-builtin resource types.
     def to_transbucket
         bucket = Puppet::TransBucket.new([])
 
         bucket.type = self.type
         bucket.name = self.title
 
         # TransBuckets don't support parameters, which is why they're being deprecated.
         return bucket
     end
 end
diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb
index 85a75d453..68977dca0 100644
--- a/lib/puppet/transportable.rb
+++ b/lib/puppet/transportable.rb
@@ -1,259 +1,259 @@
 require 'puppet'
 require 'puppet/resource/reference'
 require 'yaml'
 
 module Puppet
     # The transportable objects themselves.  Basically just a hash with some
     # metadata and a few extra methods.  I used to have the object actually
     # be a subclass of Hash, but I could never correctly dump them using
     # YAML.
     class TransObject
         include Enumerable
         attr_accessor :type, :name, :file, :line, :catalog
 
         attr_writer :tags
 
         %w{has_key? include? length delete empty? << [] []=}.each { |method|
             define_method(method) do |*args|
                 @params.send(method, *args)
             end
         }
 
         def each
             @params.each { |p,v| yield p, v }
         end
 
         def initialize(name,type)
             @type = type.to_s.downcase
             @name = name
             @params = {}
             @tags = []
         end
 
         def longname
             return [@type,@name].join('--')
         end
 
         def ref
             unless defined? @ref
                 @ref = Puppet::Resource::Reference.new(@type, @name)
             end
             @ref.to_s
         end
 
         def tags
             return @tags
         end
 
         # Convert a defined type into a component.
         def to_component
             trans = TransObject.new(ref, :component)
             @params.each { |param,value|
                 next unless Puppet::Type::Component.validattr?(param)
                 Puppet.debug "Defining %s on %s" % [param, ref]
                 trans[param] = value
             }
             trans.catalog = self.catalog
             Puppet::Type::Component.create(trans)
         end
 
         def to_hash
             @params.dup
         end
 
         def to_s
             return "%s(%s) => %s" % [@type,@name,super]
         end
 
         def to_manifest
             "%s { '%s':\n%s\n}" %
                 [self.type.to_s, self.name,
                  @params.collect { |p, v|
                      if v.is_a? Array
                          "    #{p} => [\'#{v.join("','")}\']"
                      else
                          "    #{p} => \'#{v}\'"
                      end
                  }.join(",\n")
                 ]
         end
 
         # Create a normalized resource from our TransObject.
         def to_resource
-            result = Puppet::Resource.new(type, name, @params.dup)
+            result = Puppet::Resource.new(type, name, :parameters => @params.dup)
             result.tag(*tags)
 
             result
         end
 
         def to_yaml_properties
             instance_variables.reject { |v| %w{@ref}.include?(v) }
         end
 
         def to_ref
             ref
         end
 
         def to_ral
             to_resource.to_ral
         end
     end
 
     # Just a linear container for objects.  Behaves mostly like an array, except
     # that YAML will correctly dump them even with their instance variables.
     class TransBucket
         include Enumerable
 
         attr_accessor :name, :type, :file, :line, :classes, :keyword, :top, :catalog
 
         %w{delete shift include? length empty? << []}.each { |method|
             define_method(method) do |*args|
                 #Puppet.warning "Calling %s with %s" % [method, args.inspect]
                 @children.send(method, *args)
                 #Puppet.warning @params.inspect
             end
         }
 
         # Recursively yield everything.
         def delve(&block)
             @children.each do |obj|
                 block.call(obj)
                 if obj.is_a? self.class
                     obj.delve(&block)
                 else
                     obj
                 end
             end
         end
 
         def each
             @children.each { |c| yield c }
         end
 
         # Turn our heirarchy into a flat list
         def flatten
             @children.collect do |obj|
                 if obj.is_a? Puppet::TransBucket
                     obj.flatten
                 else
                     obj
                 end
             end.flatten
         end
 
         def initialize(children = [])
             @children = children
         end
 
         def push(*args)
             args.each { |arg|
                 case arg
                 when Puppet::TransBucket, Puppet::TransObject
                     # nada
                 else
                     raise Puppet::DevError,
                         "TransBuckets cannot handle objects of type %s" %
                             arg.class
                 end
             }
             @children += args
         end
 
         # Convert to a parseable manifest
         def to_manifest
             unless self.top
                 unless defined? @keyword and @keyword
                     raise Puppet::DevError, "No keyword; cannot convert to manifest"
                 end
             end
 
             str = "#{@keyword} #{@name} {\n%s\n}"
             str % @children.collect { |child|
                 child.to_manifest
             }.collect { |str|
                 if self.top
                     str
                 else
                     str.gsub(/^/, "    ") # indent everything once
                 end
             }.join("\n\n") # and throw in a blank line
         end
 
         def to_yaml_properties
             instance_variables
         end
 
         # Create a resource graph from our structure.
         def to_catalog(clear_on_failure = true)
             catalog = Puppet::Resource::Catalog.new(Facter.value("hostname"))
 
             # This should really use the 'delve' method, but this
             # whole class is going away relatively soon, hopefully,
             # so it's not worth it.
             delver = proc do |obj|
                 obj.catalog = catalog
                 unless container = catalog.resource(obj.to_ref)
                     container = obj.to_ral
                     catalog.add_resource container
                 end
                 obj.each do |child|
                     child.catalog = catalog
                     unless resource = catalog.resource(child.to_ref)
                         resource = child.to_ral
                         catalog.add_resource resource
                     end
 
                     catalog.add_edge(container, resource)
                     if child.is_a?(self.class)
                         delver.call(child)
                     end
                 end
             end
 
             begin
                 delver.call(self)
                 catalog.finalize
             rescue => detail
                 # This is important until we lose the global resource references.
                 catalog.clear if (clear_on_failure)
                 raise
             end
 
             return catalog
         end
 
         def to_ref
             unless defined? @ref
                 if self.type and self.name
                     @ref = Puppet::Resource::Reference.new(self.type, self.name)
                 elsif self.type and ! self.name # This is old-school node types
                     @ref = Puppet::Resource::Reference.new("node", self.type)
                 elsif ! self.type and self.name
                     @ref = Puppet::Resource::Reference.new("component", self.name)
                 else
                     @ref = nil
                 end
             end
             @ref.to_s if @ref
         end
 
         def to_ral
             to_resource.to_ral
         end
 
         # Create a normalized resource from our TransObject.
         def to_resource
             params = defined?(@parameters) ? @parameters.dup : {}
             Puppet::Resource.new(type, name, params)
         end
 
         def param(param,value)
             unless defined? @parameters
                 @parameters = {}
             end
             @parameters[param] = value
         end
 
     end
 end
 
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index ad1b947b3..308abc2f9 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -1,964 +1,964 @@
 require 'puppet'
 require 'sync'
 require 'getoptlong'
 
 require 'puppet/external/event-loop'
 require 'puppet/util/cacher'
 require 'puppet/util/loadedfile'
 
 # The class for handling configuration files.
 class Puppet::Util::Settings
     include Enumerable
     include Puppet::Util::Cacher
 
     require 'puppet/util/settings/setting'
     require 'puppet/util/settings/file_setting'
     require 'puppet/util/settings/boolean_setting'
 
     attr_accessor :file
     attr_reader :timer
 
     # Retrieve a config value
     def [](param)
         value(param)
     end
 
     # Set a config value.  This doesn't set the defaults, it sets the value itself.
     def []=(param, value)
         set_value(param, value, :memory)
     end
 
     # Generate the list of valid arguments, in a format that GetoptLong can
     # understand, and add them to the passed option list.
     def addargs(options)
         # Add all of the config parameters as valid options.
         self.each { |name, setting|
             setting.getopt_args.each { |args| options << args }
         }
 
         return options
     end
 
     # Generate the list of valid arguments, in a format that OptionParser can
     # understand, and add them to the passed option list.
     def optparse_addargs(options)
         # Add all of the config parameters as valid options.
         self.each { |name, setting|
             options << setting.optparse_args
         }
 
         return options
     end
 
     # Is our parameter a boolean parameter?
     def boolean?(param)
         param = param.to_sym
         if @config.include?(param) and @config[param].kind_of? BooleanSetting
             return true
         else
             return false
         end
     end
 
     # Remove all set values, potentially skipping cli values.
     def clear(exceptcli = false)
         @sync.synchronize do
             unsafe_clear(exceptcli)
         end
     end
     
     # Remove all set values, potentially skipping cli values.
     def unsafe_clear(exceptcli = false)
         @values.each do |name, values|
             @values.delete(name) unless exceptcli and name == :cli
         end
 
         # Don't clear the 'used' in this case, since it's a config file reparse,
         # and we want to retain this info.
         unless exceptcli
             @used = []
         end
 
         @cache.clear
 
         @name = nil
     end
 
     # This is mostly just used for testing.
     def clearused
         @cache.clear
         @used = []
     end
 
     # Do variable interpolation on the value.
     def convert(value, environment = nil)
         return value unless value
         return value unless value.is_a? String
         newval = value.gsub(/\$(\w+)|\$\{(\w+)\}/) do |value|
             varname = $2 || $1
             if varname == "environment" and environment
                 environment
             elsif pval = self.value(varname)
                 pval
             else
                 raise Puppet::DevError, "Could not find value for %s" % value
             end
         end
 
         return newval
     end
 
     # Return a value's description.
     def description(name)
         if obj = @config[name.to_sym]
             obj.desc
         else
             nil
         end
     end
 
     def each
         @config.each { |name, object|
             yield name, object
         }
     end
 
     # Iterate over each section name.
     def eachsection
         yielded = []
         @config.each do |name, object|
             section = object.section
             unless yielded.include? section
                 yield section
                 yielded << section
             end
         end
     end
 
     # Return an object by name.
     def setting(param)
         param = param.to_sym
         @config[param]
     end
 
     # Handle a command-line argument.
     def handlearg(opt, value = nil)
         @cache.clear
         value = munge_value(value) if value
         str = opt.sub(/^--/,'')
 
         bool = true
         newstr = str.sub(/^no-/, '')
         if newstr != str
             str = newstr
             bool = false
         end
         str = str.intern
 
         if @config[str].is_a?(Puppet::Util::Settings::BooleanSetting)
             if value == "" or value.nil?
                 value = bool
             end
         end
 
         set_value(str, value, :cli)
     end
 
     def without_noop
         old_noop = value(:noop,:cli) and set_value(:noop, false, :cli) if valid?(:noop)
         yield
     ensure
         set_value(:noop, old_noop, :cli) if valid?(:noop)
     end
 
     def include?(name)
         name = name.intern if name.is_a? String
         @config.include?(name)
     end
 
     # check to see if a short name is already defined
     def shortinclude?(short)
         short = short.intern if name.is_a? String
         @shortnames.include?(short)
     end
 
     # Create a new collection of config settings.
     def initialize
         @config = {}
         @shortnames = {}
 
         @created = []
         @searchpath = nil
 
         # Mutex-like thing to protect @values
         @sync = Sync.new
 
         # Keep track of set values.
         @values = Hash.new { |hash, key| hash[key] = {} }
 
         # And keep a per-environment cache
         @cache = Hash.new { |hash, key| hash[key] = {} }
 
         # A central concept of a name.
         @name = nil
 
         # The list of sections we've used.
         @used = []
     end
 
     # NOTE: ACS ahh the util classes. . .sigh
     # as part of a fix for 1183, I pulled the logic for the following 5 methods out of the executables and puppet.rb
     # They probably deserve their own class, but I don't want to do that until I can refactor environments
     # its a little better than where they were
 
     # Prints the contents of a config file with the available config settings, or it
     # prints a single value of a config setting.
     def print_config_options
         env = value(:environment)
         val = value(:configprint)
         if val == "all"
             hash = {}
             each do |name, obj|
                 val = value(name,env)
                 val = val.inspect if val == ""
                 hash[name] = val
             end
             hash.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, val|
                 puts "%s = %s" % [name, val]
             end
         else
             val.split(/\s*,\s*/).sort.each do |v|
                 if include?(v)
                     #if there is only one value, just print it for back compatibility
                     if v == val
                          puts value(val,env)
                          break
                     end
                     puts "%s = %s" % [v, value(v,env)]
                 else
                     puts "invalid parameter: %s" % v
                     return false
                 end
             end
         end
         true
     end
 
     def generate_config
         puts to_config
         true
     end
 
     def generate_manifest
         puts to_manifest
         true
     end
 
     def print_configs
         return print_config_options if value(:configprint) != ""
         return generate_config if value(:genconfig)
         return generate_manifest if value(:genmanifest)
     end
 
     def print_configs?
         return (value(:configprint) != "" || value(:genconfig) || value(:genmanifest)) && true
     end
 
     # Return a given object's file metadata.
     def metadata(param)
         if obj = @config[param.to_sym] and obj.is_a?(FileSetting)
             return [:owner, :group, :mode].inject({}) do |meta, p|
                 if v = obj.send(p)
                     meta[p] = v
                 end
                 meta
             end
         else
             nil
         end
     end
 
     # Make a directory with the appropriate user, group, and mode
     def mkdir(default)
         obj = get_config_file_default(default)
 
         Puppet::Util::SUIDManager.asuser(obj.owner, obj.group) do
             mode = obj.mode || 0750
             Dir.mkdir(obj.value, mode)
         end
     end
 
     # Figure out our name.
     def name
         unless @name
             unless @config[:name]
                 return nil
             end
             searchpath.each do |source|
                 next if source == :name
                 @sync.synchronize do
                     @name = @values[source][:name]
                 end
                 break if @name
             end
             unless @name
                 @name = convert(@config[:name].default).intern
             end
         end
         @name
     end
 
     # Return all of the parameters associated with a given section.
     def params(section = nil)
         if section
             section = section.intern if section.is_a? String
             @config.find_all { |name, obj|
                 obj.section == section
             }.collect { |name, obj|
                 name
             }
         else
             @config.keys
         end
     end
 
     # Parse the configuration file.  Just provides
     # thread safety.
     def parse
         raise "No :config setting defined; cannot parse unknown config file" unless self[:config]
 
         # Create a timer so that this file will get checked automatically
         # and reparsed if necessary.
         set_filetimeout_timer()
 
         @sync.synchronize do
             unsafe_parse(self[:config])
         end
     end
 
     # Unsafely parse the file -- this isn't thread-safe and causes plenty of problems if used directly.
     def unsafe_parse(file)
         return unless FileTest.exist?(file)
         begin
             data = parse_file(file)
         rescue => details
             puts details.backtrace if Puppet[:trace]
             Puppet.err "Could not parse #{file}: #{details}"
             return
         end
 
         unsafe_clear(true)
 
         data.each do |area, values|
             @values[area] = values
         end
 
         # Determine our environment, if we have one.
         if @config[:environment]
             env = self.value(:environment).to_sym
         else
             env = "none"
         end
 
         # Call any hooks we should be calling.
         settings_with_hooks.each do |setting|
             each_source(env) do |source|
                 if value = @values[source][setting.name]
                     # We still have to use value() to retrieve the value, since
                     # we want the fully interpolated value, not $vardir/lib or whatever.
                     # This results in extra work, but so few of the settings
                     # will have associated hooks that it ends up being less work this
                     # way overall.
                     setting.handle(self.value(setting.name, env))
                     break
                 end
             end
         end
 
         # We have to do it in the reverse of the search path,
         # because multiple sections could set the same value
         # and I'm too lazy to only set the metadata once.
         searchpath.reverse.each do |source|
             if meta = @values[source][:_meta]
                 set_metadata(meta)
             end
         end
     end
 
     # Create a new setting.  The value is passed in because it's used to determine
     # what kind of setting we're creating, but the value itself might be either
     # a default or a value, so we can't actually assign it.
     def newsetting(hash)
         klass = nil
         if hash[:section]
             hash[:section] = hash[:section].to_sym
         end
         if type = hash[:type]
             unless klass = {:setting => Setting, :file => FileSetting, :boolean => BooleanSetting}[type]
                 raise ArgumentError, "Invalid setting type '%s'" % type
             end
             hash.delete(:type)
         else
             case hash[:default]
             when true, false, "true", "false"
                 klass = BooleanSetting
             when /^\$\w+\//, /^\//
                 klass = FileSetting
             when String, Integer, Float # nothing
                 klass = Setting
             else
                 raise Puppet::Error, "Invalid value '%s' for %s" % [value.inspect, hash[:name]]
             end
         end
         hash[:settings] = self
         setting = klass.new(hash)
 
         return setting
     end
 
     # This has to be private, because it doesn't add the settings to @config
     private :newsetting
 
     # Iterate across all of the objects in a given section.
     def persection(section)
         section = section.to_sym
         self.each { |name, obj|
             if obj.section == section
                 yield obj
             end
         }
     end
 
     # Cache this in an easily clearable way, since we were
     # having trouble cleaning it up after tests.
     cached_attr(:file) do
         if path = self[:config] and FileTest.exist?(path)
             Puppet::Util::LoadedFile.new(path)
         end
     end
 
     # Reparse our config file, if necessary.
     def reparse
         if file and file.changed?
             Puppet.notice "Reparsing %s" % file.file
             parse
             reuse()
         end
     end
 
     def reuse
         return unless defined? @used
         @sync.synchronize do # yay, thread-safe
             new = @used
             @used = []
             self.use(*new)
         end
     end
 
     # The order in which to search for values.
     def searchpath(environment = nil)
         if environment
             [:cli, :memory, environment, :name, :main]
         else
             [:cli, :memory, :name, :main]
         end
     end
 
     # Get a list of objects per section
     def sectionlist
         sectionlist = []
         self.each { |name, obj|
             section = obj.section || "puppet"
             sections[section] ||= []
             unless sectionlist.include?(section)
                 sectionlist << section
             end
             sections[section] << obj
         }
 
         return sectionlist, sections
     end
 
     def service_user_available?
         return @service_user_available if defined?(@service_user_available)
 
         return @service_user_available = false unless user_name = self[:user]
 
         user = Puppet::Type.type(:user).new :name => self[:user], :check => :ensure
 
         return @service_user_available = user.exists?
     end
 
     def set_value(param, value, type)
         param = param.to_sym
         unless setting = @config[param]
             raise ArgumentError,
                 "Attempt to assign a value to unknown configuration parameter %s" % param.inspect
         end
         if setting.respond_to?(:munge)
             value = setting.munge(value)
         end
         if setting.respond_to?(:handle)
             setting.handle(value)
         end
         # Reset the name, so it's looked up again.
         if param == :name
             @name = nil
         end
         @sync.synchronize do # yay, thread-safe
             @values[type][param] = value
             @cache.clear
 
             clearused
 
             # Clear the list of environments, because they cache, at least, the module path.
             # We *could* preferentially just clear them if the modulepath is changed,
             # but we don't really know if, say, the vardir is changed and the modulepath
             # is defined relative to it. We need the defined? stuff because of loading
             # order issues.
             Puppet::Node::Environment.clear if defined?(Puppet::Node) and defined?(Puppet::Node::Environment)
         end
 
         return value
     end
 
     private :set_value
 
     # Set a bunch of defaults in a given section.  The sections are actually pretty
     # pointless, but they help break things up a bit, anyway.
     def setdefaults(section, defs)
         section = section.to_sym
         call = []
         defs.each { |name, hash|
             if hash.is_a? Array
                 unless hash.length == 2
                     raise ArgumentError, "Defaults specified as an array must contain only the default value and the decription"
                 end
                 tmp = hash
                 hash = {}
                 [:default, :desc].zip(tmp).each { |p,v| hash[p] = v }
             end
             name = name.to_sym
             hash[:name] = name
             hash[:section] = section
             if @config.include?(name)
                 raise ArgumentError, "Parameter %s is already defined" % name
             end
             tryconfig = newsetting(hash)
             if short = tryconfig.short
                 if other = @shortnames[short]
                     raise ArgumentError, "Parameter %s is already using short name '%s'" % [other.name, short]
                 end
                 @shortnames[short] = tryconfig
             end
             @config[name] = tryconfig
 
             # Collect the settings that need to have their hooks called immediately.
             # We have to collect them so that we can be sure we're fully initialized before
             # the hook is called.
             call << tryconfig if tryconfig.call_on_define
         }
 
         call.each { |setting| setting.handle(self.value(setting.name)) }
     end
 
     # Create a timer to check whether the file should be reparsed.
     def set_filetimeout_timer
         return unless timeout = self[:filetimeout] and timeout = Integer(timeout) and timeout > 0
         timer = EventLoop::Timer.new(:interval => timeout, :tolerance => 1, :start? => true) { self.reparse() }
     end
 
     # Convert the settings we manage into a catalog full of resources that model those settings.
     # We currently have to go through Trans{Object,Bucket} instances,
     # because this hasn't been ported yet.
     def to_catalog(*sections)
         sections = nil if sections.empty?
 
         catalog = Puppet::Resource::Catalog.new("Settings")
 
         @config.values.find_all { |value| value.is_a?(FileSetting) }.each do |file|
             next unless (sections.nil? or sections.include?(file.section))
             next unless resource = file.to_resource
             next if catalog.resource(resource.ref)
 
             catalog.add_resource(resource)
         end
 
         add_user_resources(catalog, sections)
 
         catalog
     end
 
     # Convert our list of config settings into a configuration file.
     def to_config
         str = %{The configuration file for #{Puppet[:name]}.  Note that this file
 is likely to have unused configuration parameters in it; any parameter that's
 valid anywhere in Puppet can be in any config file, even if it's not used.
 
 Every section can specify three special parameters: owner, group, and mode.
 These parameters affect the required permissions of any files specified after
 their specification.  Puppet will sometimes use these parameters to check its
 own configured state, so they can be used to make Puppet a bit more self-managing.
 
 Generated on #{Time.now}.
 
 }.gsub(/^/, "# ")
 
         # Add a section heading that matches our name.
         if @config.include?(:name)
             str += "[%s]\n" % self[:name]
         end
         eachsection do |section|
             persection(section) do |obj|
                 str += obj.to_config + "\n"
             end
         end
 
         return str
     end
 
     # Convert to a parseable manifest
     def to_manifest
         catalog = to_catalog
         # The resource list is a list of references, not actual instances.
         catalog.resources.collect do |ref|
             catalog.resource(ref).to_manifest
         end.join("\n\n")
     end
 
     # Create the necessary objects to use a section.  This is idempotent;
     # you can 'use' a section as many times as you want.
     def use(*sections)
         sections = sections.collect { |s| s.to_sym }
         @sync.synchronize do # yay, thread-safe
             sections = sections.reject { |s| @used.include?(s) }
 
             return if sections.empty?
 
             begin
                 catalog = to_catalog(*sections).to_ral
             rescue => detail
                 puts detail.backtrace if Puppet[:trace]
                 Puppet.err "Could not create resources for managing Puppet's files and directories in sections %s: %s" % [sections.inspect, detail]
 
                 # We need some way to get rid of any resources created during the catalog creation
                 # but not cleaned up.
                 return
             end
 
             without_noop do
                 catalog.host_config = false
                 catalog.apply do |transaction|
                     if transaction.any_failed?
                         report = transaction.report
                         failures = report.logs.find_all { |log| log.level == :err }
                         raise "Got %s failure(s) while initializing: %s" % [failures.length, failures.collect { |l| l.to_s }.join("; ")]
                     end
                 end
             end
 
             sections.each { |s| @used << s }
             @used.uniq!
         end
     end
 
     def valid?(param)
         param = param.to_sym
         @config.has_key?(param)
     end
 
     def uninterpolated_value(param, environment = nil)
         param = param.to_sym
         environment = environment.to_sym if environment
 
         # See if we can find it within our searchable list of values
         val = catch :foundval do
             each_source(environment) do |source|
                 # Look for the value.  We have to test the hash for whether
                 # it exists, because the value might be false.
                 @sync.synchronize do
                     if @values[source].include?(param)
                         throw :foundval, @values[source][param]
                     end
                 end
             end
             throw :foundval, nil
         end
         
         # If we didn't get a value, use the default
         val = @config[param].default if val.nil?
 
         return val
     end
 
     # Find the correct value using our search path.  Optionally accept an environment
     # in which to search before the other configuration sections.
     def value(param, environment = nil)
         param = param.to_sym
         environment = environment.to_sym if environment
 
         # Short circuit to nil for undefined parameters.
         return nil unless @config.include?(param)
 
         # Yay, recursion.
         #self.reparse() unless [:config, :filetimeout].include?(param)
 
         # Check the cache first.  It needs to be a per-environment
         # cache so that we don't spread values from one env
         # to another.
         if cached = @cache[environment||"none"][param]
             return cached
         end
 
         val = uninterpolated_value(param, environment)
 
         # Convert it if necessary
         val = convert(val, environment)
 
         # And cache it
         @cache[environment||"none"][param] = val
         return val
     end
 
     # Open a file with the appropriate user, group, and mode
     def write(default, *args, &bloc)
         obj = get_config_file_default(default)
         writesub(default, value(obj.name), *args, &bloc)
     end
 
     # Open a non-default file under a default dir with the appropriate user,
     # group, and mode
     def writesub(default, file, *args, &bloc)
         obj = get_config_file_default(default)
         chown = nil
         if Puppet::Util::SUIDManager.uid == 0
             chown = [obj.owner, obj.group]
         else
             chown = [nil, nil]
         end
 
         Puppet::Util::SUIDManager.asuser(*chown) do
             mode = obj.mode || 0640
             if args.empty?
                 args << "w"
             end
 
             args << mode
 
             # Update the umask to make non-executable files
             Puppet::Util.withumask(File.umask ^ 0111) do
                 File.open(file, *args) do |file|
                     yield file
                 end
             end
         end
     end
 
     def readwritelock(default, *args, &bloc)
         file = value(get_config_file_default(default).name)
         tmpfile = file + ".tmp"
         sync = Sync.new
         unless FileTest.directory?(File.dirname(tmpfile))
             raise Puppet::DevError, "Cannot create %s; directory %s does not exist" %
                 [file, File.dirname(file)]
         end
 
         sync.synchronize(Sync::EX) do
             File.open(file, ::File::CREAT|::File::RDWR, 0600) do |rf|
                 rf.lock_exclusive do
                     if File.exist?(tmpfile)
                         raise Puppet::Error, ".tmp file already exists for %s; Aborting locked write. Check the .tmp file and delete if appropriate" %
                             [file]
                     end
 
                     # If there's a failure, remove our tmpfile
                     begin
                         writesub(default, tmpfile, *args, &bloc)
                     rescue
                         File.unlink(tmpfile) if FileTest.exist?(tmpfile)
                         raise
                     end
 
                     begin
                         File.rename(tmpfile, file)
                     rescue => detail
                         Puppet.err "Could not rename %s to %s: %s" % [file, tmpfile, detail]
                         File.unlink(tmpfile) if FileTest.exist?(tmpfile)
                     end
                 end
             end
         end
     end
 
     private
 
     def get_config_file_default(default)
         obj = nil
         unless obj = @config[default]
             raise ArgumentError, "Unknown default %s" % default
         end
 
         unless obj.is_a? FileSetting
             raise ArgumentError, "Default %s is not a file" % default
         end
 
         return obj
     end
 
     # Create the transportable objects for users and groups.
     def add_user_resources(catalog, sections)
         return unless Puppet.features.root?
         return unless self[:mkusers]
 
         @config.each do |name, setting|
             next unless setting.respond_to?(:owner)
             next unless sections.nil? or sections.include?(setting.section)
 
             if user = setting.owner and user != "root" and catalog.resource(:user, user).nil?
-                resource = Puppet::Resource.new(:user, user, :ensure => :present)
+                resource = Puppet::Resource.new(:user, user, :parameters => {:ensure => :present})
                 if self[:group]
                     resource[:gid] = self[:group]
                 end
                 catalog.add_resource resource
             end
             if group = setting.group and ! %w{root wheel}.include?(group) and catalog.resource(:group, group).nil?
-                catalog.add_resource Puppet::Resource.new(:group, group, :ensure => :present)
+                catalog.add_resource Puppet::Resource.new(:group, group, :parameters => {:ensure => :present})
             end
         end
     end
 
     # Yield each search source in turn.
     def each_source(environment)
         searchpath(environment).each do |source|
             # Modify the source as necessary.
             source = self.name if source == :name
             yield source
         end
     end
 
     # Return all settings that have associated hooks; this is so
     # we can call them after parsing the configuration file.
     def settings_with_hooks
         @config.values.find_all { |setting| setting.respond_to?(:handle) }
     end
 
     # Extract extra setting information for files.
     def extract_fileinfo(string)
         result = {}
         value = string.sub(/\{\s*([^}]+)\s*\}/) do
             params = $1
             params.split(/\s*,\s*/).each do |str|
                 if str =~ /^\s*(\w+)\s*=\s*([\w\d]+)\s*$/
                     param, value = $1.intern, $2
                     result[param] = value
                     unless [:owner, :mode, :group].include?(param)
                         raise ArgumentError, "Invalid file option '%s'" % param
                     end
 
                     if param == :mode and value !~ /^\d+$/
                         raise ArgumentError, "File modes must be numbers"
                     end
                 else
                     raise ArgumentError, "Could not parse '%s'" % string
                 end
             end
             ''
         end
         result[:value] = value.sub(/\s*$/, '')
         return result
     end
 
     # Convert arguments into booleans, integers, or whatever.
     def munge_value(value)
         # Handle different data types correctly
         return case value
             when /^false$/i; false
             when /^true$/i; true
             when /^\d+$/i; Integer(value)
             when true; true
             when false; false
             else
                 value.gsub(/^["']|["']$/,'').sub(/\s+$/, '')
         end
     end
 
     # This is an abstract method that just turns a file in to a hash of hashes.
     # We mostly need this for backward compatibility -- as of May 2007 we need to
     # support parsing old files with any section, or new files with just two
     # valid sections.
     def parse_file(file)
         text = read_file(file)
 
         result = Hash.new { |names, name|
             names[name] = {}
         }
 
         count = 0
 
         # Default to 'main' for the section.
         section = :main
         result[section][:_meta] = {}
         text.split(/\n/).each { |line|
             count += 1
             case line
             when /^\s*\[(\w+)\]$/
                 section = $1.intern # Section names
                 # Add a meta section
                 result[section][:_meta] ||= {}
             when /^\s*#/; next # Skip comments
             when /^\s*$/; next # Skip blanks
             when /^\s*(\w+)\s*=\s*(.*)$/ # settings
                 var = $1.intern
 
                 # We don't want to munge modes, because they're specified in octal, so we'll
                 # just leave them as a String, since Puppet handles that case correctly.
                 if var == :mode
                     value = $2
                 else
                     value = munge_value($2)
                 end
 
                 # Check to see if this is a file argument and it has extra options
                 begin
                     if value.is_a?(String) and options = extract_fileinfo(value)
                         value = options[:value]
                         options.delete(:value)
                         result[section][:_meta][var] = options
                     end
                     result[section][var] = value
                 rescue Puppet::Error => detail
                     detail.file = file
                     detail.line = line
                     raise
                 end
             else
                 error = Puppet::Error.new("Could not match line %s" % line)
                 error.file = file
                 error.line = line
                 raise error
             end
         }
 
         return result
     end
 
     # Read the file in.
     def read_file(file)
         begin
             return File.read(file)
         rescue Errno::ENOENT
             raise ArgumentError, "No such file %s" % file
         rescue Errno::EACCES
             raise ArgumentError, "Permission denied to file %s" % file
         end
     end
 
     # Set file metadata.
     def set_metadata(meta)
         meta.each do |var, values|
             values.each do |param, value|
                 @config[var].send(param.to_s + "=", value)
             end
         end
     end
 end
diff --git a/spec/integration/util/settings.rb b/spec/integration/util/settings.rb
index 826bfc97e..536eab643 100755
--- a/spec/integration/util/settings.rb
+++ b/spec/integration/util/settings.rb
@@ -1,31 +1,30 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet_spec/files'
 
 describe Puppet::Util::Settings do
     include PuppetSpec::Files
 
     def minimal_default_settings
         { :noop => {:default => false, :desc => "noop"} }
     end
 
     it "should be able to make needed directories" do
         settings = Puppet::Util::Settings.new
         settings.setdefaults :main, minimal_default_settings.update( :maindir => [tmpfile("main"), "a"] )
-
         settings.use(:main)
 
         File.should be_directory(settings[:maindir])
     end
 
     it "should make its directories with the corret modes" do
         settings = Puppet::Util::Settings.new
         settings.setdefaults :main,  minimal_default_settings.update( :maindir => {:default => tmpfile("main"), :desc => "a", :mode => 0750} )
 
         settings.use(:main)
 
         (File.stat(settings[:maindir]).mode & 007777).should == 0750
     end
 end
diff --git a/spec/unit/resource.rb b/spec/unit/resource.rb
index 2b1d49d50..bc47fa7ed 100755
--- a/spec/unit/resource.rb
+++ b/spec/unit/resource.rb
@@ -1,514 +1,529 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'puppet/resource'
 
 describe Puppet::Resource do
     [:catalog, :file, :line].each do |attr|
         it "should have an #{attr} attribute" do
             resource = Puppet::Resource.new("file", "/my/file")
             resource.should respond_to(attr)
             resource.should respond_to(attr.to_s + "=")
         end
     end
 
     describe "when initializing" do
         it "should require the type and title" do
             lambda { Puppet::Resource.new }.should raise_error(ArgumentError)
         end
 
         it "should create a resource reference with its type and title" do
             ref = Puppet::Resource::Reference.new("file", "/f")
             Puppet::Resource::Reference.expects(:new).with("file", "/f").returns ref
             Puppet::Resource.new("file", "/f")
         end
 
-        it "should allow setting of parameters" do
-            Puppet::Resource.new("file", "/f", :noop => true)[:noop].should be_true
-        end
-
         it "should tag itself with its type" do
             Puppet::Resource.new("file", "/f").should be_tagged("file")
         end
 
         it "should tag itself with its title if the title is a valid tag" do
             Puppet::Resource.new("file", "bar").should be_tagged("bar")
         end
 
         it "should not tag itself with its title if the title is a not valid tag" do
             Puppet::Resource.new("file", "/bar").should_not be_tagged("/bar")
         end
+
+        it "should allow setting of attributes" do
+            Puppet::Resource.new("file", "/bar", :file => "/foo").file.should == "/foo"
+            Puppet::Resource.new("file", "/bar", :exported => true).should be_exported
+        end
     end
 
     it "should use the resource reference to determine its type" do
         ref = Puppet::Resource::Reference.new("file", "/f")
         Puppet::Resource::Reference.expects(:new).returns ref
         resource = Puppet::Resource.new("file", "/f")
         ref.expects(:type).returns "mytype"
         resource.type.should == "mytype"
     end
 
     it "should use its resource reference to determine its title" do
         ref = Puppet::Resource::Reference.new("file", "/f")
         Puppet::Resource::Reference.expects(:new).returns ref
         resource = Puppet::Resource.new("file", "/f")
         ref.expects(:title).returns "mytitle"
         resource.title.should == "mytitle"
     end
 
     it "should use its resource reference to determine whether it is builtin" do
         ref = Puppet::Resource::Reference.new("file", "/f")
         Puppet::Resource::Reference.expects(:new).returns ref
         resource = Puppet::Resource.new("file", "/f")
         ref.expects(:builtin_type?).returns "yep"
         resource.builtin_type?.should == "yep"
     end
 
     it "should call its builtin_type? method when 'builtin?' is called" do
         resource = Puppet::Resource.new("file", "/f")
         resource.expects(:builtin_type?).returns "foo"
         resource.builtin?.should == "foo"
     end
 
     it "should use its resource reference to produce its canonical reference string" do
         ref = Puppet::Resource::Reference.new("file", "/f")
         Puppet::Resource::Reference.expects(:new).returns ref
         resource = Puppet::Resource.new("file", "/f")
         ref.expects(:to_s).returns "Foo[bar]"
         resource.ref.should == "Foo[bar]"
     end
 
     it "should be taggable" do
         Puppet::Resource.ancestors.should be_include(Puppet::Util::Tagging)
     end
 
     it "should have an 'exported' attribute" do
         resource = Puppet::Resource.new("file", "/f")
         resource.exported = true
         resource.exported.should == true
         resource.should be_exported
     end
 
+    it "should support an environment attribute"
+
+    it "should convert its environment into an environment instance if one is provided"
+
+    it "should support a namespace attribute"
+
     describe "when managing parameters" do
         before do
             @resource = Puppet::Resource.new("file", "/my/file")
         end
 
+        it "should be able to check whether parameters are valid when the resource models builtin resources"
+
+        it "should be able to check whether parameters are valid when the resource models defined resources"
+
         it "should allow setting and retrieving of parameters" do
             @resource[:foo] = "bar"
             @resource[:foo].should == "bar"
         end
 
+        it "should allow setting of parameters at initialization" do
+            Puppet::Resource.new("file", "/my/file", :parameters => {:foo => "bar"})[:foo].should == "bar"
+        end
+
         it "should canonicalize retrieved parameter names to treat symbols and strings equivalently" do
             @resource[:foo] = "bar"
             @resource["foo"].should == "bar"
         end
 
         it "should canonicalize set parameter names to treat symbols and strings equivalently" do
             @resource["foo"] = "bar"
             @resource[:foo].should == "bar"
         end
 
         it "should set the namevar when asked to set the name" do
             Puppet::Type.type(:file).stubs(:namevar).returns :myvar
             @resource[:name] = "/foo"
             @resource[:myvar].should == "/foo"
         end
 
         it "should return the namevar when asked to return the name" do
             Puppet::Type.type(:file).stubs(:namevar).returns :myvar
             @resource[:myvar] = "/foo"
             @resource[:name].should == "/foo"
         end
 
         it "should be able to set the name for non-builtin types" do
             resource = Puppet::Resource.new(:foo, "bar")
             lambda { resource[:name] = "eh" }.should_not raise_error
         end
 
         it "should be able to return the name for non-builtin types" do
             resource = Puppet::Resource.new(:foo, "bar")
             resource[:name] = "eh"
             resource[:name].should == "eh"
         end
 
         it "should be able to iterate over parameters" do
             @resource[:foo] = "bar"
             @resource[:fee] = "bare"
             params = {}
             @resource.each do |key, value|
                 params[key] = value
             end
             params.should == {:foo => "bar", :fee => "bare"}
         end
 
         it "should include Enumerable" do
             @resource.class.ancestors.should be_include(Enumerable)
         end
 
         it "should have a method for testing whether a parameter is included" do
             @resource[:foo] = "bar"
             @resource.should be_has_key(:foo)
             @resource.should_not be_has_key(:eh)
         end
 
         it "should have a method for providing the list of parameters" do
             @resource[:foo] = "bar"
             @resource[:bar] = "foo"
             keys = @resource.keys
             keys.should be_include(:foo)
             keys.should be_include(:bar)
         end
 
         it "should have a method for providing the number of parameters" do
             @resource[:foo] = "bar"
             @resource.length.should == 1
         end
 
         it "should have a method for deleting parameters" do
             @resource[:foo] = "bar"
             @resource.delete(:foo)
             @resource[:foo].should be_nil
         end
 
         it "should have a method for testing whether the parameter list is empty" do
             @resource.should be_empty
             @resource[:foo] = "bar"
             @resource.should_not be_empty
         end
 
         it "should be able to produce a hash of all existing parameters" do
             @resource[:foo] = "bar"
             @resource[:fee] = "yay"
 
             hash = @resource.to_hash
             hash[:foo].should == "bar"
             hash[:fee].should == "yay"
         end
 
         it "should not provide direct access to the internal parameters hash when producing a hash" do
             hash = @resource.to_hash
             hash[:foo] = "bar"
             @resource[:foo].should be_nil
         end
 
         it "should use the title as the namevar to the hash if no namevar is present" do
             Puppet::Type.type(:file).stubs(:namevar).returns :myvar
             @resource.to_hash[:myvar].should == "/my/file"
         end
 
         it "should set :name to the title if :name is not present for non-builtin types" do
             resource = Puppet::Resource.new :foo, "bar"
             resource.to_hash[:name].should == "bar"
         end
     end
 
     describe "when serializing" do
         before do
             @resource = Puppet::Resource.new("file", "/my/file")
             @resource["one"] = "test"
             @resource["two"] = "other"
         end
 
         it "should be able to be dumped to yaml" do
             proc { YAML.dump(@resource) }.should_not raise_error
         end
 
         it "should produce an equivalent yaml object" do
             text = YAML.dump(@resource)
 
             newresource = YAML.load(text)
             newresource.title.should == @resource.title
             newresource.type.should == @resource.type
             %w{one two}.each do |param|
                 newresource[param].should == @resource[param]
             end
         end
     end
 
     describe "when converting to a RAL resource" do
         before do
             @resource = Puppet::Resource.new("file", "/my/file")
             @resource["one"] = "test"
             @resource["two"] = "other"
         end
 
         it "should use the resource type's :create method to create the resource if the resource is of a builtin type" do
             type = mock 'resource type'
             type.expects(:new).with(@resource).returns(:myresource)
             Puppet::Type.expects(:type).with(@resource.type).returns(type)
             @resource.to_ral.should == :myresource
         end
 
         it "should convert to a component instance if the resource type is not of a builtin type" do
             component = mock 'component type'
             Puppet::Type::Component.expects(:new).with(@resource).returns "meh"
 
             Puppet::Type.expects(:type).with(@resource.type).returns(nil)
             @resource.to_ral.should == "meh"
         end
     end
 
     it "should be able to convert itself to Puppet code" do
         Puppet::Resource.new("one::two", "/my/file").should respond_to(:to_manifest)
     end
 
     describe "when converting to puppet code" do
         before do
-            @resource = Puppet::Resource.new("one::two", "/my/file", :noop => true, :foo => %w{one two})
+            @resource = Puppet::Resource.new("one::two", "/my/file", :parameters => {:noop => true, :foo => %w{one two}})
         end
 
         it "should print the type and title" do
             @resource.to_manifest.should be_include("one::two { '/my/file':\n")
         end
 
         it "should print each parameter, with the value single-quoted" do
             @resource.to_manifest.should be_include("    noop => 'true'")
         end
 
         it "should print array values appropriately" do
             @resource.to_manifest.should be_include("    foo => ['one','two']")
         end
     end
 
     it "should be able to convert itself to a TransObject instance" do
         Puppet::Resource.new("one::two", "/my/file").should respond_to(:to_trans)
     end
 
     describe "when converting to a TransObject" do
         describe "and the resource is not an instance of a builtin type" do
             before do
                 @resource = Puppet::Resource.new("foo", "bar")
             end
 
             it "should return a simple TransBucket if it is not an instance of a builtin type" do
                 bucket = @resource.to_trans
                 bucket.should be_instance_of(Puppet::TransBucket)
                 bucket.type.should == @resource.type
                 bucket.name.should == @resource.title
             end
 
             it "should copy over the resource's file" do
                 @resource.file = "/foo/bar"
                 @resource.to_trans.file.should == "/foo/bar"
             end
 
             it "should copy over the resource's line" do
                 @resource.line = 50
                 @resource.to_trans.line.should == 50
             end
         end
 
         describe "and the resource is an instance of a builtin type" do
             before do
                 @resource = Puppet::Resource.new("file", "bar")
             end
 
             it "should return a TransObject if it is an instance of a builtin resource type" do
                 trans = @resource.to_trans
                 trans.should be_instance_of(Puppet::TransObject)
                 trans.type.should == "file"
                 trans.name.should == @resource.title
             end
 
             it "should copy over the resource's file" do
                 @resource.file = "/foo/bar"
                 @resource.to_trans.file.should == "/foo/bar"
             end
 
             it "should copy over the resource's line" do
                 @resource.line = 50
                 @resource.to_trans.line.should == 50
             end
 
             # Only TransObjects support tags, annoyingly
             it "should copy over the resource's tags" do
                 @resource.tag "foo"
                 @resource.to_trans.tags.should == @resource.tags
             end
 
             it "should copy the resource's parameters into the transobject and convert the parameter name to a string" do
                 @resource[:foo] = "bar"
                 @resource.to_trans["foo"].should == "bar"
             end
 
             it "should be able to copy arrays of values" do
                 @resource[:foo] = %w{yay fee}
                 @resource.to_trans["foo"].should == %w{yay fee}
             end
 
             it "should reduce single-value arrays to just a value" do
                 @resource[:foo] = %w{yay}
                 @resource.to_trans["foo"].should == "yay"
             end
 
             it "should convert resource references into the backward-compatible form" do
                 @resource[:foo] = Puppet::Resource::Reference.new(:file, "/f")
                 @resource.to_trans["foo"].should == %w{file /f}
             end
 
             it "should convert resource references into the backward-compatible form even when within arrays" do
                 @resource[:foo] = ["a", Puppet::Resource::Reference.new(:file, "/f")]
                 @resource.to_trans["foo"].should == ["a", %w{file /f}]
             end
         end
     end
 
     describe "when converting to pson" do
         confine "Missing 'pson' library" => Puppet.features.pson?
 
         def pson_output_should
             @resource.class.expects(:pson_create).with { |hash| yield hash }
         end
 
         it "should include the pson util module" do
             Puppet::Resource.metaclass.ancestors.should be_include(Puppet::Util::Pson)
         end
 
         # LAK:NOTE For all of these tests, we convert back to the resource so we can
         # trap the actual data structure then.
 
         it "should set its type to the provided type" do
             Puppet::Resource.from_pson(PSON.parse(Puppet::Resource.new("File", "/foo").to_pson)).type.should == "File"
         end
 
         it "should set its title to the provided title" do
             Puppet::Resource.from_pson(PSON.parse(Puppet::Resource.new("File", "/foo").to_pson)).title.should == "/foo"
         end
 
         it "should include all tags from the resource" do
             resource = Puppet::Resource.new("File", "/foo")
             resource.tag("yay")
 
             Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).tags.should == resource.tags
         end
 
         it "should include the file if one is set" do
             resource = Puppet::Resource.new("File", "/foo")
             resource.file = "/my/file"
 
             Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).file.should == "/my/file"
         end
 
         it "should include the line if one is set" do
             resource = Puppet::Resource.new("File", "/foo")
             resource.line = 50
 
             Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).line.should == 50
         end
 
         it "should include the 'exported' value if one is set" do
             resource = Puppet::Resource.new("File", "/foo")
             resource.exported = true
 
             Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).exported.should be_true
         end
 
         it "should set 'exported' to false if no value is set" do
             resource = Puppet::Resource.new("File", "/foo")
 
             Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).exported.should be_false
         end
 
         it "should set all of its parameters as the 'parameters' entry" do
             resource = Puppet::Resource.new("File", "/foo")
             resource[:foo] = %w{bar eh}
             resource[:fee] = %w{baz}
 
             result = Puppet::Resource.from_pson(PSON.parse(resource.to_pson))
             result["foo"].should == %w{bar eh}
             result["fee"].should == %w{baz}
         end
     end
 
     describe "when converting from pson" do
         confine "Missing 'pson' library" => Puppet.features.pson?
 
         def pson_result_should
             Puppet::Resource.expects(:new).with { |hash| yield hash }
         end
 
         before do
             @data = {
                 'type' => "file",
                 'title' => "yay",
             }
         end
 
         it "should set its type to the provided type" do
             Puppet::Resource.from_pson(@data).type.should == "File"
         end
 
         it "should set its title to the provided title" do
             Puppet::Resource.from_pson(@data).title.should == "yay"
         end
 
         it "should tag the resource with any provided tags" do
             @data['tags'] = %w{foo bar}
             resource = Puppet::Resource.from_pson(@data)
             resource.tags.should be_include("foo")
             resource.tags.should be_include("bar")
         end
 
         it "should set its file to the provided file" do
             @data['file'] = "/foo/bar"
             Puppet::Resource.from_pson(@data).file.should == "/foo/bar"
         end
 
         it "should set its line to the provided line" do
             @data['line'] = 50
             Puppet::Resource.from_pson(@data).line.should == 50
         end
 
         it "should 'exported' to true if set in the pson data" do
             @data['exported'] = true
             Puppet::Resource.from_pson(@data).exported.should be_true
         end
 
         it "should 'exported' to false if not set in the pson data" do
             Puppet::Resource.from_pson(@data).exported.should be_false
         end
 
         it "should fail if no title is provided" do
             @data.delete('title')
             lambda { Puppet::Resource.from_pson(@data) }.should raise_error(ArgumentError)
         end
 
         it "should fail if no type is provided" do
             @data.delete('type')
             lambda { Puppet::Resource.from_pson(@data) }.should raise_error(ArgumentError)
         end
 
         it "should set each of the provided parameters" do
             @data['parameters'] = {'foo' => %w{one two}, 'fee' => %w{three four}}
             resource = Puppet::Resource.from_pson(@data)
             resource['foo'].should == %w{one two}
             resource['fee'].should == %w{three four}
         end
 
         it "should convert single-value array parameters to normal values" do
             @data['parameters'] = {'foo' => %w{one}}
             resource = Puppet::Resource.from_pson(@data)
             resource['foo'].should == %w{one}
         end
     end
 
     describe "it should implement to_resource" do
         resource = Puppet::Resource.new("file", "/my/file")
         resource.to_resource.should == resource
     end
 
     describe "because it is an indirector model" do
         it "should include Puppet::Indirector" do
             Puppet::Resource.should be_is_a(Puppet::Indirector)
         end
 
         it "should have a default terminus" do
             Puppet::Resource.indirection.terminus_class.should == :ral
         end
 
         it "should have a name" do
             Puppet::Resource.new("file", "/my/file").name.should == "File//my/file"
         end
     end
 end
diff --git a/spec/unit/type.rb b/spec/unit/type.rb
index f5953aa9c..97dc113a6 100755
--- a/spec/unit/type.rb
+++ b/spec/unit/type.rb
@@ -1,482 +1,482 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Puppet::Type do
     it "should include the Cacher module" do
         Puppet::Type.ancestors.should be_include(Puppet::Util::Cacher)
     end
 
     it "should use its catalog as its expirer" do
         catalog = Puppet::Resource::Catalog.new
         resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
         resource.catalog = catalog
         resource.expirer.should equal(catalog)
     end
 
     it "should do nothing when asked to expire when it has no catalog" do
         resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
         lambda { resource.expire }.should_not raise_error
     end
 
     it "should be able to retrieve a property by name" do
         resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
         resource.property(:fstype).must be_instance_of(Puppet::Type.type(:mount).attrclass(:fstype))
     end
 
     it "should be able to retrieve a parameter by name" do
         resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
         resource.parameter(:name).must be_instance_of(Puppet::Type.type(:mount).attrclass(:name))
     end
 
     it "should be able to retrieve a property by name using the :parameter method" do
         resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
         resource.parameter(:fstype).must be_instance_of(Puppet::Type.type(:mount).attrclass(:fstype))
     end
 
     it "should be able to retrieve all set properties" do
         resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
         props = resource.properties
         props.should_not be_include(nil)
         [:fstype, :ensure, :pass].each do |name|
             props.should be_include(resource.parameter(name))
         end
     end
 
     it "should have a method for setting default values for resources" do
         Puppet::Type.type(:mount).new(:name => "foo").should respond_to(:set_default)
     end
 
     it "should do nothing for attributes that have no defaults and no specified value" do
         Puppet::Type.type(:mount).new(:name => "foo").parameter(:noop).should be_nil
     end
 
     it "should have a method for adding tags" do
         Puppet::Type.type(:mount).new(:name => "foo").should respond_to(:tags)
     end
 
     it "should use the tagging module" do
         Puppet::Type.type(:mount).ancestors.should be_include(Puppet::Util::Tagging)
     end
 
     it "should delegate to the tagging module when tags are added" do
         resource = Puppet::Type.type(:mount).new(:name => "foo")
         resource.stubs(:tag).with(:mount)
 
         resource.expects(:tag).with(:tag1, :tag2)
 
         resource.tags = [:tag1,:tag2]
     end
 
     it "should add the current type as tag" do
         resource = Puppet::Type.type(:mount).new(:name => "foo")
         resource.stubs(:tag)
 
         resource.expects(:tag).with(:mount)
 
         resource.tags = [:tag1,:tag2]
     end
 
     it "should have a method to know if the resource is exported" do
         Puppet::Type.type(:mount).new(:name => "foo").should respond_to(:exported?)
     end
 
     it "should have a method to know if the resource is virtual" do
         Puppet::Type.type(:mount).new(:name => "foo").should respond_to(:virtual?)
     end
 
     it "should consider its version to be its catalog version" do
         resource = Puppet::Type.type(:mount).new(:name => "foo")
         catalog = Puppet::Resource::Catalog.new
         catalog.version = 50
         catalog.add_resource resource
 
         resource.version.should == 50
     end
 
     it "should consider its version to be zero if it has no catalog" do
         Puppet::Type.type(:mount).new(:name => "foo").version.should == 0
     end
 
     it "should provide source_descriptors" do
         resource = Puppet::Type.type(:mount).new(:name => "foo")
         catalog = Puppet::Resource::Catalog.new
         catalog.version = 50
         catalog.add_resource resource
 
         resource.source_descriptors.should == {:version=>50, :tags=>["mount", "foo"], :path=>"/Mount[foo]"}
     end
 
     it "should consider its type to be the name of its class" do
         Puppet::Type.type(:mount).new(:name => "foo").type.should == :mount
     end
 
     describe "when creating an event" do
         before do
             @resource = Puppet::Type.type(:mount).new :name => "foo"
         end
 
         it "should have the resource's reference as the resource" do
             @resource.event.resource.should == "Mount[foo]"
         end
 
         it "should have the resource's log level as the default log level" do
             @resource[:loglevel] = :warning
             @resource.event.default_log_level.should == :warning
         end
 
         {:file => "/my/file", :line => 50, :tags => %{foo bar}, :version => 50}.each do |attr, value|
             it "should set the #{attr}" do
                 @resource.stubs(attr).returns value
                 @resource.event.send(attr).should == value
             end
         end
 
         it "should allow specification of event attributes" do
             @resource.event(:status => "noop").status.should == "noop"
         end
     end
 
     describe "when choosing a default provider" do
         it "should choose the provider with the highest specificity" do
             # Make a fake type
             type = Puppet::Type.newtype(:defaultprovidertest) do
                 newparam(:name) do end
             end
 
             basic = type.provide(:basic) {}
             greater = type.provide(:greater) {}
 
             basic.stubs(:specificity).returns 1
             greater.stubs(:specificity).returns 2
 
             type.defaultprovider.should equal(greater)
         end
     end
 
     describe "when initializing" do
         describe "and passed a TransObject" do
             it "should fail" do
                 trans = Puppet::TransObject.new("/foo", :mount)
                 lambda { Puppet::Type.type(:mount).new(trans) }.should raise_error(Puppet::DevError)
             end
         end
 
         describe "and passed a Puppet::Resource instance" do
             it "should set its title to the title of the resource if the resource type is equal to the current type" do
-                resource = Puppet::Resource.new(:mount, "/foo", :name => "/other")
+                resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "/other"})
                 Puppet::Type.type(:mount).new(resource).title.should == "/foo"
             end
 
             it "should set its title to the resource reference if the resource type is not equal to the current type" do
                 resource = Puppet::Resource.new(:user, "foo")
                 Puppet::Type.type(:mount).new(resource).title.should == "User[foo]"
             end
 
             [:line, :file, :catalog, :exported, :virtual].each do |param|
                 it "should copy '#{param}' from the resource if present" do
                     resource = Puppet::Resource.new(:mount, "/foo")
                     resource.send(param.to_s + "=", "foo")
                     resource.send(param.to_s + "=", "foo")
                     Puppet::Type.type(:mount).new(resource).send(param).should == "foo"
                 end
             end
 
             it "should copy any tags from the resource" do
                 resource = Puppet::Resource.new(:mount, "/foo")
                 resource.tag "one", "two"
                 tags = Puppet::Type.type(:mount).new(resource).tags
                 tags.should be_include("one")
                 tags.should be_include("two")
             end
 
             it "should copy the resource's parameters as its own" do
-                resource = Puppet::Resource.new(:mount, "/foo", :atboot => true, :fstype => "boo")
+                resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:atboot => true, :fstype => "boo"})
                 params = Puppet::Type.type(:mount).new(resource).to_hash
                 params[:fstype].should == "boo"
                 params[:atboot].should == true
             end
         end
 
         describe "and passed a Hash" do
             it "should extract the title from the hash" do
                 Puppet::Type.type(:mount).new(:title => "/yay").title.should == "/yay"
             end
 
             it "should work when hash keys are provided as strings" do
                 Puppet::Type.type(:mount).new("title" => "/yay").title.should == "/yay"
             end
 
             it "should work when hash keys are provided as symbols" do
                 Puppet::Type.type(:mount).new(:title => "/yay").title.should == "/yay"
             end
 
             it "should use the name from the hash as the title if no explicit title is provided" do
                 Puppet::Type.type(:mount).new(:name => "/yay").title.should == "/yay"
             end
 
             it "should use the Resource Type's namevar to determine how to find the name in the hash" do
                 Puppet::Type.type(:file).new(:path => "/yay").title.should == "/yay"
             end
 
             it "should fail if the namevar is not equal to :name and both :name and the namevar are provided" do
                 lambda { Puppet::Type.type(:file).new(:path => "/yay", :name => "/foo") }.should raise_error(Puppet::Error)
                 @type.stubs(:namevar).returns :myname
             end
 
             [:catalog].each do |param|
                 it "should extract '#{param}' from the hash if present" do
                     Puppet::Type.type(:mount).new(:name => "/yay", param => "foo").send(param).should == "foo"
                 end
             end
 
             it "should use any remaining hash keys as its parameters" do
                 resource = Puppet::Type.type(:mount).new(:title => "/foo", :catalog => "foo", :atboot => true, :fstype => "boo")
                 resource[:fstype].must == "boo"
                 resource[:atboot].must == true
             end
         end
 
         it "should fail if any invalid attributes have been provided" do
             lambda { Puppet::Type.type(:mount).new(:title => "/foo", :nosuchattr => "whatever") }.should raise_error(Puppet::Error)
         end
 
         it "should set its name to the resource's title if the resource does not have a :name or namevar parameter set" do
             resource = Puppet::Resource.new(:mount, "/foo")
 
             Puppet::Type.type(:mount).new(resource).name.should == "/foo"
         end
 
         it "should fail if no title, name, or namevar are provided" do
             lambda { Puppet::Type.type(:file).new(:atboot => true) }.should raise_error(Puppet::Error)
         end
 
         it "should set the attributes in the order returned by the class's :allattrs method" do
             Puppet::Type.type(:mount).stubs(:allattrs).returns([:name, :atboot, :noop])
-            resource = Puppet::Resource.new(:mount, "/foo", :name => "myname", :atboot => "myboot", :noop => "whatever")
+            resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "myname", :atboot => "myboot", :noop => "whatever"})
 
             set = []
 
             Puppet::Type.type(:mount).any_instance.stubs(:newattr).with do |param, hash|
                 set << param
                 true
             end
 
             Puppet::Type.type(:mount).new(resource)
 
             set[-1].should == :noop
             set[-2].should == :atboot
         end
 
         it "should always set the name and then default provider before anything else" do
             Puppet::Type.type(:mount).stubs(:allattrs).returns([:provider, :name, :atboot])
-            resource = Puppet::Resource.new(:mount, "/foo", :name => "myname", :atboot => "myboot")
+            resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "myname", :atboot => "myboot"})
 
             set = []
 
             Puppet::Type.type(:mount).any_instance.stubs(:newattr).with do |param, hash|
                 set << param
                 true
             end
 
             Puppet::Type.type(:mount).new(resource)
             set[0].should == :name
             set[1].should == :provider
         end
 
         # This one is really hard to test :/
         it "should each default immediately if no value is provided" do
             defaults = []
             Puppet::Type.type(:package).any_instance.stubs(:set_default).with { |value| defaults << value; true }
 
             Puppet::Type.type(:package).new :name => "whatever"
 
             defaults[0].should == :provider
         end
 
         it "should retain a copy of the originally provided parameters" do
             Puppet::Type.type(:mount).new(:name => "foo", :atboot => true, :noop => false).original_parameters.should == {:atboot => true, :noop => false}
         end
 
         it "should delete the name via the namevar from the originally provided parameters" do
             Puppet::Type.type(:file).new(:name => "/foo").original_parameters[:path].should be_nil
         end
     end
 
     it "should have a class method for converting a hash into a Puppet::Resource instance" do
         Puppet::Type.type(:mount).must respond_to(:hash2resource)
     end
 
     describe "when converting a hash to a Puppet::Resource instance" do
         before do
             @type = Puppet::Type.type(:mount)
         end
 
         it "should treat a :title key as the title of the resource" do
             @type.hash2resource(:name => "/foo", :title => "foo").title.should == "foo"
         end
 
         it "should use the name from the hash as the title if no explicit title is provided" do
             @type.hash2resource(:name => "foo").title.should == "foo"
         end
 
         it "should use the Resource Type's namevar to determine how to find the name in the hash" do
             @type.stubs(:namevar).returns :myname
 
             @type.hash2resource(:myname => "foo").title.should == "foo"
         end
 
         it "should fail if the namevar is not equal to :name and both :name and the namevar are provided" do
             @type.stubs(:namevar).returns :myname
 
             lambda { @type.hash2resource(:myname => "foo", :name => 'bar') }.should raise_error(Puppet::Error)
         end
 
         [:catalog].each do |attr|
             it "should use any provided #{attr}" do
                 @type.hash2resource(:name => "foo", attr => "eh").send(attr).should == "eh"
             end
         end
 
         it "should set all provided parameters on the resource" do
             @type.hash2resource(:name => "foo", :fstype => "boo", :boot => "fee").to_hash.should == {:name => "foo", :fstype => "boo", :boot => "fee"}
         end
 
         it "should not set the title as a parameter on the resource" do
             @type.hash2resource(:name => "foo", :title => "eh")[:title].should be_nil
         end
 
         it "should not set the catalog as a parameter on the resource" do
             @type.hash2resource(:name => "foo", :catalog => "eh")[:catalog].should be_nil
         end
 
         it "should treat hash keys equivalently whether provided as strings or symbols" do
             resource = @type.hash2resource("name" => "foo", "title" => "eh", "fstype" => "boo")
             resource.title.should == "eh"
             resource[:name].should == "foo"
             resource[:fstype].should == "boo"
         end
     end
 
     describe "when retrieving current property values" do
         before do
             @resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
             @resource.property(:ensure).stubs(:retrieve).returns :absent
         end
 
         it "should fail if its provider is unsuitable" do
             @resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
             @resource.provider.class.expects(:suitable?).returns false
             lambda { @resource.retrieve }.should raise_error(Puppet::Error)
         end
 
         it "should return a Puppet::Resource instance with its type and title set appropriately" do
             result = @resource.retrieve
             result.should be_instance_of(Puppet::Resource)
             result.type.should == "Mount"
             result.title.should == "foo"
         end
 
         it "should set the name of the returned resource if its own name and title differ" do
             @resource[:name] = "my name"
             @resource.title = "other name"
             @resource.retrieve[:name].should == "my name"
         end
 
         it "should provide a value for all set properties" do
             values = @resource.retrieve
             [:ensure, :fstype, :pass].each { |property| values[property].should_not be_nil }
         end
 
         it "should provide a value for 'ensure' even if no desired value is provided" do
             @resource = Puppet::Type.type(:file).new(:path => "/my/file/that/can't/exist")
         end
 
         it "should not call retrieve on non-ensure properties if the resource is absent and should consider the property absent" do
             @resource.property(:ensure).expects(:retrieve).returns :absent
             @resource.property(:fstype).expects(:retrieve).never
             @resource.retrieve[:fstype].should == :absent
         end
 
         it "should include the result of retrieving each property's current value if the resource is present" do
             @resource.property(:ensure).expects(:retrieve).returns :present
             @resource.property(:fstype).expects(:retrieve).returns 15
             @resource.retrieve[:fstype] == 15
         end
     end
 
 
     describe "when in a catalog" do
         before do
             @catalog = Puppet::Resource::Catalog.new
             @container = Puppet::Type.type(:component).new(:name => "container")
             @one = Puppet::Type.type(:file).new(:path => "/file/one")
             @two = Puppet::Type.type(:file).new(:path => "/file/two")
 
             @catalog.add_resource @container
             @catalog.add_resource @one
             @catalog.add_resource @two
             @catalog.add_edge @container, @one
             @catalog.add_edge @container, @two
         end
 
         it "should have no parent if there is no in edge" do
             @container.parent.should be_nil
         end
 
         it "should set its parent to its in edge" do
             @one.parent.ref.should == @container.ref
         end
 
         after do
             @catalog.clear(true)
         end
     end
 
     describe "when managing relationships" do
     end
 end
 
 describe Puppet::Type::RelationshipMetaparam do
     it "should be a subclass of Puppet::Parameter" do
         Puppet::Type::RelationshipMetaparam.superclass.should equal(Puppet::Parameter)
     end
 
     it "should be able to produce a list of subclasses" do
         Puppet::Type::RelationshipMetaparam.should respond_to(:subclasses)
     end
 
     describe "when munging relationships" do
         before do
             @resource = Puppet::Type.type(:mount).new :name => "/foo"
             @metaparam = Puppet::Type.metaparamclass(:require).new :resource => @resource
         end
 
         it "should accept Puppet::Resource::Reference instances" do
             ref = Puppet::Resource::Reference.new(:file, "/foo")
             @metaparam.munge(ref)[0].should equal(ref)
         end
 
         it "should turn any string into a Puppet::Resource::Reference" do
             @metaparam.munge("File[/ref]")[0].should be_instance_of(Puppet::Resource::Reference)
         end
     end
 
     it "should be able to validate relationships" do
         Puppet::Type.metaparamclass(:require).new(:resource => mock("resource")).should respond_to(:validate_relationship)
     end
 
     it "should fail if any specified resource is not found in the catalog" do
         catalog = mock 'catalog'
         resource = stub 'resource', :catalog => catalog, :ref => "resource"
 
         param = Puppet::Type.metaparamclass(:require).new(:resource => resource, :value => %w{Foo[bar] Class[test]})
 
         catalog.expects(:resource).with("Foo[bar]").returns "something"
         catalog.expects(:resource).with("Class[test]").returns nil
 
         param.expects(:fail).with { |string| string.include?("Class[test]") }
 
         param.validate_relationship
     end
 end