From 8f44cc5de71b7cb34ef415bb261c41ab0e543290 Mon Sep 17 00:00:00 2001
From: Cory Bennett <cbennett@lgmac-cbennett.local>
Date: Tue, 15 Sep 2015 22:55:19 -0700
Subject: [PATCH] update usage

---
 jira/main.go | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/jira/main.go b/jira/main.go
index 0d10a80..3d59171 100644
--- a/jira/main.go
+++ b/jira/main.go
@@ -48,21 +48,21 @@ func main() {
 		}
 		output := fmt.Sprintf(`
 Usage:
-  jira (ls|list) ( [-q JQL] | [-p PROJECT] [-c COMPONENT] [-a ASSIGNEE] [-i ISSUETYPE] [-w WATCHER] [-r REPORTER]) [-f FIELDS] [-s ORDER] [--max_results MAX_RESULTS]
+  jira (ls|list) <Query Options> 
   jira view ISSUE
-  jira edit ISSUE [--noedit] [-m COMMENT] [-o KEY=VAL]... 
-  jira create [--noedit] [-p PROJECT] [-i ISSUETYPE] [-o KEY=VAL]...
+  jira edit [--noedit] <Edit Options> [ISSUE | <Query Options>]
+  jira create [--noedit] [-p PROJECT] <Create Options>
   jira DUPLICATE dups ISSUE
   jira BLOCKER blocks ISSUE
   jira watch ISSUE [-w WATCHER]
-  jira (trans|transition) TRANSITION ISSUE [-m COMMENT] [-o KEY=VAL] [--noedit]
-  jira ack ISSUE [-m COMMENT] [-o KEY=VAL] [--edit] 
-  jira close ISSUE [-m COMMENT] [-o KEY=VAL] [--edit]
-  jira resolve ISSUE [-m COMMENT] [-o KEY=VAL] [--edit]
-  jira reopen ISSUE [-m COMMENT] [-o KEY=VAL] [--edit]
-  jira start ISSUE [-m COMMENT] [-o KEY=VAL] [--edit]
-  jira stop ISSUE [-m COMMENT] [-o KEY=VAL] [--edit]
-  jira comment ISSUE [-m COMMENT]
+  jira (trans|transition) TRANSITION ISSUE [--noedit] <Edit Options>
+  jira ack ISSUE [--edit] <Edit Options>
+  jira close ISSUE [--edit] <Edit Options>
+  jira resolve ISSUE [--edit] <Edit Options>
+  jira reopen ISSUE [--edit] <Edit Options>
+  jira start ISSUE [--edit] <Edit Options>
+  jira stop ISSUE [--edit] <Edit Options>
+  jira comment ISSUE [--noedit] <Edit Options>
   jira take ISSUE
   jira (assign|give) ISSUE ASSIGNEE
   jira fields
@@ -76,31 +76,40 @@ Usage:
   jira (b|browse) ISSUE
   jira login
   jira ISSUE
- 
+
 General Options:
+  -b --browse         Open your browser to the Jira issue
   -e --endpoint=URI   URI to use for jira
   -h --help           Show this usage
   -t --template=FILE  Template file to use for output/editing
   -u --user=USER      Username to use for authenticaion (default: %s)
   -v --verbose        Increase output logging
 
-Command Options:
+Query Options:
   -a --assignee=USER        Username assigned the issue
-  -b --browse               Open your browser to the Jira issue
   -c --component=COMPONENT  Component to Search for
-  -d --directory=DIR        Directory to export templates to (default: %s)
   -f --queryfields=FIELDS   Fields that are used in "list" template: (default: %s)
-  -i --issuetype=ISSUETYPE  Jira Issue Type (default: Bug)
-  -m --comment=COMMENT      Comment message for transition
-  -o --override=KEY=VAL     Set custom key/value pairs
+  -i --issuetype=ISSUETYPE  The Issue Type
+  -l --limit=VAL            Maximum number of results to return in query (default: %d)
   -p --project=PROJECT      Project to Search for
   -q --query=JQL            Jira Query Language expression for the search
   -r --reporter=USER        Reporter to search for
   -s --sort=ORDER           For list operations, sort issues (default: %s)
   -w --watcher=USER         Watcher to add to issue (default: %s)
                             or Watcher to search for
-  --max_results=VAL         Maximum number of results to return in query (default: %d)
-`, user, fmt.Sprintf("%s/.jira.d/templates", home), defaultQueryFields, defaultSort, user, defaultMaxResults)
+
+Edit Options:
+  -m --comment=COMMENT      Comment message for transition
+  -o --override=KEY=VAL     Set custom key/value pairs
+
+Create Options:
+  -i --issuetype=ISSUETYPE  Jira Issue Type (default: Bug)
+  -m --comment=COMMENT      Comment message for transition
+  -o --override=KEY=VAL     Set custom key/value pairs
+
+Command Options:
+  -d --directory=DIR        Directory to export templates to (default: %s)
+`, user, defaultQueryFields, defaultMaxResults, defaultSort, user, fmt.Sprintf("%s/.jira.d/templates", home))
 		printer(output)
 	}