version bump

use os.exec instead of syscall.exec for windows

.gitignore

@@ -2,4 +2,9 @@ jira
 schemas/*.json
 t/.gnupg/random_seed
 t/issue.props
+t/attach.props
+t/garbage.bin
+t/attach1.txt
+t/binary.out
+t/foobar.bin
 dist

.jira.d/config.yml

@@ -3,3 +3,9 @@ config:
 password-source: pass
 endpoint: https://go-jira.atlassian.net
 user: admin
+
+queries:
+  todo: |
+    resolution = unresolved {{if .project}}AND project = '{{.project}}'{{end}} AND status = 'To Do'
+  open: |
+    resolution = unresolved {{if .project}}AND project = '{{.project}}'{{end}} AND status = 'Open'

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 1.0.10 - 2017-09-18
+
+* clean up usage formatting, print aliases [Cory Bennett] [[9f433ac](https://github.com/Netflix-Skunkworks/go-jira/commit/9f433ac)]
+* fix edit [Cory Bennett] [[4c6b36c](https://github.com/Netflix-Skunkworks/go-jira/commit/4c6b36c)]
+* fix named query template expansion [Cory Bennett] [[a8eaa97](https://github.com/Netflix-Skunkworks/go-jira/commit/a8eaa97)]
+* fix usage message [Cory Bennett] [[cd3cfd8](https://github.com/Netflix-Skunkworks/go-jira/commit/cd3cfd8)]
+
+## 1.0.9 - 2017-09-17
+
+* need issuetype to use the default list table template now [Cory Bennett] [[3e8b9bd](https://github.com/Netflix-Skunkworks/go-jira/commit/3e8b9bd)]
+* [[#102](https://github.com/Netflix-Skunkworks/go-jira/issues/102)] add issuetype into the default queryfields and add it to the default `table` list template [Cory Bennett] [[c9d8dfb](https://github.com/Netflix-Skunkworks/go-jira/commit/c9d8dfb)]
+
+## 1.0.8 - 2017-09-17
+
+* [[#100](https://github.com/Netflix-Skunkworks/go-jira/issues/100)] add support for posting, fetching, listing and removing attachments [Cory Bennett] [[66eb7bf](https://github.com/Netflix-Skunkworks/go-jira/commit/66eb7bf)]
+
+## 1.0.7 - 2017-09-15
+
+* [[#87](https://github.com/Netflix-Skunkworks/go-jira/issues/87)] add various commands for interacting with epics [Cory Bennett] [[893454f](https://github.com/Netflix-Skunkworks/go-jira/commit/893454f)]
+
+## 1.0.6 - 2017-09-13
+
+* tweaks for templates in named queries to work better [Cory Bennett] [[00cba79](https://github.com/Netflix-Skunkworks/go-jira/commit/00cba79)]
+* [[#99](https://github.com/Netflix-Skunkworks/go-jira/issues/99)] add support for named queries to be stored in configs [Cory Bennett] [[fb43753](https://github.com/Netflix-Skunkworks/go-jira/commit/fb43753)]
+* [[#98](https://github.com/Netflix-Skunkworks/go-jira/issues/98)] add `--status` option for JQL filter on status with `list` command [Cory Bennett] [[5da04c1](https://github.com/Netflix-Skunkworks/go-jira/commit/5da04c1)]
+
+## 1.0.5 - 2017-09-11
+
+* use --gjq for GJson Query to filter json response data [Cory Bennett] [[608e586](https://github.com/Netflix-Skunkworks/go-jira/commit/608e586)]
+* fix field tag syntax [Cory Bennett] [[2c552ac](https://github.com/Netflix-Skunkworks/go-jira/commit/2c552ac)]
+* add '{{jira}}' template macro to refer to path of currently running jira command [Cory Bennett] [[941824d](https://github.com/Netflix-Skunkworks/go-jira/commit/941824d)]
+
+## 1.0.4 - 2017-09-08
+
+* update deps for kingpeon update use os.exec instead of syscall.exec for windows [Cory Bennett] [[86b963b](https://github.com/Netflix-Skunkworks/go-jira/commit/86b963b)]
+
 ## 1.0.3 - 2017-09-06
 
 * [[#66](https://github.com/Netflix-Skunkworks/go-jira/issues/66)] add --started option to `jira worklog add` to change the start time for worklog [Cory Bennett] [[e6faee1](https://github.com/Netflix-Skunkworks/go-jira/commit/e6faee1)]

Gopkg.lock

@@ -0,0 +1,165 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/template"
+  packages = [".","parse"]
+  revision = "a0175ee3bccc567396460bf5acd36800cb10c49c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/units"
+  packages = ["."]
+  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/cheekybits/genny"
+  packages = ["generic"]
+  revision = "9127e812e1e9e501ce899a18121d316ecb52e4ba"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/coryb/figtree"
+  packages = ["."]
+  revision = "c7d8fbf1d7746b5864b8262fabffec813b5a43fa"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/coryb/kingpeon"
+  packages = ["."]
+  revision = "64b561ae2d0f895b94719c486bed798f4236a4b3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/coryb/oreo"
+  packages = ["."]
+  revision = "95687d61c95ee1522c1140e2af59b0c1846abfc1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/fatih/camelcase"
+  packages = ["."]
+  revision = "f6a740d52f961c60348ebb109adde9f4635d7540"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/guelfey/go.dbus"
+  packages = ["."]
+  revision = "f6a3a2366cc39b8479cadc499d3c735fb10fbdda"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/jinzhu/copier"
+  packages = ["."]
+  revision = "32e0d0db1dcd4373fb9eb0f9d727b1fe1a723e54"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kballard/go-shellquote"
+  packages = ["."]
+  revision = "cd60e84ee657ff3dc51de0b4f55dd299a3e136f2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mattn/go-colorable"
+  packages = ["."]
+  revision = "ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b"
+
+[[projects]]
+  name = "github.com/mattn/go-isatty"
+  packages = ["."]
+  revision = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"
+  version = "v0.0.2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mgutz/ansi"
+  packages = ["."]
+  revision = "9520e82c474b0a04dd04f8a40959027271bab992"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/pkg/browser"
+  packages = ["."]
+  revision = "c90ca0c84f15f81c982e32665bffd8d7aac8f097"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/sethgrid/pester"
+  packages = ["."]
+  revision = "a86a2d88f4dc3c7dbf3a6a6bbbfb095690b834b6"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/theckman/go-flock"
+  packages = ["."]
+  revision = "6de226b0d5f040ed85b88c82c381709b98277f3d"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tidwall/gjson"
+  packages = ["."]
+  revision = "be96719f990978a867f52c48f29d43f6b591da28"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tidwall/match"
+  packages = ["."]
+  revision = "173748da739a410c5b0b813b956f89ff94730b4c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tmc/keyring"
+  packages = ["."]
+  revision = "06e6283d50adc5f8fcdb3cdf33ee1244d4400ae1"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["ssh/terminal"]
+  revision = "9ba3862cf6a5452ae579de98f9364dd2e544844c"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix","windows"]
+  revision = "a5054c7c1385fd50d9394475365355a87a7873ec"
+
+[[projects]]
+  name = "gopkg.in/AlecAivazis/survey.v1"
+  packages = [".","core","terminal"]
+  revision = "9d910423e24aa6d7c7950160658c295e0734c7e0"
+  version = "1.3.1"
+
+[[projects]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  packages = ["."]
+  revision = "1087e65c9441605df944fb12c33f0fe7072d18ca"
+  version = "v2.2.5"
+
+[[projects]]
+  branch = "v2"
+  name = "gopkg.in/coryb/yaml.v2"
+  packages = ["."]
+  revision = "fb7cb9628c6e3bdd76c29fb91798d51a09832470"
+
+[[projects]]
+  name = "gopkg.in/op/go-logging.v1"
+  packages = ["."]
+  revision = "b2cb9fa56473e98db8caba80237377e83fe44db5"
+  version = "v1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "1f4b97fcf898a5ef03af5e222686a09328b393e71797d21bf0c37b74d1e74a8e"
+  solver-name = "gps-cdcl"
+  solver-version = 1

Gopkg.toml

@@ -0,0 +1,75 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/coryb/figtree"
+
+[[constraint]]
+  name = "github.com/coryb/kingpeon"
+
+[[constraint]]
+  name = "github.com/coryb/oreo"
+
+[[constraint]]
+  name = "github.com/jinzhu/copier"
+
+[[constraint]]
+  name = "github.com/kballard/go-shellquote"
+
+[[constraint]]
+  name = "github.com/mgutz/ansi"
+
+[[constraint]]
+  name = "github.com/pkg/browser"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+  version = "0.8.0"
+
+[[constraint]]
+  name = "github.com/savaki/jq"
+
+[[constraint]]
+  name = "github.com/tmc/keyring"
+
+[[constraint]]
+  name = "golang.org/x/crypto"
+
+[[constraint]]
+  name = "gopkg.in/AlecAivazis/survey.v1"
+  version = "1.3.1"
+
+[[constraint]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  version = "2.2.5"
+
+[[constraint]]
+  name = "gopkg.in/coryb/yaml.v2"
+
+[[constraint]]
+  name = "gopkg.in/op/go-logging.v1"
+  version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/tidwall/gjson"

Makefile

@@ -50,7 +50,7 @@ NEWVER ?= $(shell echo $(CURVER) | awk -F. '{print $$1"."$$2"."$$3+1}')
 TODAY  := $(shell date +%Y-%m-%d)
 
 changes:
-	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^v$(CURVER) HEAD *.go jiracli/*.go jiradata/*.go jiracmd/*.go cmd/*/*.go glide.* | grep -vE 'gofmt|go fmt|version bump'
+	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^v$(CURVER) HEAD *.go jiracli/*.go jiradata/*.go jiracmd/*.go cmd/*/*.go *.lock | grep -vE 'gofmt|go fmt|version bump'
 
 update-changelog:
 	@echo "# Changelog" > CHANGELOG.md.new; \
@@ -66,8 +66,13 @@ update-changelog:
 	$(NULL)
 
 release:
-	git commit -m "Updated Changelog" CHANGELOG.md; \
-    git commit -m "version bump" jira.go
+	perl -pi -e 'undef $$/; s/\n```\nusage.*```//sg' README.md
+	echo '```' >> README.md
+	./jira --help >> README.md || true
+	echo '```' >> README.md
+	git diff --exit-code --quiet README.md || git commit -m "Updated Usage" README.md
+	git commit -m "Updated Changelog" CHANGELOG.md
+	git commit -m "version bump" jira.go
 	git tag v$(NEWVER)
 	git push --tags
 

README.md

