From 8f420e5ef2c18fefcf1bd2f738a32e08133f05a8 Mon Sep 17 00:00:00 2001 From: zkevin <2930705585@qq.com> Date: Thu, 4 Jun 2026 12:12:42 +0800 Subject: [PATCH] fix: update RequireArg calls to match new 2-arg signature from master merge Co-Authored-By: Claude Opus 4.7 --- shortcuts/issue/issue.go | 2 +- shortcuts/issue/label.go | 10 +++++----- shortcuts/milestone/milestone.go | 6 +++--- shortcuts/org/org.go | 8 ++++---- shortcuts/pr/review.go | 8 ++++---- shortcuts/release/release.go | 2 +- shortcuts/repo/repo.go | 4 ++-- shortcuts/search/search.go | 2 +- shortcuts/team/team.go | 26 +++++++++++++------------- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/shortcuts/issue/issue.go b/shortcuts/issue/issue.go index 9c3fc2a..e0efc6b 100644 --- a/shortcuts/issue/issue.go +++ b/shortcuts/issue/issue.go @@ -167,7 +167,7 @@ func Shortcuts() []*common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - number, err := ctx.RequireArg("number") + number, err := ctx.RequireArg("number", "--number 42") if err != nil { return err } diff --git a/shortcuts/issue/label.go b/shortcuts/issue/label.go index 7b2e063..bc5e279 100644 --- a/shortcuts/issue/label.go +++ b/shortcuts/issue/label.go @@ -18,8 +18,8 @@ func newLabelAddShortcut() *common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - number, _ := ctx.RequireArg("number") - labelsStr, _ := ctx.RequireArg("labels") + number, _ := ctx.RequireArg("number", "--number 42") + labelsStr, _ := ctx.RequireArg("labels", `--labels "bug,urgent"`) body := map[string]interface{}{ "labels": labelsStr, } @@ -44,8 +44,8 @@ func newLabelRemoveShortcut() *common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - number, _ := ctx.RequireArg("number") - label, _ := ctx.RequireArg("label") + number, _ := ctx.RequireArg("number", "--number 42") + label, _ := ctx.RequireArg("label", "--label bug") env, err := ctx.CallAPI("DELETE", fmt.Sprintf("%s/issues/%s/labels/%s", v1RepoPath(ctx), number, label), nil) if err != nil { return err @@ -66,7 +66,7 @@ func newLabelListShortcut() *common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - number, _ := ctx.RequireArg("number") + number, _ := ctx.RequireArg("number", "--number 42") env, err := ctx.CallAPI("GET", fmt.Sprintf("%s/issues/%s/labels", v1RepoPath(ctx), number), nil) if err != nil { return err diff --git a/shortcuts/milestone/milestone.go b/shortcuts/milestone/milestone.go index 7062a0e..23d55da 100644 --- a/shortcuts/milestone/milestone.go +++ b/shortcuts/milestone/milestone.go @@ -42,7 +42,7 @@ func Shortcuts() []*common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - name, _ := ctx.RequireArg("name") + name, _ := ctx.RequireArg("name", `--name "My Name"`) body := map[string]interface{}{ "title": name, } @@ -72,7 +72,7 @@ func Shortcuts() []*common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - id, _ := ctx.RequireArg("id") + id, _ := ctx.RequireArg("id", "--id 1") body := map[string]interface{}{} if n := ctx.Arg("name"); n != "" { body["title"] = n @@ -103,7 +103,7 @@ func Shortcuts() []*common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - id, _ := ctx.RequireArg("id") + id, _ := ctx.RequireArg("id", "--id 1") env, err := ctx.CallAPI("DELETE", fmt.Sprintf("/v1%s/milestones/%s", ctx.RepoPath(), id), nil) if err != nil { return err diff --git a/shortcuts/org/org.go b/shortcuts/org/org.go index 00295a8..a330dc6 100644 --- a/shortcuts/org/org.go +++ b/shortcuts/org/org.go @@ -109,7 +109,7 @@ func Shortcuts() []*common.Shortcut { {Name: "description", Short: "d", Usage: "New description"}, }, Run: func(ctx *common.RuntimeContext) error { - id, _ := ctx.RequireArg("id") + id, _ := ctx.RequireArg("id", "--id my-org") body := map[string]interface{}{} if n := ctx.Arg("name"); n != "" { body["name"] = n @@ -134,7 +134,7 @@ func Shortcuts() []*common.Shortcut { {Name: "id", Short: "i", Usage: "Organization ID", Required: true}, }, Run: func(ctx *common.RuntimeContext) error { - id, _ := ctx.RequireArg("id") + id, _ := ctx.RequireArg("id", "--id my-org") env, err := ctx.CallAPI("DELETE", fmt.Sprintf("/organizations/%s", id), nil) if err != nil { return err @@ -158,7 +158,7 @@ func Shortcuts() []*common.Shortcut { {Name: "repo", Short: "r", Usage: "Project repo name (e.g., gitlink-cli)", Required: true}, }, Run: func(ctx *common.RuntimeContext) error { - userID, err := ctx.RequireArg("user-id") + userID, err := ctx.RequireArg("user-id", "--user-id 42") if err != nil { return err } @@ -186,7 +186,7 @@ func Shortcuts() []*common.Shortcut { {Name: "repo", Short: "r", Usage: "Project repo name (e.g., gitlink-cli)", Required: true}, }, Run: func(ctx *common.RuntimeContext) error { - userID, err := ctx.RequireArg("user-id") + userID, err := ctx.RequireArg("user-id", "--user-id 42") if err != nil { return err } diff --git a/shortcuts/pr/review.go b/shortcuts/pr/review.go index 72c1cfb..61645b8 100644 --- a/shortcuts/pr/review.go +++ b/shortcuts/pr/review.go @@ -18,7 +18,7 @@ func newApproveShortcut() *common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - id, _ := ctx.RequireArg("id") + id, _ := ctx.RequireArg("id", "--id 42") body := map[string]interface{}{ "state": "approved", } @@ -46,8 +46,8 @@ func newRequestChangesShortcut() *common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - id, _ := ctx.RequireArg("id") - body, _ := ctx.RequireArg("body") + id, _ := ctx.RequireArg("id", "--id 42") + body, _ := ctx.RequireArg("body", `--body "Looks good"`) payload := map[string]interface{}{ "state": "changes_requested", "body": body, @@ -72,7 +72,7 @@ func newReviewsShortcut() *common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - id, _ := ctx.RequireArg("id") + id, _ := ctx.RequireArg("id", "--id 42") env, err := ctx.CallAPI("GET", fmt.Sprintf("%s/pulls/%s/reviews", ctx.RepoPath(), id), nil) if err != nil { return err diff --git a/shortcuts/release/release.go b/shortcuts/release/release.go index 9bd9f08..5da6307 100644 --- a/shortcuts/release/release.go +++ b/shortcuts/release/release.go @@ -147,7 +147,7 @@ func Shortcuts() []*common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - id, _ := ctx.RequireArg("id") + id, _ := ctx.RequireArg("id", "--id my-org") body := map[string]interface{}{} if n := ctx.Arg("name"); n != "" { body["name"] = n diff --git a/shortcuts/repo/repo.go b/shortcuts/repo/repo.go index 8fae2ce..761efb5 100644 --- a/shortcuts/repo/repo.go +++ b/shortcuts/repo/repo.go @@ -211,7 +211,7 @@ func Shortcuts() []*common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - userID, err := ctx.RequireArg("user-id") + userID, err := ctx.RequireArg("user-id", "--user-id 42") if err != nil { return err } @@ -245,7 +245,7 @@ func Shortcuts() []*common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - userID, err := ctx.RequireArg("user-id") + userID, err := ctx.RequireArg("user-id", "--user-id 42") if err != nil { return err } diff --git a/shortcuts/search/search.go b/shortcuts/search/search.go index c147c71..25cde0a 100644 --- a/shortcuts/search/search.go +++ b/shortcuts/search/search.go @@ -69,7 +69,7 @@ func Shortcuts() []*common.Shortcut { if err := ctx.ResolveOwnerRepo(); err != nil { return err } - keyword, _ := ctx.RequireArg("keyword") + keyword, _ := ctx.RequireArg("keyword", "--keyword myproject") q := url.Values{} q.Set("search", keyword) q.Set("page", ctx.Arg("page")) diff --git a/shortcuts/team/team.go b/shortcuts/team/team.go index 87e1ff7..18f4de4 100644 --- a/shortcuts/team/team.go +++ b/shortcuts/team/team.go @@ -18,7 +18,7 @@ func Shortcuts() []*common.Shortcut { {Name: "limit", Short: "l", Usage: "Items per page", Default: "20"}, }, Run: func(ctx *common.RuntimeContext) error { - org, _ := ctx.RequireArg("org") + org, _ := ctx.RequireArg("org", "--org my-org") q := url.Values{} q.Set("page", ctx.Arg("page")) q.Set("limit", ctx.Arg("limit")) @@ -38,8 +38,8 @@ func Shortcuts() []*common.Shortcut { {Name: "description", Short: "d", Usage: "Team description"}, }, Run: func(ctx *common.RuntimeContext) error { - org, _ := ctx.RequireArg("org") - name, _ := ctx.RequireArg("name") + org, _ := ctx.RequireArg("org", "--org my-org") + name, _ := ctx.RequireArg("name", `--name "My Team"`) body := map[string]interface{}{ "name": name, } @@ -61,8 +61,8 @@ func Shortcuts() []*common.Shortcut { {Name: "id", Short: "i", Usage: "Team ID", Required: true}, }, Run: func(ctx *common.RuntimeContext) error { - org, _ := ctx.RequireArg("org") - id, _ := ctx.RequireArg("id") + org, _ := ctx.RequireArg("org", "--org my-org") + id, _ := ctx.RequireArg("id", "--id 1") env, err := ctx.CallAPI("DELETE", fmt.Sprintf("/organizations/%s/teams/%s", org, id), nil) if err != nil { return err @@ -80,8 +80,8 @@ func Shortcuts() []*common.Shortcut { {Name: "limit", Short: "l", Usage: "Items per page", Default: "20"}, }, Run: func(ctx *common.RuntimeContext) error { - org, _ := ctx.RequireArg("org") - id, _ := ctx.RequireArg("id") + org, _ := ctx.RequireArg("org", "--org my-org") + id, _ := ctx.RequireArg("id", "--id 1") q := url.Values{} q.Set("page", ctx.Arg("page")) q.Set("limit", ctx.Arg("limit")) @@ -101,9 +101,9 @@ func Shortcuts() []*common.Shortcut { {Name: "user", Short: "u", Usage: "User login or ID to add", Required: true}, }, Run: func(ctx *common.RuntimeContext) error { - org, _ := ctx.RequireArg("org") - team, _ := ctx.RequireArg("team") - user, _ := ctx.RequireArg("user") + org, _ := ctx.RequireArg("org", "--org my-org") + team, _ := ctx.RequireArg("team", "--team dev-team") + user, _ := ctx.RequireArg("user", "--user alice") body := map[string]interface{}{ "user_id": user, } @@ -123,9 +123,9 @@ func Shortcuts() []*common.Shortcut { {Name: "user", Short: "u", Usage: "User login or ID to remove", Required: true}, }, Run: func(ctx *common.RuntimeContext) error { - org, _ := ctx.RequireArg("org") - team, _ := ctx.RequireArg("team") - user, _ := ctx.RequireArg("user") + org, _ := ctx.RequireArg("org", "--org my-org") + team, _ := ctx.RequireArg("team", "--team dev-team") + user, _ := ctx.RequireArg("user", "--user alice") env, err := ctx.CallAPI("DELETE", fmt.Sprintf("/organizations/%s/teams/%s/members/%s", org, team, user), nil) if err != nil { return err