feat: add filter support

phodal · Sep 18, 2020 · ed69884 · ed69884
1 parent 08c432a
commit ed69884
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/cmd/testdata/todo_filter.txt b/cmd/testdata/todo_filter.txt
@@ -0,0 +1,4 @@
+Todos Count 1
+|           FILENAME            |              MESSAGES               | ASSIGNEE | LINE |
+|-------------------------------|-------------------------------------|----------|------|
+| ../_fixtures/todo/todo.phodal | add todo for other text like phodal |          |    1 |
diff --git a/cmd/todo.go b/cmd/todo.go
@@ -7,6 +7,7 @@ import (
 	"github.com/phodal/coca/pkg/application/todo"
 	"github.com/spf13/cobra"
 	"strconv"
+	"strings"
 )
 
 type RootCmdConfig struct {
@@ -26,7 +27,8 @@ var todoCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		path := cmd.Flag("path").Value.String()
 		app := todo.NewTodoApp()
-		filters := []string{".go", ".py", ".js", ".ts", ".java", ".kotlin", ".groovy"}
+
+		filters := strings.Split(todoCmdConfig.Extensions, ",")
 		todos := app.AnalysisPath(path, filters)
 
 		simple, _ := json.MarshalIndent(todos, "", "\t")
@@ -61,7 +63,7 @@ var todoCmd = &cobra.Command{
 
 func init() {
 	todoCmd.SetOut(output)
-	todoCmd.PersistentFlags().StringVarP(&todoCmdConfig.Extensions, "ext", "e", ".java,.py,.go,.ts,.js", "ext=\".java,.go\"")
+	todoCmd.PersistentFlags().StringVarP(&todoCmdConfig.Extensions, "ext", "e", ".java,.py,.go,.ts,.js,.kt,.groovy,.gradle", "ext=\".java,.go\"")
 	todoCmd.PersistentFlags().StringVarP(&todoCmdConfig.Path, "path", "p", ".", "path")
 	todoCmd.PersistentFlags().BoolVarP(&todoCmdConfig.WithGit, "git", "g", false, "is with git info")
 

diff --git a/cmd/todo_test.go b/cmd/todo_test.go
@@ -14,6 +14,15 @@ func Test_ShouldOutputCount(t *testing.T) {
 	RunTestCmd(t, tests)
 }
 
+func Test_ShouldFilterTodo(t *testing.T) {
+	tests := []testcase.CmdTestCase{{
+		Name:   "todo",
+		Cmd:    "todo -p ../_fixtures/todo --ext=.phodal",
+		Golden: "testdata/todo_filter.txt",
+	}}
+	RunTestCmd(t, tests)
+}
+
 //TODO: update func for CI which clone depth = 1
 func TestTodo(t *testing.T) {
 	tests := []testcase.CmdTestCase{{

diff --git a/pkg/application/todo/todo_app_test.go b/pkg/application/todo/todo_app_test.go
@@ -19,7 +19,6 @@ func TestNewTodoApp(t *testing.T) {
 	// todo: add suport for python
 	g.Expect(len(todos)).To(Equal(4))
 	g.Expect(todos[0].Line).To(Equal("3"))
-	//g.Expect(todos[0].Date).To(Equal("2019-12-28")) test: will failure in CI
 	g.Expect(todos[1].FileName).To(ContainSubstring(filepath.FromSlash("_fixtures/todo/Todo.java")))
 	g.Expect(todos[1].Author).To(ContainSubstring("Phodal Huang"))
 	g.Expect(todos[1].Line).To(Equal("6"))