@@ -1,7 +1,7 @@
 [![Join the chat at https://gitter.im/go-jira-cli/help](https://badges.gitter.im/go-jira-cli/help.svg)](https://gitter.im/go-jira-cli/help?utm_source=badge&utm_medium=badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/Netflix-Skunkworks/go-jira.svg?branch=master)](https://travis-ci.org/Netflix-Skunkworks/go-jira)
-[![GoDoc](https://godoc.org/gopkg.in/Netflix-Skunkworks/go-jira.v1?status.png)](https://godoc.org/gopkg.in/Netflix-Skunkworks/go-jira.v1)
-
+[![GoDoc](https://godoc.org/gopkg.in/Netflix-Skunkworks/go-jira.v1?status.svg)](https://godoc.org/gopkg.in/Netflix-Skunkworks/go-jira.v1)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 # go-jira
 simple command line client for Atlassian's Jira service written in Go
@@ -56,7 +56,7 @@ custom-commands:
   - name: mine
     help: display issues assigned to me
     script: |-
-      jira list --query "resolution = unresolved and assignee=currentuser() ORDER BY created"
+      {{jira}} list --query "resolution = unresolved and assignee=currentuser() ORDER BY created"
 ```
 Then the next time you run `jira help` you will see your usage:
 ```
@@ -267,25 +267,27 @@ custom-commands:
 
 * `jira mine` for listing issues assigned to you
 ```
+custom-commands:
   - name: mine
     help: display issues assigned to me
     script: |-
       if [ -n "$JIRA_PROJECT" ]; then
           # if `project: ...` configured just list the issues for current project
-          jira list --template table --query "resolution = unresolved and assignee=currentuser() and project = $JIRA_PROJECT ORDER BY priority asc, created"
+          {{jira}} list --template table --query "resolution = unresolved and assignee=currentuser() and project = $JIRA_PROJECT ORDER BY priority asc, created"
       else
           # otherwise list issues for all project
-          jira list --template table --query "resolution = unresolved and assignee=currentuser() ORDER BY priority asc, created"
+          {{jira}} list --template table --query "resolution = unresolved and assignee=currentuser() ORDER BY priority asc, created"
       fi
 ```
 * `jira sprint` for listing issues in your current sprint
 ```
+custom-commands:
   - name: sprint
     help: display issues for active sprint
     script: |-
       if [ -n "$JIRA_PROJECT" ]; then
           # if `project: ...` configured just list the issues for current project
-          jira list --template table --query "sprint in openSprints() and type != epic and resolution = unresolved and project=$JIRA_PROJECT ORDER BY rank asc, created"
+          {{jira}} list --template table --query "sprint in openSprints() and type != epic and resolution = unresolved and project=$JIRA_PROJECT ORDER BY rank asc, created"
       else
           # otherwise list issues for all project
           echo "\"project: ...\" configuration missing from .jira.d/config.yml"
@@ -393,369 +395,4 @@ export GPG_TTY=$(tty)
 ## Usage
 
 ```
-usage: jira [<flags>] <command> [<args> ...]
-
-Jira Command Line Interface
-
-Flags:
-      --help                 Show context-sensitive help (also try --help-long and --help-man).
-  -v, --verbose ...          Increase verbosity for debugging
-  -e, --endpoint=ENDPOINT    Base URI to use for Jira
-  -k, --insecure             Disable TLS certificate verification
-  -Q, --quiet                Suppress output to console
-      --unixproxy=UNIXPROXY  Path for a unix-socket proxy
-  -u, --user=USER            Login name used for authentication with Jira service
-
-Commands:
-  help [<command>...]
-    Show help.
-
-
-  version
-    Prints version
-
-
-  login
-    Attempt to login into jira server
-
-
-  logout
-    Deactivate sesssion with Jira server
-
-
-  list [<flags>]
-    Prints list of issues for given search criteria
-
-    -t, --template=TEMPLATE        Template to use for output
-    -a, --assignee=ASSIGNEE        User assigned the issue
-    -c, --component=COMPONENT      Component to search for
-    -i, --issuetype=ISSUETYPE      Issue type to search for
-    -l, --limit=LIMIT              Maximum number of results to return in search
-    -p, --project=PROJECT          Project to search for
-    -q, --query=QUERY              Jira Query Language (JQL) expression for the search
-    -f, --queryfields=QUERYFIELDS  Fields that are used in "list" template
-    -r, --reporter=REPORTER        Reporter to search for
-    -s, --sort=SORT                Sort order to return
-    -w, --watcher=WATCHER          Watcher to search for
-
-  view [<flags>] <ISSUE>
-    Prints issue details
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --expand=EXPAND ...      field to expand for the issue
-        --field=FIELD ...        field to return for the issue
-        --property=PROPERTY ...  property to return for issue
-
-  create [<flags>]
-    Create issue
-
-    -b, --browse                 Open issue(s) in browser after operation
-        --editor=EDITOR          Editor to use
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -p, --project=PROJECT        project to create issue in
-    -i, --issuetype=ISSUETYPE    issuetype in to create
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-        --saveFile=SAVEFILE      Write issue as yaml to file
-
-  edit [<flags>] [<ISSUE>]
-    Edit issue details
-
-    -b, --browse                 Open issue(s) in browser after operation
-        --editor=EDITOR          Editor to use
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -q, --query=QUERY            Jira Query Language (JQL) expression for the search to edit multiple issues
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  comment [<flags>] [<ISSUE>]
-    Add comment to issue
-
-    -b, --browse             Open issue(s) in browser after operation
-        --editor=EDITOR      Editor to use
-    -t, --template=TEMPLATE  Template to use for output
-        --noedit             Disable opening the editor
-    -m, --comment=COMMENT    Comment message for issue
-
-  worklog list [<flags>] <ISSUE>
-    Prints the worklog data for given issue
-
-    -b, --browse             Open issue(s) in browser after operation
-    -t, --template=TEMPLATE  Template to use for output
-
-  worklog add [<flags>] <ISSUE>
-    Add a worklog to an issue
-
-    -b, --browse                 Open issue(s) in browser after operation
-        --editor=EDITOR          Editor to use
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for worklog
-    -T, --time-spent=TIME-SPENT  Time spent working on issue
-
-  fields [<flags>]
-    Prints all fields, both System and Custom
-
-    -t, --template=TEMPLATE  Template to use for output
-
-  createmeta [<flags>]
-    View 'create' metadata
-
-    -t, --template=TEMPLATE    Template to use for output
-    -p, --project=PROJECT      project to fetch create metadata
-    -i, --issuetype=ISSUETYPE  issuetype in project to fetch create metadata
-
-  editmeta [<flags>] <ISSUE>
-    View 'edit' metadata
-
-    -b, --browse             Open issue(s) in browser after operation
-    -t, --template=TEMPLATE  Template to use for output
-
-  subtask [<flags>] [<ISSUE>]
-    Subtask issue
-
-    -b, --browse                 Open issue(s) in browser after operation
-        --editor=EDITOR          Editor to use
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -p, --project=PROJECT        project to subtask issue in
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  dup [<flags>] <DUPLICATE> <ISSUE>
-    Mark issues as duplicate
-
-    -b, --browse             Open issue(s) in browser after operation
-        --editor=EDITOR      Editor to use
-    -t, --template=TEMPLATE  Template to use for output
-    -m, --comment=COMMENT    Comment message when marking issue as duplicate
-
-  block [<flags>] <BLOCKER> <ISSUE>
-    Mark issues as blocker
-
-    -b, --browse             Open issue(s) in browser after operation
-        --editor=EDITOR      Editor to use
-    -t, --template=TEMPLATE  Template to use for output
-    -m, --comment=COMMENT    Comment message when marking issue as blocker
-
-  issuelink [<flags>] <OUTWARDISSUE> <ISSUELINKTYPE> <INWARDISSUE>
-    Link two issues
-
-    -b, --browse             Open issue(s) in browser after operation
-        --editor=EDITOR      Editor to use
-    -t, --template=TEMPLATE  Template to use for output
-    -m, --comment=COMMENT    Comment message when linking issue
-
-  issuelinktypes [<flags>]
-    Show the issue link types
-
-    -t, --template=TEMPLATE  Template to use for output
-
-  transition [<flags>] <TRANSITION> <ISSUE>
-    Transition issue to given state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  transitions [<flags>] <ISSUE>
-    List valid issue transitions
-
-    -b, --browse             Open issue(s) in browser after operation
-    -t, --template=TEMPLATE  Template to use for output
-
-  transmeta [<flags>] <ISSUE>
-    List valid issue transitions
-
-    -b, --browse             Open issue(s) in browser after operation
-    -t, --template=TEMPLATE  Template to use for output
-
-  close [<flags>] <ISSUE>
-    Transition issue to close state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  acknowledge [<flags>] <ISSUE>
-    Transition issue to acknowledge state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  reopen [<flags>] <ISSUE>
-    Transition issue to reopen state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  resolve [<flags>] <ISSUE>
-    Transition issue to resolve state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  start [<flags>] <ISSUE>
-    Transition issue to start state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  stop [<flags>] <ISSUE>
-    Transition issue to stop state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  todo [<flags>] <ISSUE>
-    Transition issue to To Do state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  backlog [<flags>] <ISSUE>
-    Transition issue to Backlog state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  done [<flags>] <ISSUE>
-    Transition issue to Done state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  in-progress [<flags>] <ISSUE>
-    Transition issue to Progress state
-
-    -b, --browse                 Open issue(s) in browser after operation
-    -t, --template=TEMPLATE      Template to use for output
-        --noedit                 Disable opening the editor
-    -m, --comment=COMMENT        Comment message for issue
-    -o, --override=OVERRIDE ...  Set issue property
-
-  vote [<flags>] [<ISSUE>]
-    Vote up/down an issue
-
-    -b, --browse  Open issue(s) in browser after operation
-    -d, --down    downvote the issue
-
-  rank [<flags>] <FIRST-ISSUE> <after|before> <SECOND-ISSUE>
-    Mark issues as blocker
-
-    -b, --browse  Open issue(s) in browser after operation
-
-  watch [<flags>] <ISSUE> [<WATCHER>]
-    Add/Remove watcher to issue
-
-    -b, --browse  Open issue(s) in browser after operation
-    -r, --remove  remove watcher from issue
-
-  labels add [<flags>] <ISSUE> <LABEL>...
-    Add labels to an issue
-
-    -b, --browse  Open issue(s) in browser after operation
-
-  labels set [<flags>] <ISSUE> <LABEL>...
-    Set labels on an issue
-
-    -b, --browse  Open issue(s) in browser after operation
-
-  labels remove [<flags>] <ISSUE> <LABEL>...
-    Remove labels from an issue
-
-    -b, --browse  Open issue(s) in browser after operation
-
-  take [<flags>] <ISSUE> [<ASSIGNEE>]
-    Assign issue to yourself
-
-    -b, --browse   Open issue(s) in browser after operation
-        --default  use default user for assignee
-
-  assign [<flags>] <ISSUE> [<ASSIGNEE>]
-    Assign user to issue
-
-    -b, --browse   Open issue(s) in browser after operation
-        --default  use default user for assignee
-
-  unassign [<flags>] <ISSUE> [<ASSIGNEE>]
-    Unassign an issue
-
-    -b, --browse   Open issue(s) in browser after operation
-        --default  use default user for assignee
-
-  component add [<flags>]
-    Add component
-
-        --editor=EDITOR            Editor to use
-    -t, --template=TEMPLATE        Template to use for output
-        --noedit                   Disable opening the editor
-    -p, --project=PROJECT          project to create component in
-    -n, --name=NAME                name of component
-    -d, --description=DESCRIPTION  description of component
-    -l, --lead=LEAD                person that acts as lead for component
-
-  components [<flags>]
-    Show components for a project
-
-    -t, --template=TEMPLATE  Template to use for output
-    -p, --project=PROJECT    project to list components
-
-  issuetypes [<flags>]
-    Show issue types for a project
-
-    -t, --template=TEMPLATE  Template to use for output
-    -p, --project=PROJECT    project to list issueTypes
-
-  export-templates [<flags>]
-    Export templates for customizations
-
-    -t, --template=TEMPLATE  Template to export
-    -d, --dir=DIR            directory to write tempates to
-
-  unexport-templates [<flags>]
-    Remove unmodified exported templates
-
-    -t, --template=TEMPLATE  Template to export
-    -d, --dir=DIR            directory to write tempates to
-
-  browse <ISSUE>
-    Open issue in browser
-
-
-  request [<flags>] <API> [<JSON>]
-    Open issue in requestr
-
-    -M, --method=METHOD  HTTP request method to use
 ```

attachment.go

@@ -0,0 +1,46 @@
+package jira
+
+import (
+	"fmt"
+
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
+)
+
+// https://docs.atlassian.com/jira/REST/cloud/#api/2/attachment-getAttachment
+func (j *Jira) GetAttachment(id string) (*jiradata.Attachment, error) {
+	return GetAttachment(j.UA, j.Endpoint, id)
+}
+
+func GetAttachment(ua HttpClient, endpoint string, id string) (*jiradata.Attachment, error) {
+	uri := fmt.Sprintf("%s/rest/api/2/attachment/%s", endpoint, id)
+	resp, err := ua.GetJSON(uri)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 200 {
+		results := &jiradata.Attachment{}
+		return results, readJSON(resp.Body, results)
+	}
+	return nil, responseError(resp)
+}
+
+// https://docs.atlassian.com/jira/REST/cloud/#api/2/attachment-removeAttachment
+func (j *Jira) RemoveAttachment(id string) error {
+	return RemoveAttachment(j.UA, j.Endpoint, id)
+}
+
+func RemoveAttachment(ua HttpClient, endpoint string, id string) error {
+	uri := fmt.Sprintf("%s/rest/api/2/attachment/%s", endpoint, id)
+	resp, err := ua.Delete(uri)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 204 {
+		return nil
+	}
+	return responseError(resp)
+}

cmd/jira/main.go

@@ -3,10 +3,13 @@ package main
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
+	"runtime"
 	"runtime/debug"
 	"strconv"
+	"syscall"
 
 	"github.com/coryb/figtree"
 	"github.com/coryb/kingpeon"
@@ -49,6 +52,92 @@ func increaseLogLevel(verbosity int) {
 	}
 }
 
+var usage = `{{define "FormatCommand"}}\
+{{if .FlagSummary}} {{.FlagSummary}}{{end}}\
+{{range .Args}} {{if not .Required}}[{{end}}<{{.Name}}>{{if .Value|IsCumulative}}...{{end}}{{if not .Required}}]{{end}}{{end}}\
+{{end}}\
+
+{{define "FormatBriefCommands"}}\
+{{range .FlattenedCommands}}\
+{{if not .Hidden}}\
+  {{ print .FullCommand ":" | printf "%-20s"}} {{.Help}}
+{{end}}\
+{{end}}\
+{{end}}\
+
+{{define "FormatCommands"}}\
+{{range .FlattenedCommands}}\
+{{if not .Hidden}}\
+  {{.FullCommand}}{{if .Default}}*{{end}}{{template "FormatCommand" .}}
+{{.Help|Wrap 4}}
+{{with .Flags|FlagsToTwoColumns}}{{FormatTwoColumnsWithIndent . 4 2}}{{end}}
+{{end}}\
+{{end}}\
+{{end}}\
+
+{{define "FormatUsage"}}\
+{{template "FormatCommand" .}}{{if .Commands}} <command> [<args> ...]{{end}}
+{{if .Help}}
+{{.Help|Wrap 0}}\
+{{end}}\
+
+{{end}}\
+
+{{if .Context.SelectedCommand}}\
+usage: {{.App.Name}} {{.Context.SelectedCommand}}{{template "FormatCommand" .Context.SelectedCommand}}
+{{if .Context.SelectedCommand.Aliases }}\
+{{range $top := .App.Commands}}\
+{{if eq $top.FullCommand $.Context.SelectedCommand.FullCommand}}\
+{{range $alias := $.Context.SelectedCommand.Aliases}}\
+alias: {{$.App.Name}} {{$alias}}{{template "FormatCommand" $.Context.SelectedCommand}}
+{{end}}\
+{{else}}\
+{{range $sub := $top.Commands}}\
+{{if eq $sub.FullCommand $.Context.SelectedCommand.FullCommand}}\
+{{range $alias := $.Context.SelectedCommand.Aliases}}\
+alias: {{$.App.Name}} {{$top.Name}} {{$alias}}{{template "FormatCommand" $.Context.SelectedCommand}}
+{{end}}\
+{{end}}\
+{{end}}\
+{{end}}\
+{{end}}\
+{{end}}
+{{if .Context.SelectedCommand.Help}}\
+{{.Context.SelectedCommand.Help|Wrap 0}}
+{{end}}\
+{{else}}\
+usage: {{.App.Name}}{{template "FormatUsage" .App}}
+{{end}}\
+
+{{if .App.Flags}}\
+Global flags:
+{{.App.Flags|FlagsToTwoColumns|FormatTwoColumns}}
+{{end}}\
+{{if .Context.SelectedCommand}}\
+{{if and .Context.SelectedCommand.Flags|RequiredFlags}}\
+Required flags:
+{{.Context.SelectedCommand.Flags|RequiredFlags|FlagsToTwoColumns|FormatTwoColumns}}
+{{end}}\
+{{if .Context.SelectedCommand.Flags|OptionalFlags}}\
+Optional flags:
+{{.Context.SelectedCommand.Flags|OptionalFlags|FlagsToTwoColumns|FormatTwoColumns}}
+{{end}}\
+{{end}}\
+{{if .Context.Args}}\
+Args:
+{{.Context.Args|ArgsToTwoColumns|FormatTwoColumns}}
+{{end}}\
+{{if .Context.SelectedCommand}}\
+{{if .Context.SelectedCommand.Commands}}\
+Subcommands:
+{{template "FormatCommands" .Context.SelectedCommand}}
+{{end}}\
+{{else if .App.Commands}}\
+Commands:
+{{template "FormatBriefCommands" .App}}
+{{end}}\
+`
+
 func main() {
 	defer handleExit()
 	logBackend := logging.NewLogBackend(os.Stderr, "", 0)
@@ -73,6 +162,7 @@ func main() {
 		fmt.Println(jira.VERSION)
 		panic(jiracli.Exit{Code: 0})
 	})
+	app.UsageTemplate(usage)
 
 	var verbosity int
 	app.Flag("verbose", "Increase verbosity for debugging").Short('v').PreAction(func(_ *kingpin.ParseContext) error {
@@ -100,66 +190,116 @@ func main() {
 
 	registry := []jiracli.CommandRegistry{
 		jiracli.CommandRegistry{
-			Command: "login",
-			Entry:   jiracmd.CmdLoginRegistry(),
+			Command: "acknowledge",
+			Aliases: []string{"ack"},
+			Entry:   jiracmd.CmdTransitionRegistry("acknowledge"),
 		},
 		jiracli.CommandRegistry{
-			Command: "logout",
-			Entry:   jiracmd.CmdLogoutRegistry(),
+			Command: "assign",
+			Entry:   jiracmd.CmdAssignRegistry(),
+			Aliases: []string{"give"},
 		},
 		jiracli.CommandRegistry{
-			Command: "list",
+			Command: "attach create",
+			Entry:   jiracmd.CmdAttachCreateRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "attach get",
+			Entry:   jiracmd.CmdAttachGetRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "attach list",
+			Entry:   jiracmd.CmdAttachListRegistry(),
 			Aliases: []string{"ls"},
-			Entry:   jiracmd.CmdListRegistry(),
 		},
 		jiracli.CommandRegistry{
-			Command: "view",
-			Entry:   jiracmd.CmdViewRegistry(),
+			Command: "attach remove",
+			Entry:   jiracmd.CmdAttachRemoveRegistry(),
+			Aliases: []string{"rm"},
 		},
 		jiracli.CommandRegistry{
-			Command: "create",
-			Entry:   jiracmd.CmdCreateRegistry(),
+			Command: "backlog",
+			Entry:   jiracmd.CmdTransitionRegistry("Backlog"),
 		},
 		jiracli.CommandRegistry{
-			Command: "edit",
-			Entry:   jiracmd.CmdEditRegistry(),
+			Command: "block",
+			Entry:   jiracmd.CmdBlockRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "browse",
+			Entry:   jiracmd.CmdBrowseRegistry(),
+			Aliases: []string{"b"},
+		},
+		jiracli.CommandRegistry{
+			Command: "close",
+			Entry:   jiracmd.CmdTransitionRegistry("close"),
 		},
 		jiracli.CommandRegistry{
 			Command: "comment",
 			Entry:   jiracmd.CmdCommentRegistry(),
 		},
 		jiracli.CommandRegistry{
-			Command: "worklog list",
-			Entry:   jiracmd.CmdWorklogListRegistry(),
-			Default: true,
+			Command: "component add",
+			Entry:   jiracmd.CmdComponentAddRegistry(),
 		},
 		jiracli.CommandRegistry{
-			Command: "worklog add",
-			Entry:   jiracmd.CmdWorklogAddRegistry(),
+			Command: "components",
+			Entry:   jiracmd.CmdComponentsRegistry(),
 		},
 		jiracli.CommandRegistry{
-			Command: "fields",
-			Entry:   jiracmd.CmdFieldsRegistry(),
+			Command: "create",
+			Entry:   jiracmd.CmdCreateRegistry(),
 		},
 		jiracli.CommandRegistry{
 			Command: "createmeta",
 			Entry:   jiracmd.CmdCreateMetaRegistry(),
 		},
 		jiracli.CommandRegistry{
-			Command: "editmeta",
-			Entry:   jiracmd.CmdEditMetaRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "subtask",
-			Entry:   jiracmd.CmdSubtaskRegistry(),
+			Command: "done",
+			Entry:   jiracmd.CmdTransitionRegistry("Done"),
 		},
 		jiracli.CommandRegistry{
 			Command: "dup",
 			Entry:   jiracmd.CmdDupRegistry(),
 		},
 		jiracli.CommandRegistry{
-			Command: "block",
-			Entry:   jiracmd.CmdBlockRegistry(),
+			Command: "edit",
+			Entry:   jiracmd.CmdEditRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "editmeta",
+			Entry:   jiracmd.CmdEditMetaRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "epic add",
+			Entry:   jiracmd.CmdEpicAddRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "epic create",
+			Entry:   jiracmd.CmdEpicCreateRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "epic list",
+			Entry:   jiracmd.CmdEpicListRegistry(),
+			Aliases: []string{"ls"},
+		},
+		jiracli.CommandRegistry{
+			Command: "epic remove",
+			Entry:   jiracmd.CmdEpicRemoveRegistry(),
+			Aliases: []string{"rm"},
+		},
+		jiracli.CommandRegistry{
+			Command: "export-templates",
+			Entry:   jiracmd.CmdExportTemplatesRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "fields",
+			Entry:   jiracmd.CmdFieldsRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "in-progress",
+			Aliases: []string{"prog", "progress"},
+			Entry:   jiracmd.CmdTransitionRegistry("Progress"),
 		},
 		jiracli.CommandRegistry{
 			Command: "issuelink",
@@ -169,6 +309,73 @@ func main() {
 			Command: "issuelinktypes",
 			Entry:   jiracmd.CmdIssueLinkTypesRegistry(),
 		},
+		jiracli.CommandRegistry{
+			Command: "issuetypes",
+			Entry:   jiracmd.CmdIssueTypesRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "labels add",
+			Entry:   jiracmd.CmdLabelsAddRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "labels remove",
+			Entry:   jiracmd.CmdLabelsRemoveRegistry(),
+			Aliases: []string{"rm"},
+		},
+		jiracli.CommandRegistry{
+			Command: "labels set",
+			Entry:   jiracmd.CmdLabelsSetRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "list",
+			Aliases: []string{"ls"},
+			Entry:   jiracmd.CmdListRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "login",
+			Entry:   jiracmd.CmdLoginRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "logout",
+			Entry:   jiracmd.CmdLogoutRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "rank",
+			Entry:   jiracmd.CmdRankRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "reopen",
+			Entry:   jiracmd.CmdTransitionRegistry("reopen"),
+		},
+		jiracli.CommandRegistry{
+			Command: "request",
+			Entry:   jiracmd.CmdRequestRegistry(),
+			Aliases: []string{"req"},
+		},
+		jiracli.CommandRegistry{
+			Command: "resolve",
+			Entry:   jiracmd.CmdTransitionRegistry("resolve"),
+		},
+		jiracli.CommandRegistry{
+			Command: "start",
+			Entry:   jiracmd.CmdTransitionRegistry("start"),
+		},
+		jiracli.CommandRegistry{
+			Command: "stop",
+			Entry:   jiracmd.CmdTransitionRegistry("stop"),
+		},
+		jiracli.CommandRegistry{
+			Command: "subtask",
+			Entry:   jiracmd.CmdSubtaskRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "take",
+			Entry:   jiracmd.CmdTakeRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "todo",
+			Entry:   jiracmd.CmdTransitionRegistry("To Do"),
+		},
 		jiracli.CommandRegistry{
 			Command: "transition",
 			Aliases: []string{"trans"},
@@ -182,115 +389,34 @@ func main() {
 			Command: "transmeta",
 			Entry:   jiracmd.CmdTransitionsRegistry("debug"),
 		},
-		jiracli.CommandRegistry{
-			Command: "close",
-			Entry:   jiracmd.CmdTransitionRegistry("close"),
-		},
-		jiracli.CommandRegistry{
-			Command: "acknowledge",
-			Aliases: []string{"ack"},
-			Entry:   jiracmd.CmdTransitionRegistry("acknowledge"),
-		},
-		jiracli.CommandRegistry{
-			Command: "reopen",
-			Entry:   jiracmd.CmdTransitionRegistry("reopen"),
-		},
-		jiracli.CommandRegistry{
-			Command: "resolve",
-			Entry:   jiracmd.CmdTransitionRegistry("resolve"),
-		},
-		jiracli.CommandRegistry{
-			Command: "start",
-			Entry:   jiracmd.CmdTransitionRegistry("start"),
-		},
-		jiracli.CommandRegistry{
-			Command: "stop",
-			Entry:   jiracmd.CmdTransitionRegistry("stop"),
-		},
-		jiracli.CommandRegistry{
-			Command: "todo",
-			Entry:   jiracmd.CmdTransitionRegistry("To Do"),
-		},
-		jiracli.CommandRegistry{
-			Command: "backlog",
-			Entry:   jiracmd.CmdTransitionRegistry("Backlog"),
-		},
-		jiracli.CommandRegistry{
-			Command: "done",
-			Entry:   jiracmd.CmdTransitionRegistry("Done"),
-		},
-		jiracli.CommandRegistry{
-			Command: "in-progress",
-			Aliases: []string{"prog", "progress"},
-			Entry:   jiracmd.CmdTransitionRegistry("Progress"),
-		},
-		jiracli.CommandRegistry{
-			Command: "vote",
-			Entry:   jiracmd.CmdVoteRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "rank",
-			Entry:   jiracmd.CmdRankRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "watch",
-			Entry:   jiracmd.CmdWatchRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "labels add",
-			Entry:   jiracmd.CmdLabelsAddRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "labels set",
-			Entry:   jiracmd.CmdLabelsSetRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "labels remove",
-			Entry:   jiracmd.CmdLabelsRemoveRegistry(),
-			Aliases: []string{"rm"},
-		},
-		jiracli.CommandRegistry{
-			Command: "take",
-			Entry:   jiracmd.CmdTakeRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "assign",
-			Entry:   jiracmd.CmdAssignRegistry(),
-			Aliases: []string{"give"},
-		},
 		jiracli.CommandRegistry{
 			Command: "unassign",
 			Entry:   jiracmd.CmdUnassignRegistry(),
 		},
-		jiracli.CommandRegistry{
-			Command: "component add",
-			Entry:   jiracmd.CmdComponentAddRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "components",
-			Entry:   jiracmd.CmdComponentsRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "issuetypes",
-			Entry:   jiracmd.CmdIssueTypesRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "export-templates",
-			Entry:   jiracmd.CmdExportTemplatesRegistry(),
-		},
 		jiracli.CommandRegistry{
 			Command: "unexport-templates",
 			Entry:   jiracmd.CmdUnexportTemplatesRegistry(),
 		},
 		jiracli.CommandRegistry{
-			Command: "browse",
-			Entry:   jiracmd.CmdBrowseRegistry(),
-			Aliases: []string{"b"},
+			Command: "view",
+			Entry:   jiracmd.CmdViewRegistry(),
 		},
 		jiracli.CommandRegistry{
-			Command: "request",
-			Entry:   jiracmd.CmdRequestRegistry(),
-			Aliases: []string{"req"},
+			Command: "vote",
+			Entry:   jiracmd.CmdVoteRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "watch",
+			Entry:   jiracmd.CmdWatchRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "worklog add",
+			Entry:   jiracmd.CmdWorklogAddRegistry(),
+		},
+		jiracli.CommandRegistry{
+			Command: "worklog list",
+			Entry:   jiracmd.CmdWorklogListRegistry(),
+			Default: true,
 		},
 	}
 
@@ -307,9 +433,21 @@ func main() {
 	}
 
 	if len(data.CustomCommands) > 0 {
+		runner := syscall.Exec
+		if runtime.GOOS == "windows" {
+			runner = func(binary string, cmd []string, env []string) error {
+				command := exec.Command(binary, cmd[1:]...)
+				command.Stdin = os.Stdin
+				command.Stdout = os.Stdout
+				command.Stderr = os.Stderr
+				command.Env = env
+				return command.Run()
+			}
+		}
+
 		tmp := map[string]interface{}{}
 		fig.LoadAllConfigs("config.yml", &tmp)
-		kingpeon.RegisterDynamicCommands(app, data.CustomCommands, jiracli.TemplateProcessor())
+		kingpeon.RegisterDynamicCommandsWithRunner(runner, app, data.CustomCommands, jiracli.TemplateProcessor())
 	}
 
 	app.Terminate(func(status int) {
@@ -323,7 +461,12 @@ func main() {
 
 	// checking for default usage of `jira ISSUE-123` but need to allow
 	// for global options first like: `jira --user mothra ISSUE-123`
-	ctx, _ := app.ParseContext(os.Args[1:])
+	ctx, err := app.ParseContext(os.Args[1:])
+	if err != nil && ctx == nil {
+		// This is an internal kingpin usage error, duplicate options/commands
+		log.Fatalf("error: %s, ctx: %v", err, ctx)
+	}
+
 	if ctx != nil {
 		if ctx.SelectedCommand == nil {
 			next := ctx.Next()

epic.go

@@ -0,0 +1,113 @@
+package jira
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"strings"
+
+	"github.com/coryb/oreo"
+
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
+)
+
+// https://docs.atlassian.com/jira-software/REST/latest/#agile/1.0/epic-getIssuesForEpic
+func (j *Jira) EpicSearch(epic string, sp SearchProvider) (*jiradata.SearchResults, error) {
+	return EpicSearch(j.UA, j.Endpoint, epic, sp)
+}
+
+func EpicSearch(ua HttpClient, endpoint string, epic string, sp SearchProvider) (*jiradata.SearchResults, error) {
+	req := sp.ProvideSearchRequest()
+	// encoded, err := json.Marshal(req)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	uri, err := url.Parse(fmt.Sprintf("%s/rest/agile/1.0/epic/%s/issue", endpoint, epic))
+	if err != nil {
+		return nil, err
+	}
+	params := url.Values{}
+	if len(req.Fields) > 0 {
+		params.Add("fields", strings.Join(req.Fields, ","))
+	}
+	if req.JQL != "" {
+		params.Add("jql", req.JQL)
+	}
+	if req.MaxResults != 0 {
+		params.Add("maxResults", fmt.Sprintf("%d", req.MaxResults))
+	}
+	if req.StartAt != 0 {
+		params.Add("startAt", fmt.Sprintf("%d", req.StartAt))
+	}
+	if req.ValidateQuery != "" {
+		params.Add("validateQuery", req.ValidateQuery)
+	}
+	uri.RawQuery = params.Encode()
+
+	resp, err := ua.Do(oreo.RequestBuilder(uri).WithHeader("Accept", "application/json").Build())
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 200 {
+		results := &jiradata.SearchResults{}
+		return results, readJSON(resp.Body, results)
+	}
+	return nil, responseError(resp)
+}
+
+type EpicIssuesProvider interface {
+	ProvideEpicIssues() *jiradata.EpicIssues
+}
+
+// https://docs.atlassian.com/jira-software/REST/latest/#agile/1.0/epic-moveIssuesToEpic
+func (j *Jira) EpicAddIssues(epic string, eip EpicIssuesProvider) error {
+	return EpicAddIssues(j.UA, j.Endpoint, epic, eip)
+}
+
+func EpicAddIssues(ua HttpClient, endpoint string, epic string, eip EpicIssuesProvider) error {
+	req := eip.ProvideEpicIssues()
+	encoded, err := json.Marshal(req)
+	if err != nil {
+		return err
+	}
+
+	uri := fmt.Sprintf("%s/rest/agile/1.0/epic/%s/issue", endpoint, epic)
+	resp, err := ua.Post(uri, "application/json", bytes.NewBuffer(encoded))
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 204 {
+		return nil
+	}
+	return responseError(resp)
+}
+
+// https://docs.atlassian.com/jira-software/REST/latest/#agile/1.0/epic-removeIssuesFromEpic
+func (j *Jira) EpicRemoveIssues(eip EpicIssuesProvider) error {
+	return EpicRemoveIssues(j.UA, j.Endpoint, eip)
+}
+
+func EpicRemoveIssues(ua HttpClient, endpoint string, eip EpicIssuesProvider) error {
+	req := eip.ProvideEpicIssues()
+	encoded, err := json.Marshal(req)
+	if err != nil {
+		return err
+	}
+
+	uri := fmt.Sprintf("%s/rest/agile/1.0/epic/none/issue", endpoint)
+	resp, err := ua.Post(uri, "application/json", bytes.NewBuffer(encoded))
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 204 {
+		return nil
+	}
+	return responseError(resp)
+}

glide.lock

@@ -1,64 +0,0 @@
-hash: 4c3ae9c9421b17aae9987ea9566cac7d0a789750bb77c8d235b7be163aec8cae
-updated: 2017-09-06T11:32:06.307462177-07:00
-imports:
-- name: github.com/alecthomas/template
-  version: a0175ee3bccc567396460bf5acd36800cb10c49c
-  subpackages:
-  - parse
-- name: github.com/alecthomas/units
-  version: 2efee857e7cfd4f3d0138cc3cbb1b4966962b93a
-- name: github.com/cheekybits/genny
-  version: 9127e812e1e9e501ce899a18121d316ecb52e4ba
-  subpackages:
-  - generic
-- name: github.com/coryb/figtree
-  version: 48d3afc6118a0c353dc7d41ff77a3e0b75e14c07
-- name: github.com/coryb/kingpeon
-  version: 3ca9749293339b932167921f92ce7a55207ad34e
-- name: github.com/coryb/oreo
-  version: 95687d61c95ee1522c1140e2af59b0c1846abfc1
-- name: github.com/fatih/camelcase
-  version: f6a740d52f961c60348ebb109adde9f4635d7540
-- name: github.com/guelfey/go.dbus
-  version: f6a3a2366cc39b8479cadc499d3c735fb10fbdda
-- name: github.com/jinzhu/copier
-  version: 32e0d0db1dcd4373fb9eb0f9d727b1fe1a723e54
-- name: github.com/kballard/go-shellquote
-  version: cd60e84ee657ff3dc51de0b4f55dd299a3e136f2
-- name: github.com/mattn/go-colorable
-  version: ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b
-- name: github.com/mattn/go-isatty
-  version: fc9e8d8ef48496124e79ae0df75490096eccf6fe
-- name: github.com/mgutz/ansi
-  version: 9520e82c474b0a04dd04f8a40959027271bab992
-- name: github.com/pkg/browser
-  version: c90ca0c84f15f81c982e32665bffd8d7aac8f097
-- name: github.com/pkg/errors
-  version: 645ef00459ed84a119197bfb8d8205042c6df63d
-- name: github.com/sethgrid/pester
-  version: a86a2d88f4dc3c7dbf3a6a6bbbfb095690b834b6
-- name: github.com/theckman/go-flock
-  version: 6de226b0d5f040ed85b88c82c381709b98277f3d
-- name: github.com/tmc/keyring
-  version: 06e6283d50adc5f8fcdb3cdf33ee1244d4400ae1
-- name: golang.org/x/crypto
-  version: 81e90905daefcd6fd217b62423c0908922eadb30
-  subpackages:
-  - ssh/terminal
-- name: golang.org/x/sys
-  version: 9aade4d3a3b7e6d876cd3823ad20ec45fc035402
-  subpackages:
-  - unix
-  - windows
-- name: gopkg.in/AlecAivazis/survey.v1
-  version: 9d910423e24aa6d7c7950160658c295e0734c7e0
-  subpackages:
-  - core
-  - terminal
-- name: gopkg.in/alecthomas/kingpin.v2
-  version: 1087e65c9441605df944fb12c33f0fe7072d18ca
-- name: gopkg.in/coryb/yaml.v2
-  version: fb7cb9628c6e3bdd76c29fb91798d51a09832470
-- name: gopkg.in/op/go-logging.v1
-  version: b2cb9fa56473e98db8caba80237377e83fe44db5
-testImports: []

glide.yaml

@@ -1,22 +0,0 @@
-package: gopkg.in/Netflix-Skunkworks/go-jira.v1
-import:
-- package: github.com/coryb/figtree
-- package: github.com/coryb/kingpeon
-- package: github.com/coryb/oreo
-- package: github.com/jinzhu/copier
-- package: github.com/kballard/go-shellquote
-- package: github.com/mgutz/ansi
-- package: github.com/pkg/browser
-- package: github.com/pkg/errors
-  version: ^0.8.0
-- package: github.com/tmc/keyring
-- package: golang.org/x/crypto
-  subpackages:
-  - ssh/terminal
-- package: gopkg.in/AlecAivazis/survey.v1
-  version: ^1.3.1
-- package: gopkg.in/alecthomas/kingpin.v2
-  version: ^2.2.5
-- package: gopkg.in/coryb/yaml.v2
-- package: gopkg.in/op/go-logging.v1
-  version: ^1.0.0

issue.go

@@ -4,8 +4,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io"
+	"mime/multipart"
+	"net/url"
 	"strings"
 
+	"github.com/coryb/oreo"
+
 	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
 )
 
@@ -533,3 +538,50 @@ func IssueAssign(ua HttpClient, endpoint string, issue, name string) error {
 	}
 	return responseError(resp)
 }
+
+// https://docs.atlassian.com/jira/REST/cloud/#api/2/issue/{issueIdOrKey}/attachments-addAttachment
+func (j *Jira) IssueAttachFile(issue, filename string, contents io.Reader) (*jiradata.ListOfAttachment, error) {
+	return IssueAttachFile(j.UA, j.Endpoint, issue, filename, contents)
+}
+
+func IssueAttachFile(ua HttpClient, endpoint string, issue, filename string, contents io.Reader) (*jiradata.ListOfAttachment, error) {
+	var buf bytes.Buffer
+	w := multipart.NewWriter(&buf)
+	formFile, err := w.CreateFormFile("file", filename)
+	if err != nil {
+		return nil, err
+	}
+	_, err = io.Copy(formFile, contents)
+	if err != nil {
+		return nil, err
+	}
+
+	uri, err := url.Parse(fmt.Sprintf("%s/rest/api/2/issue/%s/attachments", endpoint, issue))
+	req := oreo.RequestBuilder(uri).WithMethod("POST").WithHeader(
+		"X-Atlassian-Token", "no-check",
+	).WithHeader(
+		"Accept", "application/json",
+	).WithContentType(w.FormDataContentType()).WithBody(&buf).Build()
+	w.Close()
+
+	resp, err := ua.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 200 {
+		// FIXME move this to a test, and run go tests as part of our regression
+		if false {
+			// this is because schema is wrong, defaults to type `int`, so we manually change it
+			// to `string`.  If the jiradata is regenerated we need to manually make the change
+			// again.
+			log.Debugf("Assert Attachment.ID is a string, rather than int: %v", &jiradata.Attachment{
+				ID: jiradata.IntOrString(0),
+			})
+		}
+		results := jiradata.ListOfAttachment{}
+		return &results, readJSON(resp.Body, &results)
+	}
+	return nil, responseError(resp)
+}

jira.go

@@ -7,7 +7,7 @@ import (
 
 var log = logging.MustGetLogger("jira")
 
-const VERSION = "1.0.3"
+const VERSION = "1.0.10"
 
 type Jira struct {
 	Endpoint string     `json:"endpoint,omitempty" yaml:"endpoint,omitempty"`

jiracli/cli.go

@@ -16,6 +16,7 @@ import (
 	"github.com/coryb/oreo"
 	"github.com/jinzhu/copier"
 	shellquote "github.com/kballard/go-shellquote"
+	"github.com/tidwall/gjson"
 	"gopkg.in/AlecAivazis/survey.v1"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 	yaml "gopkg.in/coryb/yaml.v2"
@@ -40,6 +41,7 @@ type GlobalOptions struct {
 type CommonOptions struct {
 	Browse      figtree.BoolOption   `yaml:"browse,omitempty" json:"browse,omitempty"`
 	Editor      figtree.StringOption `yaml:"editor,omitempty" json:"editor,omitempty"`
+	GJsonQuery  figtree.StringOption `yaml:"gjq,omitempty" json:"gjq,omitempty"`
 	SkipEditing figtree.BoolOption   `yaml:"noedit,omitempty" json:"noedit,omitempty"`
 	Template    figtree.StringOption `yaml:"template,omitempty" json:"template,omitempty"`
 }
@@ -169,6 +171,22 @@ func TemplateUsage(cmd *kingpin.CmdClause, opts *CommonOptions) {
 	cmd.Flag("template", "Template to use for output").Short('t').SetValue(&opts.Template)
 }
 
+func GJsonQueryUsage(cmd *kingpin.CmdClause, opts *CommonOptions) {
+	cmd.Flag("gjq", "GJSON Query to filter output, see https://goo.gl/iaYwJ5").SetValue(&opts.GJsonQuery)
+}
+
+func (o *CommonOptions) PrintTemplate(data interface{}) error {
+	if o.GJsonQuery.Value != "" {
+		buf := bytes.NewBufferString("")
+		RunTemplate("json", data, buf)
+		results := gjson.GetBytes(buf.Bytes(), o.GJsonQuery.Value)
+		_, err := os.Stdout.Write([]byte(results.String()))
+		os.Stdout.Write([]byte{'\n'})
+		return err
+	}
+	return RunTemplate(o.Template.Value, data, nil)
+}
+
 func (o *CommonOptions) editFile(fileName string) (changes bool, err error) {
 	var editor string
 	for _, ed := range []string{o.Editor.Value, os.Getenv("JIRA_EDITOR"), os.Getenv("EDITOR"), "vim"} {

jiracli/templates.go

@@ -13,9 +13,11 @@ import (
 	"strings"
 	"text/template"
 
+	yaml "gopkg.in/coryb/yaml.v2"
+
+	"github.com/coryb/figtree"
 	"github.com/mgutz/ansi"
 	"golang.org/x/crypto/ssh/terminal"
-	yaml "gopkg.in/coryb/yaml.v2"
 )
 
 func findTemplate(name string) ([]byte, error) {
@@ -60,6 +62,9 @@ func tmpTemplate(templateName string, data interface{}) (string, error) {
 
 func TemplateProcessor() *template.Template {
 	funcs := map[string]interface{}{
+		"jira": func() string {
+			return os.Args[0]
+		},
 		"toJson": func(content interface{}) (string, error) {
 			bytes, err := json.MarshalIndent(content, "", "    ")
 			if err != nil {
@@ -154,6 +159,48 @@ func TemplateProcessor() *template.Template {
 	return template.New("gojira").Funcs(funcs)
 }
 
+func ConfigTemplate(fig *figtree.FigTree, template, command string, opts interface{}) (string, error) {
+	var tmp map[string]interface{}
+	err := ConvertType(opts, &tmp)
+	if err != nil {
+		return "", err
+	}
+	fig.LoadAllConfigs(command+".yml", &tmp)
+	fig.LoadAllConfigs("config.yml", &tmp)
+
+	tmpl, err := TemplateProcessor().Parse(template)
+	if err != nil {
+		return "", err
+	}
+	buf := bytes.NewBufferString("")
+	if err := tmpl.Execute(buf, &tmp); err != nil {
+		return "", err
+	}
+	return buf.String(), nil
+}
+
+func ConvertType(input interface{}, output interface{}) error {
+	// HACK HACK HACK: convert data formats to json for backwards compatibilty with templates
+	jsonData, err := json.Marshal(input)
+	if err != nil {
+		return err
+	}
+
+	defer func(mapType, iface reflect.Type) {
+		yaml.DefaultMapType = mapType
+		yaml.IfaceType = iface
+	}(yaml.DefaultMapType, yaml.IfaceType)
+
+	yaml.DefaultMapType = reflect.TypeOf(map[string]interface{}{})
+	yaml.IfaceType = yaml.DefaultMapType.Elem()
+
+	if err := yaml.Unmarshal(jsonData, output); err != nil {
+		return err
+	}
+	return nil
+
+}
+
 func RunTemplate(templateName string, data interface{}, out io.Writer) error {
 
 	templateContent, err := getTemplate(templateName)
@@ -165,22 +212,10 @@ func RunTemplate(templateName string, data interface{}, out io.Writer) error {
 		out = os.Stdout
 	}
 
-	// HACK HACK HACK: convert data formats to json for backwards compatibilty with templates
 	var rawData interface{}
-	if jsonData, err := json.Marshal(data); err != nil {
+	err = ConvertType(data, &rawData)
+	if err != nil {
 		return err
-	} else {
-		defer func(mapType, iface reflect.Type) {
-			yaml.DefaultMapType = mapType
-			yaml.IfaceType = iface
-		}(yaml.DefaultMapType, yaml.IfaceType)
-
-		yaml.DefaultMapType = reflect.TypeOf(map[string]interface{}{})
-		yaml.IfaceType = yaml.DefaultMapType.Elem()
-
-		if err := yaml.Unmarshal(jsonData, &rawData); err != nil {
-			return err
-		}
 	}
 
 	tmpl, err := TemplateProcessor().Parse(templateContent)
@@ -194,25 +229,29 @@ func RunTemplate(templateName string, data interface{}, out io.Writer) error {
 }
 
 var AllTemplates = map[string]string{
-	"component-add":  defaultComponentAddTemplate,
-	"debug":          defaultDebugTemplate,
-	"fields":         defaultDebugTemplate,
-	"editmeta":       defaultDebugTemplate,
-	"transmeta":      defaultDebugTemplate,
-	"createmeta":     defaultDebugTemplate,
-	"issuelinktypes": defaultDebugTemplate,
-	"list":           defaultListTemplate,
-	"table":          defaultTableTemplate,
-	"view":           defaultViewTemplate,
-	"edit":           defaultEditTemplate,
-	"transitions":    defaultTransitionsTemplate,
-	"components":     defaultComponentsTemplate,
-	"issuetypes":     defaultIssuetypesTemplate,
-	"create":         defaultCreateTemplate,
-	"subtask":        defaultSubtaskTemplate,
+	"attach-list":    defaultAttachListTemplate,
 	"comment":        defaultCommentTemplate,
-	"transition":     defaultTransitionTemplate,
+	"component-add":  defaultComponentAddTemplate,
+	"components":     defaultComponentsTemplate,
+	"create":         defaultCreateTemplate,
+	"createmeta":     defaultDebugTemplate,
+	"debug":          defaultDebugTemplate,
+	"edit":           defaultEditTemplate,
+	"editmeta":       defaultDebugTemplate,
+	"epic-create":    defaultEpicCreateTemplate,
+	"epic-list":      defaultTableTemplate,
+	"fields":         defaultDebugTemplate,
+	"issuelinktypes": defaultDebugTemplate,
+	"issuetypes":     defaultIssuetypesTemplate,
+	"json":           defaultDebugTemplate,
+	"list":           defaultListTemplate,
 	"request":        defaultDebugTemplate,
+	"subtask":        defaultSubtaskTemplate,
+	"table":          defaultTableTemplate,
+	"transition":     defaultTransitionTemplate,
+	"transitions":    defaultTransitionsTemplate,
+	"transmeta":      defaultDebugTemplate,
+	"view":           defaultViewTemplate,
 	"worklog":        defaultWorklogTemplate,
 	"worklogs":       defaultWorklogsTemplate,
 }
@@ -222,14 +261,23 @@ const defaultDebugTemplate = "{{ . | toJson}}\n"
 const defaultListTemplate = "{{ range .issues }}{{ .key | append \":\" | printf \"%-12s\"}} {{ .fields.summary }}\n{{ end }}"
 
 const defaultTableTemplate = `{{/* table template */ -}}
-{{$w := sub termWidth 92 -}}
-+{{ "-" | rep 16 }}+{{ "-" | rep $w }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
-| {{ "Issue" | printf "%-14s" }} | {{ "Summary" | printf (printf "%%-%ds" (sub $w 2)) }} | {{ "Priority" | printf "%-12s" }} | {{ "Status" | printf "%-12s" }} | {{ "Age" | printf "%-10s" }} | {{ "Reporter" | printf "%-12s" }} | {{ "Assignee" | printf "%-12s" }} |
-+{{ "-" | rep 16 }}+{{ "-" | rep $w }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
+{{$w := sub termWidth 107 -}}
++{{ "-" | rep 16 }}+{{ "-" | rep $w }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
+| {{ "Issue" | printf "%-14s" }} | {{ "Summary" | printf (printf "%%-%ds" (sub $w 2)) }} | {{ "Type" | printf "%-12s"}} | {{ "Priority" | printf "%-12s" }} | {{ "Status" | printf "%-12s" }} | {{ "Age" | printf "%-10s" }} | {{ "Reporter" | printf "%-12s" }} | {{ "Assignee" | printf "%-12s" }} |
++{{ "-" | rep 16 }}+{{ "-" | rep $w }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
 {{ range .issues -}}
-  | {{ .key | printf "%-14s"}} | {{ .fields.summary | abbrev (sub $w 2) | printf (printf "%%-%ds" (sub $w 2)) }} | {{.fields.priority.name | printf "%-12s" }} | {{.fields.status.name | printf "%-12s" }} | {{.fields.created | age | printf "%-10s" }} | {{if .fields.reporter}}{{ .fields.reporter.name | printf "%-12s"}}{{else}}<unassigned>{{end}} | {{if .fields.assignee }}{{.fields.assignee.name | printf "%-12s" }}{{else}}<unassigned>{{end}} |
+  | {{ .key | printf "%-14s"}} | {{ .fields.summary | abbrev (sub $w 2) | printf (printf "%%-%ds" (sub $w 2)) }} | {{.fields.issuetype.name | printf "%-12s" }} | {{.fields.priority.name | printf "%-12s" }} | {{.fields.status.name | printf "%-12s" }} | {{.fields.created | age | printf "%-10s" }} | {{if .fields.reporter}}{{ .fields.reporter.name | printf "%-12s"}}{{else}}<unassigned>{{end}} | {{if .fields.assignee }}{{.fields.assignee.name | printf "%-12s" }}{{else}}<unassigned>{{end}} |
 {{ end -}}
-+{{ "-" | rep 16 }}+{{ "-" | rep $w }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
++{{ "-" | rep 16 }}+{{ "-" | rep $w }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
+`
+const defaultAttachListTemplate = `{{/* table template */ -}}
++{{ "-" | rep 12 }}+{{ "-" | rep 30 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
+| {{printf "%-10s" "id"}} | {{printf "%-28s" "filename"}} | {{printf "%-10s" "bytes"}} | {{printf "%-12s" "user"}} | {{printf "%-12s" "created"}} |
++{{ "-" | rep 12 }}+{{ "-" | rep 30 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
+{{range . -}}
+| {{.id | printf "%10d" }} | {{.filename | printf "%-28s"}} | {{.size | printf "%10d"}} | {{.author.name | printf "%-12s"}} | {{.created | age | printf "%-12s"}} |
+{{end -}}
++{{ "-" | rep 12 }}+{{ "-" | rep 30 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
 `
 
 const defaultViewTemplate = `{{/* view template */ -}}
@@ -352,6 +400,31 @@ fields:
     - name: {{.}}{{end}}
     - name:{{end}}`
 
+const defaultEpicCreateTemplate = `{{/* epic create template */ -}}
+fields:
+  project:
+    key: {{ or .overrides.project "" }}
+  # Epic Name
+  customfield_10120: {{ or (index .overrides "epic-name") "" }}
+  summary: >-
+    {{ or .overrides.summary "" }}{{if .meta.fields.priority.allowedValues}}
+  priority: # Values: {{ range .meta.fields.priority.allowedValues }}{{.name}}, {{end}}
+    name: {{ or .overrides.priority ""}}{{end}}{{if .meta.fields.components.allowedValues}}
+  components: # Values: {{ range .meta.fields.components.allowedValues }}{{.name}}, {{end}}{{ range split "," (or .overrides.components "")}}
+    - name: {{ . }}{{end}}{{end}}
+  description: |~
+    {{ or .overrides.description "" | indent 4 }}{{if .meta.fields.assignee}}
+  assignee:
+    name: {{ or .overrides.assignee "" }}{{end}}{{if .meta.fields.reporter}}
+  reporter:
+    name: {{ or .overrides.reporter .overrides.user }}{{end}}{{if .meta.fields.customfield_10110}}
+  # watchers
+  customfield_10110: {{ range split "," (or .overrides.watchers "")}}
+    - name: {{.}}{{end}}
+    - name:{{end}}
+  issuetype:
+    name: Epic`
+
 const defaultSubtaskTemplate = `{{/* create subtask template */ -}}
 fields:
   project:

jiracmd/attachCreate.go

@@ -0,0 +1,99 @@
+package jiracmd
+
+import (
+	"fmt"
+	"os"
+	"sort"
+
+	"golang.org/x/crypto/ssh/terminal"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	jira "gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	yaml "gopkg.in/coryb/yaml.v2"
+)
+
+type AttachCreateOptions struct {
+	jiracli.CommonOptions `yaml:",inline" json:",inline" figtree:",inline"`
+	Issue                 string `yaml:"issue,omitempty" json:"issue,omitempty"`
+	Attachment            string `yaml:"attachment,omitempty" json:"attachment,omitempty"`
+	Filename              string `yaml:"filename,omitempty" json:"filename,omitempty"`
+	SaveFile              string `yaml:"savefile,omitempty" json:"savefile,omitempty"`
+}
+
+func CmdAttachCreateRegistry() *jiracli.CommandRegistryEntry {
+	opts := AttachCreateOptions{}
+
+	return &jiracli.CommandRegistryEntry{
+		"Attach file to issue",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdAttachCreateUsage(cmd, &opts)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdAttachCreate(o, globals, &opts)
+		},
+	}
+}
+
+func CmdAttachCreateUsage(cmd *kingpin.CmdClause, opts *AttachCreateOptions) error {
+	jiracli.BrowseUsage(cmd, &opts.CommonOptions)
+	cmd.Flag("saveFile", "Write attachment information as yaml to file").StringVar(&opts.SaveFile)
+	cmd.Flag("filename", "Filename to use for attachment").Short('f').StringVar(&opts.Filename)
+	cmd.Arg("ISSUE", "issue to assign").Required().StringVar(&opts.Issue)
+	cmd.Arg("ATTACHMENT", "File to attach to issue, if not provided read from stdin").StringVar(&opts.Attachment)
+	return nil
+}
+
+func CmdAttachCreate(o *oreo.Client, globals *jiracli.GlobalOptions, opts *AttachCreateOptions) error {
+	var contents *os.File
+	var err error
+	if opts.Attachment == "" {
+		if terminal.IsTerminal(int(os.Stdin.Fd())) {
+			return fmt.Errorf("ATTACHMENT argument required or redirect from STDIN")
+		}
+		contents = os.Stdin
+		if opts.Filename == "" {
+			return fmt.Errorf("--filename required when reading from stdin")
+		}
+	} else {
+		contents, err = os.Open(opts.Attachment)
+		if err != nil {
+			return err
+		}
+		if opts.Filename == "" {
+			opts.Filename = opts.Attachment
+		}
+	}
+	attachments, err := jira.IssueAttachFile(o, globals.Endpoint.Value, opts.Issue, opts.Filename, contents)
+	if err != nil {
+		return err
+	}
+
+	sort.Sort(sort.Reverse(attachments))
+
+	if opts.SaveFile != "" {
+		fh, err := os.Create(opts.SaveFile)
+		if err != nil {
+			return err
+		}
+		defer fh.Close()
+		out, err := yaml.Marshal((*attachments)[0])
+		if err != nil {
+			return err
+		}
+		fh.Write(out)
+	}
+
+	if !globals.Quiet.Value {
+		fmt.Printf("OK %d %s\n", (*attachments)[0].ID, (*attachments)[0].Content)
+	}
+
+	if opts.Browse.Value {
+		return CmdBrowse(globals, opts.Issue)
+	}
+
+	return nil
+}

jiracmd/attachGet.go

@@ -0,0 +1,79 @@
+package jiracmd
+
+import (
+	"fmt"
+	"io"
+	"os"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	jira "gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
+)
+
+type AttachGetOptions struct {
+	AttachmentID string `yaml:"attachment-id,omitempty" json:"attachment-id,omitempty"`
+	OutputFile   string `yaml:"output-file,omitempty" json:"output-file,omitempty"`
+}
+
+func CmdAttachGetRegistry() *jiracli.CommandRegistryEntry {
+	opts := AttachGetOptions{}
+
+	return &jiracli.CommandRegistryEntry{
+		"Fetch attachment",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdAttachGetUsage(cmd, &opts)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdAttachGet(o, globals, &opts)
+		},
+	}
+}
+
+func CmdAttachGetUsage(cmd *kingpin.CmdClause, opts *AttachGetOptions) error {
+	cmd.Flag("output", "Write attachment to specified file name, '-' for stdout").Short('o').StringVar(&opts.OutputFile)
+	cmd.Arg("ATTACHMENT-ID", "Attachment id to fetch").StringVar(&opts.AttachmentID)
+	return nil
+}
+
+func CmdAttachGet(o *oreo.Client, globals *jiracli.GlobalOptions, opts *AttachGetOptions) error {
+	attachment, err := jira.GetAttachment(o, globals.Endpoint.Value, opts.AttachmentID)
+	if err != nil {
+		return err
+	}
+
+	resp, err := o.Get(attachment.Content)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	var output *os.File
+	if opts.OutputFile == "-" {
+		output = os.Stdout
+	} else if opts.OutputFile != "" {
+		output, err = os.Create(opts.OutputFile)
+		if err != nil {
+			return err
+		}
+		defer output.Close()
+	} else {
+		output, err = os.Create(attachment.Filename)
+		if err != nil {
+			return err
+		}
+		defer output.Close()
+	}
+
+	_, err = io.Copy(output, resp.Body)
+	if err != nil {
+		return err
+	}
+	output.Close()
+	if opts.OutputFile != "-" && !globals.Quiet.Value {
+		fmt.Printf("OK Wrote %s\n", output.Name())
+	}
+	return nil
+}

jiracmd/attachList.go

@@ -0,0 +1,67 @@
+package jiracmd
+
+import (
+	"sort"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	"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 AttachListOptions struct {
+	jiracli.CommonOptions `yaml:",inline" json:",inline" figtree:",inline"`
+	Issue                 string `yaml:"issue,omitempty" json:"issue,omitempty"`
+}
+
+func CmdAttachListRegistry() *jiracli.CommandRegistryEntry {
+	opts := AttachListOptions{
+		CommonOptions: jiracli.CommonOptions{
+			Template: figtree.NewStringOption("attach-list"),
+		},
+	}
+
+	return &jiracli.CommandRegistryEntry{
+		"Prints attachment details for issue",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdAttachListUsage(cmd, &opts)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdAttachList(o, globals, &opts)
+		},
+	}
+}
+
+func CmdAttachListUsage(cmd *kingpin.CmdClause, opts *AttachListOptions) error {
+	jiracli.BrowseUsage(cmd, &opts.CommonOptions)
+	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	cmd.Arg("ISSUE", "Issue id to lookup attachments").Required().StringVar(&opts.Issue)
+	return nil
+}
+
+func CmdAttachList(o *oreo.Client, globals *jiracli.GlobalOptions, opts *AttachListOptions) error {
+	data, err := jira.GetIssue(o, globals.Endpoint.Value, opts.Issue, nil)
+	if err != nil {
+		return err
+	}
+
+	// need to conver the interface{} "attachment" field to an actual
+	// ListOfAttachment object so we can sort it
+	var attachments jiradata.ListOfAttachment
+	err = jiracli.ConvertType(data.Fields["attachment"], &attachments)
+	if err != nil {
+		return err
+	}
+	sort.Sort(&attachments)
+
+	if err := opts.PrintTemplate(attachments); err != nil {
+		return err
+	}
+	if opts.Browse.Value {
+		return CmdBrowse(globals, opts.Issue)
+	}
+	return nil
+}

jiracmd/attachRemove.go

@@ -0,0 +1,46 @@
+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/jiracli"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
+)
+
+type AttachRemoveOptions struct {
+	AttachmentID string `yaml:"attachment-id,omitempty" json:"attachment-id,omitempty"`
+}
+
+func CmdAttachRemoveRegistry() *jiracli.CommandRegistryEntry {
+	opts := AttachRemoveOptions{}
+
+	return &jiracli.CommandRegistryEntry{
+		"Delete attachment",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdAttachRemoveUsage(cmd, &opts)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdAttachRemove(o, globals, &opts)
+		},
+	}
+}
+
+func CmdAttachRemoveUsage(cmd *kingpin.CmdClause, opts *AttachRemoveOptions) error {
+	cmd.Arg("ATTACHMENT-ID", "Attachment id to fetch").StringVar(&opts.AttachmentID)
+	return nil
+}
+
+func CmdAttachRemove(o *oreo.Client, globals *jiracli.GlobalOptions, opts *AttachRemoveOptions) error {
+	if err := jira.RemoveAttachment(o, globals.Endpoint.Value, opts.AttachmentID); err != nil {
+		return err
+	}
+
+	if !globals.Quiet.Value {
+		fmt.Printf("OK Deleted Attachment %s\n", opts.AttachmentID)
+	}
+	return nil
+}

jiracmd/components.go

@@ -37,6 +37,7 @@ func CmdComponentsRegistry() *jiracli.CommandRegistryEntry {
 
 func CmdComponentsUsage(cmd *kingpin.CmdClause, opts *ComponentsOptions) error {
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 	cmd.Flag("project", "project to list components").Short('p').StringVar(&opts.Project)
 
 	return nil
@@ -51,5 +52,5 @@ func CmdComponents(o *oreo.Client, globals *jiracli.GlobalOptions, opts *Compone
 	if err != nil {
 		return err
 	}
-	return jiracli.RunTemplate(opts.Template.Value, data, nil)
+	return opts.PrintTemplate(data)
 }

jiracmd/createmeta.go

@@ -35,6 +35,7 @@ func CmdCreateMetaRegistry() *jiracli.CommandRegistryEntry {
 
 func CmdCreateMetaUsage(cmd *kingpin.CmdClause, opts *CreateMetaOptions) error {
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 	cmd.Flag("project", "project to fetch create metadata").Short('p').StringVar(&opts.Project)
 	cmd.Flag("issuetype", "issuetype in project to fetch create metadata").Short('i').StringVar(&opts.IssueType)
 	return nil
@@ -49,5 +50,5 @@ func CmdCreateMeta(o *oreo.Client, globals *jiracli.GlobalOptions, opts *CreateM
 	if err != nil {
 		return err
 	}
-	return jiracli.RunTemplate(opts.Template.Value, createMeta, nil)
+	return opts.PrintTemplate(createMeta)
 }

jiracmd/edit.go

@@ -18,6 +18,7 @@ type EditOptions struct {
 	jira.SearchOptions    `yaml:",inline" json:",inline" figtree:",inline"`
 	Overrides             map[string]string `yaml:"overrides,omitempty" json:"overrides,omitempty"`
 	Issue                 string            `yaml:"issue,omitempty" json:"issue,omitempty"`
+	Queries               map[string]string `yaml:"queries,omitempty" json:"queries,omitempty"`
 }
 
 func CmdEditRegistry() *jiracli.CommandRegistryEntry {
@@ -32,7 +33,7 @@ func CmdEditRegistry() *jiracli.CommandRegistryEntry {
 		"Edit issue details",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			return CmdEditUsage(cmd, &opts)
+			return CmdEditUsage(cmd, &opts, fig)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
 			return CmdEdit(o, globals, &opts)
@@ -40,11 +41,20 @@ func CmdEditRegistry() *jiracli.CommandRegistryEntry {
 	}
 }
 
-func CmdEditUsage(cmd *kingpin.CmdClause, opts *EditOptions) error {
+func CmdEditUsage(cmd *kingpin.CmdClause, opts *EditOptions, fig *figtree.FigTree) error {
 	jiracli.BrowseUsage(cmd, &opts.CommonOptions)
 	jiracli.EditorUsage(cmd, &opts.CommonOptions)
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
 	cmd.Flag("noedit", "Disable opening the editor").SetValue(&opts.SkipEditing)
+	cmd.Flag("named-query", "The name of a query in the `queries` configuration").Short('n').PreAction(func(ctx *kingpin.ParseContext) error {
+		name := jiracli.FlagValue(ctx, "named-query")
+		if query, ok := opts.Queries[name]; ok && query != "" {
+			var err error
+			opts.Query, err = jiracli.ConfigTemplate(fig, query, cmd.FullCommand(), opts)
+			return err
+		}
+		return fmt.Errorf("A valid named-query %q not found in `queries` configuration", name)
+	}).String()
 	cmd.Flag("query", "Jira Query Language (JQL) expression for the search to edit multiple issues").Short('q').StringVar(&opts.Query)
 	cmd.Flag("comment", "Comment message for issue").Short('m').PreAction(func(ctx *kingpin.ParseContext) error {
 		opts.Overrides["comment"] = jiracli.FlagValue(ctx, "comment")
@@ -90,6 +100,7 @@ func CmdEdit(o *oreo.Client, globals *jiracli.GlobalOptions, opts *EditOptions)
 		if opts.Browse.Value {
 			return CmdBrowse(globals, opts.Issue)
 		}
+		return nil
 	}
 	results, err := jira.Search(o, globals.Endpoint.Value, opts)
 	if err != nil {
@@ -103,8 +114,9 @@ func CmdEdit(o *oreo.Client, globals *jiracli.GlobalOptions, opts *EditOptions)
 
 		issueUpdate := jiradata.IssueUpdate{}
 		input := templateInput{
-			Issue: issueData,
-			Meta:  editMeta,
+			Issue:     issueData,
+			Meta:      editMeta,
+			Overrides: opts.Overrides,
 		}
 		err = jiracli.EditLoop(&opts.CommonOptions, &input, &issueUpdate, func() error {
 			return jira.EditIssue(o, globals.Endpoint.Value, issueData.Key, &issueUpdate)

jiracmd/editmeta.go

@@ -36,6 +36,7 @@ func CmdEditMetaRegistry() *jiracli.CommandRegistryEntry {
 func CmdEditMetaUsage(cmd *kingpin.CmdClause, opts *EditMetaOptions) error {
 	jiracli.BrowseUsage(cmd, &opts.CommonOptions)
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 	cmd.Arg("ISSUE", "edit metadata for issue id").Required().StringVar(&opts.Issue)
 	return nil
 }
@@ -46,7 +47,7 @@ func CmdEditMeta(o *oreo.Client, globals *jiracli.GlobalOptions, opts *EditMetaO
 	if err != nil {
 		return err
 	}
-	if err := jiracli.RunTemplate(opts.Template.Value, editMeta, nil); err != nil {
+	if err := opts.PrintTemplate(editMeta); err != nil {
 		return err
 	}
 	if opts.Browse.Value {

jiracmd/epicAdd.go

@@ -0,0 +1,54 @@
+package jiracmd
+
+import (
+	"fmt"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+
+	"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 EpicAddOptions struct {
+	jiradata.EpicIssues `yaml:",inline" json:",inline" figtree:",inline"`
+	Epic                string `yaml:"epic,omitempty" json:"epic,omitempty"`
+}
+
+func CmdEpicAddRegistry() *jiracli.CommandRegistryEntry {
+	opts := EpicAddOptions{}
+
+	return &jiracli.CommandRegistryEntry{
+		"Add issues to Epic",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdEpicAddUsage(cmd, &opts)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdEpicAdd(o, globals, &opts)
+		},
+	}
+}
+
+func CmdEpicAddUsage(cmd *kingpin.CmdClause, opts *EpicAddOptions) error {
+	cmd.Arg("EPIC", "Epic Key or ID to add issues to").Required().StringVar(&opts.Epic)
+	cmd.Arg("ISSUE", "Issues to add to epic").Required().StringsVar(&opts.Issues)
+	return nil
+}
+
+func CmdEpicAdd(o *oreo.Client, globals *jiracli.GlobalOptions, opts *EpicAddOptions) error {
+	if err := jira.EpicAddIssues(o, globals.Endpoint.Value, opts.Epic, &opts.EpicIssues); err != nil {
+		return err
+	}
+
+	if !globals.Quiet.Value {
+		fmt.Printf("OK %s %s/browse/%s\n", opts.Epic, globals.Endpoint.Value, opts.Epic)
+		for _, issue := range opts.Issues {
+			fmt.Printf("OK %s %s/browse/%s\n", issue, globals.Endpoint.Value, issue)
+		}
+	}
+
+	return nil
+}

jiracmd/epicCreate.go

@@ -0,0 +1,48 @@
+package jiracmd
+
+import (
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
+)
+
+func CmdEpicCreateRegistry() *jiracli.CommandRegistryEntry {
+	opts := CreateOptions{
+		CommonOptions: jiracli.CommonOptions{
+			Template: figtree.NewStringOption("epic-create"),
+		},
+		Overrides: map[string]string{},
+	}
+
+	return &jiracli.CommandRegistryEntry{
+		"Create Epic",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdEpicCreateUsage(cmd, &opts)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdCreate(o, globals, &opts)
+		},
+	}
+}
+
+func CmdEpicCreateUsage(cmd *kingpin.CmdClause, opts *CreateOptions) error {
+	jiracli.BrowseUsage(cmd, &opts.CommonOptions)
+	jiracli.EditorUsage(cmd, &opts.CommonOptions)
+	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	cmd.Flag("noedit", "Disable opening the editor").SetValue(&opts.SkipEditing)
+	cmd.Flag("project", "project to create epic in").Short('p').StringVar(&opts.Project)
+	cmd.Flag("epic-name", "Epic Name").Short('n').PreAction(func(ctx *kingpin.ParseContext) error {
+		opts.Overrides["epic-name"] = jiracli.FlagValue(ctx, "epic-name")
+		return nil
+	}).String()
+	cmd.Flag("comment", "Comment message for epic").Short('m').PreAction(func(ctx *kingpin.ParseContext) error {
+		opts.Overrides["comment"] = jiracli.FlagValue(ctx, "comment")
+		return nil
+	}).String()
+	cmd.Flag("override", "Set epic property").Short('o').StringMapVar(&opts.Overrides)
+	cmd.Flag("saveFile", "Write epic as yaml to file").StringVar(&opts.SaveFile)
+	return nil
+}

jiracmd/epicList.go

@@ -0,0 +1,58 @@
+package jiracmd
+
+import (
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
+)
+
+type EpicListOptions struct {
+	ListOptions `yaml:",inline" json:",inline" figtree:",inline"`
+	Epic        string `yaml:"epic,omitempty" json:"epic,omitempty"`
+}
+
+func CmdEpicListRegistry() *jiracli.CommandRegistryEntry {
+	opts := EpicListOptions{
+		ListOptions: ListOptions{
+			CommonOptions: jiracli.CommonOptions{
+				Template: figtree.NewStringOption("epic-list"),
+			},
+		},
+	}
+
+	return &jiracli.CommandRegistryEntry{
+		"Prints list of issues for an epic with optional search criteria",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			if opts.MaxResults == 0 {
+				opts.MaxResults = 500
+			}
+			if opts.QueryFields == "" {
+				opts.QueryFields = "assignee,created,priority,reporter,status,summary,updated,issuetype"
+			}
+			if opts.Sort == "" {
+				opts.Sort = "priority asc, key"
+			}
+			return CmdEpicListUsage(cmd, &opts, fig)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdEpicList(o, globals, &opts)
+		},
+	}
+}
+
+func CmdEpicListUsage(cmd *kingpin.CmdClause, opts *EpicListOptions, fig *figtree.FigTree) error {
+	CmdListUsage(cmd, &opts.ListOptions, fig)
+	cmd.Arg("EPIC", "Epic Key or ID to list").Required().StringVar(&opts.Epic)
+	return nil
+}
+
+func CmdEpicList(o *oreo.Client, globals *jiracli.GlobalOptions, opts *EpicListOptions) error {
+	data, err := jira.EpicSearch(o, globals.Endpoint.Value, opts.Epic, opts)
+	if err != nil {
+		return err
+	}
+	return opts.PrintTemplate(data)
+}

jiracmd/epicRemove.go

@@ -0,0 +1,51 @@
+package jiracmd
+
+import (
+	"fmt"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+
+	"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 EpicRemoveOptions struct {
+	jiradata.EpicIssues `yaml:",inline" json:",inline" figtree:",inline"`
+}
+
+func CmdEpicRemoveRegistry() *jiracli.CommandRegistryEntry {
+	opts := EpicRemoveOptions{}
+
+	return &jiracli.CommandRegistryEntry{
+		"Remove issues from Epic",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdEpicRemoveUsage(cmd, &opts)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdEpicRemove(o, globals, &opts)
+		},
+	}
+}
+
+func CmdEpicRemoveUsage(cmd *kingpin.CmdClause, opts *EpicRemoveOptions) error {
+	cmd.Arg("ISSUE", "Issues to remove from any epic").Required().StringsVar(&opts.Issues)
+	return nil
+}
+
+func CmdEpicRemove(o *oreo.Client, globals *jiracli.GlobalOptions, opts *EpicRemoveOptions) error {
+	if err := jira.EpicRemoveIssues(o, globals.Endpoint.Value, &opts.EpicIssues); err != nil {
+		return err
+	}
+
+	if !globals.Quiet.Value {
+		for _, issue := range opts.Issues {
+			fmt.Printf("OK %s %s/browse/%s\n", issue, globals.Endpoint.Value, issue)
+		}
+	}
+
+	return nil
+}

jiracmd/fields.go

@@ -17,6 +17,7 @@ func CmdFieldsRegistry() *jiracli.CommandRegistryEntry {
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
 			jiracli.TemplateUsage(cmd, &opts)
+			jiracli.GJsonQueryUsage(cmd, &opts)
 			return nil
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
@@ -31,5 +32,5 @@ func CmdFields(o *oreo.Client, globals *jiracli.GlobalOptions, opts *jiracli.Com
 	if err != nil {
 		return err
 	}
-	return jiracli.RunTemplate(opts.Template.Value, data, nil)
+	return opts.PrintTemplate(data)
 }

jiracmd/issuelinktypes.go

@@ -27,6 +27,7 @@ func CmdIssueLinkTypesRegistry() *jiracli.CommandRegistryEntry {
 
 func CmdIssueLinkTypesUsage(cmd *kingpin.CmdClause, opts *jiracli.CommonOptions) error {
 	jiracli.TemplateUsage(cmd, opts)
+	jiracli.GJsonQueryUsage(cmd, opts)
 	return nil
 }
 
@@ -36,5 +37,5 @@ func CmdIssueLinkTypes(o *oreo.Client, globals *jiracli.GlobalOptions, opts *jir
 	if err != nil {
 		return err
 	}
-	return jiracli.RunTemplate(opts.Template.Value, data, nil)
+	return opts.PrintTemplate(data)
 }

jiracmd/issuetypes.go

@@ -37,6 +37,7 @@ func CmdIssueTypesRegistry() *jiracli.CommandRegistryEntry {
 
 func CmdIssueTypesUsage(cmd *kingpin.CmdClause, opts *IssueTypesOptions) error {
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 	cmd.Flag("project", "project to list issueTypes").Short('p').StringVar(&opts.Project)
 
 	return nil
@@ -51,5 +52,5 @@ func CmdIssueTypes(o *oreo.Client, globals *jiracli.GlobalOptions, opts *IssueTy
 	if err != nil {
 		return err
 	}
-	return jiracli.RunTemplate(opts.Template.Value, data, nil)
+	return opts.PrintTemplate(data)
 }

jiracmd/list.go

@@ -1,6 +1,8 @@
 package jiracmd
 
 import (
+	"fmt"
+
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
 	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
@@ -11,6 +13,7 @@ import (
 type ListOptions struct {
 	jiracli.CommonOptions `yaml:",inline" json:",inline" figtree:",inline"`
 	jira.SearchOptions    `yaml:",inline" json:",inline" figtree:",inline"`
+	Queries               map[string]string `yaml:"queries,omitempty" json:"queries,omitempty"`
 }
 
 func CmdListRegistry() *jiracli.CommandRegistryEntry {
@@ -28,12 +31,12 @@ func CmdListRegistry() *jiracli.CommandRegistryEntry {
 				opts.MaxResults = 500
 			}
 			if opts.QueryFields == "" {
-				opts.QueryFields = "assignee,created,priority,reporter,status,summary,updated"
+				opts.QueryFields = "assignee,created,priority,reporter,status,summary,updated,issuetype"
 			}
 			if opts.Sort == "" {
 				opts.Sort = "priority asc, key"
 			}
-			return CmdListUsage(cmd, &opts)
+			return CmdListUsage(cmd, &opts, fig)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
 			return CmdList(o, globals, &opts)
@@ -41,16 +44,27 @@ func CmdListRegistry() *jiracli.CommandRegistryEntry {
 	}
 }
 
-func CmdListUsage(cmd *kingpin.CmdClause, opts *ListOptions) error {
+func CmdListUsage(cmd *kingpin.CmdClause, opts *ListOptions, fig *figtree.FigTree) error {
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 	cmd.Flag("assignee", "User assigned the issue").Short('a').StringVar(&opts.Assignee)
 	cmd.Flag("component", "Component to search for").Short('c').StringVar(&opts.Component)
 	cmd.Flag("issuetype", "Issue type to search for").Short('i').StringVar(&opts.IssueType)
 	cmd.Flag("limit", "Maximum number of results to return in search").Short('l').IntVar(&opts.MaxResults)
 	cmd.Flag("project", "Project to search for").Short('p').StringVar(&opts.Project)
+	cmd.Flag("named-query", "The name of a query in the `queries` configuration").Short('n').PreAction(func(ctx *kingpin.ParseContext) error {
+		name := jiracli.FlagValue(ctx, "named-query")
+		if query, ok := opts.Queries[name]; ok && query != "" {
+			var err error
+			opts.Query, err = jiracli.ConfigTemplate(fig, query, cmd.FullCommand(), opts)
+			return err
+		}
+		return fmt.Errorf("A valid named-query %q not found in `queries` configuration", name)
+	}).String()
 	cmd.Flag("query", "Jira Query Language (JQL) expression for the search").Short('q').StringVar(&opts.Query)
 	cmd.Flag("queryfields", "Fields that are used in \"list\" template").Short('f').StringVar(&opts.QueryFields)
 	cmd.Flag("reporter", "Reporter to search for").Short('r').StringVar(&opts.Reporter)
+	cmd.Flag("status", "Filter on issue status").Short('S').StringVar(&opts.Status)
 	cmd.Flag("sort", "Sort order to return").Short('s').StringVar(&opts.Sort)
 	cmd.Flag("watcher", "Watcher to search for").Short('w').StringVar(&opts.Watcher)
 	return nil
@@ -62,5 +76,5 @@ func CmdList(o *oreo.Client, globals *jiracli.GlobalOptions, opts *ListOptions)
 	if err != nil {
 		return err
 	}
-	return jiracli.RunTemplate(opts.Template.Value, data, nil)
+	return opts.PrintTemplate(data)
 }

jiracmd/request.go

@@ -35,6 +35,8 @@ func CmdRequestRegistry() *jiracli.CommandRegistryEntry {
 			if opts.Method == "" {
 				opts.Method = "GET"
 			}
+			jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+			jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 			return CmdRequestUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
@@ -89,5 +91,5 @@ func CmdRequest(o *oreo.Client, globals *jiracli.GlobalOptions, opts *RequestOpt
 		return fmt.Errorf("JSON Parse Error: %s from %q", err, content)
 	}
 
-	return jiracli.RunTemplate(opts.Template.Value, &data, nil)
+	return opts.PrintTemplate(&data)
 }

jiracmd/transitions.go

@@ -35,6 +35,7 @@ func CmdTransitionsRegistry(defaultTemplate string) *jiracli.CommandRegistryEntr
 func CmdTransitionsUsage(cmd *kingpin.CmdClause, opts *TransitionsOptions) error {
 	jiracli.BrowseUsage(cmd, &opts.CommonOptions)
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 	cmd.Arg("ISSUE", "issue to list valid transitions").Required().StringVar(&opts.Issue)
 	return nil
 }
@@ -45,7 +46,7 @@ func CmdTransitions(o *oreo.Client, globals *jiracli.GlobalOptions, opts *Transi
 	if err != nil {
 		return err
 	}
-	if err := jiracli.RunTemplate(opts.Template.Value, editMeta, nil); err != nil {
+	if err := opts.PrintTemplate(editMeta); err != nil {
 		return err
 	}
 	if opts.Browse.Value {

jiracmd/view.go

@@ -36,6 +36,7 @@ func CmdViewRegistry() *jiracli.CommandRegistryEntry {
 func CmdViewUsage(cmd *kingpin.CmdClause, opts *ViewOptions) error {
 	jiracli.BrowseUsage(cmd, &opts.CommonOptions)
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 	cmd.Flag("expand", "field to expand for the issue").StringsVar(&opts.Expand)
 	cmd.Flag("field", "field to return for the issue").StringsVar(&opts.Fields)
 	cmd.Flag("property", "property to return for issue").StringsVar(&opts.Properties)
@@ -49,7 +50,7 @@ func CmdView(o *oreo.Client, globals *jiracli.GlobalOptions, opts *ViewOptions)
 	if err != nil {
 		return err
 	}
-	if err := jiracli.RunTemplate(opts.Template.Value, data, nil); err != nil {
+	if err := opts.PrintTemplate(data); err != nil {
 		return err
 	}
 	if opts.Browse.Value {

jiracmd/worklogList.go

@@ -35,6 +35,7 @@ func CmdWorklogListRegistry() *jiracli.CommandRegistryEntry {
 func CmdWorklogListUsage(cmd *kingpin.CmdClause, opts *WorklogListOptions) error {
 	jiracli.BrowseUsage(cmd, &opts.CommonOptions)
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
+	jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 	cmd.Arg("ISSUE", "issue id to fetch worklogs").Required().StringVar(&opts.Issue)
 	return nil
 }
@@ -45,9 +46,9 @@ func CmdWorklogList(o *oreo.Client, globals *jiracli.GlobalOptions, opts *Worklo
 	if err != nil {
 		return err
 	}
-	if err := jiracli.RunTemplate(opts.Template.Value, struct {
+	if err := opts.PrintTemplate(struct {
 		Worklogs *jiradata.Worklogs `json:"worklogs,omitempty" yaml:"worklogs,omitempty"`
-	}{data}, nil); err != nil {
+	}{data}); err != nil {
 		return err
 	}
 	if opts.Browse.Value {

jiradata/Attachment.go

@@ -0,0 +1,179 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -dir jiradata -pkg jiradata -overwrite schemas/ListofAttachment.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// Attachment defined from schema:
+// {
+//   "title": "Attachment",
+//   "type": "object",
+//   "properties": {
+//     "author": {
+//       "title": "User",
+//       "type": "object",
+//       "properties": {
+//         "accountId": {
+//           "title": "accountId",
+//           "type": "string"
+//         },
+//         "active": {
+//           "title": "active",
+//           "type": "boolean"
+//         },
+//         "applicationRoles": {
+//           "title": "Simple List Wrapper",
+//           "type": "object",
+//           "properties": {
+//             "items": {
+//               "type": "array",
+//               "items": {
+//                 "title": "Group",
+//                 "type": "object",
+//                 "properties": {
+//                   "name": {
+//                     "type": "string"
+//                   },
+//                   "self": {
+//                     "type": "string"
+//                   }
+//                 }
+//               }
+//             },
+//             "max-results": {
+//               "type": "integer"
+//             },
+//             "size": {
+//               "type": "integer"
+//             }
+//           }
+//         },
+//         "avatarUrls": {
+//           "title": "avatarUrls",
+//           "type": "object",
+//           "patternProperties": {
+//             ".+": {
+//               "type": "string"
+//             }
+//           }
+//         },
+//         "displayName": {
+//           "title": "displayName",
+//           "type": "string"
+//         },
+//         "emailAddress": {
+//           "title": "emailAddress",
+//           "type": "string"
+//         },
+//         "expand": {
+//           "title": "expand",
+//           "type": "string"
+//         },
+//         "groups": {
+//           "title": "Simple List Wrapper",
+//           "type": "object",
+//           "properties": {
+//             "items": {
+//               "type": "array",
+//               "items": {
+//                 "title": "Group",
+//                 "type": "object",
+//                 "properties": {
+//                   "name": {
+//                     "type": "string"
+//                   },
+//                   "self": {
+//                     "type": "string"
+//                   }
+//                 }
+//               }
+//             },
+//             "max-results": {
+//               "type": "integer"
+//             },
+//             "size": {
+//               "type": "integer"
+//             }
+//           }
+//         },
+//         "key": {
+//           "title": "key",
+//           "type": "string"
+//         },
+//         "locale": {
+//           "title": "locale",
+//           "type": "string"
+//         },
+//         "name": {
+//           "title": "name",
+//           "type": "string"
+//         },
+//         "self": {
+//           "title": "self",
+//           "type": "string"
+//         },
+//         "timeZone": {
+//           "title": "timeZone",
+//           "type": "string"
+//         }
+//       }
+//     },
+//     "content": {
+//       "title": "content",
+//       "type": "string"
+//     },
+//     "created": {
+//       "title": "created",
+//       "type": "string"
+//     },
+//     "filename": {
+//       "title": "filename",
+//       "type": "string"
+//     },
+//     "id": {
+//       "title": "id",
+//       "type": "integer"
+//     },
+//     "mimeType": {
+//       "title": "mimeType",
+//       "type": "string"
+//     },
+//     "properties": {
+//       "title": "properties",
+//       "type": "object",
+//       "patternProperties": {
+//         ".+": {}
+//       }
+//     },
+//     "self": {
+//       "title": "self",
+//       "type": "string"
+//     },
+//     "size": {
+//       "title": "size",
+//       "type": "integer"
+//     },
+//     "thumbnail": {
+//       "title": "thumbnail",
+//       "type": "string"
+//     }
+//   }
+// }
+type Attachment struct {
+	Author     *User                  `json:"author,omitempty" yaml:"author,omitempty"`
+	Content    string                 `json:"content,omitempty" yaml:"content,omitempty"`
+	Created    string                 `json:"created,omitempty" yaml:"created,omitempty"`
+	Filename   string                 `json:"filename,omitempty" yaml:"filename,omitempty"`
+	ID         IntOrString            `json:"id,omitempty" yaml:"id,omitempty"`
+	MimeType   string                 `json:"mimeType,omitempty" yaml:"mimeType,omitempty"`
+	Properties map[string]interface{} `json:"properties,omitempty" yaml:"properties,omitempty"`
+	Self       string                 `json:"self,omitempty" yaml:"self,omitempty"`
+	Size       int                    `json:"size,omitempty" yaml:"size,omitempty"`
+	Thumbnail  string                 `json:"thumbnail,omitempty" yaml:"thumbnail,omitempty"`
+}

jiradata/EpicIssues.go

@@ -0,0 +1,5 @@
+package jiradata
+
+type EpicIssues struct {
+	Issues []string `json:"issues,omitempty" yaml:"issues,omitempty"`
+}

jiradata/Group.go

@@ -0,0 +1,29 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -dir jiradata -pkg jiradata -overwrite schemas/ListofAttachment.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// Group defined from schema:
+// {
+//   "title": "Group",
+//   "type": "object",
+//   "properties": {
+//     "name": {
+//       "type": "string"
+//     },
+//     "self": {
+//       "type": "string"
+//     }
+//   }
+// }
+type Group struct {
+	Name string `json:"name,omitempty" yaml:"name,omitempty"`
+	Self string `json:"self,omitempty" yaml:"self,omitempty"`
+}

jiradata/Groups.go

@@ -0,0 +1,29 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -dir jiradata -pkg jiradata -overwrite schemas/ListofAttachment.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// Groups defined from schema:
+// {
+//   "type": "array",
+//   "items": {
+//     "title": "Group",
+//     "type": "object",
+//     "properties": {
+//       "name": {
+//         "type": "string"
+//       },
+//       "self": {
+//         "type": "string"
+//       }
+//     }
+//   }
+// }
+type Groups []*Group

jiradata/ListOfAttachment.go

@@ -0,0 +1,202 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -dir jiradata -pkg jiradata -overwrite schemas/ListofAttachment.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// ListOfAttachment defined from schema:
+// {
+//   "title": "List of Attachment",
+//   "id": "https://docs.atlassian.com/jira/REST/schema/list-of-attachment#",
+//   "type": "array",
+//   "definitions": {
+//     "simple-list-wrapper": {
+//       "title": "Simple List Wrapper",
+//       "type": "object",
+//       "properties": {
+//         "items": {
+//           "type": "array",
+//           "items": {
+//             "title": "Group",
+//             "type": "object",
+//             "properties": {
+//               "name": {
+//                 "type": "string"
+//               },
+//               "self": {
+//                 "type": "string"
+//               }
+//             }
+//           }
+//         },
+//         "max-results": {
+//           "type": "integer"
+//         },
+//         "size": {
+//           "type": "integer"
+//         }
+//       }
+//     }
+//   },
+//   "items": {
+//     "title": "Attachment",
+//     "type": "object",
+//     "properties": {
+//       "author": {
+//         "title": "User",
+//         "type": "object",
+//         "properties": {
+//           "accountId": {
+//             "title": "accountId",
+//             "type": "string"
+//           },
+//           "active": {
+//             "title": "active",
+//             "type": "boolean"
+//           },
+//           "applicationRoles": {
+//             "title": "Simple List Wrapper",
+//             "type": "object",
+//             "properties": {
+//               "items": {
+//                 "type": "array",
+//                 "items": {
+//                   "title": "Group",
+//                   "type": "object",
+//                   "properties": {
+//                     "name": {
+//                       "type": "string"
+//                     },
+//                     "self": {
+//                       "type": "string"
+//                     }
+//                   }
+//                 }
+//               },
+//               "max-results": {
+//                 "type": "integer"
+//               },
+//               "size": {
+//                 "type": "integer"
+//               }
+//             }
+//           },
+//           "avatarUrls": {
+//             "title": "avatarUrls",
+//             "type": "object",
+//             "patternProperties": {
+//               ".+": {
+//                 "type": "string"
+//               }
+//             }
+//           },
+//           "displayName": {
+//             "title": "displayName",
+//             "type": "string"
+//           },
+//           "emailAddress": {
+//             "title": "emailAddress",
+//             "type": "string"
+//           },
+//           "expand": {
+//             "title": "expand",
+//             "type": "string"
+//           },
+//           "groups": {
+//             "title": "Simple List Wrapper",
+//             "type": "object",
+//             "properties": {
+//               "items": {
+//                 "type": "array",
+//                 "items": {
+//                   "title": "Group",
+//                   "type": "object",
+//                   "properties": {
+//                     "name": {
+//                       "type": "string"
+//                     },
+//                     "self": {
+//                       "type": "string"
+//                     }
+//                   }
+//                 }
+//               },
+//               "max-results": {
+//                 "type": "integer"
+//               },
+//               "size": {
+//                 "type": "integer"
+//               }
+//             }
+//           },
+//           "key": {
+//             "title": "key",
+//             "type": "string"
+//           },
+//           "locale": {
+//             "title": "locale",
+//             "type": "string"
+//           },
+//           "name": {
+//             "title": "name",
+//             "type": "string"
+//           },
+//           "self": {
+//             "title": "self",
+//             "type": "string"
+//           },
+//           "timeZone": {
+//             "title": "timeZone",
+//             "type": "string"
+//           }
+//         }
+//       },
+//       "content": {
+//         "title": "content",
+//         "type": "string"
+//       },
+//       "created": {
+//         "title": "created",
+//         "type": "string"
+//       },
+//       "filename": {
+//         "title": "filename",
+//         "type": "string"
+//       },
+//       "id": {
+//         "title": "id",
+//         "type": "integer"
+//       },
+//       "mimeType": {
+//         "title": "mimeType",
+//         "type": "string"
+//       },
+//       "properties": {
+//         "title": "properties",
+//         "type": "object",
+//         "patternProperties": {
+//           ".+": {}
+//         }
+//       },
+//       "self": {
+//         "title": "self",
+//         "type": "string"
+//       },
+//       "size": {
+//         "title": "size",
+//         "type": "integer"
+//       },
+//       "thumbnail": {
+//         "title": "thumbnail",
+//         "type": "string"
+//       }
+//     }
+//   }
+// }
+type ListOfAttachment []*Attachment

jiradata/ListOfAttachmentFuncs.go

@@ -0,0 +1,13 @@
+package jiradata
+
+func (l *ListOfAttachment) Len() int {
+	return len(*l)
+}
+
+func (l *ListOfAttachment) Less(i, j int) bool {
+	return (*l)[i].ID < (*l)[j].ID
+}
+
+func (l *ListOfAttachment) Swap(i, j int) {
+	(*l)[i], (*l)[j] = (*l)[j], (*l)[i]
+}

jiradata/SimpleListWrapper.go

@@ -0,0 +1,45 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -dir jiradata -pkg jiradata -overwrite schemas/ListofAttachment.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// SimpleListWrapper defined from schema:
+// {
+//   "title": "Simple List Wrapper",
+//   "type": "object",
+//   "properties": {
+//     "items": {
+//       "type": "array",
+//       "items": {
+//         "title": "Group",
+//         "type": "object",
+//         "properties": {
+//           "name": {
+//             "type": "string"
+//           },
+//           "self": {
+//             "type": "string"
+//           }
+//         }
+//       }
+//     },
+//     "max-results": {
+//       "type": "integer"
+//     },
+//     "size": {
+//       "type": "integer"
+//     }
+//   }
+// }
+type SimpleListWrapper struct {
+	Items      Groups `json:"items,omitempty" yaml:"items,omitempty"`
+	MaxResults int    `json:"max-results,omitempty" yaml:"max-results,omitempty"`
+	Size       int    `json:"size,omitempty" yaml:"size,omitempty"`
+}

jiradata/User.go

@@ -5,7 +5,7 @@ package jiradata
 // https://github.com/coryb/slipscheme
 //
 // Generated with command:
-// slipscheme -dir jiradata -pkg jiradata -overwrite schemas/WorklogWithPagination.json
+// slipscheme -dir jiradata -pkg jiradata -overwrite schemas/ListofAttachment.json
 /////////////////////////////////////////////////////////////////////////
 //                            DO NOT EDIT                              //
 /////////////////////////////////////////////////////////////////////////
@@ -16,12 +16,42 @@ package jiradata
 //   "type": "object",
 //   "properties": {
 //     "accountId": {
+//       "title": "accountId",
 //       "type": "string"
 //     },
 //     "active": {
+//       "title": "active",
 //       "type": "boolean"
 //     },
+//     "applicationRoles": {
+//       "title": "Simple List Wrapper",
+//       "type": "object",
+//       "properties": {
+//         "items": {
+//           "type": "array",
+//           "items": {
+//             "title": "Group",
+//             "type": "object",
+//             "properties": {
+//               "name": {
+//                 "type": "string"
+//               },
+//               "self": {
+//                 "type": "string"
+//               }
+//             }
+//           }
+//         },
+//         "max-results": {
+//           "type": "integer"
+//         },
+//         "size": {
+//           "type": "integer"
+//         }
+//       }
+//     },
 //     "avatarUrls": {
+//       "title": "avatarUrls",
 //       "type": "object",
 //       "patternProperties": {
 //         ".+": {
@@ -30,33 +60,78 @@ package jiradata
 //       }
 //     },
 //     "displayName": {
+//       "title": "displayName",
 //       "type": "string"
 //     },
 //     "emailAddress": {
+//       "title": "emailAddress",
 //       "type": "string"
 //     },
+//     "expand": {
+//       "title": "expand",
+//       "type": "string"
+//     },
+//     "groups": {
+//       "title": "Simple List Wrapper",
+//       "type": "object",
+//       "properties": {
+//         "items": {
+//           "type": "array",
+//           "items": {
+//             "title": "Group",
+//             "type": "object",
+//             "properties": {
+//               "name": {
+//                 "type": "string"
+//               },
+//               "self": {
+//                 "type": "string"
+//               }
+//             }
+//           }
+//         },
+//         "max-results": {
+//           "type": "integer"
+//         },
+//         "size": {
+//           "type": "integer"
+//         }
+//       }
+//     },
 //     "key": {
+//       "title": "key",
+//       "type": "string"
+//     },
+//     "locale": {
+//       "title": "locale",
 //       "type": "string"
 //     },
 //     "name": {
+//       "title": "name",
 //       "type": "string"
 //     },
 //     "self": {
+//       "title": "self",
 //       "type": "string"
 //     },
 //     "timeZone": {
+//       "title": "timeZone",
 //       "type": "string"
 //     }
 //   }
 // }
 type User struct {
-	AccountID    string            `json:"accountId,omitempty" yaml:"accountId,omitempty"`
-	Active       bool              `json:"active,omitempty" yaml:"active,omitempty"`
-	AvatarUrls   map[string]string `json:"avatarUrls,omitempty" yaml:"avatarUrls,omitempty"`
-	DisplayName  string            `json:"displayName,omitempty" yaml:"displayName,omitempty"`
-	EmailAddress string            `json:"emailAddress,omitempty" yaml:"emailAddress,omitempty"`
-	Key          string            `json:"key,omitempty" yaml:"key,omitempty"`
-	Name         string            `json:"name,omitempty" yaml:"name,omitempty"`
-	Self         string            `json:"self,omitempty" yaml:"self,omitempty"`
-	TimeZone     string            `json:"timeZone,omitempty" yaml:"timeZone,omitempty"`
+	AccountID        string             `json:"accountId,omitempty" yaml:"accountId,omitempty"`
+	Active           bool               `json:"active,omitempty" yaml:"active,omitempty"`
+	ApplicationRoles *SimpleListWrapper `json:"applicationRoles,omitempty" yaml:"applicationRoles,omitempty"`
+	AvatarUrls       map[string]string  `json:"avatarUrls,omitempty" yaml:"avatarUrls,omitempty"`
+	DisplayName      string             `json:"displayName,omitempty" yaml:"displayName,omitempty"`
+	EmailAddress     string             `json:"emailAddress,omitempty" yaml:"emailAddress,omitempty"`
+	Expand           string             `json:"expand,omitempty" yaml:"expand,omitempty"`
+	Groups           *SimpleListWrapper `json:"groups,omitempty" yaml:"groups,omitempty"`
+	Key              string             `json:"key,omitempty" yaml:"key,omitempty"`
+	Locale           string             `json:"locale,omitempty" yaml:"locale,omitempty"`
+	Name             string             `json:"name,omitempty" yaml:"name,omitempty"`
+	Self             string             `json:"self,omitempty" yaml:"self,omitempty"`
+	TimeZone         string             `json:"timeZone,omitempty" yaml:"timeZone,omitempty"`
 }

jiradata/intOrString.go

@@ -0,0 +1,29 @@
+package jiradata
+
+import (
+	"encoding/json"
+	"strconv"
+)
+
+// this is for some bad schemas like Attachments.ID where in some api's it is an `int` and some it is a `string`
+type IntOrString int
+
+func (i *IntOrString) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var tmp string
+	if err := unmarshal(&tmp); err != nil {
+		return unmarshal((*int)(i))
+	}
+	tmpInt, err := strconv.Atoi(tmp)
+	*i = IntOrString(tmpInt)
+	return err
+}
+
+func (i *IntOrString) UnmarshalJSON(b []byte) error {
+	var tmp string
+	if err := json.Unmarshal(b, &tmp); err != nil {
+		return json.Unmarshal(b, (*int)(i))
+	}
+	tmpInt, err := strconv.Atoi(tmp)
+	*i = IntOrString(tmpInt)
+	return err
+}

jiradata/providers.go

@@ -25,3 +25,7 @@ func (c *Comment) ProvideComment() *Comment {
 func (c *Component) ProvideComponent() *Component {
 	return c
 }
+
+func (e *EpicIssues) ProvideEpicIssues() *EpicIssues {
+	return e
+}

search.go

@@ -14,16 +14,17 @@ type SearchProvider interface {
 }
 
 type SearchOptions struct {
-	Assignee    string
-	Query       string
-	QueryFields string
-	Project     string
-	Component   string
-	IssueType   string
-	Watcher     string
-	Reporter    string
-	Sort        string
-	MaxResults  int
+	Assignee    string `yaml:"assignee,omitempty" json:"assignee,omitempty"`
+	Query       string `yaml:"query,omitempty" json:"query,omitempty"`
+	QueryFields string `yaml:"query-fields,omitempty" json:"query-fields,omitempty"`
+	Project     string `yaml:"project,omitempty" json:"project,omitempty"`
+	Component   string `yaml:"component,omitempty" json:"component,omitempty"`
+	IssueType   string `yaml:"issue-type,omitempty" json:"issue-type,omitempty"`
+	Watcher     string `yaml:"watcher,omitempty" json:"watcher,omitempty"`
+	Reporter    string `yaml:"reporter,omitempty" json:"reporter,omitempty"`
+	Status      string `yaml:"status,omitempty" json:"status,omitempty"`
+	Sort        string `yaml:"sort,omitempty" json:"sort,omitempty"`
+	MaxResults  int    `yaml:"max-results,omitempty" json:"max-results,omitempty"`
 }
 
 func (o *SearchOptions) ProvideSearchRequest() *jiradata.SearchRequest {
@@ -49,6 +50,9 @@ func (o *SearchOptions) ProvideSearchRequest() *jiradata.SearchRequest {
 		if o.Reporter != "" {
 			qbuff.WriteString(fmt.Sprintf(" AND reporter = '%s'", o.Reporter))
 		}
+		if o.Status != "" {
+			qbuff.WriteString(fmt.Sprintf(" AND status = '%s'", o.Status))
+		}
 		if o.Sort != "" {
 			qbuff.WriteString(fmt.Sprintf(" ORDER BY %s", o.Sort))
 		}

t/.jira.d/config.yml

@@ -3,3 +3,46 @@ config:
 password-source: pass
 endpoint: https://go-jira.atlassian.net
 user: gojira
+
+project: BASIC
+
+queries:
+  todo: >-
+    resolution = unresolved {{if .project}}AND project = '{{.project}}'{{end}} AND status = 'To Do'
+
+custom-commands:
+  - name: env
+    help: print the JIRA environment variables available to custom commands
+    script: |-
+      env | sort | grep JIRA
+  - name: print-project
+    help: print the name of the configured project
+    script: "echo $JIRA_PROJECT"
+  - name: jira-path
+    help: print the path the jira command that is running this alias
+    script: |-
+      echo {{jira}}
+  - name: mine
+    help: display issues assigned to me
+    script: |-
+      if [ -n "$JIRA_PROJECT" ]; then
+          # if `project: ...` configured just list the issues for current project
+          {{jira}} list --template table --query "resolution = unresolved and assignee=currentuser() and project = $JIRA_PROJECT ORDER BY priority asc, created"
+      else
+          # otherwise list issues for all project
+          {{jira}} list --template table --query "resolution = unresolved and assignee=currentuser() ORDER BY priority asc, created"
+      fi
+  - name: argtest
+    help: testing passing args
+    script: |-
+      echo {{args.ARG}}
+    args:
+      - name: ARG
+        help: string to echo for testing
+  - name: opttest
+    help: testing passing option flags
+    script: |-
+      echo {{options.OPT}}
+    options:
+      - name: OPT
+        help: string to echo for testing

t/100basic.t

@@ -4,7 +4,7 @@ cd $(dirname $0)
 jira="../jira"
 . env.sh
 
-PLAN 86
+PLAN 94
 
 # reset login
 RUNS $jira logout
@@ -52,17 +52,64 @@ DIFF <<EOF
 $(printf %-12s $issue:) summary
 EOF
 
+###############################################################################
+## List issues using a named query
+###############################################################################
+RUNS $jira ls --project BASIC -n todo
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
 ###############################################################################
 ## List all issues, using the table template
 ###############################################################################
 
 RUNS $jira ls --project BASIC --template table
 DIFF <<EOF
-+----------------+---------------------------------------------------------+--------------+--------------+------------+--------------+--------------+
-| Issue          | Summary                                                 | Priority     | Status       | Age        | Reporter     | Assignee     |
-+----------------+---------------------------------------------------------+--------------+--------------+------------+--------------+--------------+
-| $(printf %-14s $issue) | summary                                                 | Medium       | To Do        | a minute   | gojira       | gojira       |
-+----------------+---------------------------------------------------------+--------------+--------------+------------+--------------+--------------+
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| Issue          | Summary                                  | Type         | Priority     | Status       | Age        | Reporter     | Assignee     |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| $(printf %-14s $issue) | summary                                  | Bug          | Medium       | To Do        | a minute   | gojira       | gojira       |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+EOF
+
+###############################################################################
+## Edit an issue
+###############################################################################
+RUNS $jira edit $issue -m "edit comment" --override priority=High --noedit
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Edit multiple issues with query
+###############################################################################
+RUNS $jira edit -m "bulk edit comment" --override priority=High --noedit --query "resolution = unresolved AND project = 'BASIC' AND status = 'To Do'"
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: BASIC
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+priority: High
+votes: 0
+description: |
+  description
+
+comments:
+  - | # gojira, a minute ago
+    edit comment
+  - | # gojira, a minute ago
+    bulk edit comment
+
 EOF
 
 ###############################################################################

t/120custom-commands.t

@@ -0,0 +1,80 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira"
+. env.sh
+
+PLAN 16
+
+# reset login
+RUNS $jira logout
+RUNS $jira login
+
+# cleanup from previous failed test executions
+($jira ls --project BASIC | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create --project BASIC -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Testing the example custom commands, print-project
+###############################################################################
+
+RUNS $jira print-project
+DIFF <<EOF
+BASIC
+EOF
+
+###############################################################################
+## Testing the example custom commands, jira-path
+###############################################################################
+
+RUNS $jira jira-path
+DIFF <<EOF
+../jira
+EOF
+
+###############################################################################
+## Testing the example custom commands, env
+###############################################################################
+
+RUNS $jira env
+GREP ^JIRA_PROJECT=BASIC
+
+###############################################################################
+## Testing the example custom commands, argtest
+###############################################################################
+
+RUNS $jira argtest TEST
+DIFF <<EOF
+TEST
+EOF
+
+###############################################################################
+## Testing the example custom commands, opttest
+###############################################################################
+
+RUNS $jira opttest --OPT TEST
+DIFF <<EOF
+TEST
+EOF
+
+###############################################################################
+## Use the "mine" alias to list issues assigned to self
+###############################################################################
+
+RUNS $jira mine
+DIFF <<EOF
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| Issue          | Summary                                  | Type         | Priority     | Status       | Age        | Reporter     | Assignee     |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| $(printf %-14s $issue) | summary                                  | Bug          | Medium       | To Do        | a minute   | gojira       | gojira       |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+EOF

t/130basic-epics.t

@@ -0,0 +1,121 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira"
+. env.sh
+
+PLAN 22
+
+# reset login
+RUNS $jira logout
+RUNS $jira login
+
+# cleanup from previous failed test executions
+($jira ls --project BASIC | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+###############################################################################
+## Create an epic
+###############################################################################
+RUNS $jira epic create --project BASIC -o summary="Totally Epic" -o description=description --epic-name "Basic Epic" --noedit --saveFile issue.props
+epic=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $epic $ENDPOINT/browse/$epic
+EOF
+
+###############################################################################
+## Create issues we can assign to epic
+###############################################################################
+RUNS $jira create --project BASIC -o summary="summary" -o description=description --noedit --saveFile issue.props
+issue1=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue1 $ENDPOINT/browse/$issue1
+EOF
+
+RUNS $jira create --project BASIC -o summary="summary" -o description=description --noedit --saveFile issue.props
+issue2=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue2 $ENDPOINT/browse/$issue2
+EOF
+
+###############################################################################
+## List the issues for the epic
+###############################################################################
+RUNS $jira epic list $epic
+
+DIFF<<EOF
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| Issue          | Summary                                  | Type         | Priority     | Status       | Age        | Reporter     | Assignee     |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+EOF
+
+###############################################################################
+## Add issues to an epic
+###############################################################################
+RUNS $jira epic add $epic $issue1 $issue2
+
+DIFF<<EOF
+OK $epic $ENDPOINT/browse/$epic
+OK $issue1 $ENDPOINT/browse/$issue1
+OK $issue2 $ENDPOINT/browse/$issue2
+EOF
+
+###############################################################################
+## List the issues for the epic
+###############################################################################
+RUNS $jira epic list $epic
+
+DIFF<<EOF
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| Issue          | Summary                                  | Type         | Priority     | Status       | Age        | Reporter     | Assignee     |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| $(printf %-14s $issue1) | summary                                  | Bug          | Medium       | To Do        | a minute   | gojira       | gojira       |
+| $(printf %-14s $issue2) | summary                                  | Bug          | Medium       | To Do        | a minute   | gojira       | gojira       |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+EOF
+
+###############################################################################
+## Remove an issue from an Epic
+###############################################################################
+RUNS $jira epic remove $issue1
+
+DIFF<<EOF
+OK $issue1 $ENDPOINT/browse/$issue1
+EOF
+
+###############################################################################
+## List the issues for the epic
+###############################################################################
+RUNS $jira epic list $epic
+
+DIFF<<EOF
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| Issue          | Summary                                  | Type         | Priority     | Status       | Age        | Reporter     | Assignee     |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| $(printf %-14s $issue2) | summary                                  | Bug          | Medium       | To Do        | a minute   | gojira       | gojira       |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+EOF
+
+###############################################################################
+## Remove last issue from an Epic
+###############################################################################
+RUNS $jira epic remove $issue2
+
+DIFF<<EOF
+OK $issue2 $ENDPOINT/browse/$issue2
+EOF
+
+###############################################################################
+## List the issues for the epic
+###############################################################################
+RUNS $jira epic list $epic
+
+DIFF<<EOF
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+| Issue          | Summary                                  | Type         | Priority     | Status       | Age        | Reporter     | Assignee     |
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
++----------------+------------------------------------------+--------------+--------------+--------------+------------+--------------+--------------+
+EOF

t/140basic-attach.t

@@ -0,0 +1,189 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira"
+. env.sh
+
+PLAN 43
+
+# reset login
+RUNS $jira logout
+RUNS $jira login
+
+# cleanup from previous failed test executions
+($jira ls --project BASIC | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create --project BASIC -o summary="Attach To Me" -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Attach via stdin
+###############################################################################
+RUNS $jira attach create $issue --filename README.md --saveFile attach.props < ./README.md
+attach1=$(awk '/^id:/{print $2}' attach.props)
+
+DIFF <<EOF
+OK $attach1 $ENDPOINT/secure/attachment/$attach1/README.md
+EOF
+
+###############################################################################
+## Attach binary file
+###############################################################################
+RUNS dd of=garbage.bin if=/dev/urandom count=1k bs=1k
+RUNS $jira attach create $issue garbage.bin --saveFile attach.props
+attach2=$(awk '/^id:/{print $2}' attach.props)
+
+DIFF <<EOF
+OK $attach2 $ENDPOINT/secure/attachment/$attach2/garbage.bin
+EOF
+
+###############################################################################
+## Attach binary file with different name
+###############################################################################
+RUNS $jira attach create $issue garbage.bin --filename foobar.bin --saveFile attach.props
+attach3=$(awk '/^id:/{print $2}' attach.props)
+
+DIFF <<EOF
+OK $attach3 $ENDPOINT/secure/attachment/$attach3/foobar.bin
+EOF
+
+###############################################################################
+## List attachments
+###############################################################################
+RUNS $jira attach list $issue
+DIFF <<EOF
++------------+------------------------------+------------+--------------+--------------+
+| id         | filename                     | bytes      | user         | created      |
++------------+------------------------------+------------+--------------+--------------+
+| $(printf %10s $attach1) | README.md                    |       1238 | gojira       | a minute     |
+| $(printf %10s $attach2) | garbage.bin                  |    1048576 | gojira       | a minute     |
+| $(printf %10s $attach3) | foobar.bin                   |    1048576 | gojira       | a minute     |
++------------+------------------------------+------------+--------------+--------------+
+EOF
+
+###############################################################################
+## Fetch text attachment
+###############################################################################
+RUNS $jira attach get $attach1 -o attach1.txt
+DIFF <<EOF
+OK Wrote attach1.txt
+EOF
+
+# verify no diffs
+RUNS diff -q README.md attach1.txt
+
+###############################################################################
+## Fetch text attachment to stdout
+###############################################################################
+RUNS sh -c "$jira attach get $attach1 -o- > attach1.txt"
+
+# verify no diffs
+RUNS diff -q README.md attach1.txt
+
+###############################################################################
+## Fetch text attachment as same name
+###############################################################################
+RUNS $jira attach get $attach1
+DIFF <<EOF
+OK Wrote README.md
+EOF
+
+# verify no diffs
+RUNS git diff README.md
+
+###############################################################################
+## Fetch binary attachment
+###############################################################################
+RUNS $jira attach get $attach2 --output binary.out
+DIFF <<EOF
+OK Wrote binary.out
+EOF
+
+# verify no diffs
+RUNS diff -q garbage.bin binary.out
+
+###############################################################################
+## Fetch binary attachment to stdout
+###############################################################################
+RUNS sh -c "$jira attach get $attach2 -o- > binary.out"
+
+# verify no diffs
+RUNS diff -q garbage.bin binary.out
+
+###############################################################################
+## Fetch binary attachment
+###############################################################################
+RUNS $jira attach get $attach3
+DIFF <<EOF
+OK Wrote foobar.bin
+EOF
+
+# verify no diffs
+RUNS diff -q garbage.bin foobar.bin
+
+###############################################################################
+## Fetch binary attachment to stdout
+###############################################################################
+RUNS sh -c "$jira attach get $attach3 --output=- > binary.out"
+
+# verify no diffs
+RUNS diff -q garbage.bin binary.out
+
+###############################################################################
+## Delete attachment
+###############################################################################
+RUNS $jira attach remove $attach1
+DIFF <<EOF
+OK Deleted Attachment $attach1
+EOF
+
+RUNS $jira attach list $issue
+DIFF <<EOF
++------------+------------------------------+------------+--------------+--------------+
+| id         | filename                     | bytes      | user         | created      |
++------------+------------------------------+------------+--------------+--------------+
+| $(printf %10s $attach2) | garbage.bin                  |    1048576 | gojira       | a minute     |
+| $(printf %10s $attach3) | foobar.bin                   |    1048576 | gojira       | a minute     |
++------------+------------------------------+------------+--------------+--------------+
+EOF
+
+
+###############################################################################
+## Delete attachment
+###############################################################################
+RUNS $jira attach rm $attach2
+DIFF <<EOF
+OK Deleted Attachment $attach2
+EOF
+
+RUNS $jira attach list $issue
+DIFF <<EOF
++------------+------------------------------+------------+--------------+--------------+
+| id         | filename                     | bytes      | user         | created      |
++------------+------------------------------+------------+--------------+--------------+
+| $(printf %10s $attach3) | foobar.bin                   |    1048576 | gojira       | a minute     |
++------------+------------------------------+------------+--------------+--------------+
+EOF
+
+###############################################################################
+## Delete last
+###############################################################################
+RUNS $jira attach rm $attach3
+DIFF <<EOF
+OK Deleted Attachment $attach3
+EOF
+
+RUNS $jira attach list $issue
+DIFF <<EOF
++------------+------------------------------+------------+--------------+--------------+
+| id         | filename                     | bytes      | user         | created      |
++------------+------------------------------+------------+--------------+--------------+
++------------+------------------------------+------------+--------------+--------------+
+EOF

vendor/github.com/alecthomas/template/testdata/file1.tmpl

@@ -1,2 +0,0 @@
-{{define "x"}}TEXT{{end}}
-{{define "dotV"}}{{.V}}{{end}}

vendor/github.com/alecthomas/template/testdata/file2.tmpl

@@ -1,2 +0,0 @@
-{{define "dot"}}{{.}}{{end}}
-{{define "nested"}}{{template "dot" .}}{{end}}

vendor/github.com/alecthomas/template/testdata/tmpl1.tmpl

@@ -1,3 +0,0 @@
-template1
-{{define "x"}}x{{end}}
-{{template "y"}}

vendor/github.com/alecthomas/template/testdata/tmpl2.tmpl

@@ -1,3 +0,0 @@
-template2
-{{define "y"}}y{{end}}
-{{template "x"}}

vendor/github.com/cheekybits/genny/examples/davechaney/func_thing.go

@@ -1,12 +0,0 @@
-package math
-
-import "github.com/cheekybits/genny/generic"
-
-type ThisNumberType generic.Number
-
-func ThisNumberTypeMax(fn func(a, b ThisNumberType) bool, a, b ThisNumberType) ThisNumberType {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}

vendor/github.com/cheekybits/genny/examples/davechaney/gen.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-cat ./generic_max.go | ../../genny gen "NumberType=NUMBERS" > numbers_max_get.go
-cat ./func_thing.go | ../../genny gen "ThisNumberType=NUMBERS" > numbers_func_thing.go

vendor/github.com/cheekybits/genny/examples/davechaney/generic_max.go

@@ -1,14 +0,0 @@
-package math
-
-import "github.com/cheekybits/genny/generic"
-
-type NumberType generic.Number
-
-// NumberTypeMax gets the maximum number from the
-// two specified.
-func NumberTypeMax(a, b NumberType) NumberType {
-	if a > b {
-		return a
-	}
-	return b
-}

vendor/github.com/cheekybits/genny/examples/davechaney/max_test.go

@@ -1,27 +0,0 @@
-package math_test
-
-import (
-	"testing"
-
-	"github.com/cheekybits/genny/examples/davechaney"
-)
-
-func TestNumberTypeMax(t *testing.T) {
-
-	var v math.NumberType
-	v = math.NumberTypeMax(10, 20)
-	if v != 20 {
-		t.Errorf("Max of 10 and 20 is 20")
-	}
-
-	v = math.NumberTypeMax(20, 20)
-	if v != 20 {
-		t.Errorf("Max of 20 and 20 is 20")
-	}
-
-	v = math.NumberTypeMax(25, 20)
-	if v != 25 {
-		t.Errorf("Max of 25 and 20 is 25")
-	}
-
-}

vendor/github.com/cheekybits/genny/examples/davechaney/numbers_func_thing.go

@@ -1,89 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package math
-
-func Float32Max(fn func(a, b float32) bool, a, b float32) float32 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Float64Max(fn func(a, b float64) bool, a, b float64) float64 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func IntMax(fn func(a, b int) bool, a, b int) int {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Int16Max(fn func(a, b int16) bool, a, b int16) int16 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Int32Max(fn func(a, b int32) bool, a, b int32) int32 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Int64Max(fn func(a, b int64) bool, a, b int64) int64 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Int8Max(fn func(a, b int8) bool, a, b int8) int8 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func UintMax(fn func(a, b uint) bool, a, b uint) uint {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Uint16Max(fn func(a, b uint16) bool, a, b uint16) uint16 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Uint32Max(fn func(a, b uint32) bool, a, b uint32) uint32 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Uint64Max(fn func(a, b uint64) bool, a, b uint64) uint64 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}
-
-func Uint8Max(fn func(a, b uint8) bool, a, b uint8) uint8 {
-	if fn(a, b) {
-		return a
-	}
-	return b
-}

vendor/github.com/cheekybits/genny/examples/go-generate/gen-go-generate.go

@@ -1,29 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package gogenerate
-
-type StringStringMap map[string]string
-
-func NewStringStringMap() map[string]string {
-	return make(map[string]string)
-}
-
-type StringIntMap map[string]int
-
-func NewStringIntMap() map[string]int {
-	return make(map[string]int)
-}
-
-type IntStringMap map[int]string
-
-func NewIntStringMap() map[int]string {
-	return make(map[int]string)
-}
-
-type IntIntMap map[int]int
-
-func NewIntIntMap() map[int]int {
-	return make(map[int]int)
-}

vendor/github.com/cheekybits/genny/examples/go-generate/go-generate.go

@@ -1,14 +0,0 @@
-package gogenerate
-
-import "github.com/cheekybits/genny/generic"
-
-//go:generate genny -in=$GOFILE -out=gen-$GOFILE gen "KeyType=string,int ValueType=string,int"
-
-type KeyType generic.Type
-type ValueType generic.Type
-
-type KeyTypeValueTypeMap map[KeyType]ValueType
-
-func NewKeyTypeValueTypeMap() map[KeyType]ValueType {
-	return make(map[KeyType]ValueType)
-}

vendor/github.com/cheekybits/genny/examples/queue/build.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-cat ./queue_generic.go | ../../genny gen "Generic=string,int" > queue_generic_gen.go

vendor/github.com/cheekybits/genny/examples/queue/queue_generic.go

@@ -1,33 +0,0 @@
-package example
-
-import "github.com/cheekybits/genny/generic"
-
-type Generic generic.Type
-
-// GenericQueue represents a queue of Generic types.
-type GenericQueue struct {
-	items []Generic
-}
-
-// NewGenericQueue makes a new empty Generic queue.
-func NewGenericQueue() *GenericQueue {
-	return &GenericQueue{items: make([]Generic, 0)}
-}
-
-// Enq adds an item to the queue.
-func (q *GenericQueue) Enq(obj Generic) *GenericQueue {
-	q.items = append(q.items, obj)
-	return q
-}
-
-// Deq removes and returns the next item in the queue.
-func (q *GenericQueue) Deq() Generic {
-	obj := q.items[0]
-	q.items = q.items[1:]
-	return obj
-}
-
-// Len gets the current number of Generic items in the queue.
-func (q *GenericQueue) Len() int {
-	return len(q.items)
-}

vendor/github.com/cheekybits/genny/examples/queue/queue_generic_test.go

@@ -1,32 +0,0 @@
-package example
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNew(t *testing.T) {
-
-	q := NewGenericQueue()
-	assert.NotNil(t, q)
-
-}
-
-func TestEnqueueAndDequeue(t *testing.T) {
-
-	item1 := new(Generic)
-	item2 := new(Generic)
-	q := NewGenericQueue()
-
-	assert.Equal(t, q, q.Enq(item1), "Enq should return the queue")
-	assert.Equal(t, 1, q.Len())
-	assert.Equal(t, q, q.Enq(item2), "Enq should return the queue")
-	assert.Equal(t, 2, q.Len())
-
-	assert.Equal(t, item1, q.Deq())
-	assert.Equal(t, 1, q.Len())
-	assert.Equal(t, item2, q.Deq())
-	assert.Equal(t, 0, q.Len())
-
-}

vendor/github.com/cheekybits/genny/parse/builtins.go

@@ -1,41 +0,0 @@
-package parse
-
-// Builtins contains a slice of all built-in Go types.
-var Builtins = []string{
-	"bool",
-	"byte",
-	"complex128",
-	"complex64",
-	"error",
-	"float32",
-	"float64",
-	"int",
-	"int16",
-	"int32",
-	"int64",
-	"int8",
-	"rune",
-	"string",
-	"uint",
-	"uint16",
-	"uint32",
-	"uint64",
-	"uint8",
-	"uintptr",
-}
-
-// Numbers contains a slice of all built-in number types.
-var Numbers = []string{
-	"float32",
-	"float64",
-	"int",
-	"int16",
-	"int32",
-	"int64",
-	"int8",
-	"uint",
-	"uint16",
-	"uint32",
-	"uint64",
-	"uint8",
-}

vendor/github.com/cheekybits/genny/parse/doc.go

@@ -1,14 +0,0 @@
-// Package parse contains the generic code generation capabilities
-// that power genny.
-//
-//     genny gen "{types}"
-//
-//     gen - generates type specific code (to stdout) from generic code (via stdin)
-//
-//     {types}  - (required) Specific types for each generic type in the source
-//     {types} format:  {generic}={specific}[,another][ {generic2}={specific2}]
-//     Examples:
-//       Generic=Specific
-//       Generic1=Specific1 Generic2=Specific2
-//       Generic1=Specific1,Specific2 Generic2=Specific3,Specific4
-package parse

vendor/github.com/cheekybits/genny/parse/errors.go

@@ -1,47 +0,0 @@
-package parse
-
-import (
-	"errors"
-)
-
-// errMissingSpecificType represents an error when a generic type is not
-// satisfied by a specific type.
-type errMissingSpecificType struct {
-	GenericType string
-}
-
-// Error gets a human readable string describing this error.
-func (e errMissingSpecificType) Error() string {
-	return "Missing specific type for '" + e.GenericType + "' generic type"
-}
-
-// errImports represents an error from goimports.
-type errImports struct {
-	Err error
-}
-
-// Error gets a human readable string describing this error.
-func (e errImports) Error() string {
-	return "Failed to goimports the generated code: " + e.Err.Error()
-}
-
-// errSource represents an error with the source file.
-type errSource struct {
-	Err error
-}
-
-// Error gets a human readable string describing this error.
-func (e errSource) Error() string {
-	return "Failed to parse source file: " + e.Err.Error()
-}
-
-type errBadTypeArgs struct {
-	Message string
-	Arg     string
-}
-
-func (e errBadTypeArgs) Error() string {
-	return "\"" + e.Arg + "\" is bad: " + e.Message
-}
-
-var errMissingTypeInformation = errors.New("No type arguments were specified and no \"// +gogen\" tag was found in the source.")

vendor/github.com/cheekybits/genny/parse/parse.go

@@ -1,271 +0,0 @@
-package parse
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"io"
-	"os"
-	"strings"
-	"unicode"
-
-	"golang.org/x/tools/imports"
-)
-
-type isExported bool
-
-var header = []byte(`
-
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-`)
-
-var (
-	packageKeyword = []byte("package")
-	importKeyword  = []byte("import")
-	openBrace      = []byte("(")
-	closeBrace     = []byte(")")
-	space          = " "
-	genericPackage = "generic"
-	genericType    = "generic.Type"
-	genericNumber  = "generic.Number"
-	linefeed       = "\r\n"
-)
-var unwantedLinePrefixes = [][]byte{
-	[]byte("//go:generate genny "),
-}
-
-func generateSpecific(filename string, in io.ReadSeeker, typeSet map[string]string) ([]byte, error) {
-
-	// ensure we are at the beginning of the file
-	in.Seek(0, os.SEEK_SET)
-
-	// parse the source file
-	fs := token.NewFileSet()
-	file, err := parser.ParseFile(fs, filename, in, 0)
-	if err != nil {
-		return nil, &errSource{Err: err}
-	}
-
-	// make sure every generic.Type is represented in the types
-	// argument.
-	for _, decl := range file.Decls {
-		switch it := decl.(type) {
-		case *ast.GenDecl:
-			for _, spec := range it.Specs {
-				ts, ok := spec.(*ast.TypeSpec)
-				if !ok {
-					continue
-				}
-				switch tt := ts.Type.(type) {
-				case *ast.SelectorExpr:
-					if name, ok := tt.X.(*ast.Ident); ok {
-						if name.Name == genericPackage {
-							if _, ok := typeSet[ts.Name.Name]; !ok {
-								return nil, &errMissingSpecificType{GenericType: ts.Name.Name}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// go back to the start of the file
-	in.Seek(0, os.SEEK_SET)
-
-	var buf bytes.Buffer
-
-	comment := ""
-	scanner := bufio.NewScanner(in)
-	for scanner.Scan() {
-
-		l := scanner.Text()
-
-		// does this line contain generic.Type?
-		if strings.Contains(l, genericType) || strings.Contains(l, genericNumber) {
-			comment = ""
-			continue
-		}
-
-		for t, specificType := range typeSet {
-
-			// does the line contain our type
-			if strings.Contains(l, t) {
-
-				var newLine string
-				// check each word
-				for _, word := range strings.Fields(l) {
-
-					i := 0
-					for {
-						i = strings.Index(word[i:], t) // find out where
-
-						if i > -1 {
-
-							// if this isn't an exact match
-							if i > 0 && isAlphaNumeric(rune(word[i-1])) || i < len(word)-len(t) && isAlphaNumeric(rune(word[i+len(t)])) {
-								// replace the word with a capitolized version
-								word = strings.Replace(word, t, wordify(specificType, unicode.IsUpper(rune(strings.TrimLeft(word, "*&")[0]))), 1)
-							} else {
-								// replace the word as is
-								word = strings.Replace(word, t, specificType, 1)
-							}
-
-						} else {
-							newLine = newLine + word + space
-							break
-						}
-
-					}
-				}
-				l = newLine
-			}
-		}
-
-		if comment != "" {
-			buf.WriteString(line(comment))
-			comment = ""
-		}
-
-		// is this line a comment?
-		// TODO: should we handle /* */ comments?
-		if strings.HasPrefix(l, "//") {
-			// record this line to print later
-			comment = l
-			continue
-		}
-
-		// write the line
-		buf.WriteString(line(l))
-	}
-
-	// write it out
-	return buf.Bytes(), nil
-}
-
-// Generics parses the source file and generates the bytes replacing the
-// generic types for the keys map with the specific types (its value).
-func Generics(filename, pkgName string, in io.ReadSeeker, typeSets []map[string]string) ([]byte, error) {
-
-	totalOutput := header
-
-	for _, typeSet := range typeSets {
-
-		// generate the specifics
-		parsed, err := generateSpecific(filename, in, typeSet)
-		if err != nil {
-			return nil, err
-		}
-
-		totalOutput = append(totalOutput, parsed...)
-
-	}
-
-	// clean up the code line by line
-	packageFound := false
-	insideImportBlock := false
-	var cleanOutputLines []string
-	scanner := bufio.NewScanner(bytes.NewReader(totalOutput))
-	for scanner.Scan() {
-
-		// end of imports block?
-		if insideImportBlock {
-			if bytes.HasSuffix(scanner.Bytes(), closeBrace) {
-				insideImportBlock = false
-			}
-			continue
-		}
-
-		if bytes.HasPrefix(scanner.Bytes(), packageKeyword) {
-			if packageFound {
-				continue
-			} else {
-				packageFound = true
-			}
-		} else if bytes.HasPrefix(scanner.Bytes(), importKeyword) {
-			if bytes.HasSuffix(scanner.Bytes(), openBrace) {
-				insideImportBlock = true
-			}
-			continue
-		}
-
-		// check all unwantedLinePrefixes - and skip them
-		skipline := false
-		for _, prefix := range unwantedLinePrefixes {
-			if bytes.HasPrefix(scanner.Bytes(), prefix) {
-				skipline = true
-				continue
-			}
-		}
-
-		if skipline {
-			continue
-		}
-
-		cleanOutputLines = append(cleanOutputLines, line(scanner.Text()))
-	}
-
-	cleanOutput := strings.Join(cleanOutputLines, "")
-
-	output := []byte(cleanOutput)
-	var err error
-
-	// change package name
-	if pkgName != "" {
-		output = changePackage(bytes.NewReader([]byte(output)), pkgName)
-	}
-	// fix the imports
-	output, err = imports.Process(filename, output, nil)
-	if err != nil {
-		return nil, &errImports{Err: err}
-	}
-
-	return output, nil
-}
-
-func line(s string) string {
-	return fmt.Sprintln(strings.TrimRight(s, linefeed))
-}
-
-// isAlphaNumeric gets whether the rune is alphanumeric or _.
-func isAlphaNumeric(r rune) bool {
-	return r == '_' || unicode.IsLetter(r) || unicode.IsDigit(r)
-}
-
-// wordify turns a type into a nice word for function and type
-// names etc.
-func wordify(s string, exported bool) string {
-	s = strings.TrimRight(s, "{}")
-	s = strings.TrimLeft(s, "*&")
-	s = strings.Replace(s, ".", "", -1)
-	if !exported {
-		return s
-	}
-	return strings.ToUpper(string(s[0])) + s[1:]
-}
-
-func changePackage(r io.Reader, pkgName string) []byte {
-	var out bytes.Buffer
-	sc := bufio.NewScanner(r)
-	done := false
-
-	for sc.Scan() {
-		s := sc.Text()
-
-		if !done && strings.HasPrefix(s, "package") {
-			parts := strings.Split(s, " ")
-			parts[1] = pkgName
-			s = strings.Join(parts, " ")
-			done = true
-		}
-
-		fmt.Fprintln(&out, s)
-	}
-	return out.Bytes()
-}

vendor/github.com/cheekybits/genny/parse/parse_int_test.go

@@ -1,35 +0,0 @@
-package parse
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestIsAlphaNumeric(t *testing.T) {
-
-	for _, r := range []rune{'a', '1', '_', 'A', 'Z'} {
-		assert.True(t, isAlphaNumeric(r))
-	}
-	for _, r := range []rune{' ', '[', ']', '!', '"'} {
-		assert.False(t, isAlphaNumeric(r))
-	}
-
-}
-
-func TestWordify(t *testing.T) {
-
-	for word, wordified := range map[string]string{
-		"int":         "Int",
-		"*int":        "Int",
-		"string":      "String",
-		"*MyType":     "MyType",
-		"*myType":     "MyType",
-		"interface{}": "Interface",
-		"pack.type":   "Packtype",
-		"*pack.type":  "Packtype",
-	} {
-		assert.Equal(t, wordified, wordify(word, true))
-	}
-
-}

vendor/github.com/cheekybits/genny/parse/parse_test.go

@@ -1,126 +0,0 @@
-package parse_test
-
-import (
-	"io/ioutil"
-	"log"
-	"strings"
-	"testing"
-
-	"github.com/cheekybits/genny/parse"
-	"github.com/stretchr/testify/assert"
-)
-
-var tests = []struct {
-	// input
-	filename string
-	pkgName  string
-	in       string
-	types    []map[string]string
-
-	// expectations
-	expectedOut string
-	expectedErr error
-}{
-	{
-		filename:    "generic_queue.go",
-		in:          `test/queue/generic_queue.go`,
-		types:       []map[string]string{{"Something": "int"}},
-		expectedOut: `test/queue/int_queue.go`,
-	},
-	{
-		filename:    "generic_queue.go",
-		pkgName:     "changed",
-		in:          `test/queue/generic_queue.go`,
-		types:       []map[string]string{{"Something": "int"}},
-		expectedOut: `test/queue/changed/int_queue.go`,
-	},
-	{
-		filename:    "generic_queue.go",
-		in:          `test/queue/generic_queue.go`,
-		types:       []map[string]string{{"Something": "float32"}},
-		expectedOut: `test/queue/float32_queue.go`,
-	},
-	{
-		filename:    "generic_simplemap.go",
-		in:          `test/multipletypes/generic_simplemap.go`,
-		types:       []map[string]string{{"KeyType": "string", "ValueType": "int"}},
-		expectedOut: `test/multipletypes/string_int_simplemap.go`,
-	},
-	{
-		filename:    "generic_simplemap.go",
-		in:          `test/multipletypes/generic_simplemap.go`,
-		types:       []map[string]string{{"KeyType": "interface{}", "ValueType": "int"}},
-		expectedOut: `test/multipletypes/interface_int_simplemap.go`,
-	},
-	{
-		filename:    "generic_simplemap.go",
-		in:          `test/multipletypes/generic_simplemap.go`,
-		types:       []map[string]string{{"KeyType": "*MyType1", "ValueType": "*MyOtherType"}},
-		expectedOut: `test/multipletypes/custom_types_simplemap.go`,
-	},
-	{
-		filename:    "generic_internal.go",
-		in:          `test/unexported/generic_internal.go`,
-		types:       []map[string]string{{"secret": "*myType"}},
-		expectedOut: `test/unexported/mytype_internal.go`,
-	},
-	{
-		filename: "generic_simplemap.go",
-		in:       `test/multipletypesets/generic_simplemap.go`,
-		types: []map[string]string{
-			{"KeyType": "int", "ValueType": "string"},
-			{"KeyType": "float64", "ValueType": "bool"},
-		},
-		expectedOut: `test/multipletypesets/many_simplemaps.go`,
-	},
-	{
-		filename:    "generic_number.go",
-		in:          `test/numbers/generic_number.go`,
-		types:       []map[string]string{{"NumberType": "int"}},
-		expectedOut: `test/numbers/int_number.go`,
-	},
-	{
-		filename:    "generic_digraph.go",
-		in:          `test/bugreports/generic_digraph.go`,
-		types:       []map[string]string{{"Node": "int"}},
-		expectedOut: `test/bugreports/int_digraph.go`,
-	},
-}
-
-func TestParse(t *testing.T) {
-
-	for _, test := range tests {
-
-		test.in = contents(test.in)
-		test.expectedOut = contents(test.expectedOut)
-
-		bytes, err := parse.Generics(test.filename, test.pkgName, strings.NewReader(test.in), test.types)
-
-		// check the error
-		if test.expectedErr == nil {
-			assert.NoError(t, err, "(%s) No error was expected but got: %s", test.filename, err)
-		} else {
-			assert.NotNil(t, err, "(%s) No error was returned by one was expected: %s", test.filename, test.expectedErr)
-			assert.IsType(t, test.expectedErr, err, "(%s) Generate should return object of type %v", test.filename, test.expectedErr)
-		}
-
-		// assert the response
-		if !assert.Equal(t, string(bytes), test.expectedOut, "Parse didn't generate the expected output.") {
-			log.Println("EXPECTED: " + test.expectedOut)
-			log.Println("ACTUAL: " + string(bytes))
-		}
-
-	}
-
-}
-
-func contents(s string) string {
-	if strings.HasSuffix(s, "go") {
-		file, err := ioutil.ReadFile(s)
-		if err != nil {
-			panic(err)
-		}
-		return string(file)
-	}
-	return s
-}

vendor/github.com/cheekybits/genny/parse/test/bugreports/generic_digraph.go

@@ -1,30 +0,0 @@
-package bugreports
-
-import "github.com/cheekybits/genny/generic"
-
-type Node generic.Type
-
-type DigraphNode struct {
-	nodes map[Node][]Node
-}
-
-func NewDigraphNode() *DigraphNode {
-	return &DigraphNode{
-		nodes: make(map[Node][]Node),
-	}
-}
-
-func (dig *DigraphNode) Add(n Node) {
-	if _, exists := dig.nodes[n]; exists {
-		return
-	}
-
-	dig.nodes[n] = nil
-}
-
-func (dig *DigraphNode) Connect(a, b Node) {
-	dig.Add(a)
-	dig.Add(b)
-
-	dig.nodes[a] = append(dig.nodes[a], b)
-}

vendor/github.com/cheekybits/genny/parse/test/bugreports/int_digraph.go

@@ -1,30 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package bugreports
-
-type DigraphInt struct {
-	nodes map[int][]int
-}
-
-func NewDigraphInt() *DigraphInt {
-	return &DigraphInt{
-		nodes: make(map[int][]int),
-	}
-}
-
-func (dig *DigraphInt) Add(n int) {
-	if _, exists := dig.nodes[n]; exists {
-		return
-	}
-
-	dig.nodes[n] = nil
-}
-
-func (dig *DigraphInt) Connect(a, b int) {
-	dig.Add(a)
-	dig.Add(b)
-
-	dig.nodes[a] = append(dig.nodes[a], b)
-}

vendor/github.com/cheekybits/genny/parse/test/multipletypes/custom_types.go

@@ -1,5 +0,0 @@
-package multipletypes
-
-type MyType1 struct{}
-
-type MyOtherType struct{}

vendor/github.com/cheekybits/genny/parse/test/multipletypes/custom_types_simplemap.go

@@ -1,21 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package multipletypes
-
-type MyType1MyOtherTypeMap map[*MyType1]*MyOtherType
-
-func (m MyType1MyOtherTypeMap) Has(key *MyType1) bool {
-	_, ok := m[key]
-	return ok
-}
-
-func (m MyType1MyOtherTypeMap) Get(key *MyType1) *MyOtherType {
-	return m[key]
-}
-
-func (m MyType1MyOtherTypeMap) Set(key *MyType1, value *MyOtherType) MyType1MyOtherTypeMap {
-	m[key] = value
-	return m
-}

vendor/github.com/cheekybits/genny/parse/test/multipletypes/generic_simplemap.go

@@ -1,22 +0,0 @@
-package multipletypes
-
-import "github.com/cheekybits/genny/generic"
-
-type KeyType generic.Type
-type ValueType generic.Type
-
-type KeyTypeValueTypeMap map[KeyType]ValueType
-
-func (m KeyTypeValueTypeMap) Has(key KeyType) bool {
-	_, ok := m[key]
-	return ok
-}
-
-func (m KeyTypeValueTypeMap) Get(key KeyType) ValueType {
-	return m[key]
-}
-
-func (m KeyTypeValueTypeMap) Set(key KeyType, value ValueType) KeyTypeValueTypeMap {
-	m[key] = value
-	return m
-}

vendor/github.com/cheekybits/genny/parse/test/multipletypes/generic_simplemap_test.go

@@ -1,35 +0,0 @@
-package multipletypes
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSimpleMap(t *testing.T) {
-
-	key1 := new(KeyType)
-	key2 := new(KeyType)
-	value1 := new(ValueType)
-	m := make(KeyTypeValueTypeMap)
-
-	assert.Equal(t, m, m.Set(key1, value1))
-	assert.True(t, m.Has(key1))
-	assert.False(t, m.Has(key2))
-	assert.Equal(t, value1, m.Get(key1))
-
-}
-
-func TestCustomTypesMap(t *testing.T) {
-
-	key1 := new(MyType1)
-	key2 := new(MyType1)
-	value1 := new(MyOtherType)
-	m := make(MyType1MyOtherTypeMap)
-
-	assert.Equal(t, m, m.Set(key1, value1))
-	assert.True(t, m.Has(key1))
-	assert.False(t, m.Has(key2))
-	assert.Equal(t, value1, m.Get(key1))
-
-}

vendor/github.com/cheekybits/genny/parse/test/multipletypes/interface_int_simplemap.go

@@ -1,21 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package multipletypes
-
-type InterfaceIntMap map[interface{}]int
-
-func (m InterfaceIntMap) Has(key interface{}) bool {
-	_, ok := m[key]
-	return ok
-}
-
-func (m InterfaceIntMap) Get(key interface{}) int {
-	return m[key]
-}
-
-func (m InterfaceIntMap) Set(key interface{}, value int) InterfaceIntMap {
-	m[key] = value
-	return m
-}

vendor/github.com/cheekybits/genny/parse/test/multipletypes/string_int_simplemap.go

@@ -1,21 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package multipletypes
-
-type StringIntMap map[string]int
-
-func (m StringIntMap) Has(key string) bool {
-	_, ok := m[key]
-	return ok
-}
-
-func (m StringIntMap) Get(key string) int {
-	return m[key]
-}
-
-func (m StringIntMap) Set(key string, value int) StringIntMap {
-	m[key] = value
-	return m
-}

vendor/github.com/cheekybits/genny/parse/test/multipletypesets/generic_simplemap.go

@@ -1,27 +0,0 @@
-package multipletypesets
-
-import (
-	"log"
-
-	"github.com/cheekybits/genny/generic"
-)
-
-type KeyType generic.Type
-type ValueType generic.Type
-
-type KeyTypeValueTypeMap map[KeyType]ValueType
-
-func (m KeyTypeValueTypeMap) Has(key KeyType) bool {
-	_, ok := m[key]
-	return ok
-}
-
-func (m KeyTypeValueTypeMap) Get(key KeyType) ValueType {
-	return m[key]
-}
-
-func (m KeyTypeValueTypeMap) Set(key KeyType, value ValueType) KeyTypeValueTypeMap {
-	log.Println(value)
-	m[key] = value
-	return m
-}

vendor/github.com/cheekybits/genny/parse/test/multipletypesets/generic_simplemap_test.go

@@ -1,21 +0,0 @@
-package multipletypesets
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSimpleMap(t *testing.T) {
-
-	key1 := new(KeyType)
-	key2 := new(KeyType)
-	value1 := new(ValueType)
-	m := make(KeyTypeValueTypeMap)
-
-	assert.Equal(t, m, m.Set(key1, value1))
-	assert.True(t, m.Has(key1))
-	assert.False(t, m.Has(key2))
-	assert.Equal(t, value1, m.Get(key1))
-
-}

vendor/github.com/cheekybits/genny/parse/test/multipletypesets/many_simplemaps.go

@@ -1,41 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package multipletypesets
-
-import "log"
-
-type IntStringMap map[int]string
-
-func (m IntStringMap) Has(key int) bool {
-	_, ok := m[key]
-	return ok
-}
-
-func (m IntStringMap) Get(key int) string {
-	return m[key]
-}
-
-func (m IntStringMap) Set(key int, value string) IntStringMap {
-	log.Println(value)
-	m[key] = value
-	return m
-}
-
-type Float64BoolMap map[float64]bool
-
-func (m Float64BoolMap) Has(key float64) bool {
-	_, ok := m[key]
-	return ok
-}
-
-func (m Float64BoolMap) Get(key float64) bool {
-	return m[key]
-}
-
-func (m Float64BoolMap) Set(key float64, value bool) Float64BoolMap {
-	log.Println(value)
-	m[key] = value
-	return m
-}

vendor/github.com/cheekybits/genny/parse/test/numbers/generic_number.go

@@ -1,12 +0,0 @@
-package numbers
-
-import "github.com/cheekybits/genny/generic"
-
-type NumberType generic.Number
-
-func NumberTypeMax(a, b NumberType) NumberType {
-	if a > b {
-		return a
-	}
-	return b
-}

vendor/github.com/cheekybits/genny/parse/test/numbers/int_number.go

@@ -1,12 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package numbers
-
-func IntMax(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}

vendor/github.com/cheekybits/genny/parse/test/queue/changed/int_queue.go

@@ -1,22 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package changed
-
-// IntQueue is a queue of Ints.
-type IntQueue struct {
-	items []int
-}
-
-func NewIntQueue() *IntQueue {
-	return &IntQueue{items: make([]int, 0)}
-}
-func (q *IntQueue) Push(item int) {
-	q.items = append(q.items, item)
-}
-func (q *IntQueue) Pop() int {
-	item := q.items[0]
-	q.items = q.items[1:]
-	return item
-}

vendor/github.com/cheekybits/genny/parse/test/queue/float32_queue.go

@@ -1,22 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package queue
-
-// Float32Queue is a queue of Float32s.
-type Float32Queue struct {
-	items []float32
-}
-
-func NewFloat32Queue() *Float32Queue {
-	return &Float32Queue{items: make([]float32, 0)}
-}
-func (q *Float32Queue) Push(item float32) {
-	q.items = append(q.items, item)
-}
-func (q *Float32Queue) Pop() float32 {
-	item := q.items[0]
-	q.items = q.items[1:]
-	return item
-}

vendor/github.com/cheekybits/genny/parse/test/queue/generic_queue.go

@@ -1,23 +0,0 @@
-package queue
-
-import "github.com/cheekybits/genny/generic"
-
-// Something is a type that does something
-type Something generic.Type
-
-// SomethingQueue is a queue of Somethings.
-type SomethingQueue struct {
-	items []Something
-}
-
-func NewSomethingQueue() *SomethingQueue {
-	return &SomethingQueue{items: make([]Something, 0)}
-}
-func (q *SomethingQueue) Push(item Something) {
-	q.items = append(q.items, item)
-}
-func (q *SomethingQueue) Pop() Something {
-	item := q.items[0]
-	q.items = q.items[1:]
-	return item
-}

vendor/github.com/cheekybits/genny/parse/test/queue/generic_queue_test.go

@@ -1,87 +0,0 @@
-package queue
-
-import "testing"
-
-func TestSomethingQueue(t *testing.T) {
-
-	var item1 *Something = new(Something)
-	var item2 *Something = new(Something)
-	var item3 *Something = new(Something)
-
-	q := NewSomethingQueue()
-
-	q.Push(item1)
-	if len(q.items) != 1 {
-		t.Error("Push should add the item")
-	}
-	q.Push(item2)
-	if len(q.items) != 2 {
-		t.Error("Push should add the item")
-	}
-	q.Push(item3)
-	if len(q.items) != 3 {
-		t.Error("Push should add the item")
-	}
-
-	if q.Pop() != item1 {
-		t.Error("Pop should return items in the order in which they were added")
-	}
-	if len(q.items) != 2 {
-		t.Error("Pop should remove the item")
-	}
-	if q.Pop() != item2 {
-		t.Error("Pop should return items in the order in which they were added")
-	}
-	if len(q.items) != 1 {
-		t.Error("Pop should remove the item")
-	}
-	if q.Pop() != item3 {
-		t.Error("Pop should return items in the order in which they were added")
-	}
-	if len(q.items) != 0 {
-		t.Error("Pop should remove the item")
-	}
-
-}
-
-func TestIntQueue(t *testing.T) {
-
-	var item1 int = 1
-	var item2 int = 2
-	var item3 int = 3
-
-	q := NewIntQueue()
-
-	q.Push(item1)
-	if len(q.items) != 1 {
-		t.Error("Push should add the item")
-	}
-	q.Push(item2)
-	if len(q.items) != 2 {
-		t.Error("Push should add the item")
-	}
-	q.Push(item3)
-	if len(q.items) != 3 {
-		t.Error("Push should add the item")
-	}
-
-	if q.Pop() != item1 {
-		t.Error("Pop should return items in the order in which they were added")
-	}
-	if len(q.items) != 2 {
-		t.Error("Pop should remove the item")
-	}
-	if q.Pop() != item2 {
-		t.Error("Pop should return items in the order in which they were added")
-	}
-	if len(q.items) != 1 {
-		t.Error("Pop should remove the item")
-	}
-	if q.Pop() != item3 {
-		t.Error("Pop should return items in the order in which they were added")
-	}
-	if len(q.items) != 0 {
-		t.Error("Pop should remove the item")
-	}
-
-}

vendor/github.com/cheekybits/genny/parse/test/queue/int_queue.go

@@ -1,22 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package queue
-
-// IntQueue is a queue of Ints.
-type IntQueue struct {
-	items []int
-}
-
-func NewIntQueue() *IntQueue {
-	return &IntQueue{items: make([]int, 0)}
-}
-func (q *IntQueue) Push(item int) {
-	q.items = append(q.items, item)
-}
-func (q *IntQueue) Pop() int {
-	item := q.items[0]
-	q.items = q.items[1:]
-	return item
-}

vendor/github.com/cheekybits/genny/parse/test/slice/ensure_slice.go

@@ -1,24 +0,0 @@
-package slice
-
-import (
-	"log"
-	"reflect"
-
-	"github.com/cheekybits/genny/generic"
-)
-
-type MyType generic.Type
-
-func EnsureSlice(objectOrSlice interface{}) []MyType {
-	log.Printf("%v", reflect.TypeOf(objectOrSlice))
-	switch obj := objectOrSlice.(type) {
-	case []MyType:
-		log.Println("  returning it untouched")
-		return obj
-	case MyType, *MyType:
-		log.Println("  wrapping in slice")
-		return []MyType{obj}
-	default:
-		panic("ensure slice needs MyType or []MyType")
-	}
-}

vendor/github.com/cheekybits/genny/parse/test/slice/ensure_slice_test.go

@@ -1,24 +0,0 @@
-package slice
-
-import (
-	"log"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestEnsureSlice(t *testing.T) {
-
-	myType := new(MyType)
-	slice := EnsureSlice(myType)
-	if assert.NotNil(t, slice) {
-		assert.Equal(t, slice[0], myType)
-	}
-
-	slice = EnsureSlice(slice)
-	log.Printf("%#v", slice[0])
-	if assert.NotNil(t, slice) {
-		assert.Equal(t, slice[0], myType)
-	}
-
-}

vendor/github.com/cheekybits/genny/parse/test/unexported/custom_types.go

@@ -1,3 +0,0 @@
-package unexported
-
-type myType struct{}

vendor/github.com/cheekybits/genny/parse/test/unexported/generic_internal.go

@@ -1,13 +0,0 @@
-package unexported
-
-import (
-	"fmt"
-
-	"github.com/cheekybits/genny/generic"
-)
-
-type secret generic.Type
-
-func secretInspect(s secret) string {
-	return fmt.Sprintf("%#v", s)
-}

vendor/github.com/cheekybits/genny/parse/test/unexported/mytype_internal.go

@@ -1,11 +0,0 @@
-// This file was automatically generated by genny.
-// Any changes will be lost if this file is regenerated.
-// see https://github.com/cheekybits/genny
-
-package unexported
-
-import "fmt"
-
-func myTypeInspect(s *myType) string {
-	return fmt.Sprintf("%#v", s)
-}

vendor/github.com/cheekybits/genny/parse/typesets.go

@@ -1,89 +0,0 @@
-package parse
-
-import "strings"
-
-const (
-	typeSep     = " "
-	keyValueSep = "="
-	valuesSep   = ","
-	builtins    = "BUILTINS"
-	numbers     = "NUMBERS"
-)
-
-// TypeSet turns a type string into a []map[string]string
-// that can be given to parse.Generics for it to do its magic.
-//
-// Acceptable args are:
-//
-//     Person=man
-//     Person=man Animal=dog
-//     Person=man Animal=dog Animal2=cat
-//     Person=man,woman Animal=dog,cat
-//     Person=man,woman,child Animal=dog,cat Place=london,paris
-func TypeSet(arg string) ([]map[string]string, error) {
-
-	types := make(map[string][]string)
-	var keys []string
-	for _, pair := range strings.Split(arg, typeSep) {
-		segs := strings.Split(pair, keyValueSep)
-		if len(segs) != 2 {
-			return nil, &errBadTypeArgs{Arg: arg, Message: "Generic=Specific expected"}
-		}
-		key := segs[0]
-		keys = append(keys, key)
-		types[key] = make([]string, 0)
-		for _, t := range strings.Split(segs[1], valuesSep) {
-			if t == builtins {
-				types[key] = append(types[key], Builtins...)
-			} else if t == numbers {
-				types[key] = append(types[key], Numbers...)
-			} else {
-				types[key] = append(types[key], t)
-			}
-		}
-	}
-
-	cursors := make(map[string]int)
-	for _, key := range keys {
-		cursors[key] = 0
-	}
-
-	outChan := make(chan map[string]string)
-	go func() {
-		buildTypeSet(keys, 0, cursors, types, outChan)
-		close(outChan)
-	}()
-
-	var typeSets []map[string]string
-	for typeSet := range outChan {
-		typeSets = append(typeSets, typeSet)
-	}
-
-	return typeSets, nil
-
-}
-
-func buildTypeSet(keys []string, keyI int, cursors map[string]int, types map[string][]string, out chan<- map[string]string) {
-	key := keys[keyI]
-	for cursors[key] < len(types[key]) {
-		if keyI < len(keys)-1 {
-			buildTypeSet(keys, keyI+1, copycursors(cursors), types, out)
-		} else {
-			// build the typeset for this combination
-			ts := make(map[string]string)
-			for k, vals := range types {
-				ts[k] = vals[cursors[k]]
-			}
-			out <- ts
-		}
-		cursors[key]++
-	}
-}
-
-func copycursors(source map[string]int) map[string]int {
-	copy := make(map[string]int)
-	for k, v := range source {
-		copy[k] = v
-	}
-	return copy
-}

vendor/github.com/cheekybits/genny/parse/typesets_test.go

@@ -1,74 +0,0 @@
-package parse_test
-
-import (
-	"testing"
-
-	"github.com/cheekybits/genny/parse"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestArgsToTypeset(t *testing.T) {
-
-	args := "Person=man,woman Animal=dog,cat Place=london,paris"
-	ts, err := parse.TypeSet(args)
-
-	if assert.NoError(t, err) {
-		if assert.Equal(t, 8, len(ts)) {
-
-			assert.Equal(t, ts[0]["Person"], "man")
-			assert.Equal(t, ts[0]["Animal"], "dog")
-			assert.Equal(t, ts[0]["Place"], "london")
-
-			assert.Equal(t, ts[1]["Person"], "man")
-			assert.Equal(t, ts[1]["Animal"], "dog")
-			assert.Equal(t, ts[1]["Place"], "paris")
-
-			assert.Equal(t, ts[2]["Person"], "man")
-			assert.Equal(t, ts[2]["Animal"], "cat")
-			assert.Equal(t, ts[2]["Place"], "london")
-
-			assert.Equal(t, ts[3]["Person"], "man")
-			assert.Equal(t, ts[3]["Animal"], "cat")
-			assert.Equal(t, ts[3]["Place"], "paris")
-
-			assert.Equal(t, ts[4]["Person"], "woman")
-			assert.Equal(t, ts[4]["Animal"], "dog")
-			assert.Equal(t, ts[4]["Place"], "london")
-
-			assert.Equal(t, ts[5]["Person"], "woman")
-			assert.Equal(t, ts[5]["Animal"], "dog")
-			assert.Equal(t, ts[5]["Place"], "paris")
-
-			assert.Equal(t, ts[6]["Person"], "woman")
-			assert.Equal(t, ts[6]["Animal"], "cat")
-			assert.Equal(t, ts[6]["Place"], "london")
-
-			assert.Equal(t, ts[7]["Person"], "woman")
-			assert.Equal(t, ts[7]["Animal"], "cat")
-			assert.Equal(t, ts[7]["Place"], "paris")
-
-		}
-	}
-
-	ts, err = parse.TypeSet("Person=man Animal=dog Place=london")
-	if assert.NoError(t, err) {
-		assert.Equal(t, 1, len(ts))
-	}
-	ts, err = parse.TypeSet("Person=1,2,3,4,5 Animal=1,2,3,4,5 Place=1,2,3,4,5")
-	if assert.NoError(t, err) {
-		assert.Equal(t, 125, len(ts))
-	}
-	ts, err = parse.TypeSet("Person=1 Animal=1,2,3,4,5 Place=1,2")
-	if assert.NoError(t, err) {
-		assert.Equal(t, 10, len(ts))
-	}
-
-	ts, err = parse.TypeSet("Person=interface{} Animal=interface{} Place=interface{}")
-	if assert.NoError(t, err) {
-		assert.Equal(t, 1, len(ts))
-		assert.Equal(t, ts[0]["Animal"], "interface{}")
-		assert.Equal(t, ts[0]["Person"], "interface{}")
-		assert.Equal(t, ts[0]["Place"], "interface{}")
-	}
-
-}

vendor/github.com/coryb/figtree/Gopkg.lock

@@ -0,0 +1,73 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/template"
+  packages = [".","parse"]
+  revision = "a0175ee3bccc567396460bf5acd36800cb10c49c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/units"
+  packages = ["."]
+  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/cheekybits/genny"
+  packages = ["generic"]
+  revision = "9127e812e1e9e501ce899a18121d316ecb52e4ba"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/fatih/camelcase"
+  packages = ["."]
+  revision = "f6a740d52f961c60348ebb109adde9f4635d7540"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = ["assert"]
+  revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"
+  version = "v1.1.4"
+
+[[projects]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  packages = ["."]
+  revision = "7f0871f2e17818990e4eed73f9b5c2f429501228"
+  version = "v2.2.4"
+
+[[projects]]
+  branch = "v2"
+  name = "gopkg.in/coryb/yaml.v2"
+  packages = ["."]
+  revision = "fb7cb9628c6e3bdd76c29fb91798d51a09832470"
+
+[[projects]]
+  name = "gopkg.in/op/go-logging.v1"
+  packages = ["."]
+  revision = "b2cb9fa56473e98db8caba80237377e83fe44db5"
+  version = "v1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "1879d7c016fcc8e210ca7fdeed4b099f4e7fc931d34ff47a170222c60eea8aab"
+  solver-name = "gps-cdcl"
+  solver-version = 1

vendor/github.com/coryb/figtree/Gopkg.toml

@@ -0,0 +1,47 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/cheekybits/genny"
+
+[[constraint]]
+  name = "github.com/fatih/camelcase"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+  version = "0.8.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"
+
+[[constraint]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  version = "2.2.4"
+
+[[constraint]]
+  name = "gopkg.in/coryb/yaml.v2"
+
+[[constraint]]
+  name = "gopkg.in/op/go-logging.v1"
+  version = "1.0.0"

vendor/github.com/coryb/figtree/d1/corrupt.yml

@@ -1,9 +0,0 @@
-str1:
-  foo: bar
-arr1: strval1
-map1:
-  - abc
-  - def
-int1: true
-float1: "strval2"
-bool1: 123.45