gmgauthier/grokkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 23 Wiki Activity

fix/prdescribe-patch #8

Merged
gmgauthier merged 2 commits from fix/prdescribe-patch into master 2026-03-31 10:02:35 +00:00
Conversation 0 Commits 2 Files Changed 3 +19 -9
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 403a408f8d - Show all commits

11
cmd/prdescribe.go
View File

@ -10,6 +10,9 @@ import (
"gmgauthier.com/grokkit/internal/git" "gmgauthier.com/grokkit/internal/git"
) )
// gitDiff is the mockable entry point (exactly like gitRun used elsewhere).
var gitDiff = git.Diff
var prDescribeCmd = &cobra.Command{ var prDescribeCmd = &cobra.Command{
Use: "pr-describe", Use: "pr-describe",
Short: "Generate full PR description from current branch", Short: "Generate full PR description from current branch",
@ -17,16 +20,16 @@ var prDescribeCmd = &cobra.Command{
} }
func init() { func init() {
prDescribeCmd.Flags().StringP("base", "b", "master", "Base branch to compare against") prDescribeCmd.Flags().StringP("base", "b", "master", "Base branch to compare against (default: master)")
} }
func runPRDescribe(cmd *cobra.Command, _ []string) { func runPRDescribe(cmd *cobra.Command, _ []string) {
base, _ := cmd.Flags().GetString("base") base, _ := cmd.Flags().GetString("base")
// Prefer a local base, fallback to origin/<base>. Tolerant of exit code 1. // Prefer local base, fallback to origin/<base>.
diff, err := git.Diff([]string{"diff", fmt.Sprintf("%s..HEAD", base), "--no-color"}) diff, err := gitDiff([]string{"diff", fmt.Sprintf("%s..HEAD", base), "--no-color"})
if err != nil || strings.TrimSpace(diff) == "" { if err != nil || strings.TrimSpace(diff) == "" {
diff, err = git.Diff([]string{"diff", fmt.Sprintf("origin/%s..HEAD", base), "--no-color"}) diff, err = gitDiff([]string{"diff", fmt.Sprintf("origin/%s..HEAD", base), "--no-color"})
if err != nil { if err != nil {
color.Red("Failed to get branch diff: %v", err) color.Red("Failed to get branch diff: %v", err)
return return

17
cmd/run_test.go
View File

@ -47,6 +47,13 @@ func withMockGit(fn func([]string) (string, error)) func() {
return func() { gitRun = orig } return func() { gitRun = orig }
} }
// withMockGitDiff injects a fake for the new git.Diff (mockable var).
func withMockGitDiff(fn func([]string) (string, error)) func() {
orig := gitDiff
gitDiff = fn
return func() { gitDiff = orig }
}
// testCmd returns a minimal cobra command with common flags registered. // testCmd returns a minimal cobra command with common flags registered.
func testCmd() *cobra.Command { func testCmd() *cobra.Command {
c := &cobra.Command{} c := &cobra.Command{}
@ -260,7 +267,7 @@ func TestRunPRDescribe(t *testing.T) {
t.Run("no changes on branch — skips AI", func(t *testing.T) { t.Run("no changes on branch — skips AI", func(t *testing.T) {
mock := &mockStreamer{} mock := &mockStreamer{}
defer withMockClient(mock)() defer withMockClient(mock)()
defer withMockGit(func(args []string) (string, error) { defer withMockGitDiff(func(args []string) (string, error) {
return "", nil // both diff calls return empty return "", nil // both diff calls return empty
})() })()
@ -275,7 +282,7 @@ func TestRunPRDescribe(t *testing.T) {
mock := &mockStreamer{response: "## PR Title\n\nDescription"} mock := &mockStreamer{response: "## PR Title\n\nDescription"}
defer withMockClient(mock)() defer withMockClient(mock)()
callCount := 0 callCount := 0
defer withMockGit(func(args []string) (string, error) { defer withMockGitDiff(func(args []string) (string, error) {
callCount++ callCount++
if callCount == 1 { if callCount == 1 {
return "diff --git a/foo.go b/foo.go", nil return "diff --git a/foo.go b/foo.go", nil
@ -294,7 +301,7 @@ func TestRunPRDescribe(t *testing.T) {
mock := &mockStreamer{response: "PR description"} mock := &mockStreamer{response: "PR description"}
defer withMockClient(mock)() defer withMockClient(mock)()
callCount := 0 callCount := 0
defer withMockGit(func(args []string) (string, error) { defer withMockGitDiff(func(args []string) (string, error) {
callCount++ callCount++
if callCount == 2 { if callCount == 2 {
return "diff --git a/bar.go b/bar.go", nil return "diff --git a/bar.go b/bar.go", nil
@ -313,7 +320,7 @@ func TestRunPRDescribe(t *testing.T) {
mock := &mockStreamer{response: "PR description"} mock := &mockStreamer{response: "PR description"}
defer withMockClient(mock)() defer withMockClient(mock)()
var capturedArgs []string var capturedArgs []string
defer withMockGit(func(args []string) (string, error) { defer withMockGitDiff(func(args []string) (string, error) {
capturedArgs = args capturedArgs = args
return "diff content", nil return "diff content", nil
})() })()
@ -345,7 +352,7 @@ func TestRunPRDescribe(t *testing.T) {
mock := &mockStreamer{response: "PR description"} mock := &mockStreamer{response: "PR description"}
defer withMockClient(mock)() defer withMockClient(mock)()
var capturedArgs []string var capturedArgs []string
defer withMockGit(func(args []string) (string, error) { defer withMockGitDiff(func(args []string) (string, error) {
capturedArgs = args capturedArgs = args
return "diff content", nil return "diff content", nil
})() })()