Merge branch 'master' into label_command

This commit is contained in:
Mike Pountney
2016-01-03 19:50:47 -08:00
3 changed files with 20 additions and 5 deletions
+15 -1
View File
@@ -19,7 +19,7 @@ import (
)
var (
log = logging.MustGetLogger("jira")
log = logging.MustGetLogger("jira")
VERSION string
)
@@ -177,6 +177,10 @@ func (c *Cli) makeRequest(req *http.Request) (resp *http.Response, err error) {
return resp, nil
}
func (c *Cli) GetTemplate(name string) string {
return c.getTemplate(name)
}
func (c *Cli) getTemplate(name string) string {
if override, ok := c.opts["template"].(string); ok {
if _, err := os.Stat(override); err == nil {
@@ -364,6 +368,16 @@ func (c *Cli) SaveData(data interface{}) error {
return nil
}
func (c *Cli) ViewIssue(issue string) (interface{}, error) {
uri := fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
data, err := responseToJson(c.get(uri))
if err != nil {
return nil, err
} else {
return data, nil
}
}
func (c *Cli) FindIssues() (interface{}, error) {
var query string
var ok bool
+1 -3
View File
@@ -80,12 +80,10 @@ func (c *Cli) CmdList() error {
func (c *Cli) CmdView(issue string) error {
log.Debug("view called")
c.Browse(issue)
uri := fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
data, err := responseToJson(c.get(uri))
data, err := c.ViewIssue(issue)
if err != nil {
return err
}
return runTemplate(c.getTemplate("view"), data, nil)
}
+4 -1
View File
@@ -109,8 +109,11 @@ func dateFormat(format string, content string) (string, error) {
}
}
func runTemplate(templateContent string, data interface{}, out io.Writer) error {
func RunTemplate(templateContent string, data interface{}, out io.Writer) error {
return runTemplate(templateContent, data, out)
}
func runTemplate(templateContent string, data interface{}, out io.Writer) error {
if out == nil {
out = os.Stdout
}