Merge pull request #26 from bmjen/fix-windows-support

fixes windows support

Author: Richard Pijnenburg

README.md

@@ -39,9 +39,9 @@ example:
     file_concat { '/tmp/file':
       tag     => 'unique_tag', # Mandatory
       path    => '/tmp/file',  # Optional. If given it overrides the resource name.
-      owner   => 'root',       # Optional. Defaults to root.
-      group   => 'root',       # Optional. Defaults to root.
-      mode    => '0644'        # Optional. Defaults to 0644.
+      owner   => 'root',       # Optional. Defaults to undef.
+      group   => 'root',       # Optional. Defaults to undef.
+      mode    => '0644'        # Optional. Defaults to undef.
       order   => 'numeric'     # Optional. Set to 'numeric' or 'alpha'. Defaults to numeric.
       replace => true          # Optional. Boolean Value. Defaults to true.
       backup  => false         # Optional. true, false, 'puppet', or a string. Defaults to 'puppet' for Filebucketing.

lib/puppet/type/file_concat.rb

@@ -13,9 +13,9 @@
       file_concat { '/tmp/file:
         tag   => 'unique_tag', # Mandatory
         path  => '/tmp/file',  # Optional. If given it overrides the resource name
-        owner => 'root',       # Optional. Default to root
-        group => 'root',       # Optional. Default to root
-        mode  => '0644'        # Optional. Default to 0644
+        owner => 'root',       # Optional. Default to undef
+        group => 'root',       # Optional. Default to undef
+        mode  => '0644'        # Optional. Default to undef
         order => 'numeric'     # Optional, Default to 'numeric'
       }
   "
@@ -46,17 +46,14 @@ def exists?
 
   newparam(:owner, :parent => Puppet::Type::File::Owner) do
     desc "Desired file owner."
-    defaultto 'root'
   end
 
   newparam(:group, :parent => Puppet::Type::File::Group) do
     desc "Desired file group."
-    defaultto 'root'
   end
 
   newparam(:mode, :parent => Puppet::Type::File::Mode) do
     desc "Desired file mode."
-    defaultto '0644'
   end
 
   newparam(:order) do
@@ -141,15 +138,17 @@ def fragment_content(r)
   end
 
   def eval_generate
-    [Puppet::Type.type(:file).new({
-      :ensure  => self[:ensure] == :absent ? :absent : :file,
-      :path    => self[:path],
-      :owner   => self[:owner],
-      :group   => self[:group],
-      :mode    => self[:mode],
-      :replace => self[:replace],
-      :backup  => self[:backup],
+    file_opts = {
+      :ensure => self[:ensure] == :absent ? :absent : :file,
       :content => self.should_content,
-    })]
+    }
+
+    [:path, :owner, :group, :mode, :replace, :backup].each do |param|
+      unless self[param].nil?
+        file_opts[param] = self[param]
+      end
+    end
+
+    [Puppet::Type.type(:file).new(file_opts)]
   end
 end