Merge pull request #229 from niklaas/fix/note-non-tty

Fix note <id> <text> discarding text without a TTY

Author: naggie

.github/workflows/ci.yml

@@ -36,17 +36,14 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - name: Go mod vendor
-        run: go mod vendor
-
       - name: Configure Git User
         run: |
           git config --global user.name "GitHub Actions Bot"
           git config --global user.email "actions@github.com"
 
       - name: Run tests
         run: |
-          go test -v -mod=vendor ./...
+          go test -v ./...
           ./integrationtest.sh
 
   windows-test:
@@ -63,10 +60,6 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - name: Go mod vendor
-        shell: pwsh
-        run: go mod vendor
-
       - name: Configure Git User
         shell: pwsh
         run: |
@@ -75,10 +68,10 @@ jobs:
 
       - name: Run Go tests
         shell: pwsh
-        run: go test -v -mod=vendor ./...
+        run: go test -v ./...
 
       - name: Build Windows binaries
         shell: pwsh
         run: |
-          go build -mod=vendor -o dstask.exe ./cmd/dstask
-          go build -mod=vendor -o dstask-import.exe ./cmd/dstask-import
+          go build -o dstask.exe ./cmd/dstask
+          go build -o dstask-import.exe ./cmd/dstask-import

commands.go

@@ -304,28 +304,26 @@ func CommandNote(conf Config, ctx, query Query) error {
 
 	for _, id := range query.IDs {
 		task := ts.MustGetByID(id)
-		// If stdout is a TTY, we may open the editor
-		if StdoutIsTTY() {
-			if query.Text == "" {
-				task.Notes = string(
-					MustEditBytes(
-						[]byte(task.Notes),
-						MakeTempFilename(task.ID, task.Summary, "md"),
-					),
-				)
+		if query.Text != "" {
+			if task.Notes == "" {
+				task.Notes = query.Text
 			} else {
-				if task.Notes == "" {
-					task.Notes = query.Text
-				} else {
-					task.Notes += "\n" + query.Text
-				}
+				task.Notes += "\n" + query.Text
 			}
-
+			ts.MustUpdateTask(task)
+			ts.SavePendingChanges()
+			MustGitCommit(conf.Repo, "Edit note %s", task)
+		} else if StdoutIsTTY() {
+			task.Notes = string(
+				MustEditBytes(
+					[]byte(task.Notes),
+					MakeTempFilename(task.ID, task.Summary, "md"),
+				),
+			)
 			ts.MustUpdateTask(task)
 			ts.SavePendingChanges()
 			MustGitCommit(conf.Repo, "Edit note %s", task)
 		} else {
-			// If stdout is not a TTY, we simply write markdown notes to stdout
 			if err := WriteStdout([]byte(task.Notes)); err != nil {
 				ExitFail("Could not write to stdout: %v", err)
 			}

integration/main_test.go

@@ -35,7 +35,7 @@ func TestMain(m *testing.M) {
 func compile(outputPath string) error {
 	// We expect to execute in the ./integration directory, and we will output
 	// our test binary there.
-	cmd := exec.Command("go", "build", "-mod=vendor", "-o", outputPath, "../cmd/dstask/main.go")
+	cmd := exec.Command("go", "build", "-o", outputPath, "../cmd/dstask/main.go")
 
 	return cmd.Run()
 }

integration/note_test.go

@@ -0,0 +1,38 @@
+package integration
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNoteAppendTextWithoutTTY(t *testing.T) {
+	repo, cleanup := makeDstaskRepo(t)
+	defer cleanup()
+
+	program := testCmd(repo)
+
+	output, exiterr, success := program("add", "test task")
+	assertProgramResult(t, output, exiterr, success)
+
+	_, exiterr, success = program("note", "1", "first line")
+	assertProgramResult(t, nil, exiterr, success)
+
+	output, exiterr, success = program("show-open")
+	assertProgramResult(t, output, exiterr, success)
+
+	tasks := unmarshalTaskArray(t, output)
+	require.Len(t, tasks, 1)
+	assert.Equal(t, "first line", tasks[0].Notes)
+
+	_, exiterr, success = program("note", "1", "second line")
+	assertProgramResult(t, nil, exiterr, success)
+
+	output, exiterr, success = program("show-open")
+	assertProgramResult(t, output, exiterr, success)
+
+	tasks = unmarshalTaskArray(t, output)
+	require.Len(t, tasks, 1)
+	assert.Equal(t, "first line\nsecond line", tasks[0].Notes)
+}

integrationtest.sh

@@ -28,7 +28,7 @@ cleanup() {
 
 trap cleanup EXIT
 
-go build -o dstask -mod=vendor cmd/dstask/main.go
+go build -o dstask cmd/dstask/main.go
 
 # initialse git repo
 git -C $DSTASK_GIT_REPO init