diff --git a/cli.go b/cli.go index 9331ffd5..54d0fb76 100644 --- a/cli.go +++ b/cli.go @@ -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 diff --git a/commands.go b/commands.go index 64d25df4..5a855818 100644 --- a/commands.go +++ b/commands.go @@ -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) } diff --git a/main/main.go b/main/main.go index 17f6f5c3..8d446d07 100644 --- a/main/main.go +++ b/main/main.go @@ -14,8 +14,8 @@ import ( ) var ( - log = logging.MustGetLogger("jira") - format = "%{color}%{time:2006-01-02T15:04:05.000Z07:00} %{level:-5s} [%{shortfile}]%{color:reset} %{message}" + log = logging.MustGetLogger("jira") + format = "%{color}%{time:2006-01-02T15:04:05.000Z07:00} %{level:-5s} [%{shortfile}]%{color:reset} %{message}" ) func main() { diff --git a/util.go b/util.go index 4c76c055..382e4c73 100644 --- a/util.go +++ b/util.go @@ -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 }