thor/jira
1
0
Fork 0
mirror of https://github.com/Threnklyn/jira.git synced 2026-06-07 21:43:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

add issue to cmd options

Browse Source
This commit is contained in:
Cory Bennett
2017-08-19 15:09:01 -07:00
parent f0b08c5869
commit 47a5ce25bc
3 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jiracli/edit.go
+16 -11
View File
@@ -13,10 +13,10 @@ type EditOptions struct {
jiradata.IssueUpdate
jira.SearchOptions
Overrides map[string]string
Issue string
}
func (jc *JiraCli) CmdEditRegistry() *CommandRegistryEntry {
issue := ""
opts := EditOptions{
GlobalOptions: GlobalOptions{
Template: "edit",
@@ -27,15 +27,15 @@ func (jc *JiraCli) CmdEditRegistry() *CommandRegistryEntry {
return &CommandRegistryEntry{
"Edit issue details",
func() error {
return jc.CmdEdit(issue, &opts)
return jc.CmdEdit(&opts)
},
func(cmd *kingpin.CmdClause) error {
return jc.CmdEditUsage(cmd, &issue, &opts)
return jc.CmdEditUsage(cmd, &opts)
},
}
}
func (jc *JiraCli) CmdEditUsage(cmd *kingpin.CmdClause, issue *string, opts *EditOptions) error {
func (jc *JiraCli) CmdEditUsage(cmd *kingpin.CmdClause, opts *EditOptions) error {
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
@@ -56,23 +56,23 @@ func (jc *JiraCli) CmdEditUsage(cmd *kingpin.CmdClause, issue *string, opts *Edi
return nil
}).String()
cmd.Flag("override", "Set issue property").Short('o').StringMapVar(&opts.Overrides)
cmd.Arg("ISSUE", "issue id to edit").StringVar(issue)
cmd.Arg("ISSUE", "issue id to edit").StringVar(&opts.Issue)
return nil
}
// Edit will get issue data and send to "edit" template
func (jc *JiraCli) CmdEdit(issue string, opts *EditOptions) error {
func (jc *JiraCli) CmdEdit(opts *EditOptions) error {
type templateInput struct {
*jiradata.Issue `yaml:",inline"`
Meta *jiradata.EditMeta `yaml:"meta" json:"meta"`
Overrides map[string]string `yaml:"overrides" json:"overrides"`
}
if issue != "" {
issueData, err := jc.GetIssue(issue, nil)
if opts.Issue != "" {
issueData, err := jc.GetIssue(opts.Issue, nil)
if err != nil {
return err
}
editMeta, err := jc.GetIssueEditMeta(issue)
editMeta, err := jc.GetIssueEditMeta(opts.Issue)
if err != nil {
return err
}
@@ -83,9 +83,14 @@ func (jc *JiraCli) CmdEdit(issue string, opts *EditOptions) error {
Meta: editMeta,
Overrides: opts.Overrides,
}
return jc.editLoop(&opts.GlobalOptions, &input, &issueUpdate, func() error {
return jc.EditIssue(issue, &issueUpdate)
err = jc.editLoop(&opts.GlobalOptions, &input, &issueUpdate, func() error {
return jc.EditIssue(opts.Issue, &issueUpdate)
})
if err != nil {
return err
}
fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, jc.Endpoint, opts.Issue)
// FIXME implement browse
}
results, err := jc.Search(opts)
jiracli/worklogAdd.go
+7 -7
View File
@@ -8,10 +8,10 @@ import (
type WorklogAddOptions struct {
GlobalOptions
jiradata.Worklog
Issue string
}
func (jc *JiraCli) CmdWorklogAddRegistry() *CommandRegistryEntry {
issue := ""
opts := WorklogAddOptions{
GlobalOptions: GlobalOptions{
Template: "worklog",
@@ -20,15 +20,15 @@ func (jc *JiraCli) CmdWorklogAddRegistry() *CommandRegistryEntry {
return &CommandRegistryEntry{
"Add a worklog to an issue",
func() error {
return jc.CmdWorklogAdd(issue, &opts)
return jc.CmdWorklogAdd(&opts)
},
func(cmd *kingpin.CmdClause) error {
return jc.CmdWorklogAddUsage(cmd, &issue, &opts)
return jc.CmdWorklogAddUsage(cmd, &opts)
},
}
}
func (jc *JiraCli) CmdWorklogAddUsage(cmd *kingpin.CmdClause, issue *string, opts *WorklogAddOptions) error {
func (jc *JiraCli) CmdWorklogAddUsage(cmd *kingpin.CmdClause, opts *WorklogAddOptions) error {
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
@@ -37,16 +37,16 @@ func (jc *JiraCli) CmdWorklogAddUsage(cmd *kingpin.CmdClause, issue *string, opt
cmd.Flag("noedit", "Disable opening the editor").BoolVar(&opts.SkipEditing)
cmd.Flag("comment", "Comment message for worklog").Short('m').StringVar(&opts.Comment)
cmd.Flag("time-spent", "Time spent working on issue").Short('T').StringVar(&opts.TimeSpent)
cmd.Arg("ISSUE", "issue id to fetch worklogs").Required().StringVar(issue)
cmd.Arg("ISSUE", "issue id to fetch worklogs").Required().StringVar(&opts.Issue)
return nil
}
// CmdWorklogAdd will attempt to add (action=add) a worklog to the given issue.
// It will spawn the editor (unless --noedit isused) and post edited YAML
// content as JSON to the worklog endpoint
func (jc *JiraCli) CmdWorklogAdd(issue string, opts *WorklogAddOptions) error {
func (jc *JiraCli) CmdWorklogAdd(opts *WorklogAddOptions) error {
return jc.editLoop(&opts.GlobalOptions, &opts.Worklog, &opts.Worklog, func() error {
_, err := jc.AddIssueWorklog(issue, opts)
_, err := jc.AddIssueWorklog(opts.Issue, opts)
return err
})
}
jiracli/worklogList.go
+17 -11
View File
@@ -2,34 +2,40 @@ package jiracli
import kingpin "gopkg.in/alecthomas/kingpin.v2"
type WorklogListOptions struct {
GlobalOptions
Issue string
}
func (jc *JiraCli) CmdWorklogListRegistry() *CommandRegistryEntry {
issue := ""
opts := GlobalOptions{
Template: "worklogs",
opts := WorklogListOptions{
GlobalOptions: GlobalOptions{
Template: "worklogs",
},
}
return &CommandRegistryEntry{
"Prints the worklog data for given issue",
func() error {
return jc.CmdWorklogList(issue, &opts)
return jc.CmdWorklogList(&opts)
},
func(cmd *kingpin.CmdClause) error {
return jc.CmdWorklogListUsage(cmd, &issue, &opts)
return jc.CmdWorklogListUsage(cmd, &opts)
},
}
}
func (jc *JiraCli) CmdWorklogListUsage(cmd *kingpin.CmdClause, issue *string, opts *GlobalOptions) error {
if err := jc.GlobalUsage(cmd, opts); err != nil {
func (jc *JiraCli) CmdWorklogListUsage(cmd *kingpin.CmdClause, opts *WorklogListOptions) error {
if err := jc.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jc.TemplateUsage(cmd, opts)
cmd.Arg("ISSUE", "issue id to fetch worklogs").Required().StringVar(issue)
jc.TemplateUsage(cmd, &opts.GlobalOptions)
cmd.Arg("ISSUE", "issue id to fetch worklogs").Required().StringVar(&opts.Issue)
return nil
}
// // CmdWorklogList will get worklog data for given issue and sent to the "worklogs" template
func (jc *JiraCli) CmdWorklogList(issue string, opts *GlobalOptions) error {
data, err := jc.GetIssueWorklog(issue)
func (jc *JiraCli) CmdWorklogList(opts *WorklogListOptions) error {
data, err := jc.GetIssueWorklog(opts.Issue)
if err != nil {
return err
}