Split up config from extra

Author: wfarr

lib/puppet/provider/repository/git.rb

@@ -20,6 +20,7 @@ def create
     command = [
       command(:git),
       "clone",
+      friendly_config,
       friendly_extra,
       friendly_source,
       friendly_path
@@ -46,7 +47,7 @@ def command_opts
 
   def build_command_opts
     default_command_opts.tap do |h|
-      if uid = (self[:user] || self.class.default_user)
+      if uid = (@resource[:user] || self.class.default_user)
         h[:uid] = uid
       end
     end
@@ -59,14 +60,20 @@ def default_command_opts
     }
   end
 
-  def friendly_extra
-    @friendly_extra ||= [@resource[:extra]].flatten.map do |o|
-      Shellwords.escape(o)
+  def friendly_config
+    @friendly_config ||= Array.new.tap do |a|
+      @resource[:config].each do |setting, value|
+        a << "-c #{setting}=#{value}"
+      end
     end.join(' ').strip
   end
 
+  def friendly_extra
+    @friendly_extra ||= [@resource[:extra]].flatten.join(' ').strip
+  end
+
   def friendly_source
-    @friendly_source ||= Shellwords.escape(expand_source(@resource[:source]))
+    @friendly_source ||= expand_source(@resource[:source])
   end
 
   def friendly_path

lib/puppet/type/repository.rb

@@ -47,6 +47,16 @@
     end
   end
 
+  newparam :config do
+    desc "The config to pass to the running provider"
+
+    validate do |value|
+      unless value.is_a? Hash
+        raise Puppet::Error, "Repository#config must be a Hash"
+      end
+    end
+  end
+
   newparam :extra, :array_matching => :all do
     desc "Extra actions or information for a provider"
   end