#46 Parsing author and timestamp for Todo.

src/main/java/com/selfxdsd/todocli/Todo.java

@@ -64,6 +64,17 @@ public final class Todo {
      */
     private String path;
 
+
+    /**
+     * The author of todo.
+     */
+    private String author;
+
+    /**
+     * Timestamp of creation.
+     */
+    private String timestamp;
+
     /**
      * Creates a new Todo object.
      *
@@ -211,6 +222,38 @@ public void setPath(final String path) {
         }
     }
 
+    /**
+     * Set the todo author.
+     * @param author Author.
+     */
+    public void setAuthor(final String author){
+        this.author = author;
+    }
+
+    /**
+     * Get the todo author.
+     * @return String
+     */
+    public String getAuthor(){
+        return this.author;
+    }
+
+    /**
+     * Set the todo creation timestamp.
+     * @param timestamp Timestamp.
+     */
+    public void setTimestamp(final String timestamp){
+        this.timestamp = timestamp;
+    }
+
+    /**
+     * Get the todo timestamp.
+     * @return String.
+     */
+    public String getTimestamp(){
+        return this.timestamp;
+    }
+
 
     /**
      * Compares this to the given, other, Todo object.
@@ -267,12 +310,15 @@ public String toString() {
 
         return String.format(
                 "TODO [%s, TicketID: %s, Estimated Time: %s, "
-                        + "Body: '%s', Path: '%s']",
+                        + "Body: '%s', Path: '%s', Author: '%s', "
+                        + "Timestamp: '%s'.]",
                 linesPart,
                 this.ticketID,
                 this.estimatedTime,
                 this.body,
-                this.path
+                this.path,
+                this.author,
+                this.timestamp
         );
     }
 }

src/main/java/com/selfxdsd/todocli/TodoBuilder.java

@@ -60,6 +60,17 @@ class TodoBuilder {
      */
     private String path;
 
+
+    /**
+     * The author of todo.
+     */
+    private String author;
+
+    /**
+     * Timestamp of creation.
+     */
+    private String timestamp;
+
     /**
      * The first line of the Todo.
      *
@@ -130,6 +141,26 @@ public TodoBuilder setPath(final String path) {
         return this;
     }
 
+    /**
+     * Set the todo author.
+     * @param author Author.
+     * @return Builder.
+     */
+    public TodoBuilder setAuthor(final String author){
+        this.author = author;
+        return this;
+    }
+
+    /**
+     * Set the todo creation timestamp.
+     * @param timestamp Timestamp.
+     * @return Builder.
+     */
+    public TodoBuilder setTimestamp(final String timestamp){
+        this.timestamp = timestamp;
+        return this;
+    }
+
     /**
      * Creates a new Todo.
      *
@@ -144,6 +175,8 @@ public Todo build() {
             this.body
         );
         todo.setPath(this.path);
+        todo.setAuthor(this.author);
+        todo.setTimestamp(this.timestamp);
         return todo;
     }
 }

src/main/java/com/selfxdsd/todocli/TodoParser.java

@@ -23,8 +23,8 @@
 package com.selfxdsd.todocli;
 
 import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -38,11 +38,20 @@
  */
 public final class TodoParser {
 
+    /**
+     * Git blame header pattern that should be at the start of each line.
+     */
+    private static final String GIT_BLAME_PATTERN =
+        ".*\\((.+)\\s+(\\d{4}-\\d{2}-\\d{2}\\s\\d{2}:\\d{2}:\\d{2}\\s\\+\\d{4})"
+        + "\\s+\\d+\\)\\s";
+
     /**
      * TODO Pattern.
      */
     private static final Pattern TODO_PATTERN = Pattern.compile(
-        "^\\W*(@todo|TODO|@fixme|FIXME)\\s*(#\\d+:\\d+(m|min|mins))\\b(.*)$"
+        "^" + GIT_BLAME_PATTERN
+            + "\\W*(@todo|TODO|@fixme|FIXME)\\s*(#\\d+:\\d+(m|min|mins))\\b(.*)"
+            + "$"
     );
 
     /**
@@ -53,9 +62,7 @@ public final class TodoParser {
      */
     public List<Todo> parse(final String path) throws IOException {
         final List<Todo> todos = new ArrayList<>();
-        try (final BufferedReader reader = new BufferedReader(
-            new FileReader(path)
-        )) {
+        try (final BufferedReader reader = this.readFileWithBlame(path)) {
             final StringBuilder bodyBuilder = new StringBuilder();
             final TodoBuilder todoBuilder = new TodoBuilder().setPath(path);
             int lineIndex = -1;
@@ -118,10 +125,12 @@ private int checkForTodo(final StringBuilder bodyBuilder,
         final Matcher matcher = TODO_PATTERN.matcher(line);
         final int todoPosition;
         if (matcher.find()) {
-            todoPosition = matcher.start(1);
-            todoBuilder.setStart(lineIndex + 1);
-            bodyBuilder.append(matcher.group(4));
-            this.addHeader(todoBuilder, matcher.group(2));
+            todoPosition = matcher.start(3);
+            todoBuilder.setAuthor(matcher.group(1).trim())
+                .setTimestamp(matcher.group(2))
+                .setStart(lineIndex + 1);
+            bodyBuilder.append(matcher.group(6));
+            this.addHeader(todoBuilder, matcher.group(4));
         } else {
             todoPosition = -1;
         }
@@ -165,4 +174,18 @@ private void addHeader(final TodoBuilder todoBuilder,
         );
     }
 
+    /**
+     * Reads file together with its git blame.
+     * @param path File path.
+     * @return Reader.
+     * @throws IOException If something goes wrong.
+     */
+    private BufferedReader readFileWithBlame(final String path)
+        throws IOException {
+        final String command = "git blame " + path;
+        final Process process = Runtime.getRuntime().exec(command);
+        return new BufferedReader(
+            new InputStreamReader(process.getInputStream())
+        );
+    }
 }

src/test/java/com/selfxdsd/todocli/TodoParserTest.java

@@ -292,6 +292,15 @@ public void shouldAllowPyFilesToBeParsedForTodos() throws IOException {
             "This is a multiline todo for python.",
             todos.get(0).getBody()
         );
+        assertEquals(
+            "cristianpela",
+            todos.get(0).getAuthor()
+        );
+        assertEquals(
+            "2020-12-15 14:39:07 +0200",
+            todos.get(0).getTimestamp()
+        );
+
         assertEquals(
             "This is another multiline todo for python.",
             todos.get(1).getBody()