version bump

Updated Changelog
2026-05-19 20:53:27 +02:00 · 2019-09-16 18:40:18 -07:00 · 2019-09-16 18:40:18 -07:00 · 2019-09-16 18:36:52 -07:00 · 2019-09-16 17:54:35 -07:00 · 2019-09-16 15:08:34 -07:00
758 changed files with 3219 additions and 222892 deletions
@@ -0,0 +1,2 @@
+# one of these users must approve the PR before merging
+* @coryb @mvdan @vanniktech @mikepea
@@ -1,5 +1,12 @@
 jira
 schemas/*.json
-t/.gnupg/random_seed
-t/issue.props
-dist
+/_t/.gnupg/random_seed
+/_t/issue.props
+/_t/attach.props
+/_t/garbage.bin
+/_t/attach1.txt
+/_t/binary.out
+/_t/foobar.bin
+/_t/.password-store/GoJira/api-token:gojira@corybennett.org.gpg
+/_t/.password-store/GoJira/api-token:mothra@corybennett.org.gpg
+dist
@@ -3,6 +3,7 @@ config:
 password-source: pass
 endpoint: https://go-jira.atlassian.net
 user: admin
+login: atlassian@corybennett.org

 queries:
  todo: |
@@ -1,16 +1,20 @@
-sudo: true
-before_install:
-    - sudo apt-get update && sudo apt-get install -y pass gnupg
+addons:
+  apt:
+    packages:
+    - pass
+    - gnupg

 language: go
-go_import_path: gopkg.in/Netflix-Skunkworks/go-jira.v1
-go:
-  - 1.8

-matrix:
-  fast_finish: true
-  
+go:
+  - 1.12.x
+  - 1.13.x
+
+env:
+  - GO111MODULE=on
+
 script:
-  - make vet
+  - go test ./...
+  - go vet -composites=false ./...
  - make
-  - make prove 2>&1 
+  - make prove 2>&1
@@ -1,5 +1,119 @@
 # Changelog

+
+## 1.0.21 - 2019-09-16
+
+* [[#277](https://github.com/Netflix-Skunkworks/go-jira/issues/277)] update figtree to latest [Cory Bennett] [[0e520a4](https://github.com/Netflix-Skunkworks/go-jira/commit/0e520a4)]
+* Switch over to using github.com/go-jira/jira, from gopkg.in [Mike Pountney] [[27f57b2](https://github.com/Netflix-Skunkworks/go-jira/commit/27f57b2)]
+* fix worklog template to allow multiline comments [Matthias Bethke] [[43e07f1](https://github.com/Netflix-Skunkworks/go-jira/commit/43e07f1)]
+* Allow reading password from stdin [Justin Ko] [[225e1dc](https://github.com/Netflix-Skunkworks/go-jira/commit/225e1dc)]
+* all: unindent some code [Daniel Martí] [[31c113d](https://github.com/Netflix-Skunkworks/go-jira/commit/31c113d)]
+* don't use ReadAll when decoding JSON [Daniel Martí] [[9bcdcc1](https://github.com/Netflix-Skunkworks/go-jira/commit/9bcdcc1)]
+* start making staticcheck happier [Daniel Martí] [[9b9186f](https://github.com/Netflix-Skunkworks/go-jira/commit/9b9186f)]
+* all: convert to a Go module [Daniel Martí] [[f125ef3](https://github.com/Netflix-Skunkworks/go-jira/commit/f125ef3)]
+* CI: test on Go 1.12.x, cleanup [Daniel Martí] [[664c5ca](https://github.com/Netflix-Skunkworks/go-jira/commit/664c5ca)]
+* make automatic pagination on search optional, fix tests [Cory Bennett] [[36c99ce](https://github.com/Netflix-Skunkworks/go-jira/commit/36c99ce)]
+* prefer defer resp.Body.Close to avoid leaks on subsequent errors [Cory Bennett] [[181bd74](https://github.com/Netflix-Skunkworks/go-jira/commit/181bd74)]
+* add pagination to search [Miles Maddox] [[76dd1d8](https://github.com/Netflix-Skunkworks/go-jira/commit/76dd1d8)]
+* Fix function comments based on best practices from Effective Go [CodeLingo Bot] [[23ac118](https://github.com/Netflix-Skunkworks/go-jira/commit/23ac118)]
+* [[#201](https://github.com/Netflix-Skunkworks/go-jira/issues/201)] update required library, failing to populate cookiejar from cookies file [Cory Bennett] [[ee69afa](https://github.com/Netflix-Skunkworks/go-jira/commit/ee69afa)]
+
+## 1.0.20 - 2018-08-04
+
+* [[#201](https://github.com/Netflix-Skunkworks/go-jira/issues/201)] update required library, failing to populate cookiejar from cookies file [Cory Bennett] [[ee69afa](https://github.com/Netflix-Skunkworks/go-jira/commit/ee69afa)]
+
+## 1.0.19 - 2018-08-02
+
+* [[#199](https://github.com/Netflix-Skunkworks/go-jira/issues/199)] [[#198](https://github.com/Netflix-Skunkworks/go-jira/issues/198)] update http client library, fix issues with internal login retries [Cory Bennett] [[0cba806](https://github.com/Netflix-Skunkworks/go-jira/commit/0cba806)]
+
+## 1.0.18 - 2018-07-29
+
+* [[#196](https://github.com/Netflix-Skunkworks/go-jira/issues/196)] add `jira session` command to show session information if user is authenticated [Cory Bennett] [[f592107](https://github.com/Netflix-Skunkworks/go-jira/commit/f592107)]
+* [[#192](https://github.com/Netflix-Skunkworks/go-jira/issues/192)] fix template usage for 'fixVersions' in transition template [Cory Bennett] [[c9a4e30](https://github.com/Netflix-Skunkworks/go-jira/commit/c9a4e30)]
+* move HandleExit to the jiracli package [Cory Bennett] [[ef9b731](https://github.com/Netflix-Skunkworks/go-jira/commit/ef9b731)]
+* they broke golang.org/x/net: ERROR: vendor/golang.org/x/net/proxy/socks5.go:11:2: use of internal package not allowed [Cory Bennett] [[7191c77](https://github.com/Netflix-Skunkworks/go-jira/commit/7191c77)]
+* udpate deps [Cory Bennett] [[d16bcc2](https://github.com/Netflix-Skunkworks/go-jira/commit/d16bcc2)]
+* udpate for figtree api changes [Cory Bennett] [[07ba74b](https://github.com/Netflix-Skunkworks/go-jira/commit/07ba74b)]
+* udpate to use latest dep, update figtree [Cory Bennett] [[462ef1c](https://github.com/Netflix-Skunkworks/go-jira/commit/462ef1c)]
+* [[#171](https://github.com/Netflix-Skunkworks/go-jira/issues/171)] change proposed PasswordPath to PasswordName [Cory Bennett] [[213a7e0](https://github.com/Netflix-Skunkworks/go-jira/commit/213a7e0)]
+* add pass path to config [dvogt23] [[fa01ff5](https://github.com/Netflix-Skunkworks/go-jira/commit/fa01ff5)]
+
+## 1.0.17 - 2018-04-15
+
+* fix IsTerminal usage for windows [Cory Bennett] [[7f9595c](https://github.com/Netflix-Skunkworks/go-jira/commit/7f9595c)]
+* [[#166](https://github.com/Netflix-Skunkworks/go-jira/issues/166)] fix issue when editing templates specified with full path [Cory Bennett] [[d787ac0](https://github.com/Netflix-Skunkworks/go-jira/commit/d787ac0)]
+* only prompt on logout if stdin and stdout are terminals [Cory Bennett] [[09a61c3](https://github.com/Netflix-Skunkworks/go-jira/commit/09a61c3)]
+* [[#163](https://github.com/Netflix-Skunkworks/go-jira/issues/163)] fix url path join logic [Cory Bennett] [[9146346](https://github.com/Netflix-Skunkworks/go-jira/commit/9146346)]
+* [[#160](https://github.com/Netflix-Skunkworks/go-jira/issues/160)] prompt when api-token is invalid to get new token [Cory Bennett] [[e639cce](https://github.com/Netflix-Skunkworks/go-jira/commit/e639cce)]
+* [[#157](https://github.com/Netflix-Skunkworks/go-jira/issues/157)] add `password-directory: path` to allow overriding PASSWORD_STORE_DIR from configs [Cory Bennett] [[06b26c9](https://github.com/Netflix-Skunkworks/go-jira/commit/06b26c9)]
+* [[#160](https://github.com/Netflix-Skunkworks/go-jira/issues/160)] allow `jira logout` to delete your api-token from keychain [Cory Bennett] [[bd3cf99](https://github.com/Netflix-Skunkworks/go-jira/commit/bd3cf99)]
+
+## 1.0.16 - 2018-04-01
+
+* [[#159](https://github.com/Netflix-Skunkworks/go-jira/issues/159)] fix `slice bounds out of range` error in `abbrev` template function [Cory Bennett] [[359bec2](https://github.com/Netflix-Skunkworks/go-jira/commit/359bec2)]
+* [[#158](https://github.com/Netflix-Skunkworks/go-jira/issues/158)] always print usage to stdout [Cory Bennett] [[79c83f6](https://github.com/Netflix-Skunkworks/go-jira/commit/79c83f6)]
+
+## 1.0.15 - 2018-03-08
+
+* [[#147](https://github.com/Netflix-Skunkworks/go-jira/issues/147)] [[#148](https://github.com/Netflix-Skunkworks/go-jira/issues/148)] add support for api token based authentication [Cory Bennett] [[edb0662](https://github.com/Netflix-Skunkworks/go-jira/commit/edb0662)]
+* refactor to simplify main [Cory Bennett] [[43ebc84](https://github.com/Netflix-Skunkworks/go-jira/commit/43ebc84)] [[0d7c1a7](https://github.com/Netflix-Skunkworks/go-jira/commit/0d7c1a7)]
+* [[#145](https://github.com/Netflix-Skunkworks/go-jira/issues/145)] fix to match AuthProvider interface [Cory Bennett] [[80325a5](https://github.com/Netflix-Skunkworks/go-jira/commit/80325a5)]
+* [[#141](https://github.com/Netflix-Skunkworks/go-jira/issues/141)] better handling in responseError for non-json error responses [Cory Bennett] [[20a9666](https://github.com/Netflix-Skunkworks/go-jira/commit/20a9666)]
+* Update unexportTemplates.go [GitHub] [[6da9974](https://github.com/Netflix-Skunkworks/go-jira/commit/6da9974)]
+* [[#139](https://github.com/Netflix-Skunkworks/go-jira/issues/139)] add shellquote and toMinJson template functions [Cory Bennett] [[8c7ca38](https://github.com/Netflix-Skunkworks/go-jira/commit/8c7ca38)]
+* [[#137](https://github.com/Netflix-Skunkworks/go-jira/issues/137)] update kingpeon dep to allow access to dynamic command structure [Cory Bennett] [[425fa63](https://github.com/Netflix-Skunkworks/go-jira/commit/425fa63)]
+* field name is "comment" not "comments" [Cory Bennett] [[464742c](https://github.com/Netflix-Skunkworks/go-jira/commit/464742c)]
+
+## 1.0.14 - 2017-11-04
+
+* [[#131](https://github.com/Netflix-Skunkworks/go-jira/issues/131)] fix parsing global options before command execution (allow unixproxy/socksproxy to be set in config.yml) [Cory Bennett] [[042bc48](https://github.com/Netflix-Skunkworks/go-jira/commit/042bc48)]
+* add/update deps [Cory Bennett] [[a2e36e8](https://github.com/Netflix-Skunkworks/go-jira/commit/a2e36e8)]
+* add support for using socks proxy [onionjake] [[ff985f9](https://github.com/Netflix-Skunkworks/go-jira/commit/ff985f9)]
+
+## 1.0.13 - 2017-10-28
+
+* fix transition command [Cory Bennett] [[9597f9b](https://github.com/Netflix-Skunkworks/go-jira/commit/9597f9b)]
+* fix default values to load after parsing configs [Cory Bennett] [[c9b5054](https://github.com/Netflix-Skunkworks/go-jira/commit/c9b5054)]
+* add test to make sure IssueType.Fields does not disappear on regeneration [Cory Bennett] [[3966def](https://github.com/Netflix-Skunkworks/go-jira/commit/3966def)]
+* add tests for validating changes to auto-generated jiradata files [Cory Bennett] [[41d1a7c](https://github.com/Netflix-Skunkworks/go-jira/commit/41d1a7c)]
+* Fix typo in 'logout' command help [Cory Bennett] [[9000777](https://github.com/Netflix-Skunkworks/go-jira/commit/9000777)]
+* Add URL escaping to an additional issuetype call [Cory Bennett] [[7bfa241](https://github.com/Netflix-Skunkworks/go-jira/commit/7bfa241)]
+* Add --resolution option [Cory Bennett] [[e6600cf](https://github.com/Netflix-Skunkworks/go-jira/commit/e6600cf)]
+* Create Metadata Not Populated Correctly [Dillon Buchanan] [[093c510](https://github.com/Netflix-Skunkworks/go-jira/commit/093c510)]
+* add regexReplace template function [Dirk Heilig] [[d3e294e](https://github.com/Netflix-Skunkworks/go-jira/commit/d3e294e)]
+
+## 1.0.12 - 2017-10-04
+
+* add `{{env.VARNAME}}` template support to allow use of env vars [Cory Bennett] [[4d74554](https://github.com/Netflix-Skunkworks/go-jira/commit/4d74554)]
+
+## 1.0.11 - 2017-09-26
+
+* [[#115](https://github.com/Netflix-Skunkworks/go-jira/issues/115)] fix transition template for description [Cory Bennett] [[986cc78](https://github.com/Netflix-Skunkworks/go-jira/commit/986cc78)]
+* update edit command to set queryFields on search to match what is used in template [Cory Bennett] [[3913726](https://github.com/Netflix-Skunkworks/go-jira/commit/3913726)]
+* fix edit with query loop, allow continuation when not submitting previous issue [Cory Bennett] [[0ba8aa0](https://github.com/Netflix-Skunkworks/go-jira/commit/0ba8aa0)]
+* fix edit when priority is not set [Cory Bennett] [[098eb99](https://github.com/Netflix-Skunkworks/go-jira/commit/098eb99)]
+* flatten CommandRegistry list to make it more readable [Cory Bennett] [[2ddaed2](https://github.com/Netflix-Skunkworks/go-jira/commit/2ddaed2)]
+
+## 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)]
@@ -1,165 +0,0 @@
-# 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
@@ -1,75 +0,0 @@
-
-# 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"
@@ -1,4 +1,5 @@
 NAME=jira
+GO?=go

 OS=$(shell uname -s)
 ifeq ($(filter CYGWIN%,$(OS)),$(OS))
@@ -20,17 +21,17 @@ CURVER ?= $(patsubst v%,%,$(shell [ -d .git ] && git describe --abbrev=0 --tags
 LDFLAGS:= -w

 build:
-	go build -gcflags="-e" -v -ldflags "$(LDFLAGS) -s" -o '$(BIN)' cmd/jira/main.go
+	$(GO) build -gcflags="-e" -v -ldflags "$(LDFLAGS) -s" -o '$(BIN)' cmd/jira/main.go

 vet:
-	@go vet .
-	@go vet ./jiracli
-	@go vet ./jiracmd
-	@go vet ./jiradata
-	@go vet ./cmd/jira
+	@$(GO) vet .
+	@$(GO) vet ./jiracli
+	@$(GO) vet ./jiracmd
+	@$(GO) vet ./jiradata
+	@$(GO) vet ./cmd/jira

 lint:
-	@go get github.com/golang/lint/golint
+	@$(GO) get github.com/golang/lint/golint
 	@golint .
 	@golint ./jiracli
 	@golint ./jiracmd
@@ -38,7 +39,7 @@ lint:
 	@golint ./cmd/jira

 all:
-	go get -u github.com/karalabe/xgo
+	GO111MODULE=off $(GO) get -u src.techknowlogick.com/xgo
 	rm -rf dist
 	mkdir -p dist
 	xgo --targets="freebsd/amd64,linux/386,linux/amd64,windows/386,windows/amd64,darwin/amd64" -dest ./dist -ldflags="-w -s" ./cmd/jira
@@ -65,21 +66,34 @@ update-changelog:
 	mv CHANGELOG.md.new CHANGELOG.md; \
 	$(NULL)

+update-usage:
+	@perl -pi -e 'undef $$/; s|\n```\nusage.*?```|"\n```\n".qx{./jira --help}."```"|esg' README.md
+
 release:
-	git commit -m "Updated Changelog" CHANGELOG.md; \
-    git commit -m "version bump" jira.go
+	make update-usage
+	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

 version:
 	@echo $(CURVER)

-clean:
+clean: clean-password-store
 	rm -rf ./$(NAME)

-prove:
-	chmod -R g-rwx,o-rwx $(CWD)/t/.gnupg
-	OSHT_VERBOSE=1 prove -v 
+clean-password-store:
+	rm -f "$(CWD)/_t/.password-store/GoJira/api-token:gojira@corybennett.org.gpg"
+	rm -f "$(CWD)/_t/.password-store/GoJira/api-token:mothra@corybennett.org.gpg"
+
+test-password-store:
+	ln -s "$(CWD)/_t/.password-store/GoJira/api-token__gojira@corybennett.org.gpg" "$(CWD)/_t/.password-store/GoJira/api-token:gojira@corybennett.org.gpg"
+	ln -s "$(CWD)/_t/.password-store/GoJira/api-token__mothra@corybennett.org.gpg" "$(CWD)/_t/.password-store/GoJira/api-token:mothra@corybennett.org.gpg"
+
+prove: test-password-store
+	chmod -R g-rwx,o-rwx $(CWD)/_t/.gnupg
+	OSHT_VERBOSE=1 prove -v _t/*.t

 generate:
 	cd schemas && ./fetch-schemas.py
@@ -1,105 +1,49 @@
-[![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)
+[![Build Status](https://travis-ci.org/go-jira/jira/go-jira.svg?branch=master)](https://travis-ci.org/go-jira/jira)
+[![GoDoc](https://godoc.org/github.com/go-jira/jira?status.svg)](https://godoc.org/github.com/go-jira/jira)
 [![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
+
+Simple command line client for Atlassian's Jira service written in Go.

 ## Install

 ### Download

-You can download one of the pre-built binaries for **go-jira** [here](https://github.com/Netflix-Skunkworks/go-jira/releases).
+You can download one of the pre-built binaries for **go-jira** [here](https://github.com/go-jira/jira/releases).

 ### Build

-You can build and install with [Go](https://golang.org/dl/):
+You can build and install the official repository with [Go](https://golang.org/dl/):

-```
-go get gopkg.in/Netflix-Skunkworks/go-jira.v1/cmd/jira
-```
+	go get github.com/go-jira/jira/cmd/jira

-## v1 vs v0 changes
+This will checkout this repository into `$GOPATH/src/github.com/go-jira/jira/`, build, and install it.

-###### **Golang library import**
-For the new version of go-jira you should use:
-```
-import "gopkg.in/Netflix-Skunkworks/go-jira.v1"
-```
+It should then be available in $GOPATH/bin/jira

-If you have code that depends on the old apis, you can still use them with this import:
-```
-import "gopkg.in/Netflix-Skunkworks/go-jira.v0"
-```
+## Usage

-###### **Configs per command**
-Instead of requiring a exectuable template to get configs for a given command now you can create a config to be applied to a command.  So if you want to use `template: table` by default for yor `jira list` you can now do:
-```
-$ cat $HOME/.jira.d/list.yml
-template: table
-```
-Where previously you needed something like:
-```
-# cat $HOME/.jira.d/config.yml
-#!/bin/sh
-case $JIRA_OPERATION in 
-    list)
-      echo "template: table";;
-esac
-```

-###### **Custom Commands**
-Now you can create your own custom commands to do common operations with jira.  Please see the details **Custom Commands** section below for more details.  If you want to create a command `jira mine` that lists all the issues assigned to you now you can modify your `.jira.d/config.yml` file to add a `custom-commands` section like this:
-```
-custom-commands:
-  - name: mine
-    help: display issues assigned to me
-    script: |-
-      {{jira}} list --query "resolution = unresolved and assignee=currentuser() ORDER BY created"
-```
-Then the next time you run `jira help` you will see your usage:
-```
-$ jira mine --help
-usage: jira mine
+#### Setting up TAB completion

-display issues assigned to me
+Since go-jira is built with the "kingpin" golang command line library we support bash/zsh shell completion automatically:

-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
-  -u, --user=USER            Login name used for authentication with Jira service
-      --unixproxy=UNIXPROXY  Path for a unix-socket proxy
-  -k, --insecure             Disable TLS certificate verification
-```
+ * <https://github.com/alecthomas/kingpin/tree/v2.2.5#bashzsh-shell-completion>

-###### **Incompatible command changes**
-Unfortunately during the rewrite between v0 and v1 there were some changes necessary that broke backwards compatibility with existing commands.  Specifically the `dups`, `blocks`, `add worklog` and `add|remove|set labels` commands have had the command word swapped around:
-  * `jira DUPLICATE dups ISSUE` => `jira dup DUPLICATE ISSUE`
-  * `jira BLOCKER blocks ISSUE` => `jira block BLOCKER ISSUE`
-  * `jira add worklog` => `jira worklog add`
-  * `jira add labels` => `jira labels add`
-  * `jira remove labels` => `jira labels remove`
-  * `jira set labels` => `jira labels set`
+For example, in bash, adding something along the lines of:

-###### **Login process change**
-Previously `jira` used attempt to get a `JSESSION` cookies by authenticating with the webservice standard GUI login process.  This has been especially problematic as users need to authenticate with various credential providers (google auth, etc).  We now attempt to authenticate via the [session login api](https://docs.atlassian.com/jira/REST/cloud/#auth/1/session-login).  This may be problematic for users if admins have locked down the session-login api, so we might have to bring back the error-prone Basic-Auth approach.  For users that are unable to authenticate via `jira` hopefully someone in your organization can provide me with details on a process for you to authenticate and we can try to update `jira`.
+  `eval "$(jira --completion-script-bash)"`
+
+to your bashrc, or .profile (assuming go-jira binary is already in your path) will cause jira to offer tab completion behavior.

 ## Configuration

-**go-jira** uses a configuration hierarchy.  When loading the configuration from disk it will recursively look through
-all parent directories in your current path looking for a **.jira.d** directory.  If your current directory is not
-a child directory of your homedir, then your homedir will also be inspected for a **.jira.d** directory.  From all of **.jira.d** directories
-discovered **go-jira** will load a **&lt;command&gt;.yml** file (ie for `jira list` it will load `.jira.d/list.yml`) then it will merge in any properties from the **config.yml** if found.  The configuration properties found in a file closests to your current working directory
-will have precedence.  Properties overriden with command line options will have final precedence.
+**go-jira** uses a configuration hierarchy.  When loading the configuration from disk it will recursively look through all parent directories in your current path looking for a **.jira.d** directory.  If your current directory is not a child directory of your homedir, then your homedir will also be inspected for a **.jira.d** directory.  From all of **.jira.d** directories discovered **go-jira** will load a **&lt;command&gt;.yml** file (ie for `jira list` it will load `.jira.d/list.yml`) then it will merge in any properties from the **config.yml** if found.  The configuration properties found in a file closest to your current working directory will have precedence.  Properties overridden with command line options will have final precedence.

-The complicated configuration hierarchy is used because **go-jira** attempts to be context aware.  For example, if you are working on a "foo" project and
-you `cd` into your project workspace, wouldn't it be nice if `jira ls` automatically knew to list only issues related to the "foo" project?  Likewise when you
-`cd` to the "bar" project then `jira ls` should only list issues related to "bar" project.  You can do this with by creating a configuration under your project
-workspace at **./.jira.d/config.yml** that looks like:
+The complicated configuration hierarchy is used because **go-jira** attempts to be context aware.  For example, if you are working on a "foo" project and you `cd` into your project workspace, wouldn't it be nice if `jira ls` automatically knew to list only issues related to the "foo" project?  Likewise when you `cd` to the "bar" project then `jira ls` should only list issues related to "bar" project.  You can do this with by creating a configuration under your project workspace at **./.jira.d/config.yml** that looks like:

-```
+```yaml
 project: foo
 ```

@@ -125,7 +69,7 @@ If the **.jira.d/config.yml** file is executable, then **go-jira** will attempt
 echo "endpoint: https://jira.mycompany.com"
 echo "editor: emacs -nw"

-case $JIRA_OPERATION in 
+case $JIRA_OPERATION in
    list)
      echo "template: table";;
 esac
@@ -147,7 +91,7 @@ esac

 ### Custom Commands
 You can now create custom commands for `jira` just by editing your `.jira.d/config.yml` config file.  These commands are effectively shell-scripts that can have documented options and arguments. The basic format is like:
-```
+```yaml
 custom-commands:
  - command1
  - command2
@@ -160,14 +104,14 @@ Where the individual commands are maps with these keys:
 * `default: bool` Use this for compound command groups.  If you wanted to have `jira foo bar` and `jira foo baz` you would have two commands with `name: foo bar` and `name: foo baz`.  Then if you wanted `jira foo baz` to be called by default when you type `jira foo` you would set `default: true` for that custom command.
 * `options: list`  This is the list of possible option flags that the command will accept
 * `args: list` This is the list of command arguments (like the ISSUE) that the command will accept.
-* `aliases: string list`: This is a list of alternate names that the user can provide on the command line to run the same command.  Typically used to shorten the command name or provide alternatives that users might expect. 
+* `aliases: string list`: This is a list of alternate names that the user can provide on the command line to run the same command.  Typically used to shorten the command name or provide alternatives that users might expect.
 * `script: string` [**required**] This is the script that will be executed as the action for this command. The value will be treated as a template and substitutions for options and arguments will be made before executing.

 ##### Options
 These are possible keys under the command `options` property:
 * `name: string` [**required**] Name of the option, so `name: foobar` will result in `--foobar` option.
-* `help: string` The help messsage displayed in usage for the option.
-* `type: string`:  The type of the option, can be one of these values: `BOOL`, `COUNTER`, `ENUM`, `FLOAT32`, `FLOAT64`, `INT8`, `INT16`, `INT32`, `INT64`, `INT`, `STRING`, `STRINGMAP`, `UINT8`, `UINT16`, `UINT32`,  `UINT64` and `UINT`.  Most of these are primitive data types an should be self-explanitory.  The default type is `STRING`. There are some special types:
+* `help: string` The help message displayed in usage for the option.
+* `type: string`:  The type of the option, can be one of these values: `BOOL`, `COUNTER`, `ENUM`, `FLOAT32`, `FLOAT64`, `INT8`, `INT16`, `INT32`, `INT64`, `INT`, `STRING`, `STRINGMAP`, `UINT8`, `UINT16`, `UINT32`,  `UINT64` and `UINT`.  Most of these are primitive data types an should be self-explanatory.  The default type is `STRING`. There are some special types:
  * `COUNTER` will be an integer type that increments each time the option is used.  So something like `--count --count` will results in `{{options.count}}` of `2`.
  * `ENUM` type is used with the `enum` property.  The raw type is a string and **must** be one of the values listed in the `enum` property.
  * `STRINGMAP` is a `string => string` map with the format of `KEY=VALUE`.  So `--override foo=bar --override bin=baz` will allow for `{{options.override.foo}}` to be `bar` and `{{options.override.bin}}` to be `baz`.
@@ -180,9 +124,9 @@ These are possible keys under the command `options` property:

 ##### Arguments
 These are possible keys under the command `args` property:
-* `name: string` [**required**] Name of the option, so `name: ISSUE` will show in the usasge as `jira <command> ISSUE`.  This also represents the name of the argument to be used in the script template, so `{{args.ISSUE}}`.
-* `help: string` The help messsage displayed in usage for the argument.
-* `type: string`:  The type of the argumemnt, can be one of these values: `BOOL`, `COUNTER`, `ENUM`, `FLOAT32`, `FLOAT64`, `INT8`, `INT16`, `INT32`, `INT64`, `INT`, `STRING`, `STRINGMAP`, `UINT8`, `UINT16`, `UINT32`,  `UINT64` and `UINT`.  Most of these are primitive data types an should be self-explanitory.  The default type is `STRING`.  There are some special types:
+* `name: string` [**required**] Name of the option, so `name: ISSUE` will show in the usage as `jira <command> ISSUE`.  This also represents the name of the argument to be used in the script template, so `{{args.ISSUE}}`.
+* `help: string` The help message displayed in usage for the argument.
+* `type: string`:  The type of the argument, can be one of these values: `BOOL`, `COUNTER`, `ENUM`, `FLOAT32`, `FLOAT64`, `INT8`, `INT16`, `INT32`, `INT64`, `INT`, `STRING`, `STRINGMAP`, `UINT8`, `UINT16`, `UINT32`,  `UINT64` and `UINT`.  Most of these are primitive data types an should be self-explanatory.  The default type is `STRING`.  There are some special types:
  * `COUNTER` will be an integer type that increments each the argument is provided  So something like `jira <command> ISSUE-12 ISSUE-23` will results in `{{args.ISSUE}}` of `2`.
  * `ENUM` type is used with the `enum` property.  The raw type is a string and **must** be one of the values listed in the `enum` property.
  * `STRINGMAP` is a `string => string` map with the format of `KEY=VALUE`.  So `jira <command> foo=bar bin=baz` along with a `name: OVERRIDE` property will allow for `{{args.OVERRIDE.foo}}` to be `bar` and `{{args.OVERRIDE.bin}}` to be `baz`.
@@ -192,10 +136,10 @@ These are possible keys under the command `args` property:
 * `enum: string list` Used with the `type: ENUM` property, it is a list of strings values that represent the set of possible values for the argument.

 ##### Script Template
-The `script` property is a template that whould produce `/bin/sh` compatible syntax after the template has been processed.  There are 2 key template functions `{{args}}` and `{{options}}` that return the parsed arguments and option flags as a map.  
+The `script` property is a template that would produce `/bin/sh` compatible syntax after the template has been processed.  There are 2 key template functions `{{args}}` and `{{options}}` that return the parsed arguments and option flags as a map.

 To demonstrate how you might use args and options here is a `custom-test` command:
-```
+```yaml
 custom-commands:
  - name: custom-test
    help: Testing the custom commands
@@ -246,16 +190,16 @@ COMMAND arg1 --abc short-non-default --day Tuesday more1 more2 more3
 ```

 The script has access to all the environment variables that are in your current environment plus those that `jira` will set.  `jira` sets environment variables for each config property it has parsed from `.jira.d/config.yml` or the command configs at `.jira.d/<command>.yml`.  It might be useful to see all environment variables that `jira` is producing, so here is a simple custom command to list them:
-```
+```yaml
 custom-commands:
  - name: env
    help: print the JIRA environment variables available to custom commands
    script: |
      env | grep JIRA
 ```
- 
+
 You could use the environment variables automatically, so if your `.jira.d/config.yml` looks something like this:
-```
+```yaml
 project: PROJECT
 custom-commands:
  - name: print-project
@@ -266,7 +210,7 @@ custom-commands:
 ##### Examples

 * `jira mine` for listing issues assigned to you
-```
+```yaml
 custom-commands:
  - name: mine
    help: display issues assigned to me
@@ -280,7 +224,7 @@ custom-commands:
      fi
 ```
 * `jira sprint` for listing issues in your current sprint
-```
+```yaml
 custom-commands:
  - name: sprint
    help: display issues for active sprint
@@ -297,7 +241,7 @@ custom-commands:
 ### Editing

 When you run command like `jira edit` it will open up your favorite editor with the templatized output so you can quickly edit.  When the editor
-closes **go-jira** will submit the completed form.  The order which **go-jira** attempts to determine your prefered editor is:
+closes **go-jira** will submit the completed form.  The order which **go-jira** attempts to determine your preferred editor is:

 * **editor** property in any config.yml file
 * **JIRA_EDITOR** environment variable
@@ -316,9 +260,9 @@ hard-coded templates with `jira export-templates` which will write them to **~/.

 #### Writing/Editing Templates

-First the basic templating functionality is defined by the Go language 'text/template' library.  The library reference documentation can be found [here](https://golang.org/pkg/text/template/), and there is a good primer document [here](https://gohugo.io/templates/go-templates/).  `go-jira` also provides a few extra helper functions to make it a bit easlier to format the data, those functions are defined [here](https://github.com/Netflix-Skunkworks/go-jira/blob/master/jiracli/templates.go#L64).
+First the basic templating functionality is defined by the Go language 'text/template' library.  The library reference documentation can be found [here](https://golang.org/pkg/text/template/), and there is a good primer document [here](https://gohugo.io/templates/go-templates/).  `go-jira` also provides a few extra helper functions to make it a bit easier to format the data, those functions are defined [here](https://github.com/go-jira/jira/blob/master/jiracli/templates.go#L64).

-Knowing what data and fields are available to any given template is not obvious. The easiest approach to determine what is available is to use the `debug` template on any given operation.  For eample to find out what is available to the "view" templates, you can use:
+Knowing what data and fields are available to any given template is not obvious. The easiest approach to determine what is available is to use the `debug` template on any given operation.  For example to find out what is available to the "view" templates, you can use:
 ```
 jira view GOJIRA-321 -t debug
 ```
@@ -330,9 +274,22 @@ jira list -t debug

 ### Authentication

-By default `go-jira` will prompt for a password automatically when get a response header from the Jira service that indicates you do not have an active session (ie the `X-Ausername` header is set to `anonymous`).  Then after authentication we cache the `cloud.session.token` cookie returned by the service [session login api](https://docs.atlassian.com/jira/REST/cloud/#auth/1/session-login) and reuse that on subsequent requests.  Typically this cookie will be valid for several hours (depending on the service configuration).  To automatically securely store your password for easy reuse by jira You can enable a `password-source` via `.jira.d/config.yml` with possible values of `keyring` or `pass`.
+For Atlassian Cloud hosted Jira [API Tokens are now required](https://developer.atlassian.com/cloud/jira/platform/deprecation-notice-basic-auth-and-cookie-based-auth/).  You will automatically be prompted for an API Token if your jira endpoint ends in `.atlassian.net`.  If you are using a private Jira service, you can force `jira` to use an api-token by setting the `authentication-method: api-token` property in your `$HOME/.jira.d/config.yml` file.  The API Token needs to be presented to the Jira service on every request, so it is recommended to store this API Token security within your OS's keyring, or using the `pass` service as documented below so that it can be programmatically accessed via `jira` and not prompt you every time.  For a less-secure option you can also provide the API token via a `JIRA_API_TOKEN` environment variable.  If you are unable to use an api-token for an Atlassian Cloud hosted Jira then you can still force `jira` to use the old session based authentication (until it the hosted system stops accepting it) by setting `authentication-method: session`.

-#### keyring password source
+The API Token authentication requires both the token and the email of the user. The email mut be set in the  `user:` in your config.yml. Failure to provide the `user` will result in a 401 error.
+
+If your Jira service still allows you to use the Session based authentication method then `jira` will prompt for a password automatically when get a response header from the Jira service that indicates you do not have an active session (ie the `X-Ausername` header is set to `anonymous`).  Then after authentication we cache the `cloud.session.token` cookie returned by the service [session login api](https://docs.atlassian.com/jira/REST/cloud/#auth/1/session-login) and reuse that on subsequent requests.  Typically this cookie will be valid for several hours (depending on the service configuration).  To automatically securely store your password for easy reuse by jira You can enable a `password-source` via `.jira.d/config.yml` with possible values of `keyring` or `pass`.
+
+#### User vs Login
+The Jira service has sometimes differing opinions about how a user is identified.  In other words the ID you login with might not be ID that the jira system recognized you as.  This matters when trying to identify a user via various Jira REST APIs (like issue assignment).  This is especially relevant when trying to authenticate with an API Token where the authentication user is usually an email address, but within the Jira system the user is identified by a user name.  To accommodate this `jira` now supports two different properties in the config file.  So when authentication using the API Tokens you will likely want something like this in your `$HOME/.jira.d/config.yml` file:
+```yaml
+user: person
+login: person@example.com
+```
+
+You can also override these values on the command line with `jira --user person --login person@example.com`.  The `login` value will be used only for authentication purposes, the `user` value will be used when a user name is required for any Jira service API calls.
+
+#### `keyring` password source
 On OSX and Linux there are a few keyring providers that `go-jira` can use (via this [golang module](https://github.com/tmc/keyring)).  To integrate `go-jira` with a supported keyring just add this configuration to `$HOME/.jira.d/config.yml`:
 ```yaml
 password-source: keyring
@@ -343,6 +300,7 @@ After setting this and issuing a `jira login`, your credentials will be stored i
 An alternative to the keyring password source is the `pass` tool (documentation [here](https://www.passwordstore.org/)).  This uses gpg to encrypt/decrypt passwords on demand and by using `gpg-agent` you can cache the gpg credentials for a period of time so you will not be prompted repeatedly for decrypting the passwords.  The advantage over the keyring integration is that `pass` can be used on more platforms than OSX and Linux, although it does require more setup.  To use `pass` for password storage and retrieval via `go-jira` just add this configuration to `$HOME/.jira.d/config.yml`:
 ```yaml
 password-source: pass
+password-name: jira.example.com/myuser
 ```

 This assumes you have already setup `pass` correctly on your system.  Specifically you will need to have created a gpg key like this:
@@ -366,7 +324,13 @@ Then initialize the `pass` tool to use the correct key:
 $ pass init "Go Jira <gojira@example.com>"
 ```

-You probably want to setup gpg-agent so that you dont have to type in your gpg passphrase all the time.  You can get `gpg-agent` to automatically start by adding something like this to your `$HOME/.bashrc`
+Now insert your password with the name you configured.
+
+```
+$ pass insert jira.example.com/myuser
+```
+
+You probably want to setup gpg-agent so that you don't have to type in your gpg passphrase all the time.  You can get `gpg-agent` to automatically start by adding something like this to your `$HOME/.bashrc`
 ```bash
 if [ -f $HOME/.gpg-agent-info ]; then
    . $HOME/.gpg-agent-info
@@ -392,372 +356,10 @@ fi
 export GPG_TTY=$(tty)
 ```

-## Usage
+#### `stdin` password source

-```
-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
+When `password-source` is set to `stdin`, the `jira login` command will read from stdin until EOF, and the bytes read will be the used as the password. This is useful if you have some other programmatic method for fetching passwords. For example, if `password-generator` creates a one-time password and prints it to stdout, you could use it like this.
+
+```bash
+$ ./password-generator | jira login --endpoint=https://my.jira.endpoint.com --user=USERNAME
 ```
@@ -3,9 +3,14 @@ config:
 password-source: pass
 endpoint: https://go-jira.atlassian.net
 user: gojira
+login: gojira@corybennett.org

 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
@@ -4,7 +4,7 @@ cd $(dirname $0)
 jira="../jira"
 . env.sh

-PLAN 86
+PLAN 98

 # 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

 ###############################################################################
@@ -198,7 +245,7 @@ EOF
 # reset login for mothra for voting
 ###############################################################################

-jira="$jira --user mothra"
+jira="$jira --user mothra --login mothra@corybennett.org"

 RUNS $jira logout
 RUNS $jira login
@@ -520,3 +567,15 @@ labels: better-label, more-label
 description: |
  blocks
 EOF
+ 
+###############################################################################
+## List 102 closed issues, should be more than 100 (max page size), verify pagination
+###############################################################################
+RUNS $jira ls -q "project = 'BASIC' AND status = 'Done'" --limit 102
+IS $(wc -l <$OSHT_STDOUT) -eq 102
+
+###############################################################################
+## List 1 issue, verify we dont get full page
+###############################################################################
+RUNS $jira ls -q "project = 'BASIC' AND status = 'Done'" --limit 1
+IS $(wc -l <$OSHT_STDOUT) -eq 1
@@ -46,15 +46,7 @@ EOF
 ###############################################################################

 RUNS $jira env
-DIFF <<'EOF'
-JIRACLOUD=1
-JIRA_CUSTOM_COMMANDS=[{"name":"env","script":"env | sort | grep JIRA","help":"print the JIRA environment variables available to custom commands"},{"name":"print-project","script":"echo $JIRA_PROJECT","help":"print the name of the configured project"},{"name":"jira-path","script":"echo {{jira}}","help":"print the path the jira command that is running this alias"},{"name":"mine","script":"if [ -n \"$JIRA_PROJECT\" ]; then\n    # if `project: ...` configured just list the issues for current project\n    {{jira}} list --template table --query \"resolution = unresolved and assignee=currentuser() and project = $JIRA_PROJECT ORDER BY priority asc, created\"\nelse\n    # otherwise list issues for all project\n    {{jira}} list --template table --query \"resolution = unresolved and assignee=currentuser() ORDER BY priority asc, created\"\nfi","help":"display issues assigned to me"},{"name":"argtest","args":[{"name":"ARG","help":"string to echo for testing"}],"script":"echo {{args.ARG}}","help":"testing passing args"},{"name":"opttest","options":[{"name":"OPT","help":"string to echo for testing"}],"script":"echo {{options.OPT}}","help":"testing passing option flags"}]
-JIRA_ENDPOINT=https://go-jira.atlassian.net
-JIRA_LOG_FORMAT=%{level:-5s} %{message}
-JIRA_PASSWORD_SOURCE=pass
-JIRA_PROJECT=BASIC
-JIRA_USER=gojira
-EOF
+GREP ^JIRA_PROJECT=BASIC

 ###############################################################################
 ## Testing the example custom commands, argtest
@@ -80,9 +72,9 @@ EOF

 RUNS $jira mine
 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
@@ -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
@@ -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                    |       1239 | 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
@@ -185,7 +185,7 @@ EOF
 # reset login for mothra for voting
 ###############################################################################

-jira="$jira --user mothra"
+jira="$jira --user mothra --login mothra@corybennett.org"

 RUNS $jira logout
 echo "mothra123" | RUNS $jira login
@@ -185,7 +185,7 @@ EOF
 # reset login for mothra for voting
 ###############################################################################

-jira="$jira --user mothra"
+jira="$jira --user mothra --login mothra@corybennett.org"

 RUNS $jira logout
 echo "mothra123" | RUNS $jira login
@@ -185,7 +185,7 @@ EOF
 # reset login for mothra for voting
 ###############################################################################

-jira="$jira --user mothra"
+jira="$jira --user mothra --login mothra@corybennett.org"

 RUNS $jira logout
 echo "mothra123" | RUNS $jira login
@@ -194,7 +194,7 @@ EOF
 # reset login for mothra for voting
 ###############################################################################

-jira="$jira --user mothra"
+jira="$jira --user mothra --login mothra@corybennett.org"

 RUNS $jira logout
 echo "mothra123" | RUNS $jira login
@@ -187,7 +187,7 @@ EOF
 # reset login for mothra for voting
 ###############################################################################

-jira="$jira --user mothra"
+jira="$jira --user mothra --login mothra@corybennett.org"

 RUNS $jira logout
 echo "mothra123" | RUNS $jira login
@@ -9,7 +9,7 @@ From the top level of the project you can run:
 # this creates a local "jira" binary
 make

-# this runs the integration tests in the "t" directory
+# this runs the integration tests in the "_t" directory
 prove
 ```

@@ -173,7 +173,7 @@

    <properties>
        <jira.version>7.2.0</jira.version>
-        <amps.version>6.2.6</amps.version>
+        <amps.version>6.3.15</amps.version>
        <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
        <atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
        <!-- This key is used to keep the consistency between the key in atlassian-plugin.xml and the key to generate bundle. -->
@@ -0,0 +1,46 @@
+package jira
+
+import (
+	"encoding/json"
+
+	"github.com/go-jira/jira/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 := URLJoin(endpoint, "rest/api/2/attachment", 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, json.NewDecoder(resp.Body).Decode(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 := URLJoin(endpoint, "rest/api/2/attachment", id)
+	resp, err := ua.Delete(uri)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 204 {
+		return nil
+	}
+	return responseError(resp)
+}
@@ -1,369 +1,54 @@
 package main

 import (
-	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
-	"regexp"
-	"runtime"
-	"runtime/debug"
-	"strconv"
-	"syscall"
+	"reflect"

 	"github.com/coryb/figtree"
-	"github.com/coryb/kingpeon"
 	"github.com/coryb/oreo"

-	jira "gopkg.in/Netflix-Skunkworks/go-jira.v1"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracmd"
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiracmd"
+	"gopkg.in/coryb/yaml.v2"
 	"gopkg.in/op/go-logging.v1"
 )

-var (
-	log           = logging.MustGetLogger("jira")
-	defaultFormat = func() string {
-		format := os.Getenv("JIRA_LOG_FORMAT")
-		if format != "" {
-			return format
-		}
-		return "%{color}%{level:-5s}%{color:reset} %{message}"
-	}()
-)
-
-func handleExit() {
-	if e := recover(); e != nil {
-		if exit, ok := e.(jiracli.Exit); ok {
-			os.Exit(exit.Code)
-		} else {
-			fmt.Fprintf(os.Stderr, "%s\n%s", e, debug.Stack())
-			os.Exit(1)
-		}
-	}
+type oreoLogger struct {
+	logger *logging.Logger
 }

-func increaseLogLevel(verbosity int) {
-	logging.SetLevel(logging.GetLevel("")+logging.Level(verbosity), "")
-	if logging.GetLevel("") > logging.DEBUG {
-		oreo.TraceRequestBody = true
-		oreo.TraceResponseBody = true
-	}
+var log = logging.MustGetLogger("jira")
+
+func (ol *oreoLogger) Printf(format string, args ...interface{}) {
+	ol.logger.Debugf(format, args...)
 }

 func main() {
-	defer handleExit()
-	logBackend := logging.NewLogBackend(os.Stderr, "", 0)
-	format := os.Getenv("JIRA_LOG_FORMAT")
-	if format == "" {
-		format = defaultFormat
-	}
-	logging.SetBackend(
-		logging.NewBackendFormatter(
-			logBackend,
-			logging.MustStringFormatter(format),
-		),
+	defer jiracli.HandleExit()
+
+	jiracli.InitLogging()
+
+	configDir := ".jira.d"
+
+	yaml.UseMapType(reflect.TypeOf(map[string]interface{}{}))
+	defer yaml.RestoreMapType()
+
+	fig := figtree.NewFigTree(
+		figtree.WithHome(jiracli.Homedir()),
+		figtree.WithEnvPrefix("JIRA"),
+		figtree.WithConfigDir(configDir),
 	)
-	if os.Getenv("JIRA_DEBUG") == "" {
-		logging.SetLevel(logging.NOTICE, "")
-	} else {
-		logging.SetLevel(logging.DEBUG, "")
-	}

-	app := kingpin.New("jira", "Jira Command Line Interface")
-	app.Command("version", "Prints version").PreAction(func(*kingpin.ParseContext) error {
-		fmt.Println(jira.VERSION)
-		panic(jiracli.Exit{Code: 0})
-	})
-
-	var verbosity int
-	app.Flag("verbose", "Increase verbosity for debugging").Short('v').PreAction(func(_ *kingpin.ParseContext) error {
-		os.Setenv("JIRA_DEBUG", fmt.Sprintf("%d", verbosity))
-		increaseLogLevel(1)
-		return nil
-	}).CounterVar(&verbosity)
-
-	if os.Getenv("JIRA_DEBUG") != "" {
-		if verbosity, err := strconv.Atoi(os.Getenv("JIRA_DEBUG")); err == nil {
-			increaseLogLevel(verbosity)
-		}
-	}
-
-	fig := figtree.NewFigTree()
-	fig.EnvPrefix = "JIRA"
-	fig.ConfigDir = ".jira.d"
-
-	if err := os.MkdirAll(filepath.Join(jiracli.Homedir(), fig.ConfigDir), 0755); err != nil {
+	if err := os.MkdirAll(filepath.Join(jiracli.Homedir(), configDir), 0755); err != nil {
 		log.Errorf("%s", err)
 		panic(jiracli.Exit{Code: 1})
 	}

-	o := oreo.New().WithCookieFile(filepath.Join(jiracli.Homedir(), fig.ConfigDir, "cookies.js"))
+	o := oreo.New().WithCookieFile(filepath.Join(jiracli.Homedir(), configDir, "cookies.js")).WithLogger(&oreoLogger{log})

-	registry := []jiracli.CommandRegistry{
-		jiracli.CommandRegistry{
-			Command: "login",
-			Entry:   jiracmd.CmdLoginRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "logout",
-			Entry:   jiracmd.CmdLogoutRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "list",
-			Aliases: []string{"ls"},
-			Entry:   jiracmd.CmdListRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "view",
-			Entry:   jiracmd.CmdViewRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "create",
-			Entry:   jiracmd.CmdCreateRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "edit",
-			Entry:   jiracmd.CmdEditRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "comment",
-			Entry:   jiracmd.CmdCommentRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "worklog list",
-			Entry:   jiracmd.CmdWorklogListRegistry(),
-			Default: true,
-		},
-		jiracli.CommandRegistry{
-			Command: "worklog add",
-			Entry:   jiracmd.CmdWorklogAddRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "fields",
-			Entry:   jiracmd.CmdFieldsRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "createmeta",
-			Entry:   jiracmd.CmdCreateMetaRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "editmeta",
-			Entry:   jiracmd.CmdEditMetaRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "subtask",
-			Entry:   jiracmd.CmdSubtaskRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "dup",
-			Entry:   jiracmd.CmdDupRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "block",
-			Entry:   jiracmd.CmdBlockRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "issuelink",
-			Entry:   jiracmd.CmdIssueLinkRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "issuelinktypes",
-			Entry:   jiracmd.CmdIssueLinkTypesRegistry(),
-		},
-		jiracli.CommandRegistry{
-			Command: "transition",
-			Aliases: []string{"trans"},
-			Entry:   jiracmd.CmdTransitionRegistry(""),
-		},
-		jiracli.CommandRegistry{
-			Command: "transitions",
-			Entry:   jiracmd.CmdTransitionsRegistry("transitions"),
-		},
-		jiracli.CommandRegistry{
-			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"},
-		},
-		jiracli.CommandRegistry{
-			Command: "request",
-			Entry:   jiracmd.CmdRequestRegistry(),
-			Aliases: []string{"req"},
-		},
-	}
+	jiracmd.RegisterAllCommands()

-	jiracli.Register(app, o, fig, registry)
-
-	// register custom commands
-	data := struct {
-		CustomCommands kingpeon.DynamicCommands `yaml:"custom-commands" json:"custom-commands"`
-	}{}
-
-	if err := fig.LoadAllConfigs("config.yml", &data); err != nil {
-		log.Errorf("%s", err)
-		panic(jiracli.Exit{Code: 1})
-	}
-
-	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.RegisterDynamicCommandsWithRunner(runner, app, data.CustomCommands, jiracli.TemplateProcessor())
-	}
-
-	app.Terminate(func(status int) {
-		for _, arg := range os.Args {
-			if arg == "-h" || arg == "--help" || len(os.Args) == 1 {
-				panic(jiracli.Exit{Code: 0})
-			}
-		}
-		panic(jiracli.Exit{Code: 1})
-	})
-
-	// 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:])
-	if ctx != nil {
-		if ctx.SelectedCommand == nil {
-			next := ctx.Next()
-			if next != nil {
-				if ok, err := regexp.MatchString("^[A-Z]+-[0-9]+$", next.Value); err != nil {
-					log.Errorf("Invalid Regex: %s", err)
-				} else if ok {
-					// insert "view" at i=1 (2nd position)
-					os.Args = append(os.Args[:1], append([]string{"view"}, os.Args[1:]...)...)
-				}
-			}
-		}
-	}
-
-	if _, err := app.Parse(os.Args[1:]); err != nil {
-		if _, ok := err.(*jiracli.Error); ok {
-			log.Errorf("%s", err)
-			panic(jiracli.Exit{Code: 1})
-		} else {
-			ctx, _ := app.ParseContext(os.Args[1:])
-			if ctx != nil {
-				app.UsageForContext(ctx)
-			}
-			log.Errorf("Invalid Usage: %s", err)
-			panic(jiracli.Exit{Code: 1})
-		}
-	}
+	app := jiracli.CommandLine(fig, o)
+	jiracli.ParseCommandLine(app, os.Args[1:])
 }
@@ -3,9 +3,8 @@ package jira
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"

-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
+	"github.com/go-jira/jira/jiradata"
 )

 type ComponentProvider interface {
@@ -23,7 +22,7 @@ func CreateComponent(ua HttpClient, endpoint string, cp ComponentProvider) (*jir
 	if err != nil {
 		return nil, err
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/component", endpoint)
+	uri := URLJoin(endpoint, "rest/api/2/component")
 	resp, err := ua.Post(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return nil, err
@@ -32,7 +31,7 @@ func CreateComponent(ua HttpClient, endpoint string, cp ComponentProvider) (*jir

 	if resp.StatusCode == 201 {
 		results := &jiradata.Component{}
-		return results, readJSON(resp.Body, results)
+		return results, json.NewDecoder(resp.Body).Decode(results)
 	}
 	return nil, responseError(resp)
 }
@@ -0,0 +1,113 @@
+package jira
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"strings"
+
+	"github.com/coryb/oreo"
+
+	"github.com/go-jira/jira/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(URLJoin(endpoint, "rest/agile/1.0/epic", epic, "issue"))
+	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, json.NewDecoder(resp.Body).Decode(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 := URLJoin(endpoint, "rest/agile/1.0/epic", epic, "issue")
+	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 := URLJoin(endpoint, "rest/agile/1.0/epic/none/issue")
+	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)
+}
@@ -1,19 +1,21 @@
 package jira

 import (
-	"fmt"
+	"encoding/json"
 	"net/http"

-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
+	"github.com/go-jira/jira/jiradata"
 )

 func responseError(resp *http.Response) error {
 	results := &jiradata.ErrorCollection{}
-	if err := readJSON(resp.Body, results); err != nil {
-		return err
+	if err := json.NewDecoder(resp.Body).Decode(results); err != nil {
+		results.Status = resp.StatusCode
+		results.ErrorMessages = append(results.ErrorMessages, err.Error())
 	}
 	if len(results.ErrorMessages) == 0 && len(results.Errors) == 0 {
-		return fmt.Errorf(resp.Status)
+		results.Status = resp.StatusCode
+		results.ErrorMessages = append(results.ErrorMessages, resp.Status)
 	}
 	return results
 }
@@ -1,9 +1,9 @@
 package jira

 import (
-	"fmt"
+	"encoding/json"

-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
+	"github.com/go-jira/jira/jiradata"
 )

 // https://docs.atlassian.com/jira/REST/cloud/#api/2/field-getFields
@@ -12,7 +12,7 @@ func (j *Jira) GetFields() ([]jiradata.Field, error) {
 }

 func GetFields(ua HttpClient, endpoint string) ([]jiradata.Field, error) {
-	uri := fmt.Sprintf("%s/rest/api/2/field", endpoint)
+	uri := URLJoin(endpoint, "rest/api/2/field")
 	resp, err := ua.GetJSON(uri)
 	if err != nil {
 		return nil, err
@@ -20,7 +20,7 @@ func GetFields(ua HttpClient, endpoint string) ([]jiradata.Field, error) {
 	defer resp.Body.Close()
 	if resp.StatusCode == 200 {
 		results := []jiradata.Field{}
-		return results, readJSON(resp.Body, &results)
+		return results, json.NewDecoder(resp.Body).Decode(&results)
 	}
 	return nil, responseError(resp)
 }
@@ -0,0 +1,41 @@
+module github.com/go-jira/jira
+
+go 1.12
+
+require (
+	github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b // indirect
+	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
+	github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d
+	github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e
+	github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/fatih/camelcase v1.0.0 // indirect
+	github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3 // indirect
+	github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c // indirect
+	github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/kr/pty v1.1.4 // indirect
+	github.com/mattn/go-colorable v0.0.9 // indirect
+	github.com/mattn/go-isatty v0.0.3 // indirect
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
+	github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15
+	github.com/pkg/errors v0.8.0
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.2.2
+	github.com/theckman/go-flock v0.4.0 // indirect
+	github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7
+	github.com/tidwall/match v1.0.0 // indirect
+	github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1
+	golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb
+	golang.org/x/net v0.0.0-20171102191033-01c190206fbd
+	golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e // indirect
+	gopkg.in/AlecAivazis/survey.v1 v1.6.1
+	gopkg.in/alecthomas/kingpin.v2 v2.2.6
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153
+	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
+	gopkg.in/yaml.v2 v2.2.2 // indirect
+)
@@ -0,0 +1,76 @@
+github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b h1:sSQK05nvxs4UkgCJaxihteu+r+6ela3dNMm7NVmsS3c=
+github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
+github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
+github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df h1:cS4Z9Nlv8J4UqFbLp9ltZypgenm2p3Jeg0yqLfpH2pc=
+github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df/go.mod h1:uAkZUEGm6dROpxfy+8vXLs7JrLCI4O+gQyKAuISxI/g=
+github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d h1:99xxg8FYj+5TYg88DxA4xL8ODuI6OvuSu35WQOVPDPg=
+github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d/go.mod h1:uAkZUEGm6dROpxfy+8vXLs7JrLCI4O+gQyKAuISxI/g=
+github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e h1:tGmk9Tuyz7fKuBq/d3nFJvVWRvc48MEBKQC4uYV3wb0=
+github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e/go.mod h1:gBc0uEH6swbOMoR7VkVuW7w5fGvZu/KHeSgxBR4Ta7Q=
+github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1 h1:Hh0qSvmvoAGL8VxvEoUv9UuUf9XlKcQtSxAMTz1kqfE=
+github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1/go.mod h1:l/wuS2rM8ostk0aApWje8tsZNWJPOc2TVr85B0n3e6M=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
+github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3 h1:fngCxKbvZdctIsWj2hYijhAt4iK0JXSSA78B36xP0yI=
+github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3/go.mod h1:0CNX5Cvi77WEH8llpfZ/ieuqyceb1cnO5//b5zzsnF8=
+github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c h1:kp3AxgXgDOmIJFR7bIwqFhwJ2qWar8tEQSE5XXhCfVk=
+github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
+github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
+github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.4 h1:5Myjjh3JY/NaAi4IsUbHADytDyl1VE1Y9PXDlL+P/VQ=
+github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15 h1:mrI+6Ae64Wjt+uahGe5we/sPS1sXjvfT3YjtawAVgps=
+github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
+github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/theckman/go-flock v0.4.0 h1:bcqNkS4RTQBGWybG7IBimUMxnLz53Qes1+D4QaOhzJc=
+github.com/theckman/go-flock v0.4.0/go.mod h1:kjuth3y9VJ2aNlkNEO99G/8lp9fMIKaGyBmh84IBheM=
+github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7 h1:PW7TzL8BOpYMcUYSv4qWDoH1Y5iRzVABteynvfF7pwE=
+github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7/go.mod h1:c/nTNbUr0E0OrXEhq1pwa8iEgc2DOt4ZZqAt1HtCkPA=
+github.com/tidwall/match v1.0.0 h1:Ym1EcFkp+UQ4ptxfWlW+iMdq5cPH5nEuGzdf/Pb7VmI=
+github.com/tidwall/match v1.0.0/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
+github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1 h1:+gXfyhy0t28Guz+vFztBg45yIquB2bNtiFvbItzJtUc=
+github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1/go.mod h1:gsa3jftQ3xia55nzIN4lXLYzDcWdxjojdKoz+N0St2Y=
+golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb h1:Ah9YqXLj6fEgeKqcmBuLCbAsrF3ScD7dJ/bYM0C6tXI=
+golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20171102191033-01c190206fbd h1:CLQSRrSDQMOMkogMxky7XOkERftMegAnxjT2re4E66M=
+golang.org/x/net v0.0.0-20171102191033-01c190206fbd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e h1:3dQ4fR8k5KugjVKO0oqSd1odxuk2yaE2CIfxWP2WarQ=
+golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+gopkg.in/AlecAivazis/survey.v1 v1.6.1 h1:HyWkjKGBpzhNxrpaKRLDqoa4L1f4cMVBNU4bnVmU8Mw=
+gopkg.in/AlecAivazis/survey.v1 v1.6.1/go.mod h1:2Ehl7OqkBl3Xb8VmC4oFW2bItAhnUfzIjrOzwRxCrOU=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153 h1:3KfEubBNUdXqlEXuMz13dXy4cYK2AvuPhp8fKTYuPdU=
+gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153/go.mod h1:Vth2iKfSejHZ3p6akgWO0iSjuuiu6mNCEgzcYUCnumw=
+gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 h1:6D+BvnJ/j6e222UW8s2qTSe3wGBtvo0MbVQG/c5k8RE=
+gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -4,9 +4,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io"
+	"mime/multipart"
+	"net/url"
 	"strings"

-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
+	"github.com/coryb/oreo"
+
+	"github.com/go-jira/jira/jiradata"
 )

 type IssueQueryProvider interface {
@@ -54,7 +59,8 @@ func GetIssue(ua HttpClient, endpoint string, issue string, iqg IssueQueryProvid
 	if iqg != nil {
 		query = iqg.ProvideIssueQueryString()
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s%s", endpoint, issue, query)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue)
+	uri += query
 	resp, err := ua.GetJSON(uri)
 	if err != nil {
 		return nil, err
@@ -63,7 +69,7 @@ func GetIssue(ua HttpClient, endpoint string, issue string, iqg IssueQueryProvid

 	if resp.StatusCode == 200 {
 		results := &jiradata.Issue{}
-		return results, readJSON(resp.Body, results)
+		return results, json.NewDecoder(resp.Body).Decode(results)
 	}
 	return nil, responseError(resp)
 }
@@ -79,7 +85,8 @@ func GetIssueWorklog(ua HttpClient, endpoint string, issue string) (*jiradata.Wo
 	maxResults := 100
 	worklogs := jiradata.Worklogs{}
 	for startAt < total {
-		uri := fmt.Sprintf("%s/rest/api/2/issue/%s/worklog?startAt=%d&maxResults=%d", endpoint, issue, startAt, maxResults)
+		uri := URLJoin(endpoint, "rest/api/2/issue", issue, "worklog")
+		uri += fmt.Sprintf("?startAt=%d&maxResults=%d", startAt, maxResults)
 		resp, err := ua.GetJSON(uri)
 		if err != nil {
 			return nil, err
@@ -88,15 +95,13 @@ func GetIssueWorklog(ua HttpClient, endpoint string, issue string) (*jiradata.Wo

 		if resp.StatusCode == 200 {
 			results := &jiradata.WorklogWithPagination{}
-			err := readJSON(resp.Body, results)
+			err := json.NewDecoder(resp.Body).Decode(results)
 			if err != nil {
 				return nil, err
 			}
 			startAt = startAt + maxResults
 			total = results.Total
-			for _, worklog := range results.Worklogs {
-				worklogs = append(worklogs, worklog)
-			}
+			worklogs = append(worklogs, results.Worklogs...)
 		} else {
 			return nil, responseError(resp)
 		}
@@ -119,7 +124,7 @@ func AddIssueWorklog(ua HttpClient, endpoint string, issue string, wp WorklogPro
 	if err != nil {
 		return nil, err
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/worklog", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "worklog")
 	resp, err := ua.Post(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return nil, err
@@ -128,7 +133,7 @@ func AddIssueWorklog(ua HttpClient, endpoint string, issue string, wp WorklogPro

 	if resp.StatusCode == 201 {
 		results := &jiradata.Worklog{}
-		return results, readJSON(resp.Body, results)
+		return results, json.NewDecoder(resp.Body).Decode(results)
 	}
 	return nil, responseError(resp)
 }
@@ -139,7 +144,7 @@ func (j *Jira) GetIssueEditMeta(issue string) (*jiradata.EditMeta, error) {
 }

 func GetIssueEditMeta(ua HttpClient, endpoint string, issue string) (*jiradata.EditMeta, error) {
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/editmeta", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "editmeta")
 	resp, err := ua.GetJSON(uri)
 	if err != nil {
 		return nil, err
@@ -148,7 +153,7 @@ func GetIssueEditMeta(ua HttpClient, endpoint string, issue string) (*jiradata.E

 	if resp.StatusCode == 200 {
 		results := &jiradata.EditMeta{}
-		return results, readJSON(resp.Body, results)
+		return results, json.NewDecoder(resp.Body).Decode(results)
 	}
 	return nil, responseError(resp)
 }
@@ -168,7 +173,7 @@ func EditIssue(ua HttpClient, endpoint string, issue string, iup IssueUpdateProv
 	if err != nil {
 		return err
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue)
 	resp, err := ua.Put(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return err
@@ -192,7 +197,7 @@ func CreateIssue(ua HttpClient, endpoint string, iup IssueUpdateProvider) (*jira
 	if err != nil {
 		return nil, err
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/issue", endpoint)
+	uri := URLJoin(endpoint, "rest/api/2/issue")
 	resp, err := ua.Post(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return nil, err
@@ -201,7 +206,7 @@ func CreateIssue(ua HttpClient, endpoint string, iup IssueUpdateProvider) (*jira

 	if resp.StatusCode == 201 {
 		results := &jiradata.IssueCreateResponse{}
-		return results, readJSON(resp.Body, results)
+		return results, json.NewDecoder(resp.Body).Decode(results)
 	}
 	return nil, responseError(resp)
 }
@@ -212,7 +217,8 @@ func (j *Jira) GetIssueCreateMetaProject(projectKey string) (*jiradata.CreateMet
 }

 func GetIssueCreateMetaProject(ua HttpClient, endpoint string, projectKey string) (*jiradata.CreateMetaProject, error) {
-	uri := fmt.Sprintf("%s/rest/api/2/issue/createmeta?projectKeys=%s&expand=projects.issuetypes.fields", endpoint, projectKey)
+	uri := URLJoin(endpoint, "rest/api/2/issue/createmeta")
+	uri += fmt.Sprintf("?projectKeys=%s&expand=projects.issuetypes.fields", projectKey)
 	resp, err := ua.GetJSON(uri)
 	if err != nil {
 		return nil, err
@@ -221,7 +227,7 @@ func GetIssueCreateMetaProject(ua HttpClient, endpoint string, projectKey string

 	if resp.StatusCode == 200 {
 		results := &jiradata.CreateMeta{}
-		err = readJSON(resp.Body, results)
+		err = json.NewDecoder(resp.Body).Decode(results)
 		if err != nil {
 			return nil, err
 		}
@@ -230,7 +236,7 @@ func GetIssueCreateMetaProject(ua HttpClient, endpoint string, projectKey string
 				return project, nil
 			}
 		}
-		return nil, fmt.Errorf("Project %s not found", projectKey)
+		return nil, fmt.Errorf("project %s not found", projectKey)
 	}
 	return nil, responseError(resp)
 }
@@ -241,31 +247,32 @@ func (j *Jira) GetIssueCreateMetaIssueType(projectKey, issueTypeName string) (*j
 }

 func GetIssueCreateMetaIssueType(ua HttpClient, endpoint string, projectKey, issueTypeName string) (*jiradata.IssueType, error) {
-	uri := fmt.Sprintf("%s/rest/api/2/issue/createmeta?projectKeys=%s&issuetypeNames=%s&expand=projects.issuetypes.fields", endpoint, projectKey, issueTypeName)
+	uri := URLJoin(endpoint, "rest/api/2/issue/createmeta")
+	uri += fmt.Sprintf("?projectKeys=%s&issuetypeNames=%s&expand=projects.issuetypes.fields", projectKey, url.QueryEscape(issueTypeName))
 	resp, err := ua.GetJSON(uri)
 	if err != nil {
 		return nil, err
 	}
 	defer resp.Body.Close()

-	if resp.StatusCode == 200 {
-		results := &jiradata.CreateMeta{}
-		err = readJSON(resp.Body, results)
-		if err != nil {
-			return nil, err
+	if resp.StatusCode != 200 {
+		return nil, responseError(resp)
+	}
+	results := &jiradata.CreateMeta{}
+	if err := json.NewDecoder(resp.Body).Decode(results); err != nil {
+		return nil, err
+	}
+	for _, project := range results.Projects {
+		if project.Key != projectKey {
+			continue
 		}
-		for _, project := range results.Projects {
-			if project.Key == projectKey {
-				for _, issueType := range project.IssueTypes {
-					if issueType.Name == issueTypeName {
-						return issueType, nil
-					}
-				}
+		for _, issueType := range project.IssueTypes {
+			if issueType.Name == issueTypeName {
+				return issueType, nil
 			}
 		}
-		return nil, fmt.Errorf("Project %s and IssueType %s not found", projectKey, issueTypeName)
 	}
-	return nil, responseError(resp)
+	return nil, fmt.Errorf("project %s and IssueType %s not found", projectKey, issueTypeName)
 }

 type LinkIssueProvider interface {
@@ -283,7 +290,7 @@ func LinkIssues(ua HttpClient, endpoint string, lip LinkIssueProvider) error {
 	if err != nil {
 		return err
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/issueLink", endpoint)
+	uri := URLJoin(endpoint, "rest/api/2/issueLink")
 	resp, err := ua.Post(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return err
@@ -302,7 +309,8 @@ func (j *Jira) GetIssueTransitions(issue string) (*jiradata.TransitionsMeta, err
 }

 func GetIssueTransitions(ua HttpClient, endpoint string, issue string) (*jiradata.TransitionsMeta, error) {
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/transitions?expand=transitions.fields", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "transitions")
+	uri += "?expand=transitions.fields"
 	resp, err := ua.GetJSON(uri)
 	if err != nil {
 		return nil, err
@@ -311,7 +319,7 @@ func GetIssueTransitions(ua HttpClient, endpoint string, issue string) (*jiradat

 	if resp.StatusCode == 200 {
 		results := &jiradata.TransitionsMeta{}
-		return results, readJSON(resp.Body, results)
+		return results, json.NewDecoder(resp.Body).Decode(results)
 	}
 	return nil, responseError(resp)
 }
@@ -327,7 +335,7 @@ func TransitionIssue(ua HttpClient, endpoint string, issue string, iup IssueUpda
 	if err != nil {
 		return err
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/transitions", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "transitions")
 	resp, err := ua.Post(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return err
@@ -346,7 +354,7 @@ func (j *Jira) GetIssueLinkTypes() (*jiradata.IssueLinkTypes, error) {
 }

 func GetIssueLinkTypes(ua HttpClient, endpoint string) (*jiradata.IssueLinkTypes, error) {
-	uri := fmt.Sprintf("%s/rest/api/2/issueLinkType", endpoint)
+	uri := URLJoin(endpoint, "rest/api/2/issueLinkType")
 	resp, err := ua.GetJSON(uri)
 	if err != nil {
 		return nil, err
@@ -359,7 +367,7 @@ func GetIssueLinkTypes(ua HttpClient, endpoint string) (*jiradata.IssueLinkTypes
 		}{
 			IssueLinkTypes: jiradata.IssueLinkTypes{},
 		}
-		return &results.IssueLinkTypes, readJSON(resp.Body, &results)
+		return &results.IssueLinkTypes, json.NewDecoder(resp.Body).Decode(&results)
 	}
 	return nil, responseError(resp)
 }
@@ -370,7 +378,7 @@ func (j *Jira) IssueAddVote(issue string) error {
 }

 func IssueAddVote(ua HttpClient, endpoint string, issue string) error {
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/votes", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "votes")
 	resp, err := ua.Post(uri, "application/json", strings.NewReader("{}"))
 	if err != nil {
 		return err
@@ -389,7 +397,7 @@ func (j *Jira) IssueRemoveVote(issue string) error {
 }

 func IssueRemoveVote(ua HttpClient, endpoint string, issue string) error {
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/votes", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "votes")
 	resp, err := ua.Delete(uri)
 	if err != nil {
 		return err
@@ -417,7 +425,7 @@ func RankIssues(ua HttpClient, endpoint string, rrp RankRequestProvider) error {
 	if err != nil {
 		return err
 	}
-	uri := fmt.Sprintf("%s/rest/agile/1.0/issue/rank", endpoint)
+	uri := URLJoin(endpoint, "rest/agile/1.0/issue/rank")
 	resp, err := ua.Put(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return err
@@ -436,7 +444,7 @@ func (j *Jira) IssueAddWatcher(issue, user string) error {
 }

 func IssueAddWatcher(ua HttpClient, endpoint string, issue, user string) error {
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/watchers", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "watchers")
 	resp, err := ua.Post(uri, "application/json", strings.NewReader(fmt.Sprintf("%q", user)))
 	if err != nil {
 		return err
@@ -455,7 +463,8 @@ func (j *Jira) IssueRemoveWatcher(issue, user string) error {
 }

 func IssueRemoveWatcher(ua HttpClient, endpoint string, issue, user string) error {
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/watchers?username=%s", endpoint, issue, user)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "watchers")
+	uri += fmt.Sprintf("?username=%s", user)
 	resp, err := ua.Delete(uri)
 	if err != nil {
 		return err
@@ -483,7 +492,7 @@ func IssueAddComment(ua HttpClient, endpoint string, issue string, cp CommentPro
 	if err != nil {
 		return nil, err
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/comment", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "comment")
 	resp, err := ua.Post(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return nil, err
@@ -492,7 +501,7 @@ func IssueAddComment(ua HttpClient, endpoint string, issue string, cp CommentPro

 	if resp.StatusCode == 201 {
 		results := jiradata.Comment{}
-		return &results, readJSON(resp.Body, &results)
+		return &results, json.NewDecoder(resp.Body).Decode(&results)
 	}
 	return nil, responseError(resp)
 }
@@ -521,7 +530,7 @@ func IssueAssign(ua HttpClient, endpoint string, issue, name string) error {
 	if err != nil {
 		return err
 	}
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/assignee", endpoint, issue)
+	uri := URLJoin(endpoint, "rest/api/2/issue", issue, "assignee")
 	resp, err := ua.Put(uri, "application/json", bytes.NewBuffer(encoded))
 	if err != nil {
 		return err
@@ -533,3 +542,44 @@ 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(URLJoin(endpoint, "rest/api/2/issue", issue, "attachments"))
+	if err != nil {
+		return nil, err
+	}
+	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 {
+		results := jiradata.ListOfAttachment{}
+		return &results, json.NewDecoder(resp.Body).Decode(&results)
+	}
+	return nil, responseError(resp)
+}
@@ -2,12 +2,9 @@ package jira

 import (
 	"github.com/coryb/oreo"
-	logging "gopkg.in/op/go-logging.v1"
 )

-var log = logging.MustGetLogger("jira")
-
-const VERSION = "1.0.6"
+const VERSION = "1.0.21"

 type Jira struct {
 	Endpoint string     `json:"endpoint,omitempty" yaml:"endpoint,omitempty"`
@@ -3,6 +3,7 @@ package jiracli
 import (
 	"bytes"
 	"crypto/tls"
+	"encoding/base64"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -10,6 +11,7 @@ import (
 	"os"
 	"os/exec"
 	"reflect"
+	"runtime/debug"
 	"strings"

 	"github.com/coryb/figtree"
@@ -23,19 +25,76 @@ import (
 	logging "gopkg.in/op/go-logging.v1"
 )

-var log = logging.MustGetLogger("jira")
-
 type Exit struct {
 	Code int
 }

+// HandleExit will unwind any panics and check to see if they are jiracli.Exit
+// and exit accordingly.
+//
+// Example:
+// func main() {
+//     defer jiracli.HandleExit()
+//     ...
+// }
+func HandleExit() {
+	if e := recover(); e != nil {
+		if exit, ok := e.(Exit); ok {
+			os.Exit(exit.Code)
+		} else {
+			fmt.Fprintf(os.Stderr, "%s\n%s", e, debug.Stack())
+			os.Exit(1)
+		}
+	}
+}
+
 type GlobalOptions struct {
-	Endpoint       figtree.StringOption `yaml:"endpoint,omitempty" json:"endpoint,omitempty"`
-	Insecure       figtree.BoolOption   `yaml:"insecure,omitempty" json:"insecure,omitempty"`
+	// AuthenticationMethod is the method we use to authenticate with the jira serivce. Possible values are "api-token" or "session".
+	// The default is "api-token" when the service endpoint ends with "atlassian.net", otherwise it "session".  Session authentication
+	// will promt for user password and use the /auth/1/session-login endpoint.
+	AuthenticationMethod figtree.StringOption `yaml:"authentication-method,omitempty" json:"authentication-method,omitempty"`
+
+	// Endpoint is the URL for the Jira service.  Something like: https://go-jira.atlassian.net
+	Endpoint figtree.StringOption `yaml:"endpoint,omitempty" json:"endpoint,omitempty"`
+
+	// Insecure will allow you to connect to an https endpoint with a self-signed SSL certificate
+	Insecure figtree.BoolOption `yaml:"insecure,omitempty" json:"insecure,omitempty"`
+
+	// Login is the id used for authenticating with the Jira service.  For "api-token" AuthenticationMethod this is usually a
+	// full email address, something like "user@example.com".  For "session" AuthenticationMethod this will be something
+	// like "user", which by default will use the same value in the `User` field.
+	Login figtree.StringOption `yaml:"login,omitempty" json:"login,omitempty"`
+
+	// PasswordSource specificies the method that we fetch the password.  Possible values are "keyring" or "pass".
+	// If this is unset we will just prompt the user.  For "keyring" this will look in the OS keychain, if missing
+	// then prompt the user and store the password in the OS keychain.  For "pass" this will look in the PasswordDirectory
+	// location using the `pass` tool, if missing prompt the user and store in the PasswordDirectory
 	PasswordSource figtree.StringOption `yaml:"password-source,omitempty" json:"password-source,omitempty"`
-	Quiet          figtree.BoolOption   `yaml:"quiet,omitempty" json:"quiet,omitempty"`
-	UnixProxy      figtree.StringOption `yaml:"unixproxy,omitempty" json:"unixproxy,omitempty"`
-	User           figtree.StringOption `yaml:"user,omitempty" json:"user,omitempty"`
+
+	// PasswordDirectory is only used for the "pass" PasswordSource.  It is the location for the encrypted password
+	// files used by `pass`.  Effectively this overrides the "PASSWORD_STORE_DIR" environment variable
+	PasswordDirectory figtree.StringOption `yaml:"password-directory,omitempty" json:"password-directory,omitempty"`
+
+	// PasswordName is the the name of the password key entry stored used with PasswordSource `pass`.
+	PasswordName figtree.StringOption `yaml:"password-name,omitempty" json:"password-name,omitempty"`
+
+	// Quiet will lower the defalt log level to suppress the standard output for commands
+	Quiet figtree.BoolOption `yaml:"quiet,omitempty" json:"quiet,omitempty"`
+
+	// SocksProxy is used to configure the http client to access the Endpoint via a socks proxy.  The value
+	// should be a ip address and port string, something like "127.0.0.1:1080"
+	SocksProxy figtree.StringOption `yaml:"socksproxy,omitempty" json:"socksproxy,omitempty"`
+
+	// UnixProxy is use to configure the http client to access the Endpoint via a local unix domain socket used
+	// to proxy requests
+	UnixProxy figtree.StringOption `yaml:"unixproxy,omitempty" json:"unixproxy,omitempty"`
+
+	// User is use to represent the user on the Jira service.  This can be different from the username used to
+	// authenticate with the service.  For example when using AuthenticationMethod `api-token` the Login is
+	// typically an email address like `username@example.com` and the User property would be someting like
+	// `username`  The User property is used on Jira service API calls that require a user to associate with
+	// an Issue (like assigning a Issue to yourself)
+	User figtree.StringOption `yaml:"user,omitempty" json:"user,omitempty"`
 }

 type CommonOptions struct {
@@ -65,34 +124,44 @@ type kingpinAppOrCommand interface {
 	GetCommand(string) *kingpin.CmdClause
 }

-func Register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree, reg []CommandRegistry) {
+var globalCommandRegistry = []CommandRegistry{}
+
+func RegisterCommand(regEntry CommandRegistry) {
+	globalCommandRegistry = append(globalCommandRegistry, regEntry)
+}
+
+func (o *GlobalOptions) AuthMethod() string {
+	if strings.Contains(o.Endpoint.Value, ".atlassian.net") && o.AuthenticationMethod.Source == "default" {
+		return "api-token"
+	}
+	return o.AuthenticationMethod.Value
+}
+
+func register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree) {
 	globals := GlobalOptions{
-		User: figtree.NewStringOption(os.Getenv("USER")),
+		User:                 figtree.NewStringOption(os.Getenv("USER")),
+		AuthenticationMethod: figtree.NewStringOption("session"),
 	}
 	app.Flag("endpoint", "Base URI to use for Jira").Short('e').SetValue(&globals.Endpoint)
 	app.Flag("insecure", "Disable TLS certificate verification").Short('k').SetValue(&globals.Insecure)
 	app.Flag("quiet", "Suppress output to console").Short('Q').SetValue(&globals.Quiet)
 	app.Flag("unixproxy", "Path for a unix-socket proxy").SetValue(&globals.UnixProxy)
-	app.Flag("user", "Login name used for authentication with Jira service").Short('u').SetValue(&globals.User)
+	app.Flag("socksproxy", "Address for a socks proxy").SetValue(&globals.SocksProxy)
+	app.Flag("user", "user name used within the Jira service").Short('u').SetValue(&globals.User)
+	app.Flag("login", "login name that corresponds to the user used for authentication").SetValue(&globals.Login)

-	app.PreAction(func(_ *kingpin.ParseContext) error {
-		if globals.Insecure.Value {
-			transport := &http.Transport{
-				Proxy: http.ProxyFromEnvironment,
-				TLSClientConfig: &tls.Config{
-					InsecureSkipVerify: true,
-				},
-			}
-			o = o.WithTransport(transport)
+	o = o.WithPreCallback(func(req *http.Request) (*http.Request, error) {
+		if globals.AuthMethod() == "api-token" {
+			// need to set basic auth header with user@domain:api-token
+			token := globals.GetPass()
+			authHeader := fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", globals.Login.Value, token))))
+			req.Header.Add("Authorization", authHeader)
 		}
-		if globals.UnixProxy.Value != "" {
-			o = o.WithTransport(unixProxy(globals.UnixProxy.Value))
-		}
-		return nil
+		return req, nil
 	})

-	o = o.WithPostCallback(
-		func(req *http.Request, resp *http.Response) (*http.Response, error) {
+	o = o.WithPostCallback(func(req *http.Request, resp *http.Response) (*http.Response, error) {
+		if globals.AuthMethod() == "session" {
 			authUser := resp.Header.Get("X-Ausername")
 			if authUser == "" || authUser == "anonymous" {
 				// preserve the --quiet value, we need to temporarily disable it so
@@ -108,11 +177,14 @@ func Register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree, re
 				// rerun the original request
 				return o.Do(req)
 			}
-			return resp, nil
-		},
-	)
+		} else if globals.AuthMethod() == "api-token" && resp.StatusCode == 401 {
+			globals.SetPass("")
+			return o.Do(req)
+		}
+		return resp, nil
+	})

-	for _, command := range reg {
+	for _, command := range globalCommandRegistry {
 		copy := command
 		commandFields := strings.Fields(copy.Command)
 		var appOrCmd kingpinAppOrCommand = app
@@ -128,6 +200,29 @@ func Register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree, re

 		cmd := appOrCmd.Command(commandFields[len(commandFields)-1], copy.Entry.Help)
 		LoadConfigs(cmd, fig, &globals)
+		cmd.PreAction(func(_ *kingpin.ParseContext) error {
+			if globals.Insecure.Value {
+				transport := &http.Transport{
+					Proxy: http.ProxyFromEnvironment,
+					TLSClientConfig: &tls.Config{
+						InsecureSkipVerify: true,
+					},
+				}
+				o = o.WithTransport(transport)
+			}
+			if globals.UnixProxy.Value != "" {
+				o = o.WithTransport(unixProxy(globals.UnixProxy.Value))
+			} else if globals.SocksProxy.Value != "" {
+				o = o.WithTransport(socksProxy(globals.SocksProxy.Value))
+			}
+			if globals.AuthMethod() == "api-token" {
+				o = o.WithCookieFile("")
+			}
+			if globals.Login.Value == "" {
+				globals.Login = globals.User
+			}
+			return nil
+		})

 		for _, alias := range copy.Aliases {
 			cmd = cmd.Alias(alias)
@@ -139,11 +234,12 @@ func Register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree, re
 			copy.Entry.UsageFunc(fig, cmd)
 		}

-		cmd.Action(
-			func(_ *kingpin.ParseContext) error {
-				return copy.Entry.ExecuteFunc(o, &globals)
-			},
-		)
+		cmd.Action(func(_ *kingpin.ParseContext) error {
+			if logging.GetLevel("") > logging.DEBUG {
+				o = o.WithTrace(true)
+			}
+			return copy.Entry.ExecuteFunc(o, &globals)
+		})
 	}
 }

@@ -219,46 +315,55 @@ func (o *CommonOptions) editFile(fileName string) (changes bool, err error) {
 	}

 	// now we just need to diff the files to see if there are any changes
-	var oldHandle, newHandle *os.File
-	var oldStat, newStat os.FileInfo
-	if oldHandle, err = os.Open(tmpFileNameOrig); err == nil {
-		if newHandle, err = os.Open(fileName); err == nil {
-			if oldStat, err = oldHandle.Stat(); err == nil {
-				if newStat, err = newHandle.Stat(); err == nil {
-					// different sizes, so must have changes
-					if oldStat.Size() != newStat.Size() {
-						return true, err
-					}
-					oldBuf, newBuf := make([]byte, 1024), make([]byte, 1024)
-					var oldCount, newCount int
-					// loop though 1024 bytes at a time comparing the buffers for changes
-					for err != io.EOF {
-						oldCount, _ = oldHandle.Read(oldBuf)
-						newCount, err = newHandle.Read(newBuf)
-						if oldCount != newCount {
-							return true, nil
-						}
-						if bytes.Compare(oldBuf[:oldCount], newBuf[:newCount]) != 0 {
-							return true, nil
-						}
-					}
-					return false, nil
-				}
-			}
+	f1, err := os.Open(tmpFileNameOrig)
+	if err != nil {
+		return false, err
+	}
+	f2, err := os.Open(fileName)
+	if err != nil {
+		return false, err
+	}
+
+	stat1, err := f1.Stat()
+	if err != nil {
+		return false, err
+	}
+	stat2, err := f2.Stat()
+	if err != nil {
+		return false, err
+	}
+	// different sizes, so must have changes
+	if stat1.Size() != stat2.Size() {
+		return true, nil
+	}
+
+	p1, p2 := make([]byte, 1024), make([]byte, 1024)
+	var n1, n2 int
+	// loop though 1024 bytes at a time comparing the buffers for changes
+	for err != io.EOF {
+		n1, _ = f1.Read(p1)
+		n2, err = f2.Read(p2)
+		if n1 != n2 {
+			return true, nil
+		}
+		if !bytes.Equal(p1[:n1], p2[:n2]) {
+			return true, nil
 		}
 	}
-	return false, err
+	return false, nil
 }

+var EditLoopAbort = fmt.Errorf("edit Loop aborted by request")
+
 func EditLoop(opts *CommonOptions, input interface{}, output interface{}, submit func() error) error {
 	tmpFile, err := tmpTemplate(opts.Template.Value, input)
 	if err != nil {
 		return err
 	}

-	confirm := func(msg string) (answer bool) {
+	confirm := func(dflt bool, msg string) (answer bool) {
 		survey.AskOne(
-			&survey.Confirm{Message: msg, Default: true},
+			&survey.Confirm{Message: msg, Default: dflt},
 			&answer,
 			nil,
 		)
@@ -279,14 +384,14 @@ func EditLoop(opts *CommonOptions, input interface{}, output interface{}, submit
 			changes, err := opts.editFile(tmpFile)
 			if err != nil {
 				log.Error(err.Error())
-				if confirm("Editor reported an error, edit again?") {
+				if confirm(true, "Editor reported an error, edit again?") {
 					continue
 				}
-				panic(Exit{Code: 1})
+				return EditLoopAbort
 			}
 			if !changes {
-				if !confirm("No changes detected, submit anyway?") {
-					panic(Exit{Code: 1})
+				if !confirm(false, "No changes detected, submit anyway?") {
+					return EditLoopAbort
 				}
 			}
 		}
@@ -319,35 +424,35 @@ func EditLoop(opts *CommonOptions, input interface{}, output interface{}, submit
 		var raw interface{}
 		if err := yaml.Unmarshal(data, &raw); err != nil {
 			log.Error(err.Error())
-			if confirm("Invalid YAML syntax, edit again?") {
+			if confirm(true, "Invalid YAML syntax, edit again?") {
 				continue
 			}
-			panic(Exit{Code: 1})
+			return EditLoopAbort
 		}
 		yamlFixup(&raw)
 		fixedYAML, err := yaml.Marshal(&raw)
 		if err != nil {
 			log.Error(err.Error())
-			if confirm("Invalid YAML syntax, edit again?") {
+			if confirm(true, "Invalid YAML syntax, edit again?") {
 				continue
 			}
-			panic(Exit{Code: 1})
+			return EditLoopAbort
 		}

 		if err := yaml.Unmarshal(fixedYAML, output); err != nil {
 			log.Error(err.Error())
-			if confirm("Invalid YAML syntax, edit again?") {
+			if confirm(true, "Invalid YAML syntax, edit again?") {
 				continue
 			}
-			panic(Exit{Code: 1})
+			return EditLoopAbort
 		}
 		// submit template
 		if err := submit(); err != nil {
 			log.Error(err.Error())
-			if confirm("Jira reported an error, edit again?") {
+			if confirm(true, "Jira reported an error, edit again?") {
 				continue
 			}
-			panic(Exit{Code: 1})
+			return EditLoopAbort
 		}
 		break
 	}
@@ -0,0 +1,38 @@
+package jiracli
+
+import (
+	"os"
+	"strconv"
+
+	logging "gopkg.in/op/go-logging.v1"
+)
+
+var (
+	log = logging.MustGetLogger("jira")
+)
+
+func IncreaseLogLevel(verbosity int) {
+	logging.SetLevel(logging.GetLevel("")+logging.Level(verbosity), "")
+}
+
+func InitLogging() {
+	logBackend := logging.NewLogBackend(os.Stderr, "", 0)
+	format := os.Getenv("JIRA_LOG_FORMAT")
+	if format == "" {
+		format = "%{color}%{level:-5s}%{color:reset} %{message}"
+	}
+	logging.SetBackend(
+		logging.NewBackendFormatter(
+			logBackend,
+			logging.MustStringFormatter(format),
+		),
+	)
+	if os.Getenv("JIRA_DEBUG") == "" {
+		logging.SetLevel(logging.NOTICE, "")
+	} else {
+		logging.SetLevel(logging.DEBUG, "")
+		if verbosity, err := strconv.Atoi(os.Getenv("JIRA_DEBUG")); err == nil {
+			IncreaseLogLevel(verbosity)
+		}
+	}
+}
@@ -3,39 +3,67 @@ package jiracli
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
+	"os"
 	"os/exec"
 	"strings"

+	"github.com/go-jira/jira/jiradata"
 	"gopkg.in/AlecAivazis/survey.v1"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiradata"
 )

 func (o *GlobalOptions) ProvideAuthParams() *jiradata.AuthParams {
 	return &jiradata.AuthParams{
-		Username: o.User.Value,
+		Username: o.Login.Value,
 		Password: o.GetPass(),
 	}
 }

+func (o *GlobalOptions) keyName() string {
+	user := o.Login.Value
+	if o.AuthMethod() == "api-token" {
+		user = "api-token:" + user
+	}
+
+	if o.PasswordSource.Value == "pass" {
+		if o.PasswordName.Value != "" {
+			return o.PasswordName.Value
+		}
+		return fmt.Sprintf("GoJira/%s", user)
+	}
+	return user
+}
+
 func (o *GlobalOptions) GetPass() string {
 	passwd := ""
 	if o.PasswordSource.Value != "" {
 		if o.PasswordSource.Value == "keyring" {
 			var err error
-			passwd, err = keyringGet(o.User.Value)
+			passwd, err = keyringGet(o.keyName())
 			if err != nil {
 				panic(err)
 			}
 		} else if o.PasswordSource.Value == "pass" {
+			if o.PasswordDirectory.Value != "" {
+				orig := os.Getenv("PASSWORD_STORE_DIR")
+				os.Setenv("PASSWORD_STORE_DIR", o.PasswordDirectory.Value)
+				defer os.Setenv("PASSWORD_STORE_DIR", orig)
+			}
 			if bin, err := exec.LookPath("pass"); err == nil {
 				buf := bytes.NewBufferString("")
-				cmd := exec.Command(bin, fmt.Sprintf("GoJira/%s", o.User))
+				cmd := exec.Command(bin, o.keyName())
 				cmd.Stdout = buf
 				cmd.Stderr = buf
 				if err := cmd.Run(); err == nil {
 					passwd = strings.TrimSpace(buf.String())
 				}
 			}
+		} else if o.PasswordSource.Value == "stdin" {
+			allBytes, err := ioutil.ReadAll(os.Stdin)
+			if err != nil {
+				panic(fmt.Sprintf("unable to read bytes from stdin: %s", err))
+			}
+			passwd = string(allBytes)
 		} else {
 			log.Warningf("Unknown password-source: %s", o.PasswordSource)
 		}
@@ -44,9 +72,23 @@ func (o *GlobalOptions) GetPass() string {
 	if passwd != "" {
 		return passwd
 	}
+
+	if passwd = os.Getenv("JIRA_API_TOKEN"); passwd != "" && o.AuthMethod() == "api-token" {
+		return passwd
+	}
+
+	prompt := fmt.Sprintf("Jira Password [%s]: ", o.Login)
+	help := ""
+
+	if o.AuthMethod() == "api-token" {
+		prompt = fmt.Sprintf("Jira API-Token [%s]: ", o.Login)
+		help = "API Tokens may be required by your Jira service endpoint: https://developer.atlassian.com/cloud/jira/platform/deprecation-notice-basic-auth-and-cookie-based-auth/"
+	}
+
 	err := survey.AskOne(
 		&survey.Password{
-			Message: fmt.Sprintf("Jira Password [%s]: ", o.User),
+			Message: prompt,
+			Help:    help,
 		},
 		&passwd,
 		nil,
@@ -62,15 +104,20 @@ func (o *GlobalOptions) GetPass() string {
 func (o *GlobalOptions) SetPass(passwd string) error {
 	if o.PasswordSource.Value == "keyring" {
 		// save password in keychain so that it can be used for subsequent http requests
-		err := keyringSet(o.User.Value, passwd)
+		err := keyringSet(o.keyName(), passwd)
 		if err != nil {
 			log.Errorf("Failed to set password in keyring: %s", err)
 			return err
 		}
 	} else if o.PasswordSource.Value == "pass" {
+		if o.PasswordDirectory.Value != "" {
+			orig := os.Getenv("PASSWORD_STORE_DIR")
+			os.Setenv("PASSWORD_STORE_DIR", o.PasswordDirectory.Value)
+			defer os.Setenv("PASSWORD_STORE_DIR", orig)
+		}
 		if bin, err := exec.LookPath("pass"); err == nil {
 			log.Debugf("using %s", bin)
-			passName := fmt.Sprintf("GoJira/%s", o.User)
+			passName := o.keyName()
 			if passwd != "" {
 				in := bytes.NewBufferString(fmt.Sprintf("%s\n%s\n", passwd, passwd))
 				out := bytes.NewBufferString("")
@@ -0,0 +1,31 @@
+package jiracli
+
+import (
+	"net"
+	"net/http"
+	"time"
+
+	"golang.org/x/net/proxy"
+)
+
+func socksProxy(address string) *http.Transport {
+	return newSocksProxyTransport(address)
+}
+
+func newSocksProxyTransport(address string) *http.Transport {
+	dialer, err := proxy.SOCKS5("tcp", address, nil, proxy.Direct)
+	if err != nil {
+		// TODO: whoops, return error?
+		panic(err)
+	}
+	dial := func(network, addr string) (net.Conn, error) {
+		return dialer.Dial(network, addr)
+	}
+
+	return &http.Transport{
+		Dial:                  dial,
+		DisableKeepAlives:     true,
+		ResponseHeaderTimeout: 30 * time.Second,
+		ExpectContinueTimeout: 10 * time.Second,
+	}
+}
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 	"text/template"
@@ -16,6 +17,7 @@ import (
 	yaml "gopkg.in/coryb/yaml.v2"

 	"github.com/coryb/figtree"
+	shellquote "github.com/kballard/go-shellquote"
 	"github.com/mgutz/ansi"
 	"golang.org/x/crypto/ssh/terminal"
 )
@@ -42,7 +44,8 @@ func getTemplate(name string) (string, error) {
 	b, err := findTemplate(name)
 	if err != nil {
 		return "", err
-	} else if b != nil {
+	}
+	if b != nil {
 		return string(b), nil
 	}
 	if s, ok := AllTemplates[name]; ok {
@@ -65,6 +68,24 @@ func TemplateProcessor() *template.Template {
 		"jira": func() string {
 			return os.Args[0]
 		},
+		"env": func() map[string]string {
+			out := map[string]string{}
+			for _, env := range os.Environ() {
+				kv := strings.SplitN(env, "=", 2)
+				out[kv[0]] = kv[1]
+			}
+			return out
+		},
+		"shellquote": func(content string) string {
+			return shellquote.Join(content)
+		},
+		"toMinJson": func(content interface{}) (string, error) {
+			bytes, err := json.Marshal(content)
+			if err != nil {
+				return "", err
+			}
+			return string(bytes), nil
+		},
 		"toJson": func(content interface{}) (string, error) {
 			bytes, err := json.MarshalIndent(content, "", "    ")
 			if err != nil {
@@ -99,7 +120,7 @@ func TemplateProcessor() *template.Template {
 			}
 		},
 		"indent": func(spaces int, content string) string {
-			indent := make([]rune, spaces+1, spaces+1)
+			indent := make([]rune, spaces+1)
 			indent[0] = '\n'
 			for i := 1; i < spaces+1; i++ {
 				indent[i] = ' '
@@ -123,6 +144,10 @@ func TemplateProcessor() *template.Template {
 		"color": func(color string) string {
 			return ansi.ColorCode(color)
 		},
+		"regReplace": func(search string, replace string, content string) string {
+			re := regexp.MustCompile(search)
+			return re.ReplaceAllString(content, replace)
+		},
 		"split": func(sep string, content string) []string {
 			return strings.Split(content, sep)
 		},
@@ -134,7 +159,7 @@ func TemplateProcessor() *template.Template {
 			return strings.Join(vals, sep)
 		},
 		"abbrev": func(max int, content string) string {
-			if len(content) > max {
+			if len(content) > max && max > 2 {
 				var buffer bytes.Buffer
 				buffer.WriteString(content[:max-3])
 				buffer.WriteString("...")
@@ -160,12 +185,13 @@ func TemplateProcessor() *template.Template {
 }

 func ConfigTemplate(fig *figtree.FigTree, template, command string, opts interface{}) (string, error) {
-	tmp, err := translateOptions(opts)
+	var tmp map[string]interface{}
+	err := ConvertType(opts, &tmp)
 	if err != nil {
 		return "", err
 	}
-	fig.LoadAllConfigs(command+".yml", tmp)
-	fig.LoadAllConfigs("config.yml", tmp)
+	fig.LoadAllConfigs(command+".yml", &tmp)
+	fig.LoadAllConfigs("config.yml", &tmp)

 	tmpl, err := TemplateProcessor().Parse(template)
 	if err != nil {
@@ -178,11 +204,11 @@ func ConfigTemplate(fig *figtree.FigTree, template, command string, opts interfa
 	return buf.String(), nil
 }

-func translateOptions(opts interface{}) (interface{}, error) {
+func ConvertType(input interface{}, output interface{}) error {
 	// HACK HACK HACK: convert data formats to json for backwards compatibilty with templates
-	jsonData, err := json.Marshal(opts)
+	jsonData, err := json.Marshal(input)
 	if err != nil {
-		return nil, err
+		return err
 	}

 	defer func(mapType, iface reflect.Type) {
@@ -193,11 +219,10 @@ func translateOptions(opts interface{}) (interface{}, error) {
 	yaml.DefaultMapType = reflect.TypeOf(map[string]interface{}{})
 	yaml.IfaceType = yaml.DefaultMapType.Elem()

-	var rawData map[string]interface{}
-	if err := yaml.Unmarshal(jsonData, &rawData); err != nil {
-		return nil, err
+	if err := yaml.Unmarshal(jsonData, output); err != nil {
+		return err
 	}
-	return &rawData, nil
+	return nil

 }

@@ -212,7 +237,8 @@ func RunTemplate(templateName string, data interface{}, out io.Writer) error {
 		out = os.Stdout
 	}

-	rawData, err := translateOptions(data)
+	var rawData interface{}
+	err = ConvertType(data, &rawData)
 	if err != nil {
 		return err
 	}
@@ -228,6 +254,7 @@ func RunTemplate(templateName string, data interface{}, out io.Writer) error {
 }

 var AllTemplates = map[string]string{
+	"attach-list":    defaultAttachListTemplate,
 	"comment":        defaultCommentTemplate,
 	"component-add":  defaultComponentAddTemplate,
 	"components":     defaultComponentsTemplate,
@@ -236,6 +263,8 @@ var AllTemplates = map[string]string{
 	"debug":          defaultDebugTemplate,
 	"edit":           defaultEditTemplate,
 	"editmeta":       defaultDebugTemplate,
+	"epic-create":    defaultEpicCreateTemplate,
+	"epic-list":      defaultTableTemplate,
 	"fields":         defaultDebugTemplate,
 	"issuelinktypes": defaultDebugTemplate,
 	"issuetypes":     defaultIssuetypesTemplate,
@@ -257,14 +286,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" }} | {{if .fields.priority}}{{.fields.priority.name | printf "%-12s" }}{{else}}<unassigned>{{end}} | {{.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 */ -}}
@@ -313,7 +351,7 @@ comments:
 {{end -}}
 `
 const defaultEditTemplate = `{{/* edit template */ -}}
