thor/jira
1
0
Fork 0
mirror of https://github.com/Threnklyn/jira.git synced 2026-05-18 20:23:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

add --browse option to more commands

Browse Source
This commit is contained in:
Cory Bennett
2017-08-24 12:39:11 -07:00
parent 89e3306254
commit 5d6170a81a
14 changed files with 84 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jiracli/commands.go
-1
View File
@@ -1 +0,0 @@
package jiracli
jiracli/editmeta.go
+26 -12
View File
@@ -2,37 +2,51 @@ package jiracli
import kingpin "gopkg.in/alecthomas/kingpin.v2"
type EditMetaOptions struct {
GlobalOptions
Issue string
}
func (jc *JiraCli) CmdEditMetaRegistry() *CommandRegistryEntry {
issue := ""
opts := GlobalOptions{
Template: "editmeta",
opts := EditMetaOptions{
GlobalOptions: GlobalOptions{
Template: "editmeta",
},
}
return &CommandRegistryEntry{
"View 'edit' metadata",
func() error {
return jc.CmdEditMeta(issue, &opts)
return jc.CmdEditMeta(&opts)
},
func(cmd *kingpin.CmdClause) error {
return jc.CmdEditMetaUsage(cmd, &issue, &opts)
return jc.CmdEditMetaUsage(cmd, &opts)
},
}
}
func (jc *JiraCli) CmdEditMetaUsage(cmd *kingpin.CmdClause, issue *string, opts *GlobalOptions) error {
if err := jc.GlobalUsage(cmd, opts); err != nil {
func (jc *JiraCli) CmdEditMetaUsage(cmd *kingpin.CmdClause, opts *EditMetaOptions) error {
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.TemplateUsage(cmd, opts)
cmd.Arg("ISSUE", "edit metadata for issue id").Required().StringVar(issue)
jc.BrowseUsage(cmd, &opts.GlobalOptions)
jc.TemplateUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "edit metadata for issue id").Required().StringVar(&opts.Issue)
return nil
}
// EditMeta will get issue edit metadata and send to "editmeta" template
func (jc *JiraCli) CmdEditMeta(issue string, opts *GlobalOptions) error {
editMeta, err := jc.GetIssueEditMeta(issue)
func (jc *JiraCli) CmdEditMeta(opts *EditMetaOptions) error {
editMeta, err := jc.GetIssueEditMeta(opts.Issue)
if err != nil {
return err
}
return jc.runTemplate(opts.Template, editMeta, nil)
if err := jc.runTemplate(opts.Template, editMeta, nil); err != nil {
return err
}
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
}
return nil
}
jiracli/labelsAdd.go
+5 -2
View File
@@ -30,6 +30,7 @@ func (jc *JiraCli) CmdLabelsAddUsage(cmd *kingpin.CmdClause, opts *LabelsAddOpti
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "issue id to modify labels").Required().StringVar(&opts.Issue)
cmd.Arg("LABEL", "label to add to issue").Required().StringsVar(&opts.Labels)
return nil
@@ -49,10 +50,12 @@ func (jc *JiraCli) CmdLabelsAdd(opts *LabelsAddOptions) error {
},
}
err := jc.EditIssue(opts.Issue, &issueUpdate)
if err != nil {
if err := jc.EditIssue(opts.Issue, &issueUpdate); err != nil {
return err
}
fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, jc.Endpoint, opts.Issue)
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
}
return nil
}
jiracli/labelsRemove.go
+4
View File
@@ -30,6 +30,7 @@ func (jc *JiraCli) CmdLabelsRemoveUsage(cmd *kingpin.CmdClause, opts *LabelsRemo
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "issue id to modify labels").Required().StringVar(&opts.Issue)
cmd.Arg("LABEL", "label to remove from issue").Required().StringsVar(&opts.Labels)
return nil
@@ -54,5 +55,8 @@ func (jc *JiraCli) CmdLabelsRemove(opts *LabelsRemoveOptions) error {
return err
}
fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, jc.Endpoint, opts.Issue)
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
}
return nil
}
jiracli/labelsSet.go
+5 -2
View File
@@ -30,6 +30,7 @@ func (jc *JiraCli) CmdLabelsSetUsage(cmd *kingpin.CmdClause, opts *LabelsSetOpti
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "issue id to modify labels").Required().StringVar(&opts.Issue)
cmd.Arg("LABEL", "label to set on issue").Required().StringsVar(&opts.Labels)
return nil
@@ -47,10 +48,12 @@ func (jc *JiraCli) CmdLabelsSet(opts *LabelsSetOptions) error {
},
}
err := jc.EditIssue(opts.Issue, &issueUpdate)
if err != nil {
if err := jc.EditIssue(opts.Issue, &issueUpdate); err != nil {
return err
}
fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, jc.Endpoint, opts.Issue)
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
}
return nil
}
jiracli/list.go
+1 -1
View File
@@ -15,7 +15,7 @@ func (jc *JiraCli) CmdListRegistry() *CommandRegistryEntry {
GlobalOptions: GlobalOptions{
Template: "list",
},
SearchOptions: SearchOptions{
SearchOptions: jira.SearchOptions{
MaxResults: 500,
QueryFields: "assignee,created,priority,reporter,status,summary,updated",
Sort: "priority asc, key",
jiracli/login.go
-43
View File
@@ -61,46 +61,3 @@ func (jc *JiraCli) CmdLogin(opts *GlobalOptions) error {
}
return nil
}
// uri := fmt.Sprintf("%s/rest/auth/1/session", c.endpoint)
// for {
// req, _ := http.NewRequest("GET", uri, nil)
// user, _ := c.opts["user"].(string)
// passwd := c.GetPass(user)
// req.SetBasicAuth(user, passwd)
// resp, err := c.makeRequest(req)
// if err != nil {
// return err
// }
// if resp.StatusCode == 403 {
// // probably got this, need to redirect the user to login manually
// // X-Authentication-Denied-Reason: CAPTCHA_CHALLENGE; login-url=https://jira/login.jsp
// if reason := resp.Header.Get("X-Authentication-Denied-Reason"); reason != "" {
// err := fmt.Errorf("Authenticaion Failed: %s", reason)
// log.Errorf("%s", err)
// return err
// }
// err := fmt.Errorf("Authentication Failed: Unknown Reason")
// log.Errorf("%s", err)
// return err
// } else if resp.StatusCode == 200 {
// // https://confluence.atlassian.com/display/JIRA043/JIRA+REST+API+%28Alpha%29+Tutorial#JIRARESTAPI%28Alpha%29Tutorial-CAPTCHAs
// // probably bad password, try again
// if reason := resp.Header.Get("X-Seraph-Loginreason"); reason == "AUTHENTICATION_DENIED" {
// log.Warning("Authentication Failed: %s", reason)
// continue
// }
// if _, ok := c.opts["password-source"]; ok {
// return c.SetPass(user, passwd)
// }
// break
// } else {
// log.Warning("Login failed")
// continue
// }
// }
// return nil
// }
jiracli/subtask.go
+1 -1
View File
@@ -105,7 +105,7 @@ func (jc *JiraCli) CmdSubtask(opts *SubtaskOptions) error {
fmt.Printf("OK %s %s/browse/%s\n", issueResp.Key, jc.Endpoint, issueResp.Key)
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, issueResp.Key})
}
return nil
}
jiracli/take.go
+1
View File
@@ -21,6 +21,7 @@ func (jc *JiraCli) CmdTakeUsage(cmd *kingpin.CmdClause, opts *AssignOptions) err
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "issue to assign").Required().StringVar(&opts.Issue)
return nil
}
jiracli/transitions.go
+8 -1
View File
@@ -29,6 +29,7 @@ func (jc *JiraCli) CmdTransitionsUsage(cmd *kingpin.CmdClause, opts *Transitions
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
jc.TemplateUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "issue to list valid transitions").Required().StringVar(&opts.Issue)
return nil
@@ -40,5 +41,11 @@ func (jc *JiraCli) CmdTransitions(opts *TransitionsOptions) error {
if err != nil {
return err
}
return jc.runTemplate(opts.Template, editMeta, nil)
if err := jc.runTemplate(opts.Template, editMeta, nil); err != nil {
return err
}
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
}
return nil
}
jiracli/unassign.go
+1
View File
@@ -20,6 +20,7 @@ func (jc *JiraCli) CmdUnassignUsage(cmd *kingpin.CmdClause, opts *AssignOptions)
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "issue to unassign").Required().StringVar(&opts.Issue)
return nil
}
jiracli/view.go
+15 -8
View File
@@ -8,10 +8,10 @@ import (
type ViewOptions struct {
GlobalOptions
jira.IssueOptions
Issue string
}
func (jc *JiraCli) CmdViewRegistry() *CommandRegistryEntry {
issue := ""
opts := ViewOptions{
GlobalOptions: GlobalOptions{
Template: "view",
@@ -21,31 +21,38 @@ func (jc *JiraCli) CmdViewRegistry() *CommandRegistryEntry {
return &CommandRegistryEntry{
"Prints issue details",
func() error {
return jc.CmdView(issue, &opts)
return jc.CmdView(&opts)
},
func(cmd *kingpin.CmdClause) error {
return jc.CmdViewUsage(cmd, &issue, &opts)
return jc.CmdViewUsage(cmd, &opts)
},
}
}
func (jc *JiraCli) CmdViewUsage(cmd *kingpin.CmdClause, issue *string, opts *ViewOptions) error {
func (jc *JiraCli) CmdViewUsage(cmd *kingpin.CmdClause, opts *ViewOptions) error {
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
jc.TemplateUsage(cmd, &opts.GlobalOptions)
cmd.Flag("expand", "field to expand for the issue").StringsVar(&opts.Expand)
cmd.Flag("field", "field to return for the issue").StringsVar(&opts.Fields)
cmd.Flag("property", "property to return for issue").StringsVar(&opts.Properties)
cmd.Arg("ISSUE", "issue id to view").Required().StringVar(issue)
cmd.Arg("ISSUE", "issue id to view").Required().StringVar(&opts.Issue)
return nil
}
// View will get issue data and send to "view" template
func (jc *JiraCli) CmdView(issue string, opts *ViewOptions) error {
data, err := jc.GetIssue(issue, opts)
func (jc *JiraCli) CmdView(opts *ViewOptions) error {
data, err := jc.GetIssue(opts.Issue, opts)
if err != nil {
return err
}
return jc.runTemplate(opts.Template, data, nil)
if err := jc.runTemplate(opts.Template, data, nil); err != nil {
return err
}
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
}
return nil
}
jiracli/worklogAdd.go
+9 -1
View File
@@ -32,6 +32,7 @@ func (jc *JiraCli) CmdWorklogAddUsage(cmd *kingpin.CmdClause, opts *WorklogAddOp
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
jc.EditorUsage(cmd, &opts.GlobalOptions)
jc.TemplateUsage(cmd, &opts.GlobalOptions)
cmd.Flag("noedit", "Disable opening the editor").BoolVar(&opts.SkipEditing)
@@ -45,8 +46,15 @@ func (jc *JiraCli) CmdWorklogAddUsage(cmd *kingpin.CmdClause, opts *WorklogAddOp
// It will spawn the editor (unless --noedit isused) and post edited YAML
// content as JSON to the worklog endpoint
func (jc *JiraCli) CmdWorklogAdd(opts *WorklogAddOptions) error {
return jc.editLoop(&opts.GlobalOptions, &opts.Worklog, &opts.Worklog, func() error {
err := jc.editLoop(&opts.GlobalOptions, &opts.Worklog, &opts.Worklog, func() error {
_, err := jc.AddIssueWorklog(opts.Issue, opts)
return err
})
if err != nil {
return err
}
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
}
return nil
}
jiracli/worklogList.go
+8 -1
View File
@@ -28,6 +28,7 @@ func (jc *JiraCli) CmdWorklogListUsage(cmd *kingpin.CmdClause, opts *WorklogList
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.BrowseUsage(cmd, &opts.GlobalOptions)
jc.TemplateUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "issue id to fetch worklogs").Required().StringVar(&opts.Issue)
return nil
@@ -39,5 +40,11 @@ func (jc *JiraCli) CmdWorklogList(opts *WorklogListOptions) error {
if err != nil {
return err
}
return jc.runTemplate(opts.Template, data, nil)
if err := jc.runTemplate(opts.Template, data, nil); err != nil {
return err
}
if opts.Browse {
return jc.CmdBrowse(&BrowseOptions{opts.GlobalOptions, opts.Issue})
}
return nil
}