Adding basic_auth feature and adding --non-interactive to all svn commands.
authorJustin Ellison <justin.ellison@buckle.com>
Wed, 17 Aug 2011 15:07:40 +0000 (10:07 -0500)
committerJustin Ellison <justin.ellison@buckle.com>
Wed, 17 Aug 2011 15:07:40 +0000 (10:07 -0500)
The basic_auth feature allows the manifest to specify an optional
basic_auth_username and basic_auth_password to be sent to the subversion
server over HTTP(S).

Adding --non-interactive to all svn commands just lets svn know that
there's not a user on the other end to send y/n questions.

lib/puppet/provider/vcsrepo/svn.rb

index 680188c..53daf53 100644 (file)
@@ -7,7 +7,7 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo)
            :svnadmin => 'svnadmin'
 
   defaultfor :svn => :exists
-  has_features :filesystem_types, :reference_tracking
+  has_features :filesystem_types, :reference_tracking, :basic_auth
 
   def create
     if !@resource.value(:source)
@@ -40,29 +40,42 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo)
       end
     end
   end
+  
+  def buildargs
+    args = ['--non-interactive']
+    if @resource.value(:basic_auth_username) && @resource.value(:basic_auth_password)
+      args.push('--username', @resource.value(:basic_auth_username))
+      args.push('--password', @resource.value(:basic_auth_password))
+      args.push('--no-auth-cache')
+    end
+    return args
+  end
 
   def latest
+    args = buildargs.push('info', '-r', 'HEAD')
     at_path do
-      svn('info', '-r', 'HEAD')[/^Revision:\s+(\d+)/m, 1]
+      svn(*args)[/^Revision:\s+(\d+)/m, 1]
     end
   end
   
   def revision
+    args = buildargs.push('info')
     at_path do
-      svn('info')[/^Revision:\s+(\d+)/m, 1]
+      svn(*args)[/^Revision:\s+(\d+)/m, 1]
     end
   end
 
   def revision=(desired)
+    args = buildargs.push('update', '-r', desired)
     at_path do
-      svn('update', '-r', desired)
+      svn(*args)
     end
   end
 
   private
 
-  def checkout_repository(source, path, revision = nil)
-    args = ['checkout']
+  def checkout_repository(source, path, revision)
+    args = buildargs.push('checkout')
     if revision
       args.push('-r', revision)
     end