Fix broken spec/commands/ log test

Author: chrisdickinson

lib/git/objects.js

@@ -130,11 +130,16 @@ var Objects = {
     }
 
     var parseAuthor = function(line) {
-      var match = /^(.*) <(.*)> (\d+) [\+\-]\d\d\d\d$/.exec(line)
+      var match = /^(.*) <(.*)> (\d+) ([\+\-]\d\d\d\d)$/.exec(line)
       var result = {}
       result.name = match[1]
       result.email = match[2]
       result.timestamp = parseInt(match[3])
+      result.offset = (1000*60*      parseInt(match[4].slice(-2), 10) +
+                       1000*60*60*   parseInt(match[4].slice(-4, 3), 10)) *
+                       match[4].charAt(0) === '+' ? 1 : -1
+      result.stroffset = match[4]
+
       result.date = new Date(result.timestamp*1000)
       return result
     }
@@ -153,7 +158,7 @@ var Objects = {
     this.toString = function() {
       var str = "commit " + sha + "\n"
       str += "Author: " + this.author.name + " <" + this.author.email + ">\n"
-      str += "Date:   " + this.author.date +"\n"
+      str += "Date:   " + (new Date(+this.author.date + this.author.offset)).toUTCString().slice(0, -4) + ' ' + this.author.stroffset +"\n"
       str += "\n"
       str += this.message
       return str

spec/commands/log-command-spec.js

@@ -25,38 +25,51 @@ describe("git log", function() {
     packedRepo = new Repo(path.join(__dirname, "../../test/fixtures/test-repo1-packed/.git"))
   })
 
-  var expectLogOutput = 
+  var expectPackedLogOutput = 
     "commit 9f00c2ee854534a785ff01115a94a50c9961610d\n" + 
     "Author: Daniel Lucraft <[email protected]>\n" + 
-    "Date:   Mon Jan 03 2011 07:22:59 GMT+0000 (GMT)\n" + 
+    "Date:   Mon, 03 Jan 2011 07:22:59 +0000\n" + 
     "\n" + 
     "Modifiying master\n" + 
     "\n" + 
     "commit d0a9e5b650718445b53cd1cab40d21fb3891c98a\n" + 
     "Author: Daniel Lucraft <[email protected]>\n" + 
-    "Date:   Mon Jan 03 2011 07:14:11 GMT+0000 (GMT)\n" + 
+    "Date:   Mon, 03 Jan 2011 07:14:11 +0000\n" + 
     "\n" + 
     "Modify README\n" + 
     "\n" + 
     "commit b3453be87b70a0c5dea28aacd49cf34ddb91a8c5\n" + 
     "Author: Daniel Lucraft <[email protected]>\n" + 
-    "Date:   Mon Dec 27 2010 12:59:13 GMT+0000 (GMT)\n" + 
+    "Date:   Mon, 27 Dec 2010 12:59:13 +0000\n" + 
     "\n" + 
     "Add sample files"
-        
+
+    var expectLooseLogOutput =
+    'commit 8e8b973cde2e6470626dedfc5d82716d1450dcda\n'+
+    'Author: Daniel Lucraft <[email protected]>\n'+
+    'Date:   Mon, 03 Jan 2011 07:08:07 +0000\n'+
+    '\n'+
+    'Thoroughly modified the README\n'+
+    '\n'+
+    'commit b3453be87b70a0c5dea28aacd49cf34ddb91a8c5\n'+
+    'Author: Daniel Lucraft <[email protected]>\n'+
+    'Date:   Mon, 27 Dec 2010 12:59:12 +0000\n'+
+    '\n'+
+    'Add sample files'
+
   it("should show a list of branches, with the current highlighted (loose)", function() {
     var cmd = new LogCommand(looseRepo, [])
 
     expectOutput(cmd, function(output) {
-      expect(output).toEqual(expectLogOutput)
+      expect(output).toEqual(expectLooseLogOutput)
     })
   })
 
   it("should show a list of branches, with the current highlighted (packed)", function() {
     var cmd = new LogCommand(packedRepo, [])
 
     expectOutput(cmd, function(output) {
-      expect(output).toEqual(expectLogOutput)
+      expect(output).toEqual(expectPackedLogOutput)
     })
   })
 })