You can now use the "resources" type to purge resources. I still need to modify transactions so they do not purge resources that have relationships. Also, apparently the noop metaparam was never actually working; now it is, and there is a test for it.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1915 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 10 insertions, 8 deletions

diff --git a/lib/puppet/metatype/metaparams.rb b/lib/puppet/metatype/metaparams.rb
index df226b146..c9d3426ff 100644
--- a/lib/puppet/metatype/metaparams.rb
+++ b/lib/puppet/metatype/metaparams.rb
@@ -11,14 +11,13 @@ class Puppet::Type
 
     newmetaparam(:noop) do
         desc "Boolean flag indicating whether work should actually
-            be done.  *true*/**false**"
-        munge do |noop|
-            if noop == "true" or noop == true
-                return true
-            elsif noop == "false" or noop == false
-                return false
-            else
-                self.fail("Invalid noop value '%s'" % noop)
+            be done."
+            
+        newvalues(:true, :false)
+        munge do |value|
+            case value
+            when true, :true, "true": @parent.noop = true
+            when false, :false, "false": @parent.noop = false
             end
         end
     end
diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb
index 7e81a08b3..5171cb58f 100644
--- a/lib/puppet/type/resources.rb
+++ b/lib/puppet/type/resources.rb
@@ -51,6 +51,9 @@ Puppet::Type.newtype(:resources) do
                     [self[:name]]
                 return []
             end
+            @metaparams.each do |name, param|
+                resource[name] = param.value
+            end
         end
     end