-# issue: {{ .key }}
+# issue: {{ .key }} - created: {{ .fields.created | age}} ago
 update:
  comment:
    - add: 
@@ -339,9 +377,10 @@ fields:
    - name: {{ .overrides.watcher}}{{end}}{{end}}
 {{- if .meta.fields.priority }}
  priority: # Values: {{ range .meta.fields.priority.allowedValues }}{{.name}}, {{end}}
-    name: {{ or .overrides.priority .fields.priority.name }}{{end}}
+    name: {{ or .overrides.priority .fields.priority.name "" }}{{end}}
  description: |~
-    {{ or .overrides.description (or .fields.description "") | indent 4 }}
+    {{ or .overrides.description .fields.description "" | indent 4 }}
+# votes: {{ .fields.votes.votes }}
 # comments:
 # {{ range .fields.comment.comments }}  - | # {{.author.name}}, {{.created | age}} ago
 #     {{ or .body "" | indent 4 | comment}}
@@ -387,6 +426,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:
@@ -435,12 +499,13 @@ fields:
    - name: {{ .name }}{{end}}{{end}}
 {{- end -}}
 {{if .meta.fields.description}}
-  description: {{or .overrides.description .fields.description }}
+  description: |~
+    {{ or .fields.description "" | indent 4 }}
 {{- end -}}
 {{if .meta.fields.fixVersions -}}
  {{if .meta.fields.fixVersions.allowedValues}}
  fixVersions: # Values: {{ range .meta.fields.fixVersions.allowedValues }}{{.name}}, {{end}}{{if .overrides.fixVersions}}{{ range (split "," .overrides.fixVersions)}}
