Merge branch 'master' into dummy-provider

Conflicts:
	lib/puppet/provider/vcsrepo/cvs.rb
	spec/support/fixture_helpers.rb
	spec/unit/puppet/provider/vcsrepo/cvs_spec.rb

diff --git a/LICENSE b/LICENSE
index a8de5fe..2ee80c8 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
-Copyright (C) 2010 Reductive Labs Inc.
+Copyright (C) 2010-2012 Puppet Labs Inc.
 
-Reductive Labs can be contacted at: info@reductivelabs.com
+Puppet Labs can be contacted at: info@puppetlabs.com
 
 This program and entire repository is free software; you can
 redistribute it and/or modify it under the terms of the GNU

diff --git a/README.BZR.markdown b/README.BZR.markdown
index dd610db..cc257e9 100644 (file)
--- a/README.BZR.markdown
+++ b/README.BZR.markdown
@@ -44,4 +44,4 @@ More Examples
 
 For examples you can run, see `examples/bzr/`
 
-[1]: http://docs.reductivelabs.com/references/stable/metaparameter.html#require
+[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require

diff --git a/README.CVS.markdown b/README.CVS.markdown
index 321c865..10121a7 100644 (file)
--- a/README.CVS.markdown
+++ b/README.CVS.markdown
@@ -53,4 +53,4 @@ More Examples
 
 For examples you can run, see `examples/cvs/`
 
-[1]: http://docs.reductivelabs.com/references/stable/metaparameter.html#require
+[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require

diff --git a/README.GIT.markdown b/README.GIT.markdown
index b63d90b..d6b8afe 100644 (file)
--- a/README.GIT.markdown
+++ b/README.GIT.markdown
@@ -54,6 +54,25 @@ For a specific revision or branch (can be a commit SHA, tag or branch name):
         revision => 'development'
     }
 
+Check out as a user:
+
+    vcsrepo { "/path/to/repo":
+        ensure => present,
+        provider => git,
+        source => 'git://example.com/repo.git',
+        revision => '0c466b8a5a45f6cd7de82c08df2fb4ce1e920a31',
+        user => 'someUser'
+    }
+
+Keep the repository at the latest revision (note: this will always overwrite local changes to the repository):
+
+    vcsrepo { "/path/to/repo":
+        ensure => latest,
+        provider => git,
+        source => 'git://example.com/repo.git',
+        revision => 'master',
+    }
+
 For sources that use SSH (eg, `username@server:...`)
 ----------------------------------------------------
 
@@ -66,5 +85,5 @@ More Examples
 
 For examples you can run, see `examples/git/`
 
-[1]: http://docs.reductivelabs.com/references/stable/metaparameter.html#require
+[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
 

diff --git a/README.HG.markdown b/README.HG.markdown
index 55ac88f..b1680c8 100644 (file)
--- a/README.HG.markdown
+++ b/README.HG.markdown
@@ -52,4 +52,4 @@ More Examples
 
 For examples you can run, see `examples/hg/`
 
-[1]: http://docs.reductivelabs.com/references/stable/metaparameter.html#require
+[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require

diff --git a/README.SVN.markdown b/README.SVN.markdown
index 3dc852f..489f5bf 100644 (file)
--- a/README.SVN.markdown
+++ b/README.SVN.markdown
@@ -44,4 +44,4 @@ More Examples
 
 For examples you can run, see `examples/svn/`
 
-[1]: http://docs.reductivelabs.com/references/stable/metaparameter.html#require
+[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require

diff --git a/README.markdown b/README.markdown
index 33fddcb..823e044 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -11,9 +11,9 @@ This type can be used to describe:
 * A working copy checked out from a (remote or local) source, at an
   arbitrary revision
 * A "blank" working copy not associated with a source (when it makes
-  sense for the VCS being used) 
+  sense for the VCS being used)
 * A "blank" central repository (when the distinction makes sense for the VCS
-  being used) 
+  being used)
 
 Supported Version Control Systems
 ---------------------------------

diff --git a/examples/bzr/branch.pp b/examples/bzr/branch.pp
index a24dbb5..0ed0705 100644 (file)
--- a/examples/bzr/branch.pp
+++ b/examples/bzr/branch.pp
@@ -2,5 +2,5 @@ vcsrepo { '/tmp/vcstest-bzr-branch':
   ensure   => present,
   provider => bzr,
   source   => 'lp:do',
-  revision => '1312'
+  revision => '1312',
 }

diff --git a/examples/bzr/init_repo.pp b/examples/bzr/init_repo.pp
index 36d2463..1129dd7 100644 (file)
--- a/examples/bzr/init_repo.pp
+++ b/examples/bzr/init_repo.pp
@@ -1,4 +1,4 @@
 vcsrepo { '/tmp/vcstest-bzr-init':
   ensure   => present,
-  provider => bzr
+  provider => bzr,
 }

diff --git a/examples/cvs/local.pp b/examples/cvs/local.pp
index c72652d..155742e 100644 (file)
--- a/examples/cvs/local.pp
+++ b/examples/cvs/local.pp
@@ -1,11 +1,11 @@
 vcsrepo { '/tmp/vcstest-cvs-repo':
   ensure   => present,
-  provider => cvs
+  provider => cvs,
 }
 
 vcsrepo { '/tmp/vcstest-cvs-workspace-local':
   ensure   => present,
   provider => cvs,
   source   => '/tmp/vcstest-cvs-repo',
-  require  => Vcsrepo['/tmp/vcstest-cvs-repo']
+  require  => Vcsrepo['/tmp/vcstest-cvs-repo'],
 }

diff --git a/examples/cvs/remote.pp b/examples/cvs/remote.pp
index 990a580..eb9665a 100644 (file)
--- a/examples/cvs/remote.pp
+++ b/examples/cvs/remote.pp
@@ -1,5 +1,5 @@
 vcsrepo { '/tmp/vcstest-cvs-workspace-remote':
   ensure   => present,
   provider => cvs,
-  source   => ':pserver:anonymous@cvs.sv.gnu.org:/sources/leetcvrt'
+  source   => ':pserver:anonymous@cvs.sv.gnu.org:/sources/leetcvrt',
 }

diff --git a/examples/git/bare_init.pp b/examples/git/bare_init.pp
index f16d137..4166f6e 100644 (file)
--- a/examples/git/bare_init.pp
+++ b/examples/git/bare_init.pp
@@ -1,4 +1,4 @@
 vcsrepo { '/tmp/vcstest-git-bare':
   ensure   => bare,
-  provider => git
+  provider => git,
 }

diff --git a/examples/git/clone.pp b/examples/git/clone.pp
index b7d5bfb..b29a4fd 100644 (file)
--- a/examples/git/clone.pp
+++ b/examples/git/clone.pp
@@ -1,5 +1,5 @@
 vcsrepo { '/tmp/vcstest-git-clone':
   ensure   => present,
   provider => git,
-  source   => 'git://github.com/bruce/rtex.git'
+  source   => 'git://github.com/bruce/rtex.git',
 }

diff --git a/examples/git/working_copy_init.pp b/examples/git/working_copy_init.pp
index b20af20..e3352eb 100644 (file)
--- a/examples/git/working_copy_init.pp
+++ b/examples/git/working_copy_init.pp
@@ -1,4 +1,4 @@
 vcsrepo { '/tmp/vcstest-git-wc':
   ensure   => present,
-  provider => git
+  provider => git,
 }

diff --git a/examples/hg/clone.pp b/examples/hg/clone.pp
index 92b3335..be2d955 100644 (file)
--- a/examples/hg/clone.pp
+++ b/examples/hg/clone.pp
@@ -2,5 +2,5 @@ vcsrepo { '/tmp/vcstest-hg-clone':
   ensure   => present,
   provider => hg,
   source   => 'http://hg.basho.com/riak',
-  revision => 'riak-0.5.3'
+  revision => 'riak-0.5.3',
 }

diff --git a/examples/hg/init_repo.pp b/examples/hg/init_repo.pp
index 52aba4c..a890804 100644 (file)
--- a/examples/hg/init_repo.pp
+++ b/examples/hg/init_repo.pp
@@ -1,4 +1,4 @@
 vcsrepo { '/tmp/vcstest-hg-init':
   ensure   => present,
-  provider => hg
+  provider => hg,
 }

diff --git a/examples/svn/checkout.pp b/examples/svn/checkout.pp
index 1fceb7b..f9fc273 100644 (file)
--- a/examples/svn/checkout.pp
+++ b/examples/svn/checkout.pp
@@ -1,6 +1,5 @@
 vcsrepo { '/tmp/vcstest-svn-checkout':
   ensure   => present,
   provider => svn,
-  source   => 'http://svn.edgewall.org/repos/babel/trunk'
+  source   => 'http://svn.edgewall.org/repos/babel/trunk',
 }
-

diff --git a/examples/svn/server.pp b/examples/svn/server.pp
index eaf6b27..de7c390 100644 (file)
--- a/examples/svn/server.pp
+++ b/examples/svn/server.pp
@@ -1,4 +1,4 @@
 vcsrepo { '/tmp/vcstest-svn-server':
   ensure   => present,
-  provider => svn
+  provider => svn,
 }

diff --git a/lib/puppet/provider/vcsrepo/cvs.rb b/lib/puppet/provider/vcsrepo/cvs.rb
index 467e2f9..6dc7882 100644 (file)
--- a/lib/puppet/provider/vcsrepo/cvs.rb
+++ b/lib/puppet/provider/vcsrepo/cvs.rb
@@ -116,5 +116,4 @@ Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo)
       set_ownership
     end
   end
-
 end

diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb
index 4b53235..1fd006b 100644 (file)
--- a/lib/puppet/type/vcsrepo.rb
+++ b/lib/puppet/type/vcsrepo.rb
@@ -135,6 +135,7 @@ Puppet::Type.newtype(:vcsrepo) do
 
   newparam :user do
     desc "The user to run for repository operations"
+    defaultto 'root'
   end
 
   newparam :excludes do