git.commit - Supporting :amend and :all (instead of :add_all)

robertodecurnex · robertodecurnex · commit 0d0e055767fa · 2013-08-17T03:50:05.000-03:00
git.log - Supporting [] to access logs by index Closes ruby-git#87
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -303,9 +303,11 @@ def revert(commitish = nil, opts = {})
     # commits all pending changes in the index file to the git repository
     # 
     # options:
-    #   :add_all
+    #   :all
     #   :allow_empty
+    #   :amend
     #   :author
+    #
     def commit(message, opts = {})
       self.lib.commit(message, opts)
     end
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -407,10 +407,13 @@ def remove(path = '.', opts = {})
     end
 
     def commit(message, opts = {})
-      arr_opts = ['-m', message]
-      arr_opts << '-a' if opts[:add_all]
+      arr_opts = []
+      arr_opts << "--message=#{message}" if message
+      arr_opts << '--amend' << '--no-edit' if opts[:amend]
+      arr_opts << '--all' if opts[:add_all] || opts[:all] 
       arr_opts << '--allow-empty' if opts[:allow_empty]
-      arr_opts << "--author" << opts[:author] if opts[:author]
+      arr_opts << "--author=#{opts[:author]}" if opts[:author]
+      
       command('commit', arr_opts)
     end
 
diff --git a/lib/git/log.rb b/lib/git/log.rb
@@ -94,6 +94,12 @@ def last
       check_log
       @commits.last rescue nil
     end
+
+    def [](index)
+      check_log
+      @commits[index] rescue nil
+    end
+
     
     private 
     
diff --git a/tests/units/test_base.rb b/tests/units/test_base.rb
@@ -78,4 +78,31 @@ def test_add
     end
   end
 
+  def test_commit
+    in_temp_dir do |path|
+      git = Git.clone(@wdir, 'test_commit')
+      
+      create_file('test_commit/test_file_1', 'content tets_file_1')
+      create_file('test_commit/test_file_2', 'content test_file_2')
+
+      git.add('test_file_1')
+      git.add('test_file_2')
+
+      base_commit_id = git.log[0].objectish
+
+      git.commit("Test Commit")
+
+      original_commit_id = git.log[0].objectish
+
+      create_file('test_commit/test_file_3', 'content test_file_3')
+      
+      git.add('test_file_3')
+
+      git.commit(nil, :amend => true)
+
+      assert(git.log[0].objectish != original_commit_id)
+      assert(git.log[1].objectish == base_commit_id)
+    end
+  end
+
 end
