Converting the file 'source' property to a parameter.

This makes a lot of sense because source was always
more of a metaparameter than a property -- it affected
the 'should' values of other properties, but it shouldn't
have done any other work.

It will hopefully make everything else much cleaner.

This is such a large commit mostly because of the need
to fix a lot of tests.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 29 insertions, 0 deletions

diff --git a/spec/integration/type/file.rb b/spec/integration/type/file.rb
index c9e0d19c6..5e32332d3 100755
--- a/spec/integration/type/file.rb
+++ b/spec/integration/type/file.rb
@@ -175,10 +175,39 @@ describe Puppet::Type.type(:file) do
 
             # And make sure it's changed
             File.read(dest).should == "bar"
+        end
+
+        it "should be able to copy individual files even if recurse has been specified" do
+            source = tmpfile("source")
+            dest = tmpfile("dest")
+
+            File.open(source, "w") { |f| f.print "foo" }
+
+            file = Puppet::Type::File.create(:name => dest, :source => source, :recurse => true)
 
+            catalog = Puppet::Node::Catalog.new
+            catalog.add_resource file
+            catalog.apply
+
+            File.read(dest).should == "foo"
         end
     end
 
+    it "should be able to create files when 'content' is specified but 'ensure' is not" do
+        dest = tmpfile("files_with_content")
+
+        file = Puppet.type(:file).create(
+            :name => dest,
+            :content => "this is some content, yo"
+        )
+
+        catalog = Puppet::Node::Catalog.new
+        catalog.add_resource file
+        catalog.apply
+
+        File.read(dest).should == "this is some content, yo"
+    end
+
     it "should create files with content if both 'content' and 'ensure' are set" do
         dest = tmpfile("files_with_content")