feat: move to coral

go.mod

@@ -10,10 +10,10 @@ require (
 	github.com/charmbracelet/lipgloss v0.5.0
 	github.com/dgraph-io/badger/v3 v3.2103.2
 	github.com/mattn/go-isatty v0.0.14
+	github.com/muesli/coral v1.0.0
 	github.com/muesli/go-app-paths v0.2.2
-	github.com/muesli/mango-cobra v0.0.0-20220201014606-122d08dcc447
+	github.com/muesli/mango-coral v1.0.1
 	github.com/muesli/roff v0.1.0
-	github.com/spf13/cobra v1.3.0
 )
 
 require (
@@ -32,6 +32,7 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.3 // indirect
 	github.com/google/flatbuffers v1.12.1 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/klauspost/compress v1.12.3 // indirect
@@ -40,8 +41,8 @@ require (
 	github.com/microcosm-cc/bluemonday v1.0.17 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
-	github.com/muesli/mango v0.0.0-20220201014152-f7df5a1c5b4b // indirect
-	github.com/muesli/mango-pflag v0.0.0-20220201014449-d694870c5590 // indirect
+	github.com/muesli/mango v0.1.0 // indirect
+	github.com/muesli/mango-pflag v0.1.0 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
@@ -56,4 +57,5 @@ require (
 	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
 	golang.org/x/term v0.0.0-20210422114643-f5beecf764ed // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

internal/cmd/completion.go

@@ -1,13 +1,13 @@
 package cmd
 
-import "github.com/spf13/cobra"
+import "github.com/muesli/coral"
 
 type completionCmd struct {
-	cmd *cobra.Command
+	cmd *coral.Command
 }
 
 func newCompletionCmd() *completionCmd {
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:   "completion [bash|zsh|fish]",
 		Short: "Print shell autocompletion scripts for tt",
 		Long: `To load completions:
@@ -34,8 +34,8 @@ Fish:
 		DisableFlagsInUseLine: true,
 		Hidden:                true,
 		ValidArgs:             []string{"bash", "zsh", "fish"},
-		Args:                  cobra.ExactValidArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args:                  coral.ExactValidArgs(1),
+		RunE: func(cmd *coral.Command, args []string) error {
 			var err error
 			switch args[0] {
 			case "bash":

internal/cmd/edit.go

@@ -8,20 +8,20 @@ import (
 	"strings"
 	"time"
 
-	"github.com/spf13/cobra"
+	"github.com/muesli/coral"
 )
 
 type editCmd struct {
-	cmd *cobra.Command
+	cmd *coral.Command
 }
 
 func newEditCmd() *editCmd {
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:     "edit",
 		Short:   "Syntactic sugar for to-json | $EDITOR | from-json",
 		Aliases: []string{"e"},
-		Args:    cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args:    coral.NoArgs,
+		RunE: func(cmd *coral.Command, args []string) error {
 			tmp := filepath.Join(os.TempDir(), fmt.Sprintf("tt-%d.json", time.Now().Unix()))
 
 			if err := newToJSONCmd().cmd.RunE(cmd, []string{tmp}); err != nil {

internal/cmd/fromjson.go

@@ -9,19 +9,19 @@ import (
 
 	"github.com/caarlos0/tasktimer/internal/model"
 	"github.com/caarlos0/tasktimer/internal/store"
-	"github.com/spf13/cobra"
+	"github.com/muesli/coral"
 )
 
 type fromJSONCmd struct {
-	cmd *cobra.Command
+	cmd *coral.Command
 }
 
 func newFromJSONCmd() *fromJSONCmd {
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:   "from-json",
 		Short: "Imports a JSON into a project - WARNING: it will wipe the project first, use with care!",
-		Args:  cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args:  coral.ExactArgs(1),
+		RunE: func(cmd *coral.Command, args []string) error {
 			project := cmd.Parent().Flag("project").Value.String()
 			db, f, err := setup(project)
 			if err != nil {

internal/cmd/list.go

@@ -9,20 +9,20 @@ import (
 
 	"github.com/charmbracelet/glamour"
 	"github.com/mattn/go-isatty"
+	"github.com/muesli/coral"
 	gap "github.com/muesli/go-app-paths"
-	"github.com/spf13/cobra"
 )
 
 type listCmd struct {
-	cmd *cobra.Command
+	cmd *coral.Command
 }
 
 func newListCmd() *listCmd {
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:   "list",
 		Short: "List all projects",
-		Args:  cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args:  coral.NoArgs,
+		RunE: func(cmd *coral.Command, args []string) error {
 			home := gap.NewScope(gap.User, "tasktimer")
 			datas, err := home.DataDirs()
 			if err != nil {

internal/cmd/man.go

@@ -4,26 +4,26 @@ import (
 	"fmt"
 	"os"
 
-	mcobra "github.com/muesli/mango-cobra"
+	"github.com/muesli/coral"
+	mcoral "github.com/muesli/mango-coral"
 	"github.com/muesli/roff"
-	"github.com/spf13/cobra"
 )
 
 type manCmd struct {
-	cmd *cobra.Command
+	cmd *coral.Command
 }
 
 func newManCmd() *manCmd {
 	root := &manCmd{}
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:                   "man",
 		Short:                 "Generates tt's command line manpages",
 		SilenceUsage:          true,
 		DisableFlagsInUseLine: true,
 		Hidden:                true,
-		Args:                  cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			manPage, err := mcobra.NewManPageFromCobra(1, root.cmd.Root())
+		Args:                  coral.NoArgs,
+		RunE: func(cmd *coral.Command, args []string) error {
+			manPage, err := mcoral.NewManPage(1, root.cmd.Root())
 			if err != nil {
 				return err
 			}

internal/cmd/paths.go

@@ -3,19 +3,19 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/spf13/cobra"
+	"github.com/muesli/coral"
 )
 
 type pathsCmd struct {
-	cmd *cobra.Command
+	cmd *coral.Command
 }
 
 func newPathsCmd() *pathsCmd {
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:   "paths",
 		Short: "Print the paths being used for logs, data et al",
-		Args:  cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args:  coral.NoArgs,
+		RunE: func(cmd *coral.Command, args []string) error {
 			project := cmd.Parent().Flag("project").Value.String()
 			logfile, dbfile, err := paths(project)
 			if err != nil {

internal/cmd/report.go

@@ -8,20 +8,20 @@ import (
 	"github.com/caarlos0/tasktimer/internal/ui"
 	"github.com/charmbracelet/glamour"
 	"github.com/mattn/go-isatty"
-	"github.com/spf13/cobra"
+	"github.com/muesli/coral"
 )
 
 type reportCmd struct {
-	cmd *cobra.Command
+	cmd *coral.Command
 }
 
 func newRerportCmd() *reportCmd {
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:     "report",
 		Aliases: []string{"r"},
 		Short:   "Print a markdown report of the given project to STDOUT",
-		Args:    cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args:    coral.NoArgs,
+		RunE: func(cmd *coral.Command, args []string) error {
 			project := cmd.Parent().Flag("project").Value.String()
 			db, f, err := setup(project)
 			if err != nil {

internal/cmd/root.go

@@ -3,15 +3,15 @@ package cmd
 import (
 	"github.com/caarlos0/tasktimer/internal/ui"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/spf13/cobra"
+	"github.com/muesli/coral"
 )
 
 func Execute(version string, exit func(int), args []string) {
 	newRootCmd(version, exit).Execute(args)
 }
 
 type rootCmd struct {
-	cmd     *cobra.Command
+	cmd     *coral.Command
 	project string
 	exit    func(int)
 }
@@ -27,12 +27,12 @@ func newRootCmd(version string, exit func(int)) *rootCmd {
 	root := &rootCmd{
 		exit: exit,
 	}
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:          "tt",
 		Short:        "Task Timer (tt) is a dead simple TUI task timer",
 		Version:      version,
 		SilenceUsage: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *coral.Command, args []string) error {
 			db, f, err := setup(root.project)
 			if err != nil {
 				return err

internal/cmd/tojson.go

@@ -4,19 +4,19 @@ import (
 	"os"
 
 	"github.com/caarlos0/tasktimer/internal/ui"
-	"github.com/spf13/cobra"
+	"github.com/muesli/coral"
 )
 
 type toJSONCmd struct {
-	cmd *cobra.Command
+	cmd *coral.Command
 }
 
 func newToJSONCmd() *toJSONCmd {
-	cmd := &cobra.Command{
+	cmd := &coral.Command{
 		Use:   "to-json",
 		Short: "Exports the database as JSON",
-		Args:  cobra.MaximumNArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args:  coral.MaximumNArgs(1),
+		RunE: func(cmd *coral.Command, args []string) error {
 			project := cmd.Parent().Flag("project").Value.String()
 			db, f, err := setup(project)
 			if err != nil {