Merge pull request #91 from jiacona/master

update git provider to handle checking out into an existing (empty) dir

3 files changed, 13 insertions, 3 deletions

diff --git a/lib/puppet/provider/vcsrepo.rb b/lib/puppet/provider/vcsrepo.rb
index 2c026ba..8793e63 100644
--- a/lib/puppet/provider/vcsrepo.rb
+++ b/lib/puppet/provider/vcsrepo.rb
@@ -17,6 +17,14 @@ class Puppet::Provider::Vcsrepo < Puppet::Provider
     File.directory?(@resource.value(:path))
   end
 
+  def path_empty?
+    # Path is empty if the only entries are '.' and '..'
+    d = Dir.new(@resource.value(:path))
+    d.read # should return '.'
+    d.read # should return '..'
+    d.read.nil?
+  end
+
   # Note: We don't rely on Dir.chdir's behavior of automatically returning the
   # value of the last statement -- for easier stubbing.
   def at_path(&block) #:nodoc:
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb
index 58330f6..47e84d2 100644
--- a/lib/puppet/provider/vcsrepo/git.rb
+++ b/lib/puppet/provider/vcsrepo/git.rb
@@ -147,7 +147,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
   end
 
   def check_force
-    if path_exists?
+    if path_exists? and not path_empty?
       if @resource.value(:force)
         notice "Removing %s to replace with vcsrepo." % @resource.value(:path)
         destroy
diff --git a/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
index 68b6c0a..1a6d008 100644
--- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
@@ -74,9 +74,10 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
           end
         end
 
-        context "when the path is not a repository" do
+        context "when the path is not empty and not a repository" do
           it "should raise an exception" do
             provider.expects(:path_exists?).returns(true)
+            provider.expects(:path_empty?).returns(false)
             proc { provider.create }.should raise_error(Puppet::Error)
           end
         end
@@ -102,9 +103,10 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
           end
         end
 
-        context "when the path is not a repository" do
+        context "when the path is not empty and not a repository" do
           it "should raise an exception" do
             expects_directory?(true)
+            provider.expects(:path_empty?).returns(false)
             proc { provider.create }.should raise_error(Puppet::Error)
           end
         end