refactor for GlobalOptions and CommonOptions

This commit is contained in:
Cory Bennett
2017-09-02 14:05:27 -07:00
parent 65891e7b3b
commit 979da1f3a5
37 changed files with 544 additions and 647 deletions
+11 -14
View File
@@ -12,45 +12,42 @@ import (
)
type IssueTypesOptions struct {
jiracli.GlobalOptions `yaml:",inline" json:",inline" figtree:",inline"`
Project string `yaml:"project,omitempty" json:"project,omitempty"`
jiracli.CommonOptions `yaml:",inline" json:",inline" figtree:",inline"`
Project string `yaml:"project,omitempty" json:"project,omitempty"`
}
func CmdIssueTypesRegistry(fig *figtree.FigTree, o *oreo.Client) *jiracli.CommandRegistryEntry {
func CmdIssueTypesRegistry(o *oreo.Client) *jiracli.CommandRegistryEntry {
opts := IssueTypesOptions{
GlobalOptions: jiracli.GlobalOptions{
CommonOptions: jiracli.CommonOptions{
Template: figtree.NewStringOption("issuetypes"),
},
}
return &jiracli.CommandRegistryEntry{
"Show issue types for a project",
func() error {
return CmdIssueTypes(o, &opts)
},
func(cmd *kingpin.CmdClause) error {
func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
jiracli.LoadConfigs(cmd, fig, &opts)
return CmdIssueTypesUsage(cmd, &opts)
},
func(globals *jiracli.GlobalOptions) error {
return CmdIssueTypes(o, globals, &opts)
},
}
}
func CmdIssueTypesUsage(cmd *kingpin.CmdClause, opts *IssueTypesOptions) error {
if err := jiracli.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
return err
}
jiracli.TemplateUsage(cmd, &opts.GlobalOptions)
jiracli.TemplateUsage(cmd, &opts.CommonOptions)
cmd.Flag("project", "project to list issueTypes").Short('p').StringVar(&opts.Project)
return nil
}
// CmdIssueTypes will get available issueTypes for project and send to the "issueTypes" template
func CmdIssueTypes(o *oreo.Client, opts *IssueTypesOptions) error {
func CmdIssueTypes(o *oreo.Client, globals *jiracli.GlobalOptions, opts *IssueTypesOptions) error {
if opts.Project == "" {
return fmt.Errorf("Project Required.")
}
data, err := jira.GetIssueCreateMetaProject(o, opts.Endpoint.Value, opts.Project)
data, err := jira.GetIssueCreateMetaProject(o, globals.Endpoint.Value, opts.Project)
if err != nil {
return err
}