Merge branch 'chef-639' of git://github.com/fujin/chef into fujin/chef-639

Author: adamhjk

chef/lib/chef/provider/git.rb

@@ -36,10 +36,15 @@ def load_current_resource
       end
 
       def action_checkout
-        clone
-        checkout
-        enable_submodules
-        @new_resource.updated = true
+        if !::File.exist?(@new_resource.destination) || Dir.entries(@new_resource.destination) == ['.','..']
+          clone
+          checkout
+          enable_submodules
+          @new_resource.updated = true
+        else
+          Chef::Log.info "Taking no action, checkout destination " +
+          "#{@new_resource.destination} already exists or is a non-empty directory"
+        end
       end
 
       def action_export

chef/spec/unit/provider/git_spec.rb

@@ -203,15 +203,28 @@
     @provider.should_receive(:run_command).with(:command => expected_cmd, :cwd => "/my/deploy/dir")
     @provider.sync
   end
-  
+ 
   it "does a checkout running the clone command then running the after clone command from the destination dir" do
+    ::File.stub!(:exist?).with("/my/deploy/dir").and_return(false)
+    ::Dir.stub!(:entries).with("/my/deploy/dir").and_return(['.','..'])
     @provider.should_receive(:clone)
     @provider.should_receive(:checkout)
     @provider.should_receive(:enable_submodules)
     @resource.should_receive(:updated=).at_least(1).times.with(true)
     @provider.action_checkout
   end
 
+  it "should not checkout if the destination exists or is a non empty directory" do
+    ::File.stub!(:exist?).with("/my/deploy/dir").and_return(true)
+    ::Dir.stub!(:entries).with("/my/deploy/dir").and_return(['.','..','foo','bar'])
+    @provider.should_not_receive(:clone)
+    @provider.should_not_receive(:checkout)
+    @provider.should_not_receive(:enable_submodules)
+    @resource.should_not_receive(:updated=)
+    Chef::Log.should_receive(:info).with("Taking no action, checkout destination /my/deploy/dir already exists or is a non-empty directory")
+    @provider.action_checkout
+  end
+
   it "does a sync by running the sync command" do
     ::File.stub!(:exist?).with("/my/deploy/dir").and_return(true)
     ::Dir.stub!(:entries).and_return(['.','..',"lib", "spec"])