read todos from a git tree as well as a local directory

Author: patrickdevivo

cmd/commands/todos.go

@@ -7,6 +7,7 @@ import (
 	"github.com/augmentable-dev/tickgit/pkg/comments"
 	"github.com/augmentable-dev/tickgit/pkg/todos"
 	"github.com/spf13/cobra"
+	"gopkg.in/src-d/go-git.v4"
 )
 
 func init() {
@@ -28,7 +29,16 @@ var todosCmd = &cobra.Command{
 			handleError(err)
 		}
 
-		comments, err := comments.SearchDir(dir)
+		r, err := git.PlainOpen(dir)
+		handleError(err)
+
+		ref, err := r.Head()
+		handleError(err)
+
+		commit, err := r.CommitObject(ref.Hash())
+		handleError(err)
+
+		comments, err := comments.SearchCommit(commit)
 		handleError(err)
 
 		t := todos.NewToDos(comments)

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/src-d/enry/v2 v2.1.0
+	github.com/src-d/go-git v4.7.0+incompatible
 	golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2

go.sum

@@ -91,6 +91,8 @@ github.com/src-d/enry/v2 v2.1.0 h1:z1L8t+B8bh3mmjPkJrgOTnVRpFGmTPJsplHX9wAn6BI=
 github.com/src-d/enry/v2 v2.1.0/go.mod h1:qQeCMRwzMF3ckeGr+h0tJLdxXnq+NVZsIDMELj0t028=
 github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
 github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
+github.com/src-d/go-git v4.7.0+incompatible h1:IYSSnbAHeKmsfbQFi9ozbid+KNh0bKjlorMfQehQbcE=
+github.com/src-d/go-git v4.7.0+incompatible/go.mod h1:1bQciz+hn0jzPQNsYj0hDFZHLJBdV7gXE2mWhC7EkFk=
 github.com/src-d/go-oniguruma v1.1.0 h1:EG+Nm5n2JqWUaCjtM0NtutPxU7ZN5Tp50GWrrV8bTww=
 github.com/src-d/go-oniguruma v1.1.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

pkg/comments/comments.go

@@ -2,13 +2,15 @@ package comments
 
 import (
 	"bytes"
+	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/augmentable-dev/lege"
 	"github.com/src-d/enry/v2"
+	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
 
 // CStyleCommentOptions ...
@@ -61,8 +63,8 @@ type Comment struct {
 }
 
 // SearchFile searches a file for comments. It infers the language
-func SearchFile(filePath string) (Comments, error) {
-	src, err := ioutil.ReadFile(filePath)
+func SearchFile(filePath string, reader io.ReadCloser) (Comments, error) {
+	src, err := ioutil.ReadAll(reader)
 	if err != nil {
 		return nil, err
 	}
@@ -71,7 +73,7 @@ func SearchFile(filePath string) (Comments, error) {
 		return nil, nil
 	}
 	options, ok := LanguageParseOptions[lang]
-	if !ok {
+	if !ok { // TODO provide a default parse option?
 		return nil, nil
 	}
 	commentParser, err := lege.NewParser(options)
@@ -116,7 +118,11 @@ func SearchDir(dirPath string) (Comments, error) {
 			if err != nil {
 				return err
 			}
-			t, err := SearchFile(p)
+			f, err := os.Open(p)
+			if err != nil {
+				return err
+			}
+			t, err := SearchFile(p, f)
 			if err != nil {
 				return err
 			}
@@ -130,3 +136,28 @@ func SearchDir(dirPath string) (Comments, error) {
 	}
 	return found, nil
 }
+
+// SearchCommit searches all files in the tree of a given commit
+func SearchCommit(commit *object.Commit) (Comments, error) {
+	c := make(Comments, 0)
+	t, err := commit.Tree()
+	if err != nil {
+		return nil, err
+	}
+	fileIter := t.Files()
+	fileIter.ForEach(func(file *object.File) error {
+		if file.Mode.IsFile() {
+			r, err := file.Reader()
+			if err != nil {
+				return err
+			}
+			found, err := SearchFile(file.Name, r)
+			if err != nil {
+				return err
+			}
+			c = append(c, found...)
+		}
+		return nil
+	})
+	return c, nil
+}