Add interactive mode for tea issue create (#302)

Implement interactive issue creation

Comment PromptRepoSlug

Move PromptRepoSlug to the right place

Hide promptRepoSlug

Signed-off-by: Martin Reboredo <yakoyoku@gmail.com>
Co-authored-by: Martin Reboredo <yakoyoku@gmail.com>
Reviewed-on: https://gitea.com/gitea/tea/pulls/302
Reviewed-by: Norwin <noerw@noreply.gitea.io>
Reviewed-by: khmarbaise <khmarbaise@noreply.gitea.io>
Reviewed-by: 6543 <6543@obermui.de>
Co-Authored-By: Martin Reboredo <yakoyakoyokuyoku@noreply.gitea.io>
Co-Committed-By: Martin Reboredo <yakoyakoyokuyoku@noreply.gitea.io>

cmd/issues/create.go

@@ -5,14 +5,11 @@
 package issues
 
 import (
-	"fmt"
-	"log"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/config"
-	"code.gitea.io/tea/modules/print"
+	"code.gitea.io/tea/modules/interact"
+	"code.gitea.io/tea/modules/task"
 
-	"code.gitea.io/sdk/gitea"
 	"github.com/urfave/cli/v2"
 )
 
@@ -39,23 +36,15 @@ var CmdIssuesCreate = cli.Command{
 func runIssuesCreate(ctx *cli.Context) error {
 	login, owner, repo := config.InitCommand(flags.GlobalRepoValue, flags.GlobalLoginValue, flags.GlobalRemoteValue)
 
-	issue, _, err := login.Client().CreateIssue(owner, repo, gitea.CreateIssueOption{
+	if ctx.NumFlags() == 0 {
-		Title: ctx.String("title"),
+		return interact.CreateIssue(login, owner, repo)
-		Body:  ctx.String("body"),
-		// TODO:
-		//Assignee  string   `json:"assignee"`
-		//Assignees []string `json:"assignees"`
-		//Deadline *time.Time `json:"due_date"`
-		//Milestone int64 `json:"milestone"`
-		//Labels []int64 `json:"labels"`
-		//Closed bool    `json:"closed"`
-	})
-
-	if err != nil {
-		log.Fatal(err)
 	}
 
-	print.IssueDetails(issue)
+	return task.CreateIssue(
-	fmt.Println(issue.HTMLURL)
+		login,
-	return nil
+		owner,
+		repo,
+		ctx.String("title"),
+		ctx.String("body"),
+	)
 }

modules/interact/issue_create.go

@@ -0,0 +1,43 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package interact
+
+import (
+	"code.gitea.io/tea/modules/config"
+	"code.gitea.io/tea/modules/task"
+
+	"github.com/AlecAivazis/survey/v2"
+)
+
+// CreateIssue interactively creates a PR
+func CreateIssue(login *config.Login, owner, repo string) error {
+	var title, description string
+
+	// owner, repo
+	owner, repo, err := promptRepoSlug(owner, repo)
+	if err != nil {
+		return err
+	}
+
+	// title
+	promptOpts := survey.WithValidator(survey.Required)
+	promptI := &survey.Input{Message: "Issue title:"}
+	if err := survey.AskOne(promptI, &title, promptOpts); err != nil {
+		return err
+	}
+
+	// description
+	promptM := &survey.Multiline{Message: "Issue description:"}
+	if err := survey.AskOne(promptM, &description); err != nil {
+		return err
+	}
+
+	return task.CreateIssue(
+		login,
+		owner,
+		repo,
+		title,
+		description)
+}

modules/interact/prompts.go

@@ -5,6 +5,9 @@
 package interact
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/AlecAivazis/survey/v2"
 )
 
@@ -14,3 +17,43 @@ func PromptPassword(name string) (pass string, err error) {
 	err = survey.AskOne(promptPW, &pass, survey.WithValidator(survey.Required))
 	return
 }
+
+// promptRepoSlug interactively prompts for a Gitea repository or returns the current one
+func promptRepoSlug(defaultOwner, defaultRepo string) (owner, repo string, err error) {
+	prompt := "Target repo:"
+	required := true
+	if len(defaultOwner) != 0 && len(defaultRepo) != 0 {
+		prompt = fmt.Sprintf("Target repo [%s/%s]:", defaultOwner, defaultRepo)
+		required = false
+	}
+	var repoSlug string
+
+	owner = defaultOwner
+	repo = defaultRepo
+
+	err = survey.AskOne(
+		&survey.Input{Message: prompt},
+		&repoSlug,
+		survey.WithValidator(func(input interface{}) error {
+			if str, ok := input.(string); ok {
+				if !required && len(str) == 0 {
+					return nil
+				}
+				split := strings.Split(str, "/")
+				if len(split) != 2 || len(split[0]) == 0 || len(split[1]) == 0 {
+					return fmt.Errorf("must follow the <owner>/<repo> syntax")
+				}
+			} else {
+				return fmt.Errorf("invalid result type")
+			}
+			return nil
+		}),
+	)
+
+	if err == nil && len(repoSlug) != 0 {
+		repoSlugSplit := strings.Split(repoSlug, "/")
+		owner = repoSlugSplit[0]
+		repo = repoSlugSplit[1]
+	}
+	return
+}

modules/interact/pull_create.go

@@ -5,9 +5,6 @@
 package interact
 
 import (
-	"fmt"
-	"strings"
-
 	"code.gitea.io/tea/modules/config"
 	"code.gitea.io/tea/modules/git"
 	"code.gitea.io/tea/modules/task"
@@ -92,42 +89,3 @@ func CreatePull(login *config.Login, owner, repo string) error {
 		title,
 		description)
 }
-
-func promptRepoSlug(defaultOwner, defaultRepo string) (owner, repo string, err error) {
-	prompt := "Target repo:"
-	required := true
-	if len(defaultOwner) != 0 && len(defaultRepo) != 0 {
-		prompt = fmt.Sprintf("Target repo [%s/%s]:", defaultOwner, defaultRepo)
-		required = false
-	}
-	var repoSlug string
-
-	owner = defaultOwner
-	repo = defaultRepo
-
-	err = survey.AskOne(
-		&survey.Input{Message: prompt},
-		&repoSlug,
-		survey.WithValidator(func(input interface{}) error {
-			if str, ok := input.(string); ok {
-				if !required && len(str) == 0 {
-					return nil
-				}
-				split := strings.Split(str, "/")
-				if len(split) != 2 || len(split[0]) == 0 || len(split[1]) == 0 {
-					return fmt.Errorf("must follow the <owner>/<repo> syntax")
-				}
-			} else {
-				return fmt.Errorf("invalid result type")
-			}
-			return nil
-		}),
-	)
-
-	if err == nil && len(repoSlug) != 0 {
-		repoSlugSplit := strings.Split(repoSlug, "/")
-		owner = repoSlugSplit[0]
-		repo = repoSlugSplit[1]
-	}
-	return
-}

modules/task/issue_create.go

@@ -0,0 +1,45 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package task
+
+import (
+	"fmt"
+	"log"
+
+	"code.gitea.io/sdk/gitea"
+	"code.gitea.io/tea/modules/config"
+	"code.gitea.io/tea/modules/print"
+)
+
+// CreateIssue creates a PR in the given repo and prints the result
+func CreateIssue(login *config.Login, repoOwner, repoName, title, description string) error {
+
+	// title is required
+	if len(title) == 0 {
+		return fmt.Errorf("Title is required")
+	}
+
+	issue, _, err := login.Client().CreateIssue(repoOwner, repoName, gitea.CreateIssueOption{
+		Title: title,
+		Body:  description,
+		// TODO:
+		//Assignee  string   `json:"assignee"`
+		//Assignees []string `json:"assignees"`
+		//Deadline *time.Time `json:"due_date"`
+		//Milestone int64 `json:"milestone"`
+		//Labels []int64 `json:"labels"`
+		//Closed bool    `json:"closed"`
+	})
+
+	if err != nil {
+		log.Fatalf("could not create issue: %s", err)
+	}
+
+	print.IssueDetails(issue)
+
+	fmt.Println(issue.HTMLURL)
+
+	return err
+}