Add long duration format, supports Jira time format

Author: mschenk42

.gitignore

@@ -71,4 +71,4 @@ Session.vim
 # auto-generated tag files
 tags
 
-
+.vimrc

command/record.go

@@ -53,16 +53,19 @@ Options:
   -terminal=false            Record a terminal event.
 
   -status=false              Return total time recorded for event.
+
+  -long-duration=false       Return total time recorded in long duration format
 `
 	return strings.TrimSpace(helpText)
 }
 
 // Run executes record command with args
 func (c RecordCmd) Run(args []string) int {
-	var status, terminal bool
+	var status, terminal, longDuration bool
 	cmdFlags := flag.NewFlagSet("record", flag.ContinueOnError)
 	cmdFlags.BoolVar(&status, "status", false, "")
 	cmdFlags.BoolVar(&terminal, "terminal", false, "")
+	cmdFlags.BoolVar(&longDuration, "long-duration", false, "")
 	cmdFlags.Usage = func() { c.Ui.Output(c.Help()) }
 	if err := cmdFlags.Parse(args); err != nil {
 		return 1
@@ -108,7 +111,7 @@ func (c RecordCmd) Run(args []string) int {
 			c.Ui.Error(err.Error())
 			return 1
 		}
-		out, err = report.Status(commitNote, report.OutputOptions{TotalOnly: true})
+		out, err = report.Status(commitNote, report.OutputOptions{TotalOnly: true, LongDuration: longDuration})
 		if err != nil {
 			c.Ui.Error(err.Error())
 			return 1

command/record_test.go

@@ -122,6 +122,44 @@ func TestRecordFileWithStatus(t *testing.T) {
 	}
 }
 
+func TestRecordFileWithStatusLongDuration(t *testing.T) {
+	repo := util.NewTestRepo(t, false)
+	defer repo.Remove()
+	repo.Seed()
+	repoPath := repo.PathIn("")
+	os.Chdir(repoPath)
+
+	(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
+
+	ui := new(cli.MockUi)
+	c := RecordCmd{Ui: ui, Out: new(bytes.Buffer)}
+
+	args := []string{"-status", "-long-duration", filepath.Join(repoPath, "README")}
+	rc := c.Run(args)
+
+	if rc != 0 {
+		t.Errorf("gtm record(%+v), want 0 got %d, %s", args, rc, ui.ErrorWriter)
+	}
+
+	if c.Out.String() != "1 minute" {
+		t.Errorf("gtm record(%+v), want '1 minutes' got %s", args, c.Out.String())
+	}
+
+	files, err := ioutil.ReadDir(filepath.Join(repoPath, ".gtm"))
+	if err != nil {
+		t.Fatalf("gtm record(%+v), want error nil got  %s", args, err)
+	}
+	cnt := 1
+	for _, f := range files {
+		if filepath.Base(f.Name()) == ".event" {
+			cnt++
+		}
+	}
+	if cnt != 1 {
+		t.Errorf("gtm record(%+v), want 1 event file got %d, %s", args, cnt, ui.ErrorWriter.String())
+	}
+}
+
 func TestRecordTerminal(t *testing.T) {
 	repo := util.NewTestRepo(t, false)
 	defer repo.Remove()

command/status.go

@@ -42,6 +42,8 @@ Options:
 
   -total-only=false          Only display total pending time
 
+  -long-duration             If total-only, display total pending time in long duration format
+
   -tags=""                   Project tags to report status for, i.e --tags tag1,tag2
 
   -all=false                 Show status for all projects
@@ -51,12 +53,13 @@ Options:
 
 // Run executes status command with args
 func (c StatusCmd) Run(args []string) int {
-	var color, terminalOff, totalOnly, all, profile bool
+	var color, terminalOff, totalOnly, all, profile, longDuration bool
 	var tags string
 	cmdFlags := flag.NewFlagSet("status", flag.ContinueOnError)
 	cmdFlags.BoolVar(&color, "color", false, "Always output color even if no terminal is detected. Use this with pagers i.e 'less -R' or 'more -R'")
 	cmdFlags.BoolVar(&terminalOff, "terminal-off", false, "Exclude time spent in terminal (Terminal plugin is required)")
 	cmdFlags.BoolVar(&totalOnly, "total-only", false, "Only display total time")
+	cmdFlags.BoolVar(&longDuration, "long-duration", false, "Display total time in long duration format")
 	cmdFlags.StringVar(&tags, "tags", "", "Project tags to show status on")
 	cmdFlags.BoolVar(&all, "all", false, "Show status for all projects")
 	cmdFlags.BoolVar(&profile, "profile", false, "Enable profiling")
@@ -96,9 +99,10 @@ func (c StatusCmd) Run(args []string) int {
 	}
 
 	options := report.OutputOptions{
-		TotalOnly:   totalOnly,
-		TerminalOff: terminalOff,
-		Color:       color}
+		TotalOnly:    totalOnly,
+		LongDuration: longDuration,
+		TerminalOff:  terminalOff,
+		Color:        color}
 
 	for _, projPath := range projects {
 		if commitNote, err = metric.Process(true, projPath); err != nil {

command/status_test.go

@@ -28,6 +28,25 @@ func TestStatusDefaultOptions(t *testing.T) {
 	}
 }
 
+func TestStatusTotalOnly(t *testing.T) {
+	repo := util.NewTestRepo(t, false)
+	defer repo.Remove()
+	repo.Seed()
+	os.Chdir(repo.PathIn(""))
+
+	(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
+
+	ui := new(cli.MockUi)
+	c := StatusCmd{Ui: ui}
+
+	args := []string{"-total-only", "-long-duration"}
+	rc := c.Run(args)
+
+	if rc != 0 {
+		t.Errorf("gtm status(%+v), want 0 got %d, %s", args, rc, ui.ErrorWriter.String())
+	}
+}
+
 func TestStatusInvalidOption(t *testing.T) {
 	ui := new(cli.MockUi)
 	c := StatusCmd{Ui: ui}

main.go

@@ -62,10 +62,10 @@ func main() {
 		},
 	}
 
-	exitStatus, err := c.Run()
+	exitStatu, err := c.Run()
 	if err != nil {
 		ui.Error(err.Error())
 	}
 
-	os.Exit(exitStatus)
+	os.Exit(exitStatu)
 }

report/report.go

@@ -36,11 +36,12 @@ type ProjectCommits struct {
 
 // OutputOptions contains cli options for reporting
 type OutputOptions struct {
-	TotalOnly   bool
-	FullMessage bool
-	TerminalOff bool
-	Color       bool
-	Limit       int
+	TotalOnly    bool
+	LongDuration bool
+	FullMessage  bool
+	TerminalOff  bool
+	Color        bool
+	Limit        int
 }
 
 func (o OutputOptions) limitNotes(notes commitNoteDetails) commitNoteDetails {
@@ -60,6 +61,9 @@ func Status(n note.CommitNote, options OutputOptions, projPath ...string) (strin
 	}
 
 	if options.TotalOnly {
+		if options.LongDuration {
+			return util.DurationStrLong(n.Total()), nil
+		}
 		return util.DurationStr(n.Total()), nil
 	}
 

util/string.go

@@ -9,6 +9,8 @@ import (
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/hako/durafmt"
 )
 
 // Percent returns a values percent of the total
@@ -40,6 +42,14 @@ func DurationStr(secs int) string {
 	return (time.Duration(secs) * time.Second).String()
 }
 
+func DurationStrLong(secs int) string {
+	d, err := durafmt.ParseString(DurationStr(secs))
+	if err != nil {
+		return ""
+	}
+	return d.String()
+}
+
 // https://github.com/DaddyOh/golang-samples/blob/master/pad.go
 
 // RightPad2Len https://github.com/DaddyOh/golang-samples/blob/master/pad.go