Merge branch 'git-clean' of git://github.com/fasttracktool-dev/ruby-git into fasttracktool-dev-git-clean

robertodecurnex · robertodecurnex · commit f9c9ce71e160 · 2013-08-16T18:13:16.000-03:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -280,6 +280,12 @@ def reset_hard(commitish = nil, opts = {})
       self.lib.reset(commitish, opts)
     end
 
+
+    # cleans the working directory, removing directories, too.
+    def clean(opts = {})
+      self.lib.clean(opts)
+    end
+
     # commits all pending changes in the index file to the git repository
     # 
     # options:
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -420,7 +420,13 @@ def reset(commit, opts = {})
       arr_opts << commit if commit
       command('reset', arr_opts)
     end
-    
+
+    def clean(opts = {})
+      arr_opts = ["--force"] # Some configurations require a --force
+      arr_opts << ["-d"] # Remove untracked directories in addition to untracked files.
+      command('clean', arr_opts)
+    end
+
     def apply(patch_file)
       arr_opts = []
       arr_opts << '--' << patch_file if patch_file
diff --git a/tests/units/test_index_ops.rb b/tests/units/test_index_ops.rb
@@ -37,7 +37,31 @@ def test_add
       end
     end
   end
-  
+
+  def test_clean
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'clean_me')
+      Dir.chdir('clean_me') do
+        new_file('test-file', 'blahblahbal')
+        g.add
+        g.commit("first commit")
+
+        new_file('file-to-clean', 'blablahbla')
+        FileUtils.mkdir_p("dir_to_clean")
+
+        Dir.chdir('dir_to_clean') do
+          new_file('clean-me-too', 'blablahbla')
+        end
+
+        assert(File.exists?('file-to-clean'))
+        assert(File.exists?('dir_to_clean'))
+        g.clean
+        assert(!File.exists?('file-to-clean'))
+        assert(!File.exists?('dir_to_clean'))
+      end
+    end
+  end
+
   def test_add_array
     in_temp_dir do |path|
       g = Git.clone(@wbare, 'new')
