Refactor and enhance klog today command (formerly klog now)

* Rename row labels and wrap end-time in parenthesis if there is no open range

* Rename `klog now` to `klog today`

* Restructure command

* Don’t display signed value for grand total values

* Cleanup

* Add test for when end time is out of bounds

* Update changelog

Author: jotaen

CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog (command line tool)
 
 ## v2.5
-- **[ FEATURE ]** Restructure output of `klog now`, especially when
-  using the `--diff` flag
+- **[ BREAKING ]** Rename `klog now` to `klog today`; restructure the
+  output, especially when using the `--diff`/`--now` flag
 - **[ FEATURE ]** Use distinct exit codes for different error cases
 - **[ FEATURE ]** Introduce `--quiet` flag to retrieve raw output
 - **[ FEATURE ]** Extend help texts, improve error messages 

src/app/cli/index.go

@@ -1,12 +1,18 @@
 package cli
 
+import (
+	"errors"
+	"klog/app"
+)
+
 type Cli struct {
 	// Evaluate
 	Print  Print  `cmd group:"Evaluate" help:"Pretty-prints records"`
 	Total  Total  `cmd group:"Evaluate" help:"Evaluates the total time"`
 	Report Report `cmd group:"Evaluate" help:"Prints a calendar report summarising all days"`
 	Tags   Tags   `cmd group:"Evaluate" help:"Prints total times aggregated by tags"`
-	Now    Now    `cmd group:"Evaluate" help:"Show overview of the current day"`
+	Today  Today  `cmd group:"Evaluate" help:"Evaluate current day"`
+	Now    Now    `cmd group:"Evaluate" hidden help:"Show overview of the current day"`
 
 	// Manipulate
 	Track  Track  `cmd group:"Manipulate" help:"Adds a new entry to a record"`
@@ -20,3 +26,12 @@ type Cli struct {
 	Widget   Widget   `cmd group:"Misc" help:"Starts menu bar widget (MacOS only)"`
 	Version  Version  `cmd group:"Misc" help:"Prints version info and check for updates"`
 }
+
+// DEPRECATED
+type Now struct {
+	Today
+}
+
+func (opt *Now) Run(_ app.Context) error {
+	return errors.New("`klog now` has been renamed to `klog today`. Note that the `--now` flag must be passed explicitly.")
+}

src/app/cli/now.go

@@ -87,7 +87,7 @@ func (opt *Report) Run(ctx app.Context) error {
 	}
 	ctx.Print("\n")
 	grandTotal := opt.NowArgs.Total(now, records...)
-	ctx.Print(indentation + lib.Pad(9-len(grandTotal.ToStringWithSign())) + ctx.Serialiser().SignedDuration(grandTotal))
+	ctx.Print(indentation + lib.Pad(9-len(grandTotal.ToString())) + ctx.Serialiser().Duration(grandTotal))
 	if opt.Diff {
 		grandShould := service.ShouldTotalSum(records...)
 		ctx.Print(lib.Pad(10-len(grandShould.ToString())) + ctx.Serialiser().ShouldTotal(grandShould))

src/app/cli/now_test.go

@@ -53,7 +53,7 @@ func TestReportOfRecords(t *testing.T) {
      Mar    Tue  2.    -8h2m
             Wed  3.       1h
                     ========
-                    +335h50m
+                     335h50m
 `, state.printBuffer)
 }
 
@@ -77,7 +77,7 @@ func TestReportConsecutive(t *testing.T) {
             Sat  3.  
             Sun  4.       3h
                     ========
-                         +4h
+                          4h
 `, state.printBuffer)
 }
 
@@ -101,6 +101,6 @@ func TestReportWithDiff(t *testing.T) {
             Sun  8.       2h    5h30m!   -3h30m
             Mon  9.    5h20m    2h19m!    +3h1m
                     ===========================
-                     +15h20m   15h49m!     -29m
+                      15h20m   15h49m!     -29m
 `, state.printBuffer)
 }