-    - name: {{.name}}{{end}}{{else}}{{range .fields.fixVersions}}
+    - name: {{.}}{{end}}{{else}}{{range .fields.fixVersions}}
    - name: {{.name}}{{end}}{{end}}
  {{- end -}}
 {{- end -}}
@@ -482,7 +547,7 @@ transition:
 const defaultWorklogTemplate = `{{/* worklog template */ -}}
 # issue: {{ .issue }}
 comment: |~
-  {{ or .comment "" }}
+  {{ or .comment "" | indent 2 }}
 timeSpent: {{ or .timeSpent "" }}
 started: {{ or .started "" }}
 `
@@ -0,0 +1,198 @@
+package jiracli
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"regexp"
+	"runtime"
+	"syscall"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/kingpeon"
+	"github.com/coryb/oreo"
+	jira "github.com/go-jira/jira"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
+)
+
+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 CommandLine(fig *figtree.FigTree, o *oreo.Client) *kingpin.Application {
+	app := kingpin.New("jira", "Jira Command Line Interface")
+	app.UsageWriter(os.Stdout)
+	app.ErrorWriter(os.Stderr)
+	app.Command("version", "Prints version").PreAction(func(*kingpin.ParseContext) error {
+		fmt.Println(jira.VERSION)
+		panic(Exit{Code: 0})
+	})
+	app.UsageTemplate(usage)
+
+	var verbosity int
+	app.Flag("verbose", "Increase verbosity for debugging").Short('v').PreAction(func(_ *kingpin.ParseContext) error {
+		os.Setenv("JIRA_DEBUG", fmt.Sprintf("%d", verbosity))
+		IncreaseLogLevel(1)
+		return nil
+	}).CounterVar(&verbosity)
+
+	app.Terminate(func(status int) {
+		for _, arg := range os.Args {
+			if arg == "-h" || arg == "--help" || len(os.Args) == 1 {
+				panic(Exit{Code: 0})
+			}
+		}
+		panic(Exit{Code: 1})
+	})
+
+	register(app, o, fig)
+
+	// register custom commands
+	data := struct {
+		CustomCommands kingpeon.DynamicCommands `yaml:"custom-commands" json:"custom-commands"`
+	}{}
+
+	if err := fig.LoadAllConfigs("config.yml", &data); err != nil {
+		log.Errorf("%s", err)
+		panic(Exit{Code: 1})
+	}
+
+	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.RegisterDynamicCommandsWithRunner(runner, app, data.CustomCommands, TemplateProcessor())
+	}
+
+	return app
+}
+
+func ParseCommandLine(app *kingpin.Application, args []string) {
+	// checking for default usage of `jira ISSUE-123` but need to allow
+	// for global options first like: `jira --user mothra ISSUE-123`
+	ctx, err := app.ParseContext(args)
+	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()
+			if next != nil {
+				if ok, err := regexp.MatchString("^[A-Z]+-[0-9]+$", next.Value); err != nil {
+					log.Errorf("Invalid Regex: %s", err)
+				} else if ok {
+					// insert "view" at i=1 (2nd position)
+					os.Args = append(os.Args[:1], append([]string{"view"}, os.Args[1:]...)...)
+				}
+			}
+		}
+	}
+
+	if _, err := app.Parse(os.Args[1:]); err != nil {
+		if _, ok := err.(*Error); ok {
+			log.Errorf("%s", err)
+			panic(Exit{Code: 1})
+		}
+		ctx, _ := app.ParseContext(os.Args[1:])
+		if ctx != nil {
+			app.UsageForContext(ctx)
+		}
+		log.Errorf("Invalid Usage: %s", err)
+		panic(Exit{Code: 1})
+	}
+}
@@ -1,11 +1,11 @@
 package jiracli

 import (
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"runtime"
 	"time"

@@ -22,15 +22,19 @@ func Homedir() string {
 }

 func findClosestParentPath(fileName string) (string, error) {
-	paths := figtree.FindParentPaths(fileName)
+	cwd, err := os.Getwd()
+	if err != nil {
+		return "", err
+	}
+	paths := figtree.FindParentPaths(Homedir(), cwd, fileName)
 	if len(paths) > 0 {
 		return paths[len(paths)-1], nil
 	}
-	return "", errors.New(fmt.Sprintf("%s not found in parent directory hierarchy", fileName))
+	return "", fmt.Errorf("%s not found in parent directory hierarchy", fileName)
 }

 func tmpYml(tmpFilePrefix string) (*os.File, error) {
-	fh, err := ioutil.TempFile("", tmpFilePrefix)
+	fh, err := ioutil.TempFile("", filepath.Base(tmpFilePrefix))
 	if err != nil {
 		return nil, err
 	}
@@ -81,7 +85,7 @@ func fuzzyAge(start string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	delta := time.Now().Sub(t)
+	delta := time.Since(t)
 	if delta.Minutes() < 2 {
 		return "a minute", nil
 	} else if dm := delta.Minutes(); dm < 45 {
@@ -5,8 +5,8 @@ import (

 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -52,7 +52,7 @@ func CmdAssign(o *oreo.Client, globals *jiracli.GlobalOptions, opts *AssignOptio
 	}

 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, globals.Endpoint.Value, opts.Issue)
+		fmt.Printf("OK %s %s\n", opts.Issue, jira.URLJoin(globals.Endpoint.Value, "browse", opts.Issue))
 	}

 	if opts.Browse.Value {
@@ -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 "github.com/go-jira/jira"
+	"github.com/go-jira/jira/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
+}
@@ -0,0 +1,79 @@
+package jiracmd
+
+import (
+	"fmt"
+	"io"
+	"os"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	jira "github.com/go-jira/jira"
+	"github.com/go-jira/jira/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
+}
@@ -0,0 +1,67 @@
+package jiracmd
+
+import (
+	"sort"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/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
+}
@@ -0,0 +1,46 @@
+package jiracmd
+
+import (
+	"fmt"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	jira "github.com/go-jira/jira"
+	"github.com/go-jira/jira/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
+}
@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -66,8 +66,8 @@ func CmdBlock(o *oreo.Client, globals *jiracli.GlobalOptions, opts *BlockOptions
 	}

 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.InwardIssue.Key, globals.Endpoint.Value, opts.InwardIssue.Key)
-		fmt.Printf("OK %s %s/browse/%s\n", opts.OutwardIssue.Key, globals.Endpoint.Value, opts.OutwardIssue.Key)
+		fmt.Printf("OK %s %s\n", opts.InwardIssue.Key, jira.URLJoin(globals.Endpoint.Value, "browse", opts.InwardIssue.Key))
+		fmt.Printf("OK %s %s\n", opts.OutwardIssue.Key, jira.URLJoin(globals.Endpoint.Value, "browse", opts.OutwardIssue.Key))
 	}

 	if opts.Browse.Value {
@@ -1,12 +1,11 @@
 package jiracmd

 import (
-	"fmt"
-
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
+	jira "github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	"github.com/pkg/browser"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -27,5 +26,5 @@ func CmdBrowseRegistry() *jiracli.CommandRegistryEntry {

 // CmdBrowse open the default system browser to the provided issue
 func CmdBrowse(globals *jiracli.GlobalOptions, issue string) error {
-	return browser.OpenURL(fmt.Sprintf("%s/browse/%s", globals.Endpoint.Value, issue))
+	return browser.OpenURL(jira.URLJoin(globals.Endpoint.Value, "browse", issue))
 }
@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -68,7 +68,7 @@ func CmdComment(o *oreo.Client, globals *jiracli.GlobalOptions, opts *CommentOpt
 	}

 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, globals.Endpoint.Value, opts.Issue)
+		fmt.Printf("OK %s %s\n", opts.Issue, jira.URLJoin(globals.Endpoint.Value, "browse", opts.Issue))
 	}

 	if opts.Browse.Value {
@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -52,9 +52,8 @@ func CmdComponentAddUsage(cmd *kingpin.CmdClause, opts *ComponentAddOptions) err
 func CmdComponentAdd(o *oreo.Client, globals *jiracli.GlobalOptions, opts *ComponentAddOptions) error {
 	var err error
 	component := &jiradata.Component{}
-	var resp *jiradata.Component
 	err = jiracli.EditLoop(&opts.CommonOptions, &opts.Component, component, func() error {
-		resp, err = jira.CreateComponent(o, globals.Endpoint.Value, component)
+		_, err = jira.CreateComponent(o, globals.Endpoint.Value, component)
 		return err
 	})
 	if err != nil {
@@ -6,8 +6,8 @@ import (
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"

-	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -7,9 +7,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 	yaml "gopkg.in/coryb/yaml.v2"
 )
@@ -93,8 +93,9 @@ func CmdCreate(o *oreo.Client, globals *jiracli.GlobalOptions, opts *CreateOptio
 		return err
 	}

+	browseLink := jira.URLJoin(globals.Endpoint.Value, "browse", issueResp.Key)
 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", issueResp.Key, globals.Endpoint.Value, issueResp.Key)
+		fmt.Printf("OK %s %s\n", issueResp.Key, browseLink)
 	}

 	if opts.SaveFile != "" {
@@ -105,7 +106,7 @@ func CmdCreate(o *oreo.Client, globals *jiracli.GlobalOptions, opts *CreateOptio
 		defer fh.Close()
 		out, err := yaml.Marshal(map[string]string{
 			"issue": issueResp.Key,
-			"link":  fmt.Sprintf("%s/browse/%s", globals.Endpoint.Value, issueResp.Key),
+			"link":  browseLink,
 		})
 		if err != nil {
 			return err
@@ -3,8 +3,8 @@ 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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -60,14 +60,14 @@ func CmdDupUsage(cmd *kingpin.CmdClause, opts *DupOptions) error {
 	return nil
 }

-// CmdDups will update the given issue as being a duplicate by the given dup issue
+// CmdDup will update the given issue as being a duplicate by the given dup issue
 // and will attempt to resolve the dup issue
 func CmdDup(o *oreo.Client, globals *jiracli.GlobalOptions, opts *DupOptions) error {
 	if err := jira.LinkIssues(o, globals.Endpoint.Value, &opts.LinkIssueRequest); err != nil {
 		return err
 	}
 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.OutwardIssue.Key, globals.Endpoint.Value, opts.OutwardIssue.Key)
+		fmt.Printf("OK %s %s\n", opts.OutwardIssue.Key, jira.URLJoin(globals.Endpoint.Value, "browse", opts.OutwardIssue.Key))
 	}

 	meta, err := jira.GetIssueTransitions(o, globals.Endpoint.Value, opts.InwardIssue.Key)
@@ -76,34 +76,35 @@ func CmdDup(o *oreo.Client, globals *jiracli.GlobalOptions, opts *DupOptions) er
 	}
 	for _, trans := range []string{"close", "done", "cancel", "start", "stop"} {
 		transMeta := meta.Transitions.Find(trans)
-		if transMeta != nil {
-			issueUpdate := jiradata.IssueUpdate{
-				Transition: transMeta,
-			}
-			resolution := defaultResolution(transMeta)
-			if resolution != "" {
-				issueUpdate.Fields = map[string]interface{}{
-					"resolution": map[string]interface{}{
-						"name": resolution,
-					},
-				}
-			}
-			if err = jira.TransitionIssue(o, globals.Endpoint.Value, opts.InwardIssue.Key, &issueUpdate); err != nil {
-				return err
-			}
-			if trans != "start" {
-				break
-			}
-			// if we are here then we must be stopping, so need to reset the meta
-			meta, err = jira.GetIssueTransitions(o, globals.Endpoint.Value, opts.InwardIssue.Key)
-			if err != nil {
-				return err
+		if transMeta == nil {
+			continue
+		}
+		issueUpdate := jiradata.IssueUpdate{
+			Transition: transMeta,
+		}
+		resolution := defaultResolution(transMeta)
+		if resolution != "" {
+			issueUpdate.Fields = map[string]interface{}{
+				"resolution": map[string]interface{}{
+					"name": resolution,
+				},
 			}
 		}
+		if err = jira.TransitionIssue(o, globals.Endpoint.Value, opts.InwardIssue.Key, &issueUpdate); err != nil {
+			return err
+		}
+		if trans != "start" {
+			break
+		}
+		// if we are here then we must be stopping, so need to reset the meta
+		meta, err = jira.GetIssueTransitions(o, globals.Endpoint.Value, opts.InwardIssue.Key)
+		if err != nil {
+			return err
+		}
 	}

 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.InwardIssue.Key, globals.Endpoint.Value, opts.InwardIssue.Key)
+		fmt.Printf("OK %s %s\n", opts.InwardIssue.Key, jira.URLJoin(globals.Endpoint.Value, "browse", opts.InwardIssue.Key))
 	}

 	if opts.Browse.Value {
@@ -5,10 +5,10 @@ import (

 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
+	"gopkg.in/AlecAivazis/survey.v1"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -36,6 +36,9 @@ func CmdEditRegistry() *jiracli.CommandRegistryEntry {
 			return CmdEditUsage(cmd, &opts, fig)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.QueryFields == "" {
+				opts.QueryFields = "assignee,created,priority,reporter,status,summary,updated,issuetype,comment,description,votes,created,customfield_10110,components"
+			}
 			return CmdEdit(o, globals, &opts)
 		},
 	}
@@ -95,17 +98,18 @@ func CmdEdit(o *oreo.Client, globals *jiracli.GlobalOptions, opts *EditOptions)
 			return err
 		}
 		if !globals.Quiet.Value {
-			fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, globals.Endpoint.Value, opts.Issue)
+			fmt.Printf("OK %s %s\n", opts.Issue, jira.URLJoin(globals.Endpoint.Value, "browse", opts.Issue))
 		}
 		if opts.Browse.Value {
 			return CmdBrowse(globals, opts.Issue)
 		}
+		return nil
 	}
 	results, err := jira.Search(o, globals.Endpoint.Value, opts)
 	if err != nil {
 		return err
 	}
-	for _, issueData := range results.Issues {
+	for i, issueData := range results.Issues {
 		editMeta, err := jira.GetIssueEditMeta(o, globals.Endpoint.Value, issueData.Key)
 		if err != nil {
 			return err
@@ -113,17 +117,33 @@ 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)
 		})
+		if err == jiracli.EditLoopAbort && len(results.Issues) > i+1 {
+			var answer bool
+			survey.AskOne(
+				&survey.Confirm{
+					Message: fmt.Sprintf("Continue to edit next issue %s?", results.Issues[i+1].Key),
+					Default: true,
+				},
+				&answer,
+				nil,
+			)
+			if answer {
+				continue
+			}
+			panic(jiracli.Exit{1})
+		}
 		if err != nil {
 			return err
 		}
 		if !globals.Quiet.Value {
-			fmt.Printf("OK %s %s/browse/%s\n", issueData.Key, globals.Endpoint.Value, issueData.Key)
+			fmt.Printf("OK %s %s\n", issueData.Key, jira.URLJoin(globals.Endpoint.Value, "browse", issueData.Key))
 		}
 		if opts.Browse.Value {
 			return CmdBrowse(globals, issueData.Key)
@@ -3,8 +3,8 @@ 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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -41,7 +41,7 @@ func CmdEditMetaUsage(cmd *kingpin.CmdClause, opts *EditMetaOptions) error {
 	return nil
 }

-// EditMeta will get issue edit metadata and send to "editmeta" template
+// CmdEditMeta will get issue edit metadata and send to "editmeta" template
 func CmdEditMeta(o *oreo.Client, globals *jiracli.GlobalOptions, opts *EditMetaOptions) error {
 	editMeta, err := jira.GetIssueEditMeta(o, globals.Endpoint.Value, opts.Issue)
 	if err != nil {
@@ -0,0 +1,54 @@
+package jiracmd
+
+import (
+	"fmt"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/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\n", opts.Epic, jira.URLJoin(globals.Endpoint.Value, "browse", opts.Epic))
+		for _, issue := range opts.Issues {
+			fmt.Printf("OK %s %s\n", issue, jira.URLJoin(globals.Endpoint.Value, "browse", issue))
+		}
+	}
+
+	return nil
+}
@@ -0,0 +1,48 @@
+package jiracmd
+
+import (
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+
+	"github.com/go-jira/jira/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
+}
@@ -0,0 +1,58 @@
+package jiracmd
+
+import (
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/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)
+			return CmdEpicListUsage(cmd, &opts, fig)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			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 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)
+}
@@ -0,0 +1,51 @@
+package jiracmd
+
+import (
+	"fmt"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/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\n", issue, jira.URLJoin(globals.Endpoint.Value, "browse", issue))
+		}
+	}
+
+	return nil
+}
@@ -7,7 +7,7 @@ import (

 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -23,12 +23,12 @@ func CmdExportTemplatesRegistry() *jiracli.CommandRegistryEntry {
 		"Export templates for customizations",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.Dir == "" {
-				opts.Dir = fmt.Sprintf("%s/.jira.d/templates", jiracli.Homedir())
-			}
 			return CmdExportTemplatesUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.Dir == "" {
+				opts.Dir = fmt.Sprintf("%s/.jira.d/templates", jiracli.Homedir())
+			}
 			return CmdExportTemplates(globals, &opts)
 		},
 	}
