update install for gomo

cmd/pttodo-cli/cli.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"io/ioutil"
 	"local/pt-todo-server/pttodo"
+	"log"
 	"os"
 	"os/exec"
 	"path"
@@ -22,32 +23,39 @@ func main() {
 }
 
 func _main() error {
-	filepath := flag.String("f", "-", "path to yaml file")
+	defaultFilepath, ok := os.LookupEnv("PTTODO_FILE")
+	if !ok {
+		defaultFilepath = "-"
+	}
+	filepath := flag.String("f", defaultFilepath, "($PTTODO_FILE) path to yaml file")
 	e := flag.Bool("e", false, "edit file")
+	dry := flag.Bool("dry", false, "dry run")
 	flag.Parse()
 	if *e {
-		if err := edit(*filepath); err != nil {
+		if err := edit(*dry, *filepath); err != nil {
 			return err
 		}
 	}
-	return dump(os.Stdout, *filepath)
+	return dump(*dry, os.Stdout, *filepath)
 }
 
-func edit(filepath string) error {
+func edit(dry bool, filepath string) error {
 	var tempFile string
 	cp := func() error {
 		f, err := ioutil.TempFile(os.TempDir(), path.Base(filepath))
 		if err != nil {
 			return err
 		}
-		g, err := os.Open(filepath)
+		if _, err := os.Stat(filepath); err == nil {
-		if err != nil {
+			g, err := os.Open(filepath)
-			return err
+			if err != nil {
+				return err
+			}
+			if _, err := io.Copy(f, g); err != nil {
+				return err
+			}
+			g.Close()
 		}
-		if _, err := io.Copy(f, g); err != nil {
-			return err
-		}
-		g.Close()
 		f.Close()
 		tempFile = f.Name()
 		return nil
@@ -84,15 +92,19 @@ func edit(filepath string) error {
 		return nil
 	}
 	verify := func() error {
-		return dump(io.Discard, tempFile)
+		return dump(true, io.Discard, tempFile)
 	}
 	save := func() error {
+		if dry {
+			log.Printf("would've saved %s as %s", tempFile, filepath)
+			return nil
+		}
 		return os.Rename(tempFile, filepath)
 	}
 
 	for _, foo := range []func() error{cp, vi, verify, save} {
 		if err := foo(); err != nil {
-			if tempFile != "" {
+			if tempFile != "" && !dry {
 				os.Remove(tempFile)
 			}
 			return err
@@ -102,7 +114,7 @@ func edit(filepath string) error {
 	return nil
 }
 
-func dump(writer io.Writer, filepath string) error {
+func dump(dry bool, writer io.Writer, filepath string) error {
 	var reader io.Reader
 	if filepath == "-" {
 		reader = os.Stdin
@@ -125,10 +137,25 @@ func dump(writer io.Writer, filepath string) error {
 	}
 	root.MoveScheduledToTodo()
 
-	b2, err := yaml.Marshal(root)
+	var v interface{} = root
+	switch flag.Arg(0) {
+	case "":
+	case "todo":
+		v = root.Todo
+	case "scheduled":
+		v = root.Scheduled
+	case "done":
+		v = root.Done
+	}
+	b2, err := yaml.Marshal(v)
 	if err != nil {
 		return err
 	}
 	fmt.Fprintf(writer, "%s\n", b2)
-	return nil
+
+	if dry {
+		return nil
+	}
+
+	return os.WriteFile(filepath, b2, os.ModePerm)
 }

cmd/pttodo-cli/go.mod

@@ -1,4 +1,4 @@
-module pttodo
+module pttodo-cli
 
 go 1.17
 

cmd/pttodo-cli/install.sh

@@ -0,0 +1,20 @@
+#! /bin/bash
+
+cd "$(dirname "$BASH_SOURCE")"
+
+binary_name="$(head -n 1 go.mod  | awk '{print $NF}' | sed 's/.*\///')"
+git_commit="$((
+   git rev-list -1 HEAD
+   if git diff | grep . > /dev/null; then
+      echo "-dirty"
+   fi
+) 2> /dev/null | tr -d '\n')"
+
+GOFLAGS="" \
+GO111MODULE="" \
+CGO_ENABLED=0 \
+go build \
+   -o $GOPATH/bin/$binary_name \
+   -a \
+   -installsuffix cgo \
+   -ldflags "-s -w -X main.GitCommit=$git_commit"

go.mod

@@ -1,4 +1,4 @@
-module local/pt-todo-server
+module pttodo
 
 go 1.17
 

pttodo/todo.go

@@ -7,8 +7,8 @@ import (
 
 type Todo struct {
 	Todo     string
+	TS       TS
 	Details  string   `yaml:",omitempty"`
-	TS       TS       `yaml:",omitempty"`
 	Schedule Schedule `yaml:",omitempty"`
 	Tags     string   `yaml:",omitempty"`
 	Subtasks []Todo   `yaml:",omitempty"`

pttodo/ts_test.go

@@ -2,10 +2,40 @@ package pttodo
 
 import (
 	"encoding/json"
+	"strings"
 	"testing"
 	"time"
+
+	yaml "gopkg.in/yaml.v2"
 )
 
+func TestTSMarshalYaml(t *testing.T) {
+	t.Run("nonzero", func(t *testing.T) {
+		var ts TS
+		if b, err := yaml.Marshal(TS(5)); err != nil {
+			t.Fatal(err)
+		} else if s := string(b); strings.TrimSpace(s) != `5` {
+			t.Fatal(s)
+		} else if err := yaml.Unmarshal(b, &ts); err != nil {
+			t.Fatal(err)
+		} else if ts != 5 {
+			t.Fatal(ts)
+		}
+	})
+	t.Run("zero", func(t *testing.T) {
+		var ts TS
+		if b, err := yaml.Marshal(TS(0)); err != nil {
+			t.Fatal(err)
+		} else if s := string(b); strings.TrimSpace(s) == `0` {
+			t.Fatal(s)
+		} else if err := yaml.Unmarshal(b, &ts); err != nil {
+			t.Fatal(err)
+		} else if ts == 0 {
+			t.Fatal(ts)
+		}
+	})
+}
+
 func TestJSONTS(t *testing.T) {
 	ts := TS(time.Now().Unix())
 	js, err := json.Marshal(ts)