summaryrefslogtreecommitdiff
path: root/lib/puppet/provider/vcsrepo/git.rb
diff options
context:
space:
mode:
authorBryan Jen <bryan.jen@gmail.com>2016-02-10 09:34:06 -0700
committerBryan Jen <bryan.jen@gmail.com>2016-02-10 09:34:06 -0700
commit818734c0264ffbca9dacc59d358399d819e89ed8 (patch)
tree15d3378c6f77924bc51951176c8697874631cc7c /lib/puppet/provider/vcsrepo/git.rb
parentd7197aa5ab8639163c24ed8ba1d758a0969e51da (diff)
parentb8f25cea95317a4b2a622e2799f1aa7ba159bdca (diff)
Merge pull request #282 from Strech/master
Add mirror option for git cloning
Diffstat (limited to 'lib/puppet/provider/vcsrepo/git.rb')
-rw-r--r--lib/puppet/provider/vcsrepo/git.rb21
1 files changed, 16 insertions, 5 deletions
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb
index 0249a3c..63986ab 100644
--- a/lib/puppet/provider/vcsrepo/git.rb
+++ b/lib/puppet/provider/vcsrepo/git.rb
@@ -10,10 +10,14 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user, :depth, :branch, :submodules
def create
- if @resource.value(:revision) and @resource.value(:ensure) == :bare
+ if @resource.value(:revision) and ensure_bare_or_mirror?
fail("Cannot set a revision (#{@resource.value(:revision)}) on a bare repository")
end
if !@resource.value(:source)
+ if @resource.value(:ensure) == :mirror
+ fail("Cannot init repository with mirror option, try bare instead")
+ end
+
init_repository(@resource.value(:path))
else
clone_repository(default_url, @resource.value(:path))
@@ -22,7 +26,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
if @resource.value(:revision)
checkout
end
- if @resource.value(:ensure) != :bare && @resource.value(:submodules) == :true
+ if !ensure_bare_or_mirror? && @resource.value(:submodules) == :true
update_submodules
end
@@ -85,7 +89,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
end
end
#TODO Would this ever reach here if it is bare?
- if @resource.value(:ensure) != :bare && @resource.value(:submodules) == :true
+ if !ensure_bare_or_mirror? && @resource.value(:submodules) == :true
update_submodules
end
update_owner_and_excludes
@@ -95,6 +99,10 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
bare_git_config_exists? && !working_copy_exists?
end
+ def ensure_bare_or_mirror?
+ [:bare, :mirror].include? @resource.value(:ensure)
+ end
+
# If :source is set to a hash (for supporting multiple remotes),
# we search for the URL for :remote. If it doesn't exist,
# we throw an error. If :source is just a string, we use that
@@ -197,9 +205,12 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
if @resource.value(:branch)
args.push('--branch', @resource.value(:branch).to_s)
end
- if @resource.value(:ensure) == :bare
- args << '--bare'
+
+ case @resource.value(:ensure)
+ when :bare then args << '--bare'
+ when :mirror then args << '--mirror'
end
+
if @resource.value(:remote) != 'origin'
args.push('--origin', @resource.value(:remote))
end