Add hook environment variables and break duration

cmd/break.go

@@ -26,13 +26,25 @@ func breakCmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	if err := hook.Run(client, "break"); err != nil {
+	if err := hook.Run(client, hook.Params{
+		Name:          "break",
+		Command:       "break",
+		Args:          getCommandArgs(cmd),
+		BreakDuration: d,
+	}); err != nil {
 		return err
 	}
 
-	if err := wait(d); err != nil {
-		return err
+	if shouldWait(cmd, true) {
+		if err := wait(d); err != nil {
+			return err
+		}
 	}
 
-	return hook.Run(client, "stop")
+	return hook.Run(client, hook.Params{
+		Name:          "stop",
+		Command:       "break",
+		Args:          getCommandArgs(cmd),
+		BreakDuration: d,
+	})
 }

cmd/cancel.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/open-pomodoro/go-openpomodoro"
 	"github.com/open-pomodoro/openpomodoro-cli/hook"
 	"github.com/spf13/cobra"
 )
@@ -16,7 +17,17 @@ func init() {
 }
 
 func cancelCmd(cmd *cobra.Command, args []string) error {
-	if err := hook.Run(client, "stop"); err != nil {
+	p, err := client.Pomodoro()
+	if err != nil {
+		return err
+	}
+
+	if err := hook.Run(client, hook.Params{
+		Name:       "stop",
+		PomodoroID: p.StartTime.Format(openpomodoro.TimeFormat),
+		Command:    "cancel",
+		Args:       getCommandArgs(cmd),
+	}); err != nil {
 		return err
 	}
 

cmd/clear.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/open-pomodoro/go-openpomodoro"
 	"github.com/open-pomodoro/openpomodoro-cli/hook"
 	"github.com/spf13/cobra"
 )
@@ -16,7 +17,17 @@ func init() {
 }
 
 func clearCmd(cmd *cobra.Command, args []string) error {
-	if err := hook.Run(client, "stop"); err != nil {
+	p, err := client.Pomodoro()
+	if err != nil {
+		return err
+	}
+
+	if err := hook.Run(client, hook.Params{
+		Name:       "stop",
+		PomodoroID: p.StartTime.Format(openpomodoro.TimeFormat),
+		Command:    "clear",
+		Args:       getCommandArgs(cmd),
+	}); err != nil {
 		return err
 	}
 

cmd/finish.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/open-pomodoro/go-openpomodoro"
 	"github.com/open-pomodoro/openpomodoro-cli/format"
 	"github.com/open-pomodoro/openpomodoro-cli/hook"
 	"github.com/spf13/cobra"
@@ -34,7 +35,12 @@ func finishCmd(cmd *cobra.Command, args []string) error {
 	d := time.Now().Sub(p.StartTime)
 	fmt.Println(format.DurationAsTime(d))
 
-	if err := hook.Run(client, "stop"); err != nil {
+	if err := hook.Run(client, hook.Params{
+		Name:       "stop",
+		PomodoroID: p.StartTime.Format(openpomodoro.TimeFormat),
+		Command:    "finish",
+		Args:       getCommandArgs(cmd),
+	}); err != nil {
 		return err
 	}
 
@@ -54,15 +60,28 @@ func finishCmd(cmd *cobra.Command, args []string) error {
 			}
 		}
 
-		if err := hook.Run(client, "break"); err != nil {
+		if err := hook.Run(client, hook.Params{
+			Name:          "break",
+			PomodoroID:    p.StartTime.Format(openpomodoro.TimeFormat),
+			Command:       "finish",
+			Args:          getCommandArgs(cmd),
+			BreakDuration: breakDuration,
+		}); err != nil {
 			return err
 		}
 
-		if err := wait(breakDuration); err != nil {
-			return err
+		if shouldWait(cmd, true) {
+			if err := wait(breakDuration); err != nil {
+				return err
+			}
 		}
 
-		return hook.Run(client, "stop")
+		return hook.Run(client, hook.Params{
+			Name:       "stop",
+			PomodoroID: p.StartTime.Format(openpomodoro.TimeFormat),
+			Command:    "finish",
+			Args:       getCommandArgs(cmd),
+		})
 	}
 
 	return nil

cmd/repeat.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/open-pomodoro/go-openpomodoro"
 	"github.com/open-pomodoro/openpomodoro-cli/hook"
 	"github.com/spf13/cobra"
 )
@@ -46,7 +47,17 @@ func repeatCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if err := hook.Run(client, "start"); err != nil {
+	current, err := client.Pomodoro()
+	if err != nil {
+		return err
+	}
+
+	if err := hook.Run(client, hook.Params{
+		Name:       "start",
+		PomodoroID: current.StartTime.Format(openpomodoro.TimeFormat),
+		Command:    "repeat",
+		Args:       getCommandArgs(cmd),
+	}); err != nil {
 		return err
 	}
 

cmd/start.go

@@ -54,7 +54,17 @@ func startCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if err := hook.Run(client, "start"); err != nil {
+	current, err := client.Pomodoro()
+	if err != nil {
+		return err
+	}
+
+	if err := hook.Run(client, hook.Params{
+		Name:       "start",
+		PomodoroID: current.StartTime.Format(openpomodoro.TimeFormat),
+		Command:    "start",
+		Args:       getCommandArgs(cmd),
+	}); err != nil {
 		return err
 	}
 

cmd/util.go

@@ -3,12 +3,14 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"strconv"
 	"time"
 
 	"github.com/justincampbell/go-countdown"
 	"github.com/justincampbell/go-countdown/format"
 	"github.com/open-pomodoro/go-openpomodoro"
+	"github.com/spf13/cobra"
 )
 
 // wait displays a countdown timer for the specified duration
@@ -23,6 +25,15 @@ func wait(d time.Duration) error {
 	return err
 }
 
+// shouldWait determines if we should wait based on the wait flag and command context
+// For break commands, wait by default unless --no-wait is explicitly set
+func shouldWait(cmd *cobra.Command, defaultWait bool) bool {
+	if cmd.Flags().Changed("wait") {
+		return waitFlag
+	}
+	return defaultWait
+}
+
 // parseDurationMinutes parses a duration string, defaulting to minutes if no unit is specified
 func parseDurationMinutes(s string) (time.Duration, error) {
 	if _, err := strconv.Atoi(s); err == nil {
@@ -47,3 +58,15 @@ func isPomodoroCompleted(p *openpomodoro.Pomodoro) bool {
 	current, _ := client.Pomodoro()
 	return current.IsInactive() || !current.Matches(p)
 }
+
+// getCommandArgs extracts the command-specific arguments from os.Args
+func getCommandArgs(cmd *cobra.Command) []string {
+	for i, arg := range os.Args {
+		if arg == cmd.Name() || (i > 0 && os.Args[i-1] == "pomodoro") {
+			if arg == cmd.Name() {
+				return os.Args[i+1:]
+			}
+		}
+	}
+	return cmd.Flags().Args()
+}

hook/hook.go

@@ -5,13 +5,24 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"strings"
+	"time"
 
 	"github.com/open-pomodoro/go-openpomodoro"
 )
 
+// Params holds the parameters for running a hook.
+type Params struct {
+	Name          string
+	PomodoroID    string
+	Command       string
+	Args          []string
+	BreakDuration time.Duration
+}
+
 // Run runs a hook with the given name.
-func Run(client *openpomodoro.Client, name string) error {
-	filename := path.Join(client.Directory, "hooks", name)
+func Run(client *openpomodoro.Client, params Params) error {
+	filename := path.Join(client.Directory, "hooks", params.Name)
 
 	if _, err := os.Stat(filename); os.IsNotExist(err) {
 		return nil
@@ -21,10 +32,28 @@ func Run(client *openpomodoro.Client, name string) error {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env,
+		fmt.Sprintf("POMODORO_ID=%s", params.PomodoroID),
+		fmt.Sprintf("POMODORO_DIRECTORY=%s", client.Directory),
+		fmt.Sprintf("POMODORO_COMMAND=%s", params.Command),
+		fmt.Sprintf("POMODORO_ARGS=%s", joinArgs(params.Args)),
+	)
+
+	if params.BreakDuration > 0 {
+		cmd.Env = append(cmd.Env,
+			fmt.Sprintf("POMODORO_BREAK_DURATION_MINUTES=%d", int(params.BreakDuration.Minutes())),
+			fmt.Sprintf("POMODORO_BREAK_DURATION_SECONDS=%d", int(params.BreakDuration.Seconds())),
+		)
+	}
+
 	if err := cmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "Hook %q failed:\n\n", name)
+		fmt.Fprintf(os.Stderr, "Hook %q failed:\n\n", params.Name)
 		return err
 	}
 
 	return nil
 }
+
+func joinArgs(args []string) string {
+	return strings.Join(args, " ")
+}

test/hooks.bats

@@ -92,3 +92,77 @@ load test_helper
     assert_hook_contains "START_EXECUTED"
     assert_hook_contains "STOP_EXECUTED"
 }
+
+@test "hook receives POMODORO_ID environment variable" {
+    create_hook "start" 'echo "ID=$POMODORO_ID" >> "$TEST_DIR/hook_log"'
+
+    run pomodoro start "Test task" --ago 5m
+    assert_success
+
+    run grep -E 'ID=[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}' "$TEST_DIR/hook_log"
+    assert_success
+}
+
+@test "hook receives POMODORO_DIRECTORY environment variable" {
+    create_hook "start" 'echo "DIR=$POMODORO_DIRECTORY" >> "$TEST_DIR/hook_log"'
+
+    run pomodoro start "Test task"
+    assert_success
+
+    assert_hook_contains "DIR=$TEST_DIR"
+}
+
+@test "hook receives POMODORO_COMMAND environment variable" {
+    create_hook "start" 'echo "CMD=$POMODORO_COMMAND" >> "$TEST_DIR/hook_log"'
+
+    run pomodoro start "Test task"
+    assert_success
+
+    assert_hook_contains "CMD=start"
+}
+
+@test "hook receives POMODORO_ARGS environment variable" {
+    create_hook "start" 'echo "ARGS=$POMODORO_ARGS" >> "$TEST_DIR/hook_log"'
+
+    run pomodoro start "Test task" --tags "urgent,work" --duration 30
+    assert_success
+
+    assert_hook_contains 'ARGS=Test task --tags urgent,work --duration 30'
+}
+
+@test "hook can use POMODORO_ID with show command" {
+    create_hook "start" 'echo "ID_SET=${POMODORO_ID:+yes}" >> "$TEST_DIR/hook_log"'
+
+    run pomodoro start "My test description"
+    assert_success
+
+    assert_hook_contains "ID_SET=yes"
+}
+
+@test "break hook receives POMODORO_BREAK_DURATION_MINUTES" {
+    create_hook "break" 'echo "MINS=$POMODORO_BREAK_DURATION_MINUTES" >> "$TEST_DIR/hook_log"'
+
+    run pomodoro break 15 --wait=false
+    assert_success
+
+    assert_hook_contains "MINS=15"
+}
+
+@test "break hook receives POMODORO_BREAK_DURATION_SECONDS" {
+    create_hook "break" 'echo "SECS=$POMODORO_BREAK_DURATION_SECONDS" >> "$TEST_DIR/hook_log"'
+
+    run pomodoro break 5 --wait=false
+    assert_success
+
+    assert_hook_contains "SECS=300"
+}
+
+@test "finish --break hook receives break duration" {
+    create_hook "break" 'echo "MINS=$POMODORO_BREAK_DURATION_MINUTES SECS=$POMODORO_BREAK_DURATION_SECONDS" >> "$TEST_DIR/hook_log"'
+
+    pomodoro start "Task" --ago 5m
+    run pomodoro finish --break=10 --wait=false
+    assert_success
+
+    assert_hook_contains "MINS=10 SECS=600"
+}