Adding support for :all option on Git::Base#add and Git::Lib#add

robertodecurnex · robertodecurnex · commit 7905a8456d1b · 2013-04-15T17:28:36.000-03:00
Adding tests related ruby-git#46
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -243,9 +243,23 @@ def diff(objectish = 'HEAD', obj2 = nil)
       Git::Diff.new(self, objectish, obj2)
     end
     
-    # adds files from the working directory to the git repository
-    def add(path = '.')
-      self.lib.add(path)
+    # updates the repository index using the workig dorectory content
+    #
+    #    @git.add('path/to/file')
+    #    @git.add(['path/to/file1','path/to/file2'])
+    #    @git.add(:all => true)
+    #
+    # options:
+    #   :all => true
+    #
+    # @param [String,Array] paths files paths to be added (optional, default='.')
+    # @param [Hash] options
+    def add(*args)
+      if args[0].instance_of?(String) || args[0].instance_of?(Array)
+        self.lib.add(args[0],args[1]||{})
+      else
+        self.lib.add('.', args[0]||{})
+      end
     end
 
     # removes file(s) from the git repository
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -392,14 +392,29 @@ def config_set(name, value)
     def global_config_set(name, value)
       command('config', ['--global', name, value], false)
     end
-          
-    def add(path = '.')
-      arr_opts = ['--']
-      if path.is_a?(Array)
-        arr_opts += path
-      else
-        arr_opts << path
-      end
+         
+    # updates the repository index using the workig dorectory content
+    # 
+    #    lib.add('path/to/file')
+    #    lib.add(['path/to/file1','path/to/file2'])
+    #    lib.add(:all => true)
+    #
+    # options:
+    #   :all => true
+    #
+    # @param [String,Array] paths files paths to be added to the repository
+    # @param [Hash] options
+    def add(paths='.',options={})
+      arr_opts = []
+      
+      arr_opts << '--all' if options[:all]
+
+      arr_opts << '--' 
+
+      arr_opts << paths
+      
+      arr_opts.flatten!
+
       command('add', arr_opts)
     end
     
diff --git a/tests/test_helper.rb b/tests/test_helper.rb
@@ -55,11 +55,22 @@ def in_temp_dir(remove_after = true) # :yields: the temporary dir's path
     FileUtils.rm_r(tmp_path) if remove_after
   end
   
+  def create_file(path, content)
+    File.open(path,'w') do |file|
+      file.puts(content)
+    end
+  end
+
+  def update_file(path, content)
+    create_file(path,content)
+  end
+
+  def delete_file(path)
+    File.delete(path)
+  end
   
   def new_file(name, contents)
-    File.open(name, 'w') do |f|
-      f.puts contents
-    end
+    create_file(name,contents)
   end
 
   def append_file(name, contents)
diff --git a/tests/units/test_base.rb b/tests/units/test_base.rb
@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestBase < Test::Unit::TestCase
+
+  def setup
+    set_file_paths
+  end
+
+  def test_add
+    in_temp_dir do |path|
+      git = Git.clone(@wdir, 'test_add')
+      
+      create_file('test_add/test_file_1', 'content tets_file_1')
+      create_file('test_add/test_file_2', 'content test_file_2')
+      create_file('test_add/test_file_3', 'content test_file_3')
+      create_file('test_add/test_file_4', 'content test_file_4')
+      
+      assert(!git.status.added.assoc('test_file_1'))
+      
+      # Adding a single file, usign String
+      git.add('test_file_1')
+
+      assert(git.status.added.assoc('test_file_1'))
+      assert(!git.status.added.assoc('test_file_2'))
+
+      # Adding a single file, using Array
+      git.add(['test_file_2'])
+
+      assert(git.status.added.assoc('test_file_2'))
+      assert(!git.status.added.assoc('test_file_3'))
+      assert(!git.status.added.assoc('test_file_4'))
+
+      # Adding multiple files, using Array
+      git.add(['test_file_3','test_file_4'])
+
+      assert(git.status.added.assoc('test_file_3'))
+      assert(git.status.added.assoc('test_file_4'))
+      
+      git.commit('test_add commit #1')
+
+      assert(git.status.added.empty?)
+       
+      delete_file('test_add/test_file_3')
+      update_file('test_add/test_file_4', 'content test_file_4 update #1')
+      create_file('test_add/test_file_5', 'content test_file_5')
+
+      # Adding all files (new, updated or deleted), using :all
+      git.add(:all => true)
+
+      assert(git.status.deleted.assoc('test_file_3'))
+      assert(git.status.changed.assoc('test_file_4'))
+      assert(git.status.added.assoc('test_file_5'))
+      
+      git.commit('test_add commit #2')
+      
+      assert(git.status.deleted.empty?)
+      assert(git.status.changed.empty?)
+      assert(git.status.added.empty?)
+      
+      delete_file('test_add/test_file_4')
+      update_file('test_add/test_file_5', 'content test_file_5 update #1')
+      create_file('test_add/test_file_6', 'content test_fiile_6')
+      
+      # Adding all files (new or updated), without params
+      git.add
+      
+      assert(git.status.deleted.assoc('test_file_4'))
+      assert(git.status.changed.assoc('test_file_5'))
+      assert(git.status.added.assoc('test_file_6'))
+      
+      git.commit('test_add commit #3')
+
+      assert(!git.status.deleted.empty?)
+      assert(git.status.changed.empty?)
+      assert(git.status.added.empty?)
+    end
+  end
+
+end
