move commands from jiracli package to jiracmd package

jiracli/cli.go

@@ -187,7 +187,7 @@ func (o *GlobalOptions) editFile(fileName string) (changes bool, err error) {
 	return false, err
 }
 
-func editLoop(opts *GlobalOptions, input interface{}, output interface{}, submit func() error) error {
+func EditLoop(opts *GlobalOptions, input interface{}, output interface{}, submit func() error) error {
 	tmpFile, err := tmpTemplate(opts.Template.Value, input)
 	if err != nil {
 		return err

jiracli/error.go

@@ -6,7 +6,7 @@ type Error struct {
 	error
 }
 
-func cliError(cause error) error {
+func CliError(cause error) error {
 	return &Error{
 		errors.WithStack(cause),
 	}

jiracli/templates.go

@@ -44,7 +44,7 @@ func getTemplate(name string) (string, error) {
 	} else if b != nil {
 		return string(b), nil
 	}
-	if s, ok := allTemplates[name]; ok {
+	if s, ok := AllTemplates[name]; ok {
 		return s, nil
 	}
 	return "", fmt.Errorf("No Template found for %q", name)
@@ -56,7 +56,7 @@ func tmpTemplate(templateName string, data interface{}) (string, error) {
 		return "", err
 	}
 	defer tmpFile.Close()
-	return tmpFile.Name(), runTemplate(templateName, data, tmpFile)
+	return tmpFile.Name(), RunTemplate(templateName, data, tmpFile)
 }
 
 func TemplateProcessor() *template.Template {
@@ -155,7 +155,7 @@ func TemplateProcessor() *template.Template {
 	return template.New("gojira").Funcs(funcs)
 }
 
-func runTemplate(templateName string, data interface{}, out io.Writer) error {
+func RunTemplate(templateName string, data interface{}, out io.Writer) error {
 
 	templateContent, err := getTemplate(templateName)
 	if err != nil {
@@ -194,7 +194,7 @@ func runTemplate(templateName string, data interface{}, out io.Writer) error {
 	return nil
 }
 
-var allTemplates = map[string]string{
+var AllTemplates = map[string]string{
 	"component-add":  defaultComponentAddTemplate,
 	"debug":          defaultDebugTemplate,
 	"fields":         defaultDebugTemplate,

jiracli/util.go

@@ -50,7 +50,7 @@ func tmpYml(tmpFilePrefix string) (*os.File, error) {
 	return os.OpenFile(newFileName, os.O_RDWR|os.O_EXCL, 0600)
 }
 
-func flagValue(ctx *kingpin.ParseContext, name string) string {
+func FlagValue(ctx *kingpin.ParseContext, name string) string {
 	for _, elem := range ctx.Elements {
 		if flag, ok := elem.Clause.(*kingpin.FlagClause); ok {
 			if flag.Model().Name == name {

jiracli/assign.go → jiracmd/assign.go

@@ -1,43 +1,44 @@
-package jiracli
+package jiracmd
 
 import (
 	"fmt"
 
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
 
-	jira "gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 type AssignOptions struct {
-	GlobalOptions `yaml:",inline" json:",inline" figtree:",inline"`
+	jiracli.GlobalOptions `yaml:",inline" json:",inline" figtree:",inline"`
 	Issue         string `yaml:"issue,omitempty" json:"issue,omitempty"`
 	Assignee      string `yaml:"assignee,omitempty" json:"assignee,omitempty"`
 }
 
-func CmdAssignRegistry(fig *figtree.FigTree, o *oreo.Client) *CommandRegistryEntry {
+func CmdAssignRegistry(fig *figtree.FigTree, o *oreo.Client) *jiracli.CommandRegistryEntry {
 	opts := AssignOptions{}
 
-	return &CommandRegistryEntry{
+	return &jiracli.CommandRegistryEntry{
 		"Assign user to issue",
 		func() error {
 			return CmdAssign(o, &opts)
 		},
 		func(cmd *kingpin.CmdClause) error {
-			LoadConfigs(cmd, fig, &opts)
+			jiracli.LoadConfigs(cmd, fig, &opts)
 			return CmdAssignUsage(cmd, &opts)
 		},
 	}
 }
 
 func CmdAssignUsage(cmd *kingpin.CmdClause, opts *AssignOptions) error {
-	if err := GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
+	if err := jiracli.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
 		return err
 	}
-	BrowseUsage(cmd, &opts.GlobalOptions)
+	jiracli.BrowseUsage(cmd, &opts.GlobalOptions)
 	cmd.Flag("default", "use default user for assignee").PreAction(func(ctx *kingpin.ParseContext) error {
-		if flagValue(ctx, "default") == "true" {
+		if jiracli.FlagValue(ctx, "default") == "true" {
 			opts.Assignee = "-1"
 		}
 		return nil

jiracli/block.go → jiracmd/block.go

@@ -1,24 +1,25 @@
-package jiracli
+package jiracmd
 
 import (
 	"fmt"
 
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
 
-	jira "gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
 	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 type BlockOptions struct {
-	GlobalOptions             `yaml:",inline" json:",inline" figtree:",inline"`
+	jiracli.GlobalOptions             `yaml:",inline" json:",inline" figtree:",inline"`
 	jiradata.LinkIssueRequest `yaml:",inline" json:",inline" figtree:",inline"`
 }
 
-func CmdBlockRegistry(fig *figtree.FigTree, o *oreo.Client) *CommandRegistryEntry {
+func CmdBlockRegistry(fig *figtree.FigTree, o *oreo.Client) *jiracli.CommandRegistryEntry {
 	opts := BlockOptions{
-		GlobalOptions: GlobalOptions{
+		GlobalOptions: jiracli.GlobalOptions{
 			Template: figtree.NewStringOption("edit"),
 		},
 		LinkIssueRequest: jiradata.LinkIssueRequest{
@@ -30,28 +31,28 @@ func CmdBlockRegistry(fig *figtree.FigTree, o *oreo.Client) *CommandRegistryEntr
 		},
 	}
 
-	return &CommandRegistryEntry{
+	return &jiracli.CommandRegistryEntry{
 		"Mark issues as blocker",
 		func() error {
 			return CmdBlock(o, &opts)
 		},
 		func(cmd *kingpin.CmdClause) error {
-			LoadConfigs(cmd, fig, &opts)
+			jiracli.LoadConfigs(cmd, fig, &opts)
 			return CmdBlockUsage(cmd, &opts)
 		},
 	}
 }
 
 func CmdBlockUsage(cmd *kingpin.CmdClause, opts *BlockOptions) error {
-	if err := GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
+	if err := jiracli.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
 		return err
 	}
-	BrowseUsage(cmd, &opts.GlobalOptions)
-	EditorUsage(cmd, &opts.GlobalOptions)
-	TemplateUsage(cmd, &opts.GlobalOptions)
+	jiracli.BrowseUsage(cmd, &opts.GlobalOptions)
+	jiracli.EditorUsage(cmd, &opts.GlobalOptions)
+	jiracli.TemplateUsage(cmd, &opts.GlobalOptions)
 	cmd.Flag("comment", "Comment message when marking issue as blocker").Short('m').PreAction(func(ctx *kingpin.ParseContext) error {
 		opts.Comment = &jiradata.Comment{
-			Body: flagValue(ctx, "comment"),
+			Body: jiracli.FlagValue(ctx, "comment"),
 		}
 		return nil
 	}).String()

jiracli/browse.go → jiracmd/browse.go

@@ -1,35 +1,36 @@
-package jiracli
+package jiracmd
 
 import (
 	"fmt"
 
 	"github.com/coryb/figtree"
 	"github.com/pkg/browser"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 type BrowseOptions struct {
-	GlobalOptions `yaml:",inline" json:",inline" figtree:",inline"`
-	Issue         string `yaml:"issue,omitempty" json:"issue,omitempty"`
+	jiracli.GlobalOptions `yaml:",inline" json:",inline" figtree:",inline"`
+	Issue                 string `yaml:"issue,omitempty" json:"issue,omitempty"`
 }
 
-func CmdBrowseRegistry(fig *figtree.FigTree) *CommandRegistryEntry {
+func CmdBrowseRegistry(fig *figtree.FigTree) *jiracli.CommandRegistryEntry {
 	opts := BrowseOptions{}
 
-	return &CommandRegistryEntry{
+	return &jiracli.CommandRegistryEntry{
 		"Open issue in browser",
 		func() error {
 			return CmdBrowse(&opts)
 		},
 		func(cmd *kingpin.CmdClause) error {
-			LoadConfigs(cmd, fig, &opts)
+			jiracli.LoadConfigs(cmd, fig, &opts)
 			return CmdBrowseUsage(cmd, &opts)
 		},
 	}
 }
 
 func CmdBrowseUsage(cmd *kingpin.CmdClause, opts *BrowseOptions) error {
-	if err := GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
+	if err := jiracli.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
 		return err
 	}
 	cmd.Arg("ISSUE", "Issue to browse to").Required().StringVar(&opts.Issue)

jiracli/comment.go → jiracmd/comment.go

@@ -1,51 +1,52 @@
-package jiracli
+package jiracmd
 
 import (
 	"fmt"
 
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
 
-	jira "gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
 	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 type CommentOptions struct {
-	GlobalOptions `yaml:",inline" json:",inline" figtree:",inline"`
+	jiracli.GlobalOptions `yaml:",inline" json:",inline" figtree:",inline"`
 	Overrides     map[string]string `yaml:"overrides,omitempty" json:"overrides,omitempty"`
 	Issue         string            `yaml:"issue,omitempty" json:"issue,omitempty"`
 }
 
-func CmdCommentRegistry(fig *figtree.FigTree, o *oreo.Client) *CommandRegistryEntry {
+func CmdCommentRegistry(fig *figtree.FigTree, o *oreo.Client) *jiracli.CommandRegistryEntry {
 	opts := CommentOptions{
-		GlobalOptions: GlobalOptions{
+		GlobalOptions: jiracli.GlobalOptions{
 			Template: figtree.NewStringOption("comment"),
 		},
 		Overrides: map[string]string{},
 	}
 
-	return &CommandRegistryEntry{
+	return &jiracli.CommandRegistryEntry{
 		"Add comment to issue",
 		func() error {
 			return CmdComment(o, &opts)
 		},
 		func(cmd *kingpin.CmdClause) error {
-			LoadConfigs(cmd, fig, &opts)
+			jiracli.LoadConfigs(cmd, fig, &opts)
 			return CmdCommentUsage(cmd, &opts)
 		},
 	}
 }
 
 func CmdCommentUsage(cmd *kingpin.CmdClause, opts *CommentOptions) error {
-	if err := GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
+	if err := jiracli.GlobalUsage(cmd, &opts.GlobalOptions); err != nil {
 		return err
 	}
-	BrowseUsage(cmd, &opts.GlobalOptions)
-	EditorUsage(cmd, &opts.GlobalOptions)
-	TemplateUsage(cmd, &opts.GlobalOptions)
+	jiracli.BrowseUsage(cmd, &opts.GlobalOptions)
+	jiracli.EditorUsage(cmd, &opts.GlobalOptions)
+	jiracli.TemplateUsage(cmd, &opts.GlobalOptions)
 	cmd.Flag("comment", "Comment message for issue").Short('m').PreAction(func(ctx *kingpin.ParseContext) error {
-		opts.Overrides["comment"] = flagValue(ctx, "comment")
+		opts.Overrides["comment"] = jiracli.FlagValue(ctx, "comment")
 		return nil
 	}).String()
 	cmd.Arg("ISSUE", "issue id to update").StringVar(&opts.Issue)
@@ -60,7 +61,7 @@ func CmdComment(o *oreo.Client, opts *CommentOptions) error {
 	}{
 		opts.Overrides,
 	}
-	err := editLoop(&opts.GlobalOptions, &input, &comment, func() error {
+	err := jiracli.EditLoop(&opts.GlobalOptions, &input, &comment, func() error {
 		_, err := jira.IssueAddComment(o, opts.Endpoint.Value, opts.Issue, &comment)
 		return err
 	})