Merge pull request #11 from nnsathish/master

OTWO-2996 Default to EPOCH time when the git parser don't find a date

Author: amujumdar

lib/scm/parsers/git_styled_parser.rb

@@ -42,7 +42,8 @@ def self.internal_parse(io, opts)
 					elsif line =~ /^Author: (.+)$/
 						e.author_name = $1
 					elsif line =~ /^Date: (.*)$/
-						e.author_date = Time.parse($1).utc # Note strongly: MUST be RFC2822 format to parse properly
+            # MUST be RFC2822 format to parse properly, else defaults to epoch time
+            e.author_date = parse_date($1)
 					elsif line == "__BEGIN_COMMENT__"
 						state = :message
 					elsif line =~ /^AuthorEmail: (.+)$/
@@ -79,5 +80,10 @@ def self.internal_parse(io, opts)
 
 			yield e if e
 		end
+
+    def self.parse_date(date)
+      t = Time.rfc2822(date) rescue Time.at(0)
+      t.utc
+    end
 	end
 end

test/unit/git_styled_parser_test.rb

@@ -0,0 +1,103 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Scm::Parsers
+	class GitStyledParserTest < Scm::Test
+
+		def test_empty_array
+			assert_equal([], GitStyledParser.parse(''))
+		end
+
+    def test_log_parser_nil_date
+sample_log = <<-SAMPLE
+__BEGIN_COMMIT__
+Commit: 1df547800dcd168e589bb9b26b4039bff3a7f7e4
+Author: Jason Allen
+AuthorEmail: jason@ohloh.net
+Date:   
+__BEGIN_COMMENT__
+    moving COPYING
+
+__END_COMMENT__
+SAMPLE
+      
+			commits = GitStyledParser.parse(sample_log)
+			assert_equal 1, commits.size
+			assert_equal Time.utc(1970,1,1,0,0,0), commits[0].author_date
+    end
+
+    def test_log_parser_bogus_date
+sample_log = <<-SAMPLE
+__BEGIN_COMMIT__
+Commit: 1df547800dcd168e589bb9b26b4039bff3a7f7e4
+Author: Jason Allen
+AuthorEmail: jason@ohloh.net
+Date: Mon, Jan 01 2012 05:00:00 -0500
+__BEGIN_COMMENT__
+    moving COPYING
+
+__END_COMMENT__
+SAMPLE
+      
+			commits = GitStyledParser.parse(sample_log)
+			assert_equal 1, commits.size
+			assert_equal Time.utc(1970,1,1,0,0,0), commits[0].author_date
+    end
+
+		def test_log_parser_default
+sample_log = <<SAMPLE
+__BEGIN_COMMIT__
+Commit: 1df547800dcd168e589bb9b26b4039bff3a7f7e4
+Author: Jason Allen
+AuthorEmail: jason@ohloh.net
+Date:   Fri, 14 Jul 2006 16:07:15 -0700
+__BEGIN_COMMENT__
+moving COPYING
+
+__END_COMMENT__
+
+:000000 100755 0000000000000000000000000000000000000000 a7b13ff050aed1191c45d7a5db9a50edcdc5755f A	COPYING
+
+__BEGIN_COMMIT__
+Commit: 2e9366dd7a786fdb35f211fff1c8ea05c51968b1
+Author: Robin Luckey
+AuthorEmail: robin@ohloh.net
+Date:   Sun, 11 Jun 2006 11:34:17 -0700
+__BEGIN_COMMENT__
+added some documentation and licensing info
+
+__END_COMMENT__
+
+:100644 100644 d4a46caf1891fccebb726504f34794a0ca5d2e42 41dc0d12cb9eaa30e57aa7126b1227ba320ad297 M	README
+:100644 000000 41dc0d12cb9eaa30e57aa7126b1227ba320ad297 0000000000000000000000000000000000000000 D	helloworld.c
+SAMPLE
+
+			commits = GitStyledParser.parse(sample_log)
+
+			assert commits
+			assert_equal 2, commits.size
+
+			assert_equal '1df547800dcd168e589bb9b26b4039bff3a7f7e4', commits[0].token
+			assert_equal 'Jason Allen', commits[0].author_name
+			assert_equal 'jason@ohloh.net', commits[0].author_email
+			assert_equal "moving COPYING\n", commits[0].message
+			assert_equal Time.utc(2006,7,14,23,7,15), commits[0].author_date
+			assert_equal 1, commits[0].diffs.size
+
+			assert_equal "A", commits[0].diffs[0].action
+			assert_equal "COPYING", commits[0].diffs[0].path
+
+			assert_equal '2e9366dd7a786fdb35f211fff1c8ea05c51968b1', commits[1].token
+			assert_equal 'Robin Luckey', commits[1].author_name
+			assert_equal 'robin@ohloh.net', commits[1].author_email
+			assert_equal "added some documentation and licensing info\n", commits[1].message # Note \n at end of comment
+			assert_equal Time.utc(2006,6,11,18,34,17), commits[1].author_date
+			assert_equal 2, commits[1].diffs.size
+
+			assert_equal "M", commits[1].diffs[0].action
+			assert_equal "README", commits[1].diffs[0].path
+			assert_equal "D", commits[1].diffs[1].action
+			assert_equal "helloworld.c", commits[1].diffs[1].path
+		end
+
+	end
+end