@@ -3,8 +3,8 @@ 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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -54,7 +54,7 @@ func CmdIssueLinkUsage(cmd *kingpin.CmdClause, opts *IssueLinkOptions) error {
 	return nil
 }

-// CmdBlock will update the given issue as being a duplicate by the given dup issue
+// CmdIssueLink will update the given issue as being a duplicate by the given dup issue
 // and will attempt to resolve the dup issue
 func CmdIssueLink(o *oreo.Client, globals *jiracli.GlobalOptions, opts *IssueLinkOptions) error {
 	if err := jira.LinkIssues(o, globals.Endpoint.Value, &opts.LinkIssueRequest); err != nil {
@@ -62,8 +62,8 @@ func CmdIssueLink(o *oreo.Client, globals *jiracli.GlobalOptions, opts *IssueLin
 	}

 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.InwardIssue.Key, globals.Endpoint.Value, opts.InwardIssue.Key)
-		fmt.Printf("OK %s %s/browse/%s\n", opts.OutwardIssue.Key, globals.Endpoint.Value, opts.OutwardIssue.Key)
+		fmt.Printf("OK %s %s\n", opts.InwardIssue.Key, jira.URLJoin(globals.Endpoint.Value, "browse", opts.InwardIssue.Key))
+		fmt.Printf("OK %s %s\n", opts.OutwardIssue.Key, jira.URLJoin(globals.Endpoint.Value, "browse", opts.OutwardIssue.Key))
 	}

 	if opts.Browse.Value {
@@ -3,8 +3,8 @@ 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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -6,8 +6,8 @@ import (
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"

-	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -39,7 +39,7 @@ func CmdLabelsAddUsage(cmd *kingpin.CmdClause, opts *LabelsAddOptions) error {
 	return nil
 }

-// CmdLabels will add labels on a given issue
+// CmdLabelsAdd will add labels on a given issue
 func CmdLabelsAdd(o *oreo.Client, globals *jiracli.GlobalOptions, opts *LabelsAddOptions) error {
 	ops := jiradata.FieldOperations{}
 	for _, label := range opts.Labels {
@@ -57,7 +57,7 @@ func CmdLabelsAdd(o *oreo.Client, globals *jiracli.GlobalOptions, opts *LabelsAd
 		return err
 	}
 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, globals.Endpoint.Value, opts.Issue)
+		fmt.Printf("OK %s %s\n", opts.Issue, jira.URLJoin(globals.Endpoint.Value, "browse", opts.Issue))
 	}
 	if opts.Browse.Value {
 		return CmdBrowse(globals, opts.Issue)
@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -39,7 +39,7 @@ func CmdLabelsRemoveUsage(cmd *kingpin.CmdClause, opts *LabelsRemoveOptions) err
 	return nil
 }

-// CmdLabels will remove labels on a given issue
+// CmdLabelsRemove will remove labels on a given issue
 func CmdLabelsRemove(o *oreo.Client, globals *jiracli.GlobalOptions, opts *LabelsRemoveOptions) error {
 	ops := jiradata.FieldOperations{}
 	for _, label := range opts.Labels {
@@ -58,7 +58,7 @@ func CmdLabelsRemove(o *oreo.Client, globals *jiracli.GlobalOptions, opts *Label
 		return err
 	}
 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, globals.Endpoint.Value, opts.Issue)
+		fmt.Printf("OK %s %s\n", opts.Issue, jira.URLJoin(globals.Endpoint.Value, "browse", opts.Issue))
 	}
 	if opts.Browse.Value {
 		return CmdBrowse(globals, opts.Issue)
@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -39,7 +39,7 @@ func CmdLabelsSetUsage(cmd *kingpin.CmdClause, opts *LabelsSetOptions) error {
 	return nil
 }

-// CmdLabels will set labels on a given issue
+// CmdLabelsSet will set labels on a given issue
 func CmdLabelsSet(o *oreo.Client, globals *jiracli.GlobalOptions, opts *LabelsSetOptions) error {
 	issueUpdate := jiradata.IssueUpdate{
 		Update: jiradata.FieldOperationsMap{
@@ -55,7 +55,7 @@ func CmdLabelsSet(o *oreo.Client, globals *jiracli.GlobalOptions, opts *LabelsSe
 		return err
 	}
 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.Issue, globals.Endpoint.Value, opts.Issue)
+		fmt.Printf("OK %s %s\n", opts.Issue, jira.URLJoin(globals.Endpoint.Value, "browse", opts.Issue))
 	}
 	if opts.Browse.Value {
 		return CmdBrowse(globals, opts.Issue)
@@ -5,8 +5,8 @@ import (

 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -27,18 +27,15 @@ func CmdListRegistry() *jiracli.CommandRegistryEntry {
 		"Prints list of issues for given search criteria",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.MaxResults == 0 {
-				opts.MaxResults = 500
-			}
+			return CmdListUsage(cmd, &opts, fig)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
 			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, fig)
-		},
-		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
 			return CmdList(o, globals, &opts)
 		},
 	}
@@ -72,7 +69,7 @@ func CmdListUsage(cmd *kingpin.CmdClause, opts *ListOptions, fig *figtree.FigTre

 // List will query jira and send data to "list" template
 func CmdList(o *oreo.Client, globals *jiracli.GlobalOptions, opts *ListOptions) error {
-	data, err := jira.Search(o, globals.Endpoint.Value, opts)
+	data, err := jira.Search(o, globals.Endpoint.Value, opts, jira.WithAutoPagination())
 	if err != nil {
 		return err
 	}
@@ -6,9 +6,9 @@ import (

 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	"github.com/mgutz/ansi"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -46,6 +46,11 @@ func authCallback(req *http.Request, resp *http.Response) (*http.Response, error

 // CmdLogin will attempt to login into jira server
 func CmdLogin(o *oreo.Client, globals *jiracli.GlobalOptions, opts *jiracli.CommonOptions) error {
+	if globals.AuthMethod() == "api-token" {
+		log.Noticef("No need to login when using api-token authentication method")
+		return nil
+	}
+
 	ua := o.WithoutRedirect().WithRetries(0).WithoutCallbacks().WithPostCallback(authCallback)
 	for {
 		if session, err := jira.GetSession(o, globals.Endpoint.Value); err != nil {
@@ -2,19 +2,22 @@ package jiracmd

 import (
 	"fmt"
+	"os"

 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
 	"github.com/mgutz/ansi"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	"golang.org/x/crypto/ssh/terminal"
+	survey "gopkg.in/AlecAivazis/survey.v1"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

 func CmdLogoutRegistry() *jiracli.CommandRegistryEntry {
 	opts := jiracli.CommonOptions{}
 	return &jiracli.CommandRegistryEntry{
-		"Deactivate sesssion with Jira server",
+		"Deactivate session with Jira server",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
 			return nil
@@ -27,6 +30,28 @@ func CmdLogoutRegistry() *jiracli.CommandRegistryEntry {

 // CmdLogout will attempt to terminate an active Jira session
 func CmdLogout(o *oreo.Client, globals *jiracli.GlobalOptions, opts *jiracli.CommonOptions) error {
+	if globals.AuthMethod() == "api-token" {
+		log.Noticef("No need to logout when using api-token authentication method")
+		if globals.GetPass() != "" && terminal.IsTerminal(int(os.Stdin.Fd())) && terminal.IsTerminal(int(os.Stdout.Fd())) {
+			delete := false
+			err := survey.AskOne(
+				&survey.Confirm{
+					Message: fmt.Sprintf("Delete api-token from password provider [%s]: ", globals.PasswordSource),
+					Default: false,
+				},
+				&delete,
+				nil,
+			)
+			if err != nil {
+				log.Errorf("%s", err)
+				panic(jiracli.Exit{Code: 1})
+			}
+			if delete {
+				globals.SetPass("")
+			}
+		}
+		return nil
+	}
 	ua := o.WithoutRedirect().WithRetries(0).WithoutCallbacks()
 	err := jira.DeleteSession(ua, globals.Endpoint.Value)
 	if err == nil {
@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -59,8 +59,8 @@ func CmdRank(o *oreo.Client, globals *jiracli.GlobalOptions, opts *RankOptions)
 	}

 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", opts.First, globals.Endpoint.Value, opts.First)
-		fmt.Printf("OK %s %s/browse/%s\n", opts.Second, globals.Endpoint.Value, opts.Second)
+		fmt.Printf("OK %s %s\n", opts.First, jira.URLJoin(globals.Endpoint.Value, "browse", opts.First))
+		fmt.Printf("OK %s %s\n", opts.Second, jira.URLJoin(globals.Endpoint.Value, "browse", opts.Second))
 	}

 	if opts.Browse.Value {
@@ -0,0 +1,61 @@
+package jiracmd
+
+import "github.com/go-jira/jira/jiracli"
+
+func RegisterAllCommands() {
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "acknowledge", Entry: CmdTransitionRegistry("acknowledge"), Aliases: []string{"ack"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "assign", Entry: CmdAssignRegistry(), Aliases: []string{"give"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "attach create", Entry: CmdAttachCreateRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "attach get", Entry: CmdAttachGetRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "attach list", Entry: CmdAttachListRegistry(), Aliases: []string{"ls"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "attach remove", Entry: CmdAttachRemoveRegistry(), Aliases: []string{"rm"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "backlog", Entry: CmdTransitionRegistry("Backlog")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "block", Entry: CmdBlockRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "browse", Entry: CmdBrowseRegistry(), Aliases: []string{"b"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "close", Entry: CmdTransitionRegistry("close")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "comment", Entry: CmdCommentRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "component add", Entry: CmdComponentAddRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "components", Entry: CmdComponentsRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "create", Entry: CmdCreateRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "createmeta", Entry: CmdCreateMetaRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "done", Entry: CmdTransitionRegistry("Done")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "dup", Entry: CmdDupRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "edit", Entry: CmdEditRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "editmeta", Entry: CmdEditMetaRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "epic add", Entry: CmdEpicAddRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "epic create", Entry: CmdEpicCreateRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "epic list", Entry: CmdEpicListRegistry(), Aliases: []string{"ls"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "epic remove", Entry: CmdEpicRemoveRegistry(), Aliases: []string{"rm"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "export-templates", Entry: CmdExportTemplatesRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "fields", Entry: CmdFieldsRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "in-progress", Entry: CmdTransitionRegistry("Progress"), Aliases: []string{"prog", "progress"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "issuelink", Entry: CmdIssueLinkRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "issuelinktypes", Entry: CmdIssueLinkTypesRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "issuetypes", Entry: CmdIssueTypesRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "labels add", Entry: CmdLabelsAddRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "labels remove", Entry: CmdLabelsRemoveRegistry(), Aliases: []string{"rm"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "labels set", Entry: CmdLabelsSetRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "list", Entry: CmdListRegistry(), Aliases: []string{"ls"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "login", Entry: CmdLoginRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "logout", Entry: CmdLogoutRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "rank", Entry: CmdRankRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "reopen", Entry: CmdTransitionRegistry("reopen")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "request", Entry: CmdRequestRegistry(), Aliases: []string{"req"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "resolve", Entry: CmdTransitionRegistry("resolve")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "start", Entry: CmdTransitionRegistry("start")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "stop", Entry: CmdTransitionRegistry("stop")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "subtask", Entry: CmdSubtaskRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "take", Entry: CmdTakeRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "todo", Entry: CmdTransitionRegistry("To Do")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "transition", Entry: CmdTransitionRegistry(""), Aliases: []string{"trans"}})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "transitions", Entry: CmdTransitionsRegistry("transitions")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "transmeta", Entry: CmdTransitionsRegistry("debug")})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "unassign", Entry: CmdUnassignRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "unexport-templates", Entry: CmdUnexportTemplatesRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "view", Entry: CmdViewRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "vote", Entry: CmdVoteRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "watch", Entry: CmdWatchRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "worklog add", Entry: CmdWorklogAddRegistry()})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "worklog list", Entry: CmdWorklogListRegistry(), Default: true})
+	jiracli.RegisterCommand(jiracli.CommandRegistry{Command: "session", Entry: CmdSessionRegistry()})
+}
@@ -3,14 +3,13 @@ package jiracmd
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"strings"

 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"

-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -32,14 +31,14 @@ func CmdRequestRegistry() *jiracli.CommandRegistryEntry {
 		"Open issue in requestr",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			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 {
+			if opts.Method == "" {
+				opts.Method = "GET"
+			}
 			return CmdRequest(o, globals, &opts)
 		},
 	}
@@ -75,21 +74,9 @@ func CmdRequest(o *oreo.Client, globals *jiracli.GlobalOptions, opts *RequestOpt
 	}
 	defer resp.Body.Close()

-	content, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
-	if len(content) == 0 {
-		if !globals.Quiet.Value {
-			fmt.Println("No content in response")
-		}
-		return nil
-	}
 	var data interface{}
-	err = json.Unmarshal(content, &data)
-	if err != nil {
-		return fmt.Errorf("JSON Parse Error: %s from %q", err, content)
+	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
+		return fmt.Errorf("JSON Parse Error: %v", err)
 	}
-
 	return opts.PrintTemplate(&data)
 }
@@ -0,0 +1,47 @@
+package jiracmd
+
+import (
+	"fmt"
+
+	"github.com/coryb/figtree"
+	"github.com/coryb/oreo"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	yaml "gopkg.in/coryb/yaml.v2"
+)
+
+func CmdSessionRegistry() *jiracli.CommandRegistryEntry {
+	opts := jiracli.CommonOptions{}
+	return &jiracli.CommandRegistryEntry{
+		"Attempt to login into jira server",
+		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
+			jiracli.LoadConfigs(cmd, fig, &opts)
+			return nil
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			return CmdSession(o, globals, &opts)
+		},
+	}
+}
+
+// CmdSession will attempt to login into jira server
+func CmdSession(o *oreo.Client, globals *jiracli.GlobalOptions, opts *jiracli.CommonOptions) error {
+	ua := o.WithoutRedirect().WithRetries(0).WithoutPostCallbacks()
+	session, err := jira.GetSession(ua, globals.Endpoint.Value)
+	var output []byte
+	if err != nil {
+		defer panic(jiracli.Exit{1})
+		output, err = yaml.Marshal(err)
+		if err != nil {
+			return err
+		}
+	} else {
+		output, err = yaml.Marshal(session)
+		if err != nil {
+			return err
+		}
+	}
+	fmt.Print(string(output))
+	return nil
+}
@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/go-jira/jira"
+	"github.com/go-jira/jira/jiracli"
+	"github.com/go-jira/jira/jiradata"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -33,12 +33,12 @@ func CmdSubtaskRegistry() *jiracli.CommandRegistryEntry {
 		"Subtask issue",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.IssueType == "" {
-				opts.IssueType = "Sub-task"
-			}
 			return CmdSubtaskUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.IssueType == "" {
+				opts.IssueType = "Sub-task"
+			}
 			return CmdSubtask(o, globals, &opts)
 		},
 	}
@@ -108,7 +108,7 @@ func CmdSubtask(o *oreo.Client, globals *jiracli.GlobalOptions, opts *SubtaskOpt
 	}

 	if !globals.Quiet.Value {
-		fmt.Printf("OK %s %s/browse/%s\n", issueResp.Key, globals.Endpoint.Value, issueResp.Key)
+		fmt.Printf("OK %s %s\n", issueResp.Key, jira.URLJoin(globals.Endpoint.Value, "browse", issueResp.Key))
 	}

 	if opts.Browse.Value {
@@ -3,7 +3,7 @@ package jiracmd
 import (
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
-	"gopkg.in/Netflix-Skunkworks/go-jira.v1/jiracli"
+	"github.com/go-jira/jira/jiracli"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

@@ -17,7 +17,9 @@ func CmdTakeRegistry() *jiracli.CommandRegistryEntry {
 			return CmdAssignUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
-			opts.Assignee = globals.User.Value
+			if opts.Assignee == "" {
+				opts.Assignee = globals.User.Value
+			}
 			return CmdAssign(o, globals, &opts)
 		},
 	}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mike Pountney	ff12f26f81	version bump	2019-09-16 18:40:18 -07:00
Mike Pountney	7424ebc606	Updated Changelog	2019-09-16 18:40:18 -07:00
Mike Pountney	85de83a6e2	Updated Changelog	2019-09-16 18:36:52 -07:00
Cory Bennett	fc5be16ac6	update to more actively supported xgo for module support	2019-09-16 17:54:35 -07:00
Mike Pountney	000a923189	Merge pull request #275 from go-jira/remove_gopkg_in Migrate from gopkg.in to github.com, to support 'go mod' more cleanly	2019-09-16 15:08:34 -07:00
Mike Pountney	d5e4ce3df1	Add 1.13.x build test to travis	2019-09-16 14:42:29 -07:00
Mike Pountney	7320d4afef	resolve merge conflict in cmd/jira/main.go	2019-09-16 08:34:26 -07:00
Mike Pountney	3ecca6895d	Merge pull request #278 from go-jira/update-figtree [#277] update figtree to latest	2019-09-16 08:27:49 -07:00
Cory Bennett	0e520a49ae	[#277 ] update figtree to latest	2019-09-15 23:41:42 -07:00
Mike Pountney	27f57b2bbe	Switch over to using github.com/go-jira/jira, from gopkg.in There should be no reason to use gopkg.in versioned imports now that we're using go modules. I think, IANAE. gopkg.in kind of gets in the way of modules, as it only pulls over tagged releases from github.com -- this then means that you need to use go modules 'replace' syntax in the go.mod to use a non-versioned commit or branch. This is feasible, but kind of ugly. go modules defaults to pulling the latest version, so the default behavior is the same as when pulling go-jira.v1 from gopkg.in.	2019-09-14 21:31:11 -07:00
coryb	71aaa88b13	Merge pull request #276 from go-jira/fix_228 Fixes #228: make ':' gpg files temporary to fix go mod	2019-09-13 22:13:01 -07:00
Mike Pountney	52a577ea48	Fixes #228 : make ':' gpg files temporary to fix go mod	2019-09-13 21:38:25 -07:00
coryb	b8e73a5cb0	Merge pull request #266 from mbethke/fix-multiline-worklog-comment Fix worklog template for multiline comments	2019-07-05 11:43:48 -07:00
Matthias Bethke	43e07f1197	fix worklog template to allow multiline comments	2019-07-05 09:07:09 +02:00
coryb	957696bed8	Merge pull request #263 from kojustin/master Allow reading password from stdin	2019-06-05 14:24:50 -07:00
Justin Ko	225e1dcc05	Allow reading password from stdin Allow reading password from stdin in `jira login`. This is useful for combining the jira tool with other command-line utilities.	2019-06-05 14:08:09 -07:00
Cory Bennett	f1390760b4	add CODEOWNERS file	2019-05-28 17:31:23 -07:00
Daniel Martí	31c113d1ba	all: unindent some code	2019-05-28 11:01:51 +01:00
Daniel Martí	9bcdcc128f	don't use ReadAll when decoding JSON An empty stream isn't valid JSON, so we shouldn't silently ignore it.	2019-05-27 13:09:31 +01:00
Daniel Martí	098d963881	README: trim down the content This README is huge; the document shouldn't take more than two or three screens. If we need more docs, they should be linked to and live elsewhere. For now, start by removing unnecessary sections. Gitter has been completely unused since 2017, so remove it. The table of contents also takes a lot of vertical space, when we don't want to have that much content to begin with. Tips on forking are also unnecessary, since that's the same for all Go projects. Moreover, this is out of date now that the project is a Go module. Remove the help output, as that can be obtained extremely easily by just running 'jira -h'. Finally, remove the v0-v1 changes, as v0 was last released over three years ago. It's extremely unlikely that anyone still has to upgrade from the older version.	2019-05-27 13:08:36 +01:00
Daniel Martí	9b9186f7d4	start making staticcheck happier	2019-05-27 10:49:15 +01:00
Daniel Martí	f125ef3fa9	all: convert to a Go module And remove vendor/, as it's now unnecessary. go.sum ensures that dependencies aren't tampered with, and proxy.golang.org keeps copies of all the archives.	2019-05-26 23:40:16 +01:00
coryb	5cc009af4c	Merge pull request #253 from mvdan/module t: rename to _t to fix module support	2019-05-26 14:41:18 -07:00
Daniel Martí	d237e86cda	t: rename to _t to fix module support The following two files contain characters which aren't valid in source files within a Go module: t/.password-store/GoJira/api-token:gojira@corybennett.org.gpg t/.password-store/GoJira/api-token:mothra@corybennett.org.gpg The directory only contains test scripts, so it doesn't need to be included in the module. The simplest way to do that is to start the directory with an underscore. Fixes #228.	2019-05-26 22:34:24 +01:00
Daniel Martí	664c5cad24	CI: test on Go 1.12.x, cleanup We can also use the apt addon to install packages. We also don't need fast_finish, since we don't use allow_failures anywhere. Finally, the 'go get' line was pointless, as all dependencies are vendored, and 'go test' will catch build failures.	2019-05-26 21:34:53 +01:00
Cory Bennett	36c99ce040	make automatic pagination on search optional, fix tests	2019-05-25 17:06:03 -07:00
coryb	58a300422b	Merge pull request #240 from jgraglia/patch-1 API Token auth requires "user" config	2019-05-25 15:34:25 -07:00
coryb	eb90676bbc	Merge pull request #219 from kerhac/master docs: update pass documentation with password-name	2019-05-25 15:33:39 -07:00
coryb	d54a549d24	Merge pull request #236 from CodeLingoBot/rewrite Fix function comments based on best practices from Effective Go	2019-05-25 14:12:06 -07:00
Cory Bennett	3d00c294f4	add test for --limit	2019-05-25 14:10:18 -07:00
Cory Bennett	181bd74f1b	prefer defer resp.Body.Close to avoid leaks on subsequent errors	2019-05-25 14:09:48 -07:00
Cory Bennett	f6809e32f4	version bump	2019-05-25 14:09:12 -07:00
Cory Bennett	cbcac1755a	Updated Changelog	2019-05-25 14:09:12 -07:00
coryb	890b9aa724	Merge pull request #245 from justmiles/211 add pagination to search (closes #211)	2019-05-25 14:08:09 -07:00
Miles Maddox	76dd1d8982	add pagination to search	2019-04-21 07:33:17 -05:00
Julien Graglia	271289a3c9	API Token auth requires "user" config API Token authentication requires the `user ` to be defined in the config	2019-03-26 09:49:29 +01:00
Julian Swagemakers	d8189f0a01	docs: update pass documentation with password-name This will update the README.md to include setting the configuration option password-name when using pass.	2019-03-13 07:48:50 +01:00
CodeLingo Bot	23ac11872b	Fix function comments based on best practices from Effective Go Signed-off-by: CodeLingo Bot <bot@codelingo.io>	2019-02-28 21:20:03 +00:00
coryb	514c1491c7	Merge pull request #220 from ejsuncy/master docs: Fix grammar typos (#1)	2018-11-29 19:52:02 -08:00
Dan Bunker	9258d4df15	Fix grammar typos (#1 )	2018-11-29 11:20:55 -07:00
Cory Bennett	ee69afadd0	[#201 ] update required library, failing to populate cookiejar from cookies file	2018-08-04 14:20:03 -07:00
Cory Bennett	a87bdf4038	version bump	2018-08-02 23:07:00 -07:00
Cory Bennett	68c2588153	Updated Changelog	2018-08-02 23:07:00 -07:00
Cory Bennett	0cba806942	[#199 ] [#198 ] update http client library, fix issues with internal login retries	2018-08-02 23:05:01 -07:00
Cory Bennett	df9dbe65b4	update amp in pom, prevents dumb prompt at jira startup	2018-08-02 23:05:01 -07:00
coryb	492754f059	Merge pull request #197 from kojiromike/spellcheck Fix Spelling	2018-07-30 08:32:49 -07:00
Michael A. Smith	97d8c5f6e0	Fix Spelling	2018-07-30 09:20:04 -04:00
Cory Bennett	1e619ea690	version bump	2018-07-29 14:56:46 -07:00
Cory Bennett	b7d8a9c324	Updated Changelog	2018-07-29 14:56:46 -07:00
Cory Bennett	8b717de870	Updated Usage	2018-07-29 14:56:46 -07:00
Cory Bennett	f5921077ca	[#196 ] add `jira session` command to show session information if user is authenticated	2018-07-29 14:54:21 -07:00
Cory Bennett	c9a4e30606	[#192 ] fix template usage for 'fixVersions' in transition template	2018-07-29 13:24:19 -07:00
Cory Bennett	ef9b731bac	move HandleExit to the jiracli package	2018-07-28 17:21:18 -07:00
Cory Bennett	62303ed81b	add missing vendored files	2018-07-28 16:55:36 -07:00
Cory Bennett	7191c7751b	they broke golang.org/x/net: ERROR: vendor/golang.org/x/net/proxy/socks5.go:11:2: use of internal package not allowed	2018-07-28 16:41:16 -07:00
Cory Bennett	d16bcc2f51	udpate deps	2018-07-28 16:29:51 -07:00
Cory Bennett	07ba74b34a	udpate for figtree api changes	2018-07-28 15:50:13 -07:00
Cory Bennett	462ef1c485	udpate to use latest dep, update figtree	2018-07-28 15:49:57 -07:00
Cory Bennett	eead13aef1	Merge branch 'pr/171'	2018-05-25 21:52:44 -07:00
Cory Bennett	213a7e04af	[#171 ] change proposed PasswordPath to PasswordName	2018-05-25 21:50:28 -07:00
Cory Bennett	49e44670d9	fix usage generation after #178	2018-05-24 00:23:29 -07:00
Cory Bennett	5503e53168	Updated Changelog	2018-05-24 00:23:15 -07:00
Cory Bennett	9ebd2cd64e	fix IsTerminal usage for windows	2018-05-24 00:23:15 -07:00
Cory Bennett	84b6155b0d	version bump	2018-05-24 00:23:15 -07:00
Cory Bennett	c23ad75957	Updated Changelog	2018-05-24 00:23:15 -07:00
coryb	3c478004d2	Merge pull request #178 from vergenzt/patch-1 Move usage info higher up in readme	2018-05-24 00:22:51 -07:00
Tim Vergenz	ed42ef920a	Move usage info higher up in readme It was frustrating wading through the whole readme when all I was trying to figure out was what typical usage looks like to decide whether this project is what I'm looking for. :) Putting basic usage sooner would have helped.	2018-05-14 10:35:11 -07:00
dvogt23	fa01ff5c46	add pass path to config	2018-04-27 12:09:53 +02:00
Cory Bennett	b98da3612d	Updated Changelog	2018-04-15 19:21:10 -07:00
Cory Bennett	7f9595cf15	fix IsTerminal usage for windows	2018-04-15 19:10:29 -07:00
Cory Bennett	09584981b6	version bump	2018-04-15 17:55:00 -07:00
Cory Bennett	1bc6b55b85	Updated Changelog	2018-04-15 17:55:00 -07:00
Cory Bennett	d787ac030c	[#166 ] fix issue when editing templates specified with full path	2018-04-15 17:40:22 -07:00
Cory Bennett	09a61c3ea1	only prompt on logout if stdin and stdout are terminals	2018-04-15 17:15:48 -07:00
Cory Bennett	64ce3812a6	only prompt on logout if stdin is an active terminal	2018-04-15 17:07:01 -07:00
Cory Bennett	9146346e2f	[#163 ] fix url path join logic	2018-04-15 16:56:09 -07:00
Cory Bennett	e639cce9af	[#160 ] prompt when api-token is invalid to get new token	2018-04-15 15:30:30 -07:00
Cory Bennett	06b26c9e00	[#157 ] add `password-directory: path` to allow overriding PASSWORD_STORE_DIR from configs	2018-04-15 13:56:37 -07:00
coryb	ac39f9ae1d	Merge pull request #161 from vanniktech/patch-1 Add syntax highlighting to YAML blocks in README	2018-04-03 09:28:36 -07:00
Cory Bennett	bd3cf994b8	[#160 ] allow `jira logout` to delete your api-token from keychain	2018-04-03 09:21:52 -07:00
Niklas Baudy	91059b3578	Add syntax highlighting to YAML blocks in README	2018-04-03 17:45:39 +02:00
Cory Bennett	4b9873b323	version bump	2018-04-01 12:04:52 -07:00
Cory Bennett	cd106df78a	Updated Changelog	2018-04-01 12:04:52 -07:00
Cory Bennett	50b5360cfe	Updated Usage	2018-04-01 12:04:52 -07:00
Cory Bennett	359bec2fdf	[#159 ] fix `slice bounds out of range` error in `abbrev` template function	2018-04-01 11:47:23 -07:00
Cory Bennett	79c83f6911	[#158 ] always print usage to stdout	2018-04-01 11:31:09 -07:00
coryb	585382eaea	Merge pull request #150 from catskul/parameterized-go-makefile make it easier to compile with aribtrary version of go via GO env var	2018-03-08 14:15:11 -08:00
Cory Bennett	9c818d427c	use latest xgo since the project has been updated again	2018-03-08 13:54:04 -08:00
Cory Bennett	8621d9e698	version bump	2018-03-08 13:54:04 -08:00
Cory Bennett	5610707c30	Updated Changelog	2018-03-08 13:54:04 -08:00
Cory Bennett	0b4e16a35d	Updated Usage	2018-03-08 13:54:04 -08:00
coryb	57bc97a378	Merge pull request #153 from catskul/document-shell-completion Document shell completion	2018-03-08 13:48:56 -08:00
Andrew Somerville	2d02cf8132	fix md link	2018-03-08 16:47:25 -05:00
coryb	18a687e78a	Merge pull request #152 from catskul/fix-missing-priority prevent crash if priority is not set	2018-03-08 13:47:02 -08:00
Andrew Somerville	5d058536d2	Add in a stanza to the Usage section about tab completion	2018-03-08 16:38:36 -05:00
Cory Bennett	d4153be0ec	fix toc	2018-03-08 11:39:41 -08:00
Cory Bennett	edb06621f8	[#148 ] [#149 ] add support for api token based authentication	2018-03-08 10:58:04 -08:00
coryb	161a68920d	Merge pull request #151 from catskul/build-instructions more explicit build instructions for newbies	2018-03-07 17:11:39 -08:00
Andrew Somerville	fd30bc1392	prevent crash if priority is not set	2018-03-07 16:59:47 -05:00
Andrew Somerville	84f77be87c	Add some text for newbies on handling forking and the difficulty of fully qualified import paths	2018-03-07 16:34:38 -05:00
Andrew Somerville	dea794f037	make it easier to compile with aribtrary version of go via GO env var	2018-03-07 15:59:40 -05:00
Cory Bennett	43ebc846b1	refactor to simplify main	2018-03-06 22:36:32 -08:00
Cory Bennett	0d7c1a7931	refactor to simplify main	2018-03-06 22:34:49 -08:00
Cory Bennett	80325a5955	[#145 ] fix to match AuthProvider interface	2018-02-21 20:16:12 -08:00
Cory Bennett	20a9666fcd	[#141 ] better handling in responseError for non-json error responses	2018-02-11 16:46:25 -08:00
coryb	4ae760f18f	Merge pull request #142 from anthonyrisinger/patch-1 Update unexportTemplates.go	2018-01-19 12:40:13 -08:00
C Anthony Risinger	6da9974380	Update unexportTemplates.go Logic error, `-d` can be set but was never used.	2018-01-19 13:29:21 -06:00
Cory Bennett	8c7ca383f6	[#139 ] add shellquote and toMinJson template functions	2018-01-07 10:49:00 -08:00
Cory Bennett	425fa63d33	[#137 ] update kingpeon dep to allow access to dynamic command structure	2018-01-06 17:18:34 -08:00
Cory Bennett	464742c9ba	field name is "comment" not "comments"	2017-12-13 11:09:25 -08:00
Cory Bennett	7fbd87289f	version bump	2017-11-04 15:32:40 -07:00
Cory Bennett	d400b58019	Updated Changelog	2017-11-04 15:32:40 -07:00
Cory Bennett	d4a3af862d	Updated Usage	2017-11-04 15:32:40 -07:00
Cory Bennett	042bc48649	[#131 ] fix parsing global options before command execution (allow unixproxy/socksproxy to be set in config.yml)	2017-11-04 15:26:27 -07:00
Cory Bennett	a2e36e808a	add/update deps	2017-11-04 15:25:51 -07:00
Cory Bennett	84bd64a188	update	2017-11-02 15:02:17 -07:00
coryb	efbd1dd96d	Merge pull request #130 from onionjake/master add support for using socks proxy	2017-11-02 13:45:03 -07:00
onionjake	ff985f910b	add support for using socks proxy	2017-11-02 14:30:19 -06:00
Cory Bennett	9597f9b56f	fix transition comman	2017-10-28 14:46:50 -07:00
Cory Bennett	66c069e3b4	version bump	2017-10-28 14:26:38 -07:00
Cory Bennett	14189c197b	Updated Changelog	2017-10-28 14:26:38 -07:00
Cory Bennett	c9b5054cde	fix default values to load after parsing configs	2017-10-28 14:23:27 -07:00
coryb	f23b1c4370	Merge pull request #126 from schorsch3000/master Add regexReplace template function	2017-10-28 14:07:25 -07:00
Cory Bennett	6c742dad0a	ignore "composite literal uses unkeyed fields" vet checks	2017-10-28 12:42:48 -07:00
Cory Bennett	3966defc53	add test to make sure IssueType.Fields does not disappear on regeneration	2017-10-28 12:28:25 -07:00
Cory Bennett	794f8dd259	Merge branch 'thedillonb-fix-missing-fields'	2017-10-28 12:21:37 -07:00
Cory Bennett	41d1a7c9a1	add tests for validating changes to auto-generated jiradata files	2017-10-28 12:21:07 -07:00
Brian Lachniet	90007771bf	Fix typo in 'logout' command help	2017-10-28 12:21:07 -07:00
Mark Harrison	7bfa241547	Add URL escaping to an additional issuetype call In #34 a fix was made to escape the issue type to support issue types with spaces in. This is an additional place where the issue type needs escaping, otherwise you get 400 Bad Request when trying to create an issue for an issuetype that has a space in.	2017-10-28 12:21:07 -07:00
Ivan Andrus	e6600cf1a5	Add --resolution option	2017-10-28 12:21:07 -07:00
Cory Bennett	2e608207cb	add tests for validating changes to auto-generated jiradata files	2017-10-28 12:19:36 -07:00
coryb	bc1b994019	Merge pull request #129 from blachniet/logout-help-typo-fix Fix typo in 'logout' command help	2017-10-28 09:21:15 -07:00
Brian Lachniet	fd399d817e	Fix typo in 'logout' command help	2017-10-28 11:04:02 -04:00
coryb	f7b587ee91	Merge pull request #124 from gvol/master Allow overriding resolution	2017-10-27 12:08:36 -07:00
coryb	de69971c1c	Merge pull request #128 from mivok/escape-issuetype Add URL escaping to an additional issuetype call	2017-10-26 13:53:08 -07:00
Mark Harrison	2f9b8bb5c1	Add URL escaping to an additional issuetype call In #34 a fix was made to escape the issue type to support issue types with spaces in. This is an additional place where the issue type needs escaping, otherwise you get 400 Bad Request when trying to create an issue for an issuetype that has a space in.	2017-10-26 16:28:41 -04:00
Dillon Buchanan	093c510ca2	Create Metadata Not Populated Correctly Fixes #123	2017-10-25 14:28:49 -04:00
Dirk Heilig	d3e294e1ce	add regexReplace template function	2017-10-19 14:58:11 +02:00
Ivan Andrus	4ed8edbd19	Add --resolution option	2017-10-13 12:22:12 -06:00
Cory Bennett	28d92eb659	version bump	2017-10-04 10:58:50 -04:00
Cory Bennett	d16db04e58	Updated Changelog	2017-10-04 10:58:49 -04:00
Cory Bennett	4d74554300	add `{{env.VARNAME}}` template support to allow use of env vars	2017-10-03 18:47:33 -04:00
Cory Bennett	172793ea69	version bump	2017-09-26 22:50:54 -07:00
Cory Bennett	dc504de271	Updated Changelog	2017-09-26 22:50:54 -07:00
Cory Bennett	986cc78ed5	[#115 ] fix transition template for description	2017-09-26 22:49:40 -07:00
Cory Bennett	3913726991	update edit command to set queryFields on search to match what is used in template	2017-09-19 00:27:11 -07:00
Cory Bennett	0ba8aa035b	fix edit with query loop, allow continuation when not submitting previous issue	2017-09-18 14:45:21 -07:00
Cory Bennett	098eb99ed6	fix edit when priority is not set	2017-09-18 14:45:04 -07:00
Cory Bennett	2ddaed2c29	flatten CommandRegistry list to make it more readable	2017-09-18 14:44:36 -07:00
Cory Bennett	9a62d1a553	tweak format	2017-09-18 00:53:57 -07:00
Cory Bennett	74d7287589	fix formatting	2017-09-18 00:50:49 -07:00
Cory Bennett	c6e4b3dc0e	add TOC	2017-09-18 00:49:34 -07:00
Cory Bennett	8b5e7b7568	fix usage	2017-09-18 00:47:35 -07:00
Cory Bennett	4dea068113	version bump	2017-09-18 00:44:55 -07:00
Cory Bennett	28e4554fe3	Updated Changelog	2017-09-18 00:44:55 -07:00
Cory Bennett	065f9c8d77	Updated Usage	2017-09-18 00:44:55 -07:00
Cory Bennett	9f433acaa0	clean up usage formatting, print aliases	2017-09-18 00:44:08 -07:00
Cory Bennett	e4c10be811	add `jira edit` tests	2017-09-17 20:33:40 -07:00
Cory Bennett	4c6b36c83a	fix edit	2017-09-17 20:32:50 -07:00
Cory Bennett	a8eaa97de1	fix named query template expansion	2017-09-17 20:31:14 -07:00
Cory Bennett	cd3cfd820f	fix usage message	2017-09-17 20:30:44 -07:00
Cory Bennett	a04c3a4c61	add test using named query	2017-09-17 18:11:57 -07:00
Cory Bennett	bb66e58dfd	use svg rather than png for godoc badge	2017-09-17 16:36:22 -07:00
Cory Bennett	e21f18e987	Updated Changelog	2017-09-17 16:30:41 -07:00
Cory Bennett	96bbbd7ce3	fix table tests for issuetype addition	2017-09-17 16:15:28 -07:00
Cory Bennett	3e8b9bd9f5	need issuetype to use the default list table template now	2017-09-17 16:15:00 -07:00
Cory Bennett	8fe0d98d54	version bump	2017-09-17 15:53:46 -07:00
Cory Bennett	1a3eaf340c	Updated Changelog	2017-09-17 15:53:46 -07:00
Cory Bennett	96b4658dcb	fix logic for detecting changes in README.md	2017-09-17 15:53:30 -07:00
Cory Bennett	c9d8dfbe55	[#102 ] add issuetype into the default queryfields and add it to the default `table` list template	2017-09-17 15:49:05 -07:00
Cory Bennett	238e16fc09	version bump	2017-09-17 15:38:25 -07:00
Cory Bennett	22a354ce42	Updated Changelog	2017-09-17 15:38:24 -07:00
Cory Bennett	d9736919bb	Updated Usage	2017-09-17 15:38:24 -07:00
Cory Bennett	3c16e1754a	fix whitespace, `--help-long` always returns non-zero exit	2017-09-17 15:38:16 -07:00
Cory Bennett	650bc4b50d	fix whitespace	2017-09-17 15:33:10 -07:00
Cory Bennett	b1c9bf5ae5	automatically update usage in README.md	2017-09-17 15:32:24 -07:00
Cory Bennett	66eb7bff38	[#100 ] add support for posting, fetching, listing and removing attachments	2017-09-17 15:18:06 -07:00
Cory Bennett	abc82b909e	version bump	2017-09-15 00:33:12 -07:00
Cory Bennett	dabf4cf034	Updated Changelog	2017-09-15 00:33:12 -07:00
Cory Bennett	79a6381307	update usage	2017-09-15 00:31:43 -07:00
Cory Bennett	893454fc69	[#87 ] add various commands for interacting with epics	2017-09-15 00:28:56 -07:00
Cory Bennett	d5b9631cf4	make test less error prone	2017-09-13 13:38:55 -07:00