From af4952621b2d52e4d3833a863e4cccdc4c5f1968 Mon Sep 17 00:00:00 2001 From: Cory Bennett Date: Wed, 18 Feb 2015 15:01:12 -0800 Subject: [PATCH] adding missing --override arguments to various transition commands add browse command --- jira/cli/cli.go | 7 ++++--- jira/main.go | 18 +++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/jira/cli/cli.go b/jira/cli/cli.go index ece1eda..eb119ad 100644 --- a/jira/cli/cli.go +++ b/jira/cli/cli.go @@ -310,12 +310,13 @@ func (c *Cli) editTemplate(template string, tmpFilePrefix string, templateData m return nil } -func (c *Cli) Browse(issue string) { +func (c *Cli) Browse(issue string) error { if val, ok := c.opts["browse"]; ok && val == "true" { if runtime.GOOS == "darwin" { - exec.Command("open", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run() + return exec.Command("open", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run() } else if runtime.GOOS == "linux" { - exec.Command("xdg-open", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run() + return exec.Command("xdg-open", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run() } } + return nil } diff --git a/jira/main.go b/jira/main.go index f0500ce..3b74a7c 100644 --- a/jira/main.go +++ b/jira/main.go @@ -26,13 +26,13 @@ Usage: jira [-v ...] [-u USER] [-e URI] [-b] DUPLICATE dups ISSUE jira [-v ...] [-u USER] [-e URI] [-b] BLOCKER blocks ISSUE jira [-v ...] [-u USER] [-e URI] [-b] watch ISSUE [-w WATCHER] - jira [-v ...] [-u USER] [-e URI] [-b] [-t FILE] (trans|transition) TRANSITION ISSUE [-m COMMENT] [--noedit] - jira [-v ...] [-u USER] [-e URI] [-b] ack ISSUE [-m COMMENT] [--edit] - jira [-v ...] [-u USER] [-e URI] [-b] close ISSUE [-m COMMENT] [--edit] - jira [-v ...] [-u USER] [-e URI] [-b] resolve ISSUE [-m COMMENT] [--edit] - jira [-v ...] [-u USER] [-e URI] [-b] reopen ISSUE [-m COMMENT] [--edit] - jira [-v ...] [-u USER] [-e URI] [-b] start ISSUE [-m COMMENT] [--edit] - jira [-v ...] [-u USER] [-e URI] [-b] stop ISSUE [-m COMMENT] [--edit] + jira [-v ...] [-u USER] [-e URI] [-b] [-t FILE] (trans|transition) TRANSITION ISSUE [-m COMMENT] [-o KEY=VAL] [--noedit] + jira [-v ...] [-u USER] [-e URI] [-b] ack ISSUE [-m COMMENT] [-o KEY=VAL] [--edit] + jira [-v ...] [-u USER] [-e URI] [-b] close ISSUE [-m COMMENT] [-o KEY=VAL] [--edit] + jira [-v ...] [-u USER] [-e URI] [-b] resolve ISSUE [-m COMMENT] [-o KEY=VAL] [--edit] + jira [-v ...] [-u USER] [-e URI] [-b] reopen ISSUE [-m COMMENT] [-o KEY=VAL] [--edit] + jira [-v ...] [-u USER] [-e URI] [-b] start ISSUE [-m COMMENT] [-o KEY=VAL] [--edit] + jira [-v ...] [-u USER] [-e URI] [-b] stop ISSUE [-m COMMENT] [-o KEY=VAL] [--edit] jira [-v ...] [-u USER] [-e URI] [-b] [-t FILE] comment ISSUE [-m COMMENT] jira [-v ...] [-u USER] [-e URI] [-b] take ISSUE jira [-v ...] [-u USER] [-e URI] [-b] (assign|give) ISSUE ASSIGNEE @@ -44,6 +44,7 @@ Usage: jira [-v ...] [-u USER] [-e URI] [-t FILE] createmeta [-p PROJECT] [-i ISSUETYPE] jira [-v ...] [-u USER] [-e URI] [-b] [-t FILE] transitions ISSUE jira [-v ...] export-templates [-d DIR] + jira [-v ...] [-u USER] [-e URI] (b|browse) ISSUE jira [-v ...] [-u USER] [-e URI] [-t FILE] login jira [-v ...] [-u USER] [-e URI] [-b] [-t FILE] ISSUE @@ -255,6 +256,9 @@ Command Options: err = c.CmdComment(args["ISSUE"].(string)) } else if validCommand("take") { err = c.CmdAssign(args["ISSUE"].(string), user) + } else if validCommand("browse") || validCommand("b") { + opts["browse"] = "true" + err = c.Browse(args["ISSUE"].(string)) } else if validCommand("export-templates") { err = c.CmdExportTemplates() } else if validCommand("assign") || validCommand("give") {