Merge pull request #1136 from rsteube/gh-expose-labels

gh: expose labels macro
carapace-sh · May 14, 2022 · 843f833 · 843f833
2 parents e35ffea + 875237f
commit 843f833
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 59 deletions.
diff --git a/completers/gh_completer/cmd/action/api.go b/completers/gh_completer/cmd/action/api.go
@@ -68,8 +68,7 @@ func ActionApiV3Paths(cmd *cobra.Command) carapace.Action {
 			case "{gitignore_name}":
 				return ActionGitignoreTemplates(cmd)
 			case "{label}":
-				fakeRepoFlag(cmd, matchedData["{owner}"], matchedData["{repo}"])
-				return ActionLabels(cmd)
+				return gh.ActionLabels(gh.RepoOpts{Owner: matchedData["{owner}"], Name: matchedData["{repo}"]})
 			case "{license}":
 				return gh.ActionLicenses(gh.HostOpts{})
 			case "{issue_number}":

diff --git a/completers/gh_completer/cmd/action/label.go b/completers/gh_completer/cmd/action/label.go
@@ -1,9 +1,8 @@
 package action
 
 import (
-	"time"
-
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -13,39 +12,12 @@ type label struct {
 	Color       string
 }
 
-type labelsQuery struct {
-	Data struct {
-		Repository struct {
-			Labels struct {
-				Nodes []label
-			}
-		}
-	}
-}
-
 func ActionLabels(cmd *cobra.Command) carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		var queryResult labelsQuery
-		return GraphQlAction(cmd, `repository(owner: $owner, name: $repo){ labels(first: 100) { nodes { name, description, color } } }`, &queryResult, func() carapace.Action {
-			labels := queryResult.Data.Repository.Labels.Nodes
-			vals := make([]string, 0)
-			for _, label := range labels {
-				vals = append(vals, label.Name, label.Description, "#"+label.Color)
-			}
-			return carapace.ActionStyledValuesDescribed(vals...)
-		})
-	}).Cache(5*time.Minute, repoCacheKey(cmd))
-}
-
-func ActionLabelFields() carapace.Action {
-	return carapace.ActionValues(
-		"color",
-		"createdAt",
-		"description",
-		"id",
-		"isDefault",
-		"name",
-		"updatedAt",
-		"url",
-	)
+		repo, err := repoOverride(cmd)
+		if err != nil {
+			return carapace.ActionMessage(err.Error())
+		}
+		return gh.ActionLabels(gh.RepoOpts{Host: repo.RepoHost(), Owner: repo.RepoOwner(), Name: repo.RepoName()})
+	})
 }
diff --git a/completers/gh_completer/cmd/action/repository.go b/completers/gh_completer/cmd/action/repository.go
@@ -2,22 +2,10 @@ package action
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/gh_completer/cmd/action/ghrepo"
 	"github.com/rsteube/carapace-bin/pkg/actions/tools/gh"
-	"github.com/rsteube/carapace/pkg/cache"
 	"github.com/spf13/cobra"
 )
 
-func repoCacheKey(cmd *cobra.Command) cache.Key {
-	return func() (string, error) {
-		if repo, err := repoOverride(cmd); err != nil {
-			return "", err
-		} else {
-			return ghrepo.FullName(repo), nil
-		}
-	}
-}
-
 func ActionOwnerRepositories(cmd *cobra.Command) carapace.Action {
 	return carapace.ActionMultiParts("/", func(c carapace.Context) carapace.Action {
 		// TODO hack to enable completion outside git repo - this needs to be fixed in GraphQlAction/repooverride though

diff --git a/completers/gh_completer/cmd/label_list.go b/completers/gh_completer/cmd/label_list.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +27,7 @@ func init() {
 
 	carapace.Gen(label_listCmd).FlagCompletion(carapace.ActionMap{
 		"json": carapace.ActionMultiParts(",", func(c carapace.Context) carapace.Action {
-			return action.ActionLabelFields().Invoke(c).Filter(c.Parts).ToA()
+			return gh.ActionLabelFields().Invoke(c).Filter(c.Parts).ToA()
 		}),
 		"order": carapace.ActionValues("asc", "desc"),
 		"sort":  carapace.ActionValues("created", "name"),

diff --git a/pkg/actions/tools/gh/gh.go b/pkg/actions/tools/gh/gh.go
@@ -1,6 +1,8 @@
 // package gh contains github related actions
 package gh
 
+import "github.com/rsteube/carapace/pkg/cache"
+
 type repo interface {
 	host() string
 	owner() string
@@ -49,5 +51,6 @@ func (o RepoOpts) host() string {
 		return o.Host
 	}
 }
-func (o RepoOpts) owner() string { return o.Owner }
-func (o RepoOpts) name() string  { return o.Name }
+func (o RepoOpts) owner() string       { return o.Owner }
+func (o RepoOpts) name() string        { return o.Name }
+func (o RepoOpts) cacheKey() cache.Key { return cache.String(o.Host, o.Owner, o.Name) }
diff --git a/pkg/actions/tools/gh/issue.go b/pkg/actions/tools/gh/issue.go
@@ -18,12 +18,6 @@ type issue struct {
 	}
 }
 
-type label struct {
-	Name        string
-	Description string
-	Color       string
-}
-
 type pinnedIssueQuery struct {
 	Data struct {
 		Repository struct {

diff --git a/pkg/actions/tools/gh/label.go b/pkg/actions/tools/gh/label.go
@@ -0,0 +1,56 @@
+package gh
+
+import (
+	"time"
+
+	"github.com/rsteube/carapace"
+)
+
+type label struct {
+	Name        string
+	Description string
+	Color       string
+}
+
+type labelsQuery struct {
+	Data struct {
+		Repository struct {
+			Labels struct {
+				Nodes []label
+			}
+		}
+	}
+}
+
+// ActionLabels completes labels
+//   enhancement (New feature or request)
+//   good first issue (Good for newcomers)
+func ActionLabels(opts RepoOpts) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		var queryResult labelsQuery
+		return graphQlAction(opts, `repository(owner: $owner, name: $repo){ labels(first: 100) { nodes { name, description, color } } }`, &queryResult, func() carapace.Action {
+			labels := queryResult.Data.Repository.Labels.Nodes
+			vals := make([]string, 0)
+			for _, label := range labels {
+				vals = append(vals, label.Name, label.Description, "#"+label.Color)
+			}
+			return carapace.ActionStyledValuesDescribed(vals...)
+		})
+	}).Cache(5*time.Minute, opts.cacheKey())
+}
+
+// ActionLabelFields completes label fields
+//   color
+//   createdAt
+func ActionLabelFields() carapace.Action {
+	return carapace.ActionValues(
+		"color",
+		"createdAt",
+		"description",
+		"id",
+		"isDefault",
+		"name",
+		"updatedAt",
+		"url",
+	)
+}