Updated Changelog

Merge pull request #74 from clausb/BrowseOnWindows
Implement "browse" subcommand on Windows
2026-05-19 20:53:27 +02:00 · 2017-03-22 22:25:25 -07:00 · 2017-03-22 22:24:50 -07:00 · 2017-03-22 22:36:21 +01:00 · 2017-02-26 22:58:28 -08:00 · 2017-02-26 22:38:47 -08:00
59 changed files with 7549 additions and 1338 deletions
@@ -5,3 +5,11 @@ src/github.com/docopt/
 src/github.com/mgutz/
 src/github.com/op/
 src/gopkg.in/
+jira
+jira.exe
+schemas/*.json
+t/issue.props
+t/.jira.d/templates
+dist/
+src/
+t/.maven-cache
@@ -0,0 +1,17 @@
+sudo: true
+before_install:
+    - sudo apt-get update && sudo apt-get install -y pass gnupg
+
+language: go
+
+go:
+  - 1.6
+
+matrix:
+  fast_finish: true
+  
+script:
+  - make vet
+  - make lint
+  - make
+  - make prove 2>&1 
@@ -1,5 +1,128 @@
 # Changelog

+## 0.1.12 - 2017-03-22
+
+* Implement "browse" subcommand on Windows [Claus Brod] [[ca333d8](https://github.com/Netflix-Skunkworks/go-jira/commit/ca333d8)]
+
+## 0.1.11 - 2017-02-26
+
+* [[#69](https://github.com/Netflix-Skunkworks/go-jira/issues/69)] add subtask command [Cory Bennett] [[21a2ed5](https://github.com/Netflix-Skunkworks/go-jira/commit/21a2ed5)]
+
+## 0.1.10 - 2017-02-08
+
+* set GPG_TTY in .bashrc [Cory Bennett] [[b1e552f](https://github.com/Netflix-Skunkworks/go-jira/commit/b1e552f)]
+* force password in case password already exists [Cory Bennett] [[d5a2c3b](https://github.com/Netflix-Skunkworks/go-jira/commit/d5a2c3b)]
+* refactor password source, allow for "pass" to be used, update tests to use `password-source: pass` [Cory Bennett] [[5a71939](https://github.com/Netflix-Skunkworks/go-jira/commit/5a71939)]
+
+## 0.1.9 - 2016-12-18
+
+* only warn about needing login when not already running the login command [Cory Bennett] [[6c24e55](https://github.com/Netflix-Skunkworks/go-jira/commit/6c24e55)]
+* fix(http): Add proxy transport [William Hearn] [[4bd740b](https://github.com/Netflix-Skunkworks/go-jira/commit/4bd740b)] [[2dff6c9](https://github.com/Netflix-Skunkworks/go-jira/commit/2dff6c9)]
+
+## 0.1.8 - 2016-11-24
+
+* [[#12](https://github.com/Netflix-Skunkworks/go-jira/issues/12)] integrate with keyring for password storage and provide http basic auth credentials for every request since most jira services have websudo enabled with does not allow cookie based authentication [Cory Bennett] [[b8a6e57](https://github.com/Netflix-Skunkworks/go-jira/commit/b8a6e57)]
+* Cleaning up usage [Jay Shirley] [[8add52b](https://github.com/Netflix-Skunkworks/go-jira/commit/8add52b)]
+* Update usage [Jay Shirley] [[b56e32a](https://github.com/Netflix-Skunkworks/go-jira/commit/b56e32a)]
+* use gopkg.in for links to maintain version compatibility [Cory Bennett] [[1414d1f](https://github.com/Netflix-Skunkworks/go-jira/commit/1414d1f)]
+* golint [Cory Bennett] [[44cdebf](https://github.com/Netflix-Skunkworks/go-jira/commit/44cdebf)]
+* add "rank" command allow ordering backlog issues in agile projects [Cory Bennett] [[e4cc9c6](https://github.com/Netflix-Skunkworks/go-jira/commit/e4cc9c6)]
+* Adding a unixproxy mechanism [Jay Shirley] [[5b9c0dd](https://github.com/Netflix-Skunkworks/go-jira/commit/5b9c0dd)]
+
+## 0.1.7 - 2016-08-24
+
+* Prefer transition names which match exactly [Don Brower] [[e40f9c1](https://github.com/Netflix-Skunkworks/go-jira/commit/e40f9c1)]
+* update tempates to make them more readable with space trimming added to go-1.6 [Cory Bennett] [[693b3e4](https://github.com/Netflix-Skunkworks/go-jira/commit/693b3e4)]
+
+## 0.1.6 - 2016-08-21
+
+* make "worklogs" command print output through template allow "add worklog" command to open edit template [Cory Bennett] [[cc3fbee](https://github.com/Netflix-Skunkworks/go-jira/commit/cc3fbee)]
+* remove extra newline at end of worklogs template [Cory Bennett] [[d08ef15](https://github.com/Netflix-Skunkworks/go-jira/commit/d08ef15)]
+* adding worklog related templates [Cory Bennett] [[ab1cd27](https://github.com/Netflix-Skunkworks/go-jira/commit/ab1cd27)]
+
+## 0.1.5 - 2016-08-21
+
+* update for golint [Cory Bennett] [[5a4e17c](https://github.com/Netflix-Skunkworks/go-jira/commit/5a4e17c)]
+* fix for go vet [Cory Bennett] [[355fb42](https://github.com/Netflix-Skunkworks/go-jira/commit/355fb42)]
+
+## 0.1.4 - 2016-08-12
+
+* when running "dups" on a Process Management Project type, you have to start/stop the task to resolve it [Cory Bennett] [[2c91905](https://github.com/Netflix-Skunkworks/go-jira/commit/2c91905)]
+* allow for defaultResolution option for transition command [Cory Bennett] [[a328c2d](https://github.com/Netflix-Skunkworks/go-jira/commit/a328c2d)]
+* add "backlog" command for Kanban related Issues [Cory Bennett] [[5d39b23](https://github.com/Netflix-Skunkworks/go-jira/commit/5d39b23)]
+* fix --noedit flag with "dups" command [Cory Bennett] [[37c07fa](https://github.com/Netflix-Skunkworks/go-jira/commit/37c07fa)]
+* add "votes" and "labels" to default view template [Cory Bennett] [[6f73b8c](https://github.com/Netflix-Skunkworks/go-jira/commit/6f73b8c)]
+* add "blockerType" config param, for issueLinkType use for "blocks" command [Cory Bennett] [[30fd301](https://github.com/Netflix-Skunkworks/go-jira/commit/30fd301)]
+* update gitter room [Cory Bennett] [[4b822b1](https://github.com/Netflix-Skunkworks/go-jira/commit/4b822b1)]
+* default issuetype to "Bug" for project that have Bug, otherwise try "Task" [Cory Bennett] [[0c807b4](https://github.com/Netflix-Skunkworks/go-jira/commit/0c807b4)]
+* make view template only show fields that have values [Cory Bennett] [[8238fe8](https://github.com/Netflix-Skunkworks/go-jira/commit/8238fe8)]
+* make default create template only display fields if they are valid fields for the project [Cory Bennett] [[adc2ace](https://github.com/Netflix-Skunkworks/go-jira/commit/adc2ace)]
+* ignore empty json fields when processing templates [Cory Bennett] [[f5f3e28](https://github.com/Netflix-Skunkworks/go-jira/commit/f5f3e28)]
+* allow JIRA_LOG_FORMAT env variable to control log output format [Cory Bennett] [[469def0](https://github.com/Netflix-Skunkworks/go-jira/commit/469def0)]
+* remove extraneous debug [Cory Bennett] [[752a94d](https://github.com/Netflix-Skunkworks/go-jira/commit/752a94d)]
+* add logout command modify password prompt to echo masked password [Cory Bennett] [[8ad91be](https://github.com/Netflix-Skunkworks/go-jira/commit/8ad91be)]
+* tweak cookies to store hostname dump all http request/response with --verbose [Cory Bennett] [[f93fe79](https://github.com/Netflix-Skunkworks/go-jira/commit/f93fe79)]
+* load configs in order of closest to cwd (/etc/go-jira.yml is last) [Cory Bennett] [[f54267b](https://github.com/Netflix-Skunkworks/go-jira/commit/f54267b)]
+
+## 0.1.3 - 2016-07-30
+
+* [[#43](https://github.com/Netflix-Skunkworks/go-jira/issues/43)] add support for jira done|todo|prog commands [Cory Bennett] [[dd7d1cc](https://github.com/Netflix-Skunkworks/go-jira/commit/dd7d1cc)]
+* Reporter is not generally editable. [Mike Pountney] [[a637b43](https://github.com/Netflix-Skunkworks/go-jira/commit/a637b43)]
+
+## 0.1.2 - 2016-06-29
+
+* [[#44](https://github.com/Netflix-Skunkworks/go-jira/issues/44)] Close tmpfile before rename to work around "The process cannot access the file because it is being used by another process" error on windows. [Cory Bennett] [[0980f8e](https://github.com/Netflix-Skunkworks/go-jira/commit/0980f8e)]
+
+## 0.1.1 - 2016-06-28
+
+* use USERPROFILE instead of HOME for windows, rework paths to use filepath.Join for better cross platform support [Cory Bennett] [[adcedc4](https://github.com/Netflix-Skunkworks/go-jira/commit/adcedc4)]
+* Include templates from a system path [Mike Pountney] [[cf10f53](https://github.com/Netflix-Skunkworks/go-jira/commit/cf10f53)]
+* Added support for the ```expand``` option for Issues [tobyjoe] [[fb4afc9](https://github.com/Netflix-Skunkworks/go-jira/commit/fb4afc9)]
+* change for api changes to go-logging [Cory Bennett] [[7bfc6e8](https://github.com/Netflix-Skunkworks/go-jira/commit/7bfc6e8)]
+* Fix issuetype calls adding URL escaping [Jonathan Wright] [[e4a25e2](https://github.com/Netflix-Skunkworks/go-jira/commit/e4a25e2)]
+
+## 0.1.0 - 2016-01-29
+
+* Fixes [#32](https://github.com/Netflix-Skunkworks/go-jira/issues/32) - make path to cookieFile if it's not present [Mike Pountney] [[6644579](https://github.com/Netflix-Skunkworks/go-jira/commit/6644579)]
+* Add component/components support: add and list for now. [Mike Pountney] [[d7b3226](https://github.com/Netflix-Skunkworks/go-jira/commit/d7b3226)]
+* Tweak the CmdWatch contract and add watcher remove support [Mike Pountney] [[383847a](https://github.com/Netflix-Skunkworks/go-jira/commit/383847a)]
+* Amend vote/unvote to be vote/vote --down [Mike Pountney] [[797edef](https://github.com/Netflix-Skunkworks/go-jira/commit/797edef)]
+* Add 'vote' and 'unvote' [Mike Pountney] [[c95e66e](https://github.com/Netflix-Skunkworks/go-jira/commit/c95e66e)]
+
+## 0.0.20 - 2016-01-21
+
+* [issue [#28](https://github.com/Netflix-Skunkworks/go-jira/issues/28)] check to make sure we got back issuetypes for create metadata [Cory Bennett] [[ee0e780](https://github.com/Netflix-Skunkworks/go-jira/commit/ee0e780)]
+* Add insecure option for TLS endpoints [Brian Lalor] [[6a88bb9](https://github.com/Netflix-Skunkworks/go-jira/commit/6a88bb9)]
+* Correct naming of parameter: set/add/remove are actions. [Mike Pountney] [[303784f](https://github.com/Netflix-Skunkworks/go-jira/commit/303784f)]
+* Tweak CmdLabels args so that magic happens with CLI [Mike Pountney] [[40a7c65](https://github.com/Netflix-Skunkworks/go-jira/commit/40a7c65)]
+* Expose ViewTicket as per FindIssues [Mike Pountney] [[8977f3d](https://github.com/Netflix-Skunkworks/go-jira/commit/8977f3d)]
+* Add exposed versions of getTemplate and runTemplate [Mike Pountney] [[da6cbd5](https://github.com/Netflix-Skunkworks/go-jira/commit/da6cbd5)]
+* Add 'labels' command to set/add/remove labels [Mike Pountney] [[230b52d](https://github.com/Netflix-Skunkworks/go-jira/commit/230b52d)]
+* Add a 'join' func to the template engine [Mike Pountney] [[a7820fe](https://github.com/Netflix-Skunkworks/go-jira/commit/a7820fe)]
+* make "jira" golang package, move code from jira/cli to root, move jira/main.go to main/main.go [Cory Bennett] [[7268b9e](https://github.com/Netflix-Skunkworks/go-jira/commit/7268b9e)]
+
+## 0.0.19 - 2015-12-09
+
+* fix jira trans TRANS ISSUE (case sensitivity issue), also go fmt [Cory Bennett] [[3c30f3b](https://github.com/Netflix-Skunkworks/go-jira/commit/3c30f3b)]
+
+## 0.0.18 - 2015-12-03
+
+* need to default "quiet" to false [Cory Bennett] [[4f4a89b](https://github.com/Netflix-Skunkworks/go-jira/commit/4f4a89b)]
+
+## 0.0.17 - 2015-12-03
+
+* add --quiet command to not print the OK .. add --saveFile option to print the issue/link to a file on create command [Cory Bennett] [[c9ac162](https://github.com/Netflix-Skunkworks/go-jira/commit/c9ac162)]
+* fix overrides [Cory Bennett] [[eaddfe6](https://github.com/Netflix-Skunkworks/go-jira/commit/eaddfe6)]
+* add abstract request wrapper to allow you to access/process random apis supported by Jira but not yet supported by go-jira [Cory Bennett] [[90ef56a](https://github.com/Netflix-Skunkworks/go-jira/commit/90ef56a)]
+
+## 0.0.16 - 2015-11-23
+
+* jira edit should not require one arguemnt (allow for --query) [Cory Bennett] [[a1eb4a1](https://github.com/Netflix-Skunkworks/go-jira/commit/a1eb4a1)]
+
+## 0.0.15 - 2015-11-23
+
+* [[#17](https://github.com/Netflix-Skunkworks/go-jira/issues/17)] print usage on missing arguments [Cory Bennett] [[fd2a2fe](https://github.com/Netflix-Skunkworks/go-jira/commit/fd2a2fe)]
+
 ## 0.0.14 - 2015-11-17

 * s/enpoint/endpoint/g [Oliver Schrenk] [[c5d251d](https://github.com/Netflix-Skunkworks/go-jira/commit/c5d251d)]
@@ -1,73 +1,132 @@
 PLATFORMS= \
-	freebsd-386 \
-	freebsd-amd64 \
-	freebsd-arm \
-	linux-386 \
-	linux-amd64 \
-	linux-arm \
-	openbsd-386 \
-	openbsd-amd64 \
-	windows-386 \
-	windows-amd64 \
-	darwin-386 \
-	darwin-amd64 \
+	freebsd/amd64 \
+	linux/386 \
+	linux/amd64 \
+	windows/386 \
+	windows/amd64 \
+	darwin/amd64 \
 	$(NULL)

-DIST=$(shell pwd)/dist
-export GOPATH=$(shell pwd)
+	# freebsd-386 \
+	# freebsd-arm \
+	# linux-arm \
+	# openbsd-386 \
+	# openbsd-amd64 \
+	# darwin-386

-build:
-	cd src/github.com/Netflix-Skunkworks/go-jira/jira; \
-	go get -v
+NAME=jira

+OS=$(shell uname -s)
+ifeq ($(filter CYGWIN%,$(OS)),$(OS))
+	export CWD=$(shell cygpath -wa .)
+	export SEP=\\
+	export CYGWIN=winsymlinks:native
+	BIN ?= $(GOBIN)$(SEP)$(NAME).exe
+else
+	export CWD=$(shell pwd)
+	export SEP=/
+	BIN ?= $(GOBIN)$(SEP)$(NAME)
+endif
+
+export GOPATH=$(CWD)
+
+DIST=$(CWD)$(SEP)dist
+
+GOBIN ?= $(CWD)
+
+CURVER ?= $(patsubst v%,%,$(shell [ -d .git ] && git describe --abbrev=0 --tags || grep ^\#\# CHANGELOG.md | awk '{print $$2; exit}'))
+LDFLAGS:=-X jira.VERSION=$(CURVER) -w
+
+# use make DEBUG=1 and you can get a debuggable golang binary
+# see https://github.com/mailgun/godebug
+ifneq ($(DEBUG),)
+	GOBUILD=go get -v github.com/mailgun/godebug && ./bin/godebug build
+else
+	GOBUILD=go build -v -ldflags "$(LDFLAGS) -s"
+endif
+
+build: src/gopkg.in/Netflix-Skunkworks/go-jira.v0
+	$(GOBUILD) -o '$(BIN)' main/main.go
+
+debug:
+	$(MAKE) DEBUG=1
+
+src/%:
+	mkdir -p $(@D)
+	test -L $@ || ln -sf '../../..' $@
+	go get -v $* $*/main
+
+vet:
+	@go vet .
+	@go vet ./data
+	@go vet ./main
+
+lint:
+	@go get github.com/golang/lint/golint
+	@./bin/golint .
+	@./bin/golint ./data
+	@./bin/golint ./main

 cross-setup:
 	for p in $(PLATFORMS); do \
-        echo "Building for $$p"; \
-		cd $(GOROOT)/src && sudo GOOS=$${p/-*/} GOARCH=$${p/*-/} bash ./make.bash --no-clean; \
+        echo Building for $$p"; \
+		cd $(GOROOT)/src && sudo GOROOT_BOOTSTRAP=$(GOROOT) GOOS=$${p/-*/} GOARCH=$${p/*-/} bash ./make.bash --no-clean; \
   done

-all:
-	rm -rf $(DIST); \
-	mkdir -p $(DIST); \
-	cd src/github.com/Netflix-Skunkworks/go-jira/jira; \
-	go get -d; \
-	for p in $(PLATFORMS); do \
-        echo "Building for $$p"; \
-		GOOS=$${p/-*/} GOARCH=$${p/*-/} go build -v -ldflags -s -o $(DIST)/jira-$$p; \
-   done
+all: 
+	git push --tags
+	rm -rf src
+	${MAKE} src/gopkg.in/Netflix-Skunkworks/go-jira.v0
+	docker pull karalabe/xgo-latest
+	rm -rf dist
+	mkdir -p dist
+	docker run --rm -e EXT_GOPATH=/gopath -v $$(pwd):/gopath -e TARGETS="$(PLATFORMS)" -v $$(pwd)/dist:/build karalabe/xgo-latest gopkg.in/Netflix-Skunkworks/go-jira.v0/main
+	cd $(DIST) && for x in main-*; do mv $$x jira-$$(echo $$x | cut -c 6-); done
+
+# all:
+# 	rm -rf $(DIST); \
+# 	mkdir -p $(DIST); \
+# 	for p in $(PLATFORMS); do \
+#         echo "Building for $$p"; \
+#         ${MAKE} build GOOS=$${p/-*/} GOARCH=$${p/*-/} BIN=$(DIST)/$(NAME)-$$p; \
+#     done
+# 	for x in $(DIST)/jira-windows-*; do mv $$x $$x.exe; done

 fmt:
-	gofmt -s -w jira
+	gofmt -s -w main/*.go *.go

 install:
-	export GOBIN=~/bin && ${MAKE} build
+	${MAKE} GOBIN=$$HOME/bin build

-# need gsort on OSX (brew install coreutils) or newer sort on linux
-# that supports the -V option for version sorting
-SORT=gsort
-
-CURVER ?= $(shell git fetch --tags && git tag | $(SORT) -V | tail -1)
 NEWVER ?= $(shell echo $(CURVER) | awk -F. '{print $$1"."$$2"."$$3+1}')
 TODAY  := $(shell date +%Y-%m-%d)

 changes:
-	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^$(CURVER) HEAD jira | grep -v gofmt | grep -v "bump version"
+	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^v$(CURVER) HEAD main/*.go *.go | grep -vE 'gofmt|go fmt'

-update-changelog: 
+update-changelog:
 	@echo "# Changelog" > CHANGELOG.md.new; \
 	echo >> CHANGELOG.md.new; \
 	echo "## $(NEWVER) - $(TODAY)" >> CHANGELOG.md.new; \
 	echo >> CHANGELOG.md.new; \
-	$(MAKE) changes | \
+	$(MAKE) --no-print-directory --silent changes | \
 	perl -pe 's{\[([a-f0-9]+)\]}{[[$$1](https://github.com/Netflix-Skunkworks/go-jira/commit/$$1)]}g' | \
 	perl -pe 's{\#(\d+)}{[#$$1](https://github.com/Netflix-Skunkworks/go-jira/issues/$$1)}g' >> CHANGELOG.md.new; \
-	tail +2 CHANGELOG.md >> CHANGELOG.md.new; \
+	tail -n +2 CHANGELOG.md >> CHANGELOG.md.new; \
 	mv CHANGELOG.md.new CHANGELOG.md; \
 	git commit -m "Updated Changelog" CHANGELOG.md; \
-	perl -pi -e "s/version: $(CURVER)/version: $(NEWVER)/" jira/main.go; \
-	git commit -m "bump version" jira/main.go; \
-	git tag $(NEWVER)
+	git tag v$(NEWVER)
+
+version:
+	@echo $(CURVER)

 clean:
-	rm -rf pkg dist bin && find src \! -path \*/go-jira\* -delete
+	rm -rf pkg dist bin src ./$(NAME)
+
+export GNUPGHOME=$(CWD)/t/.gnupg
+export PASSWORD_STORE_DIR=$(CWD)/t/.password-store
+export JIRACLOUD=1
+
+prove:
+	chmod -R g-rwx,o-rwx $(GNUPGHOME)
+	OSHT_VERBOSE=1 prove -v 
@@ -1,10 +1,15 @@
+[![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.v0?status.png)](https://godoc.org/gopkg.in/Netflix-Skunkworks/go-jira.v0)
+
+
 # go-jira
 simple command line client for Atlassian's Jira service written in Go

 ## Synopsis

 ```bash
-jira ls -p GOJIRA                       # list all unresolved issues for project GOJRIA
+jira ls -p GOJIRA                       # list all unresolved issues for project GOJIRA
 jira ls -p GOJIRA -a mothra             # as above also assigned to user mothra
 jira ls -p GOJIRA -w mothra             # lists GOJIRA unresolved issues watched by user mothra
 jira ls -p GOJIRA -r mothra             # list GOJIRA unresolved issues reported by user mothra
@@ -16,7 +21,7 @@ jira GOJIRA-321                         # same as above
 jira edit GOJIRA-321                    # open up the issue in an editor, when you exit the
                                        # editor the issue will post the updates to the server

-# edit the issue, using the overirdes on the command line, skip the interactive editor:
+# edit the issue, using the overrides on the command line, skip the interactive editor:
 jira edit GOJIRA-321 --noedit \
     -o assignee=mothra \
     -o comment="mothra, please take care of this." \
@@ -33,7 +38,7 @@ jira trans close GOJIRA-321 -o resolution="Won't Fix" --noedit
 # same as above
 jira close GOJIRA-321 -o resolution="Won't Fix"

-jira repopen GOJIRA-321 -m "reopening"  # reopen issue
+jira reopen GOJIRA-321 -m "reopening"  # reopen issue

 jira watch GOJIRA-321                   # add self as watcher to the issue

@@ -69,25 +74,13 @@ You can download one of the pre-built binaries for **go-jira** [here](https://gi

 * **NOTE** You will need **`go-1.4.1`** minimum

-*  If you do not have a **GOPATH** setup, these are simple build steps:
-
+*  To build the `jira` binary the current directory just run:
 ```bash
-git clone git@github.com:Netflix-Skunkworks/go-jira.git
-cd go-jira
-export GOPATH=$(pwd)
-export GOBIN=$GOPATH/bin
-export PATH=$GOBIN:$PATH
-cd src/github.com/Netflix-Skunkworks/go-jira/jira
-go get -v
+make
 ```
-
-* If you do have a **GOPATH** setup, these are the standard steps to build:
-
-```
-cd $GOPATH
-git clone git@github.com:Netflix-Skunkworks/go-jira.git src/github.com/Netflix-Skunkworks/go-jira
-cd src/github.com/Netflix-Skunkworks/go-jira/jira
-go get -v
+* To install the binary to you ~/bin directory you can run:
+```bash
+make install
 ```

 ## Configuration
@@ -98,7 +91,7 @@ a child directory of your homedir, then your homedir will also be inspected for
 discovered **go-jira** will load a **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.

-The complicated configuration heirarchy is used because **go-jira** attempts to be context aware.  For example, if you are working on a "foo" project and
+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:
@@ -117,6 +110,8 @@ endpoint: https://jira.mycompany.com
 EOM
 ```

+Then use `jira login` to authenticate yourself as $USER. To change your username, use the `-u` CLI flag or set `user:` in your config.yml
+
 ### Dynamic Configuration

 If the **.jira.d/config.yml** file is executable, then **go-jira** will attempt to execute the file and use the stdout for configuration.  You can use this to customize templates or other overrides depending on what type of operation you are running.  For example if you would like to use the "table" template when ever you run `jira ls`, then you can create a template like this:
@@ -167,6 +162,81 @@ When running a command like `jira edit` it will look through the current directo
 if found it will use that file as the template, otherwise it will use the default **edit** template hard-coded into **go-jira**.  You can export the default
 hard-coded templates with `jira export-templates` which will write them to **~/.jira.d/templates/**.

+#### 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/util.go#L133).
+
+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:
+```
+jira view GOJIRA-321 -t debug
+```
+
+This will print out the data in JSON format that is available to the template.  You can do this for any other operation, like "list":
+```
+jira list -t debug
+```
+
+Figuring out what is available to input templates (like for the `create` operation) is a bit more tricky, but similar.  To find the data available for a `create` template you can run:
+```
+jira create --dryrun -t debug --editor /bin/cat
+```
+This will attempt to fetch metadata for your default project (you can provide any options that you would normally specify for the `create` operation).  It uses the `--dryrun` option to prevent any actual updates being sent to Jira.  The `-t debug` is like before to cause the input to be serialized to JSON and printed for your inspection.  Finally the `--editor /bin/cat` will cause `go-jira` to just print the template rather than open up an editor and wait for you to edit/save it.
+
+### Authentication
+
+By default `go-jira` will prompt for a password automatically when we receive an 403 http response.  Then after authentication we cache the JSESSSION cookie returned by the service and reuse that on subsequent requests.  Typically this cookie will be valid for several hours (depending on the service configuration).  Many deployments of Jira (like the cloud services on atlassian.net) have "websudo" enabled which will prevent the cookie based authentcation from working.  On these deployments you have a few options with `go-jira`.  You can enable a `password-source` via `.jira.d/config.yml` with possible values of `keyring` or `pass`.
+
+#### keyring password source
+**Note: Version 0.1.9 required.**
+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
+```
+After setting this and issuing a `jira login`, your credentials will be stored in your platform's backend (e.g. Keychain for Mac OS X) automatically. Subsequent operations, like a `jira ls`, should "just work" from there.
+
+#### `pass` password source
+**Note: Version 0.1.9 required.**
+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
+```
+
+This assumes you have already setup `pass` correctly on your system.  Specifically you will need to have created a gpg key like this:
+
+```
+$ gpg --gen-key
+```
+
+Then you will need the GPG Key ID you want associated with `pass`.  First list the available keys:
+```
+$ gpg --list-keys
+/home/gojira/.gnupg/pubring.gpg
+-------------------------------------------------
+pub   2048R/A307D709 2016-12-18
+uid                  Go Jira <gojira@example.com>
+sub   2048R/F9A047B8 2016-12-18
+```
+
+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`
+```bash
+if [ -f $HOME/.gpg-agent-info ]; then
+    . $HOME/.gpg-agent-info
+    export GPG_AGENT_INFO
+fi
+# verify sock file from GPG_AGENT_INFO is actually present
+if [ ! -S "${GPG_AGENT_INFO%%:*}" ]; then
+    # set passphrase cache so I only have to type my passphrase once a day
+    eval $(gpg-agent --default-cache-ttl 604800 --daemon --write-env-file $HOME/.gpg-agent-info)
+fi
+export GPG_TTY=$(tty)
+```
+
+
 ## Usage

 ```
@@ -205,7 +275,7 @@ General Options:
  -e --endpoint=URI   URI to use for jira
  -h --help           Show this usage
  -t --template=FILE  Template file to use for output/editing
-  -u --user=USER      Username to use for authenticaion (default: $USER)
+  -u --user=USER      Username to use for authentication (default: $USER)
  -v --verbose        Increase output logging

 Query Options:
@@ -0,0 +1,646 @@
+package jira
+
+import (
+	"bytes"
+	"crypto/tls"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/http/cookiejar"
+	"net/http/httputil"
+	"net/url"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"time"
+
+	"github.com/kballard/go-shellquote"
+	"gopkg.in/coryb/yaml.v2"
+	"gopkg.in/op/go-logging.v1"
+)
+
+var (
+	log = logging.MustGetLogger("jira")
+	// VERSION is the go-jira library version
+	VERSION string
+)
+
+// Cli is go-jira client object
+type Cli struct {
+	endpoint   *url.URL
+	opts       map[string]interface{}
+	cookieFile string
+	ua         *http.Client
+}
+
+// New creates go-jira client object
+func New(opts map[string]interface{}) *Cli {
+	homedir := homedir()
+	cookieJar, _ := cookiejar.New(nil)
+	endpoint, _ := opts["endpoint"].(string)
+	url, _ := url.Parse(strings.TrimRight(endpoint, "/"))
+
+	if project, ok := opts["project"].(string); ok {
+		opts["project"] = strings.ToUpper(project)
+	}
+
+	var ua *http.Client
+	if unixProxyPath, ok := opts["unixproxy"].(string); ok {
+		ua = &http.Client{
+			Jar:       cookieJar,
+			Transport: UnixProxy(unixProxyPath),
+		}
+	} else {
+		transport := &http.Transport{
+			Proxy:           http.ProxyFromEnvironment,
+			TLSClientConfig: &tls.Config{},
+		}
+		if insecureSkipVerify, ok := opts["insecure"].(bool); ok {
+			transport.TLSClientConfig.InsecureSkipVerify = insecureSkipVerify
+		}
+
+		ua = &http.Client{
+			Jar:       cookieJar,
+			Transport: transport,
+		}
+	}
+
+	cli := &Cli{
+		endpoint:   url,
+		opts:       opts,
+		cookieFile: filepath.Join(homedir, ".jira.d", "cookies.js"),
+		ua:         ua,
+	}
+
+	cli.ua.Jar.SetCookies(url, cli.loadCookies())
+
+	return cli
+}
+
+func (c *Cli) saveCookies(resp *http.Response) {
+	if _, ok := resp.Header["Set-Cookie"]; !ok {
+		return
+	}
+
+	cookies := resp.Cookies()
+	for _, cookie := range cookies {
+		if cookie.Domain == "" {
+			// if it is host:port then we need to split off port
+			parts := strings.Split(resp.Request.URL.Host, ":")
+			host := parts[0]
+			log.Debugf("Setting DOMAIN to %s for Cookie: %s", host, cookie)
+			cookie.Domain = host
+		}
+	}
+
+	// expiry in one week from now
+	expiry := time.Now().Add(24 * 7 * time.Hour)
+	for _, cookie := range cookies {
+		cookie.Expires = expiry
+	}
+
+	if currentCookies := c.loadCookies(); currentCookies != nil {
+		currentCookiesByName := make(map[string]*http.Cookie)
+		for _, cookie := range currentCookies {
+			currentCookiesByName[cookie.Name+cookie.Domain] = cookie
+		}
+
+		for _, cookie := range cookies {
+			currentCookiesByName[cookie.Name+cookie.Domain] = cookie
+		}
+
+		mergedCookies := make([]*http.Cookie, 0, len(currentCookiesByName))
+		for _, v := range currentCookiesByName {
+			mergedCookies = append(mergedCookies, v)
+		}
+		jsonWrite(c.cookieFile, mergedCookies)
+	} else {
+		mkdir(path.Dir(c.cookieFile))
+		jsonWrite(c.cookieFile, cookies)
+	}
+}
+
+func (c *Cli) loadCookies() []*http.Cookie {
+	bytes, err := ioutil.ReadFile(c.cookieFile)
+	if err != nil && os.IsNotExist(err) {
+		// dont load cookies if the file does not exist
+		return nil
+	}
+	if err != nil {
+		log.Errorf("Failed to open %s: %s", c.cookieFile, err)
+		panic(err)
+	}
+	cookies := []*http.Cookie{}
+	err = json.Unmarshal(bytes, &cookies)
+	if err != nil {
+		log.Errorf("Failed to parse json from file %s: %s", c.cookieFile, err)
+	}
+
+	if os.Getenv("LOG_TRACE") != "" && log.IsEnabledFor(logging.DEBUG) {
+		log.Debugf("Loading Cookies: %s", cookies)
+	}
+	return cookies
+}
+
+func (c *Cli) post(uri string, content string) (*http.Response, error) {
+	return c.makeRequestWithContent("POST", uri, content)
+}
+
+func (c *Cli) put(uri string, content string) (*http.Response, error) {
+	return c.makeRequestWithContent("PUT", uri, content)
+}
+
+func (c *Cli) delete(uri string) (resp *http.Response, err error) {
+	method := "DELETE"
+	req, _ := http.NewRequest(method, uri, nil)
+	log.Infof("%s %s", req.Method, req.URL.String())
+	if resp, err = c.makeRequest(req); err != nil {
+		return nil, err
+	}
+	if resp.StatusCode == 401 {
+		if err = c.CmdLogin(); err != nil {
+			return nil, err
+		}
+		req, _ = http.NewRequest(method, uri, nil)
+		return c.makeRequest(req)
+	}
+	return resp, err
+}
+
+func (c *Cli) makeRequestWithContent(method string, uri string, content string) (resp *http.Response, err error) {
+	buffer := bytes.NewBufferString(content)
+	req, _ := http.NewRequest(method, uri, buffer)
+
+	log.Infof("%s %s", req.Method, req.URL.String())
+	if resp, err = c.makeRequest(req); err != nil {
+		return nil, err
+	}
+	if resp.StatusCode == 401 {
+		if err = c.CmdLogin(); err != nil {
+			return nil, err
+		}
+		req, _ = http.NewRequest(method, uri, bytes.NewBufferString(content))
+		return c.makeRequest(req)
+	}
+	return resp, err
+}
+
+func (c *Cli) get(uri string) (resp *http.Response, err error) {
+	req, _ := http.NewRequest("GET", uri, nil)
+	log.Infof("%s %s", req.Method, req.URL.String())
+	if log.IsEnabledFor(logging.DEBUG) {
+		logBuffer := bytes.NewBuffer(make([]byte, 0))
+		req.Write(logBuffer)
+		log.Debugf("%s", logBuffer)
+	}
+
+	if resp, err = c.makeRequest(req); err != nil {
+		return nil, err
+	}
+	if resp.StatusCode == 401 {
+		if err := c.CmdLogin(); err != nil {
+			return nil, err
+		}
+		return c.makeRequest(req)
+	}
+	return resp, err
+}
+
+func (c *Cli) makeRequest(req *http.Request) (resp *http.Response, err error) {
+	req.Header.Set("Accept", "application/json")
+	req.Header.Set("Content-Type", "application/json")
+
+	if source, ok := c.opts["password-source"]; ok && !strings.HasSuffix(req.URL.Path, "/rest/auth/1/session") {
+		user, _ := c.opts["user"].(string)
+		password := c.GetPass(user)
+		if password == "" {
+			log.Warning("No password for user %s in %s, please run the 'login' command first", user, source)
+		} else {
+			req.SetBasicAuth(user, password)
+		}
+	}
+
+	// this is actually done in http.send but doing it
+	// here so we can log it in DumpRequest for debugging
+	for _, cookie := range c.ua.Jar.Cookies(req.URL) {
+		req.AddCookie(cookie)
+	}
+
+	if log.IsEnabledFor(logging.DEBUG) {
+		out, _ := httputil.DumpRequest(req, true)
+		log.Debugf("Request: %s", out)
+	}
+
+	if resp, err = c.ua.Do(req); err != nil {
+		log.Errorf("Failed to %s %s: %s", req.Method, req.URL.String(), err)
+		return nil, err
+	}
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 && resp.StatusCode != 401 {
+		log.Errorf("response status: %s", resp.Status)
+	}
+
+	runtime.SetFinalizer(resp, func(r *http.Response) {
+		r.Body.Close()
+	})
+
+	if _, ok := resp.Header["Set-Cookie"]; ok {
+		c.saveCookies(resp)
+	}
+	if log.IsEnabledFor(logging.DEBUG) {
+		out, _ := httputil.DumpResponse(resp, true)
+		log.Debugf("Response: %s", out)
+	}
+	return resp, nil
+}
+
+// GetTemplate will return the text/template for the given command name
+func (c *Cli) GetTemplate(name string) string {
+	return c.getTemplate(name)
+}
+
+func getLookedUpTemplate(name string, dflt string) string {
+	if file, err := FindClosestParentPath(filepath.Join(".jira.d", "templates", name)); err == nil {
+		return readFile(file)
+	}
+	if _, err := os.Stat(fmt.Sprintf("/etc/go-jira/templates/%s", name)); err == nil {
+		file := fmt.Sprintf("/etc/go-jira/templates/%s", name)
+		return readFile(file)
+	}
+	return dflt
+}
+
+func (c *Cli) getTemplate(name string) string {
+	if override, ok := c.opts["template"].(string); ok {
+		if _, err := os.Stat(override); err == nil {
+			return readFile(override)
+		}
+		if t := getLookedUpTemplate(override, allTemplates[override]); t != "" {
+			return t
+		}
+	}
+	// create-bug etc are special, if we dont find it in the path
+	// then just return the create template
+	if strings.HasPrefix(name, "create-") {
+		return getLookedUpTemplate(name, c.getTemplate("create"))
+	}
+	return getLookedUpTemplate(name, allTemplates[name])
+}
+
+// NoChangesFound is an error returned from when editing templates
+// and no modifications were made while editing
+type NoChangesFound struct{}
+
+func (f NoChangesFound) Error() string {
+	return "No changes found, aborting"
+}
+
+func (c *Cli) editTemplate(template string, tmpFilePrefix string, templateData map[string]interface{}, templateProcessor func(string) error) error {
+
+	tmpdir := filepath.Join(homedir(), ".jira.d", "tmp")
+	if err := mkdir(tmpdir); err != nil {
+		return err
+	}
+
+	fh, err := ioutil.TempFile(tmpdir, tmpFilePrefix)
+	if err != nil {
+		log.Errorf("Failed to make temp file in %s: %s", tmpdir, err)
+		return err
+	}
+
+	oldFileName := fh.Name()
+	tmpFileName := fmt.Sprintf("%s.yml", oldFileName)
+
+	// close tmpfile so we can rename on windows
+	fh.Close()
+
+	if err := os.Rename(oldFileName, tmpFileName); err != nil {
+		log.Errorf("Failed to rename %s to %s: %s", oldFileName, tmpFileName, err)
+		return err
+	}
+
+	fh, err = os.OpenFile(tmpFileName, os.O_RDWR|os.O_EXCL, 0600)
+	if err != nil {
+		log.Errorf("Failed to reopen temp file file in %s: %s", tmpFileName, err)
+		return err
+	}
+
+	defer fh.Close()
+	defer func() {
+		os.Remove(tmpFileName)
+	}()
+
+	err = runTemplate(template, templateData, fh)
+	if err != nil {
+		return err
+	}
+
+	fh.Close()
+
+	editor, ok := c.opts["editor"].(string)
+	if !ok {
+		editor = os.Getenv("JIRA_EDITOR")
+		if editor == "" {
+			editor = os.Getenv("EDITOR")
+			if editor == "" {
+				editor = "vim"
+			}
+		}
+	}
+
+	editing := c.getOptBool("edit", true)
+
+	tmpFileNameOrig := fmt.Sprintf("%s.orig", tmpFileName)
+	copyFile(tmpFileName, tmpFileNameOrig)
+	defer func() {
+		os.Remove(tmpFileNameOrig)
+	}()
+
+	for true {
+		if editing {
+			shell, _ := shellquote.Split(editor)
+			shell = append(shell, tmpFileName)
+			log.Debugf("Running: %#v", shell)
+			cmd := exec.Command(shell[0], shell[1:]...)
+			cmd.Stdout, cmd.Stderr, cmd.Stdin = os.Stdout, os.Stderr, os.Stdin
+			if err := cmd.Run(); err != nil {
+				log.Errorf("Failed to edit template with %s: %s", editor, err)
+				if promptYN("edit again?", true) {
+					continue
+				}
+				return err
+			}
+
+			diff := exec.Command("diff", "-q", tmpFileNameOrig, tmpFileName)
+			// if err == nil then diff found no changes
+			if err := diff.Run(); err == nil {
+				return NoChangesFound{}
+			}
+		}
+
+		edited := make(map[string]interface{})
+		var data []byte
+		if data, err = ioutil.ReadFile(tmpFileName); err != nil {
+			log.Errorf("Failed to read tmpfile %s: %s", tmpFileName, err)
+			if editing && promptYN("edit again?", true) {
+				continue
+			}
+			return err
+		}
+		if err := yaml.Unmarshal(data, &edited); err != nil {
+			log.Errorf("Failed to parse YAML: %s", err)
+			if editing && promptYN("edit again?", true) {
+				continue
+			}
+			return err
+		}
+
+		var fixed interface{}
+		if fixed, err = yamlFixup(edited); err != nil {
+			return err
+		}
+		edited = fixed.(map[string]interface{})
+
+		// if you want to abort editing a jira issue then
+		// you can add the "abort: true" flag to the document
+		// and we will abort now
+		if val, ok := edited["abort"].(bool); ok && val {
+			log.Infof("abort flag found in template, quiting")
+			return fmt.Errorf("abort flag found in template, quiting")
+		}
+
+		if _, ok := templateData["meta"]; ok {
+			mf := templateData["meta"].(map[string]interface{})["fields"]
+			if f, ok := edited["fields"].(map[string]interface{}); ok {
+				for k := range f {
+					if _, ok := mf.(map[string]interface{})[k]; !ok {
+						err := fmt.Errorf("Field %s is not editable", k)
+						log.Errorf("%s", err)
+						if editing && promptYN("edit again?", true) {
+							continue
+						}
+						return err
+					}
+				}
+			}
+		}
+
+		json, err := jsonEncode(edited)
+		if err != nil {
+			return err
+		}
+
+		if err := templateProcessor(json); err != nil {
+			log.Errorf("%s", err)
+			if editing && promptYN("edit again?", true) {
+				continue
+			}
+		}
+		return nil
+	}
+	return nil
+}
+
+// Browse will open up your default browser to the provided issue
+func (c *Cli) Browse(issue string) error {
+	if val, ok := c.opts["browse"].(bool); ok && val {
+		if runtime.GOOS == "darwin" {
+			return exec.Command("open", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run()
+		} else if runtime.GOOS == "linux" {
+			return exec.Command("xdg-open", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run()
+		} else if runtime.GOOS == "windows" {
+			return exec.Command("cmd", "/c", "start", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run()
+		}
+	}
+	return nil
+}
+
+// SaveData will write out the yaml formated --saveFile file with provided data
+func (c *Cli) SaveData(data interface{}) error {
+	if val, ok := c.opts["saveFile"].(string); ok && val != "" {
+		yamlWrite(val, data)
+	}
+	return nil
+}
+
+// ViewIssueWorkLogs gets the worklog data for the given issue
+func (c *Cli) ViewIssueWorkLogs(issue string) (interface{}, error) {
+	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/worklog", c.endpoint, issue)
+	data, err := responseToJSON(c.get(uri))
+	if err != nil {
+		return nil, err
+	}
+	return data, nil
+}
+
+// ViewIssue will return the details for the given issue id
+func (c *Cli) ViewIssue(issue string) (interface{}, error) {
+	uri := fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
+	if x := c.expansions(); len(x) > 0 {
+		uri = fmt.Sprintf("%s?expand=%s", uri, strings.Join(x, ","))
+	}
+
+	data, err := responseToJSON(c.get(uri))
+	if err != nil {
+		return nil, err
+	}
+	return data, nil
+}
+
+// FindIssues will return a list of issues that match the given options.
+// If the "query" option is undefined it will generate a JQL query
+// using any/all of the provide options: project, component, assignee,
+// issuetype, watcher, reporter, sort
+// Further it will restrict the fields being extracted from the jira
+// response with the 'queryfields' option
+func (c *Cli) FindIssues() (interface{}, error) {
+	var query string
+	var ok bool
+	// project = BAKERY and status not in (Resolved, Closed)
+	if query, ok = c.opts["query"].(string); !ok {
+		qbuff := bytes.NewBufferString("resolution = unresolved")
+		var project string
+		if project, ok = c.opts["project"].(string); !ok {
+			err := fmt.Errorf("Missing required arguments, either 'query' or 'project' are required")
+			log.Errorf("%s", err)
+			return nil, err
+		}
+		qbuff.WriteString(fmt.Sprintf(" AND project = '%s'", project))
+
+		if component, ok := c.opts["component"]; ok {
+			qbuff.WriteString(fmt.Sprintf(" AND component = '%s'", component))
+		}
+
+		if assignee, ok := c.opts["assignee"]; ok {
+			qbuff.WriteString(fmt.Sprintf(" AND assignee = '%s'", assignee))
+		}
+
+		if issuetype, ok := c.opts["issuetype"]; ok {
+			qbuff.WriteString(fmt.Sprintf(" AND issuetype = '%s'", issuetype))
+		}
+
+		if watcher, ok := c.opts["watcher"]; ok {
+			qbuff.WriteString(fmt.Sprintf(" AND watcher = '%s'", watcher))
+		}
+
+		if reporter, ok := c.opts["reporter"]; ok {
+			qbuff.WriteString(fmt.Sprintf(" AND reporter = '%s'", reporter))
+		}
+
+		if sort, ok := c.opts["sort"]; ok && sort != "" {
+			qbuff.WriteString(fmt.Sprintf(" ORDER BY %s", sort))
+		}
+
+		query = qbuff.String()
+	}
+
+	fields := []string{"summary"}
+	if qf, ok := c.opts["queryfields"].(string); ok {
+		fields = strings.Split(qf, ",")
+	}
+
+	json, err := jsonEncode(map[string]interface{}{
+		"jql":        query,
+		"startAt":    "0",
+		"maxResults": c.opts["max_results"],
+		"fields":     fields,
+		"expand":     c.expansions(),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	uri := fmt.Sprintf("%s/rest/api/2/search", c.endpoint)
+	var data interface{}
+	if data, err = responseToJSON(c.post(uri, json)); err != nil {
+		return nil, err
+	}
+	return data, nil
+}
+
+// RankOrder type used to specify before/after ranking arguments to RankIssue
+type RankOrder int
+
+const (
+	// RANKBEFORE should be used to rank issue before the target issue
+	RANKBEFORE RankOrder = iota
+	// RANKAFTER should be used to rank issue after the target issue
+	RANKAFTER RankOrder = iota
+)
+
+// RankIssue will modify issue to have rank before or after the target issue
+func (c *Cli) RankIssue(issue, target string, order RankOrder) error {
+	type RankRequest struct {
+		Issues []string `json:"issues"`
+		Before string   `json:"rankBeforeIssue,omitempty"`
+		After  string   `json:"rankAfterIssue,omitempty"`
+	}
+	req := &RankRequest{
+		Issues: []string{
+			issue,
+		},
+	}
+	if order == RANKBEFORE {
+		req.Before = target
+	} else {
+		req.After = target
+	}
+
+	json, err := jsonEncode(req)
+	if err != nil {
+		return err
+	}
+
+	uri := fmt.Sprintf("%s/rest/agile/1.0/issue/rank", c.endpoint)
+	if c.getOptBool("dryrun", false) {
+		log.Debugf("PUT: %s", json)
+		log.Debugf("Dryrun mode, skipping PUT")
+		return nil
+	}
+	resp, err := c.put(uri, json)
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode != 204 {
+		return fmt.Errorf("failed to modify issue rank: %s", resp.Status)
+	}
+	return nil
+}
+
+// GetOptString will extract the string from the Cli object options
+// otherwise return the provided default
+func (c *Cli) GetOptString(optName string, dflt string) string {
+	return c.getOptString(optName, dflt)
+}
+
+func (c *Cli) getOptString(optName string, dflt string) string {
+	if val, ok := c.opts[optName].(string); ok {
+		return val
+	}
+	return dflt
+}
+
+// GetOptBool will extract the boolean value from the Client object options
+// otherwise return the provided default\
+func (c *Cli) GetOptBool(optName string, dflt bool) bool {
+	return c.getOptBool(optName, dflt)
+}
+
+func (c *Cli) getOptBool(optName string, dflt bool) bool {
+	if val, ok := c.opts[optName].(bool); ok {
+		return val
+	}
+	return dflt
+}
+
+// expansions returns a comma-separated list of values for field expansion
+func (c *Cli) expansions() []string {
+	var expansions []string
+	if x, ok := c.opts["expand"].(string); ok {
+		expansions = strings.Split(x, ",")
+	}
+	return expansions
+}
@@ -0,0 +1,19 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// AllowedValues defined from schema:
+// {
+//   "title": "allowedValues",
+//   "type": "array",
+//   "items": {}
+// }
+type AllowedValues []interface{}
@@ -0,0 +1,87 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// FieldMeta defined from schema:
+// {
+//   "title": "Field Meta",
+//   "type": "object",
+//   "properties": {
+//     "allowedValues": {
+//       "title": "allowedValues",
+//       "type": "array",
+//       "items": {}
+//     },
+//     "autoCompleteUrl": {
+//       "title": "autoCompleteUrl",
+//       "type": "string"
+//     },
+//     "hasDefaultValue": {
+//       "title": "hasDefaultValue",
+//       "type": "boolean"
+//     },
+//     "key": {
+//       "title": "key",
+//       "type": "string"
+//     },
+//     "name": {
+//       "title": "name",
+//       "type": "string"
+//     },
+//     "operations": {
+//       "title": "operations",
+//       "type": "array",
+//       "items": {
+//         "type": "string"
+//       }
+//     },
+//     "required": {
+//       "title": "required",
+//       "type": "boolean"
+//     },
+//     "schema": {
+//       "title": "Json Type",
+//       "type": "object",
+//       "properties": {
+//         "custom": {
+//           "title": "custom",
+//           "type": "string"
+//         },
+//         "customId": {
+//           "title": "customId",
+//           "type": "integer"
+//         },
+//         "items": {
+//           "title": "items",
+//           "type": "string"
+//         },
+//         "system": {
+//           "title": "system",
+//           "type": "string"
+//         },
+//         "type": {
+//           "title": "type",
+//           "type": "string"
+//         }
+//       }
+//     }
+//   }
+// }
+type FieldMeta struct {
+	AllowedValues   AllowedValues `json:"allowedValues,omitempty" yaml:"allowedValues,omitempty"`
+	AutoCompleteURL string        `json:"autoCompleteUrl,omitempty" yaml:"autoCompleteUrl,omitempty"`
+	HasDefaultValue bool          `json:"hasDefaultValue,omitempty" yaml:"hasDefaultValue,omitempty"`
+	Key             string        `json:"key,omitempty" yaml:"key,omitempty"`
+	Name            string        `json:"name,omitempty" yaml:"name,omitempty"`
+	Operations      Operations    `json:"operations,omitempty" yaml:"operations,omitempty"`
+	Required        bool          `json:"required,omitempty" yaml:"required,omitempty"`
+	Schema          *JSONType     `json:"schema,omitempty" yaml:"schema,omitempty"`
+}
@@ -0,0 +1,84 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// FieldMetaMap defined from schema:
+// {
+//   "title": "fields",
+//   "type": "object",
+//   "patternProperties": {
+//     ".+": {
+//       "title": "Field Meta",
+//       "type": "object",
+//       "properties": {
+//         "allowedValues": {
+//           "title": "allowedValues",
+//           "type": "array",
+//           "items": {}
+//         },
+//         "autoCompleteUrl": {
+//           "title": "autoCompleteUrl",
+//           "type": "string"
+//         },
+//         "hasDefaultValue": {
+//           "title": "hasDefaultValue",
+//           "type": "boolean"
+//         },
+//         "key": {
+//           "title": "key",
+//           "type": "string"
+//         },
+//         "name": {
+//           "title": "name",
+//           "type": "string"
+//         },
+//         "operations": {
+//           "title": "operations",
+//           "type": "array",
+//           "items": {
+//             "type": "string"
+//           }
+//         },
+//         "required": {
+//           "title": "required",
+//           "type": "boolean"
+//         },
+//         "schema": {
+//           "title": "Json Type",
+//           "type": "object",
+//           "properties": {
+//             "custom": {
+//               "title": "custom",
+//               "type": "string"
+//             },
+//             "customId": {
+//               "title": "customId",
+//               "type": "integer"
+//             },
+//             "items": {
+//               "title": "items",
+//               "type": "string"
+//             },
+//             "system": {
+//               "title": "system",
+//               "type": "string"
+//             },
+//             "type": {
+//               "title": "type",
+//               "type": "string"
+//             }
+//           }
+//         }
+//       }
+//     }
+//   }
+// }
+type FieldMetaMap map[string]*FieldMeta
@@ -0,0 +1,46 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// JSONType defined from schema:
+// {
+//   "title": "Json Type",
+//   "type": "object",
+//   "properties": {
+//     "custom": {
+//       "title": "custom",
+//       "type": "string"
+//     },
+//     "customId": {
+//       "title": "customId",
+//       "type": "integer"
+//     },
+//     "items": {
+//       "title": "items",
+//       "type": "string"
+//     },
+//     "system": {
+//       "title": "system",
+//       "type": "string"
+//     },
+//     "type": {
+//       "title": "type",
+//       "type": "string"
+//     }
+//   }
+// }
+type JSONType struct {
+	Custom   string `json:"custom,omitempty" yaml:"custom,omitempty"`
+	CustomID int    `json:"customId,omitempty" yaml:"customId,omitempty"`
+	Items    string `json:"items,omitempty" yaml:"items,omitempty"`
+	System   string `json:"system,omitempty" yaml:"system,omitempty"`
+	Type     string `json:"type,omitempty" yaml:"type,omitempty"`
+}
@@ -0,0 +1,21 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// Operations defined from schema:
+// {
+//   "title": "operations",
+//   "type": "array",
+//   "items": {
+//     "type": "string"
+//   }
+// }
+type Operations []string
@@ -0,0 +1,78 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// Status defined from schema:
+// {
+//   "title": "Status",
+//   "type": "object",
+//   "properties": {
+//     "description": {
+//       "title": "description",
+//       "type": "string"
+//     },
+//     "iconUrl": {
+//       "title": "iconUrl",
+//       "type": "string"
+//     },
+//     "id": {
+//       "title": "id",
+//       "type": "string"
+//     },
+//     "name": {
+//       "title": "name",
+//       "type": "string"
+//     },
+//     "self": {
+//       "title": "self",
+//       "type": "string"
+//     },
+//     "statusCategory": {
+//       "title": "Status Category",
+//       "type": "object",
+//       "properties": {
+//         "colorName": {
+//           "title": "colorName",
+//           "type": "string"
+//         },
+//         "id": {
+//           "title": "id",
+//           "type": "integer"
+//         },
+//         "key": {
+//           "title": "key",
+//           "type": "string"
+//         },
+//         "name": {
+//           "title": "name",
+//           "type": "string"
+//         },
+//         "self": {
+//           "title": "self",
+//           "type": "string"
+//         }
+//       }
+//     },
+//     "statusColor": {
+//       "title": "statusColor",
+//       "type": "string"
+//     }
+//   }
+// }
+type Status struct {
+	Description    string          `json:"description,omitempty" yaml:"description,omitempty"`
+	IconURL        string          `json:"iconUrl,omitempty" yaml:"iconUrl,omitempty"`
+	ID             string          `json:"id,omitempty" yaml:"id,omitempty"`
+	Name           string          `json:"name,omitempty" yaml:"name,omitempty"`
+	Self           string          `json:"self,omitempty" yaml:"self,omitempty"`
+	StatusCategory *StatusCategory `json:"statusCategory,omitempty" yaml:"statusCategory,omitempty"`
+	StatusColor    string          `json:"statusColor,omitempty" yaml:"statusColor,omitempty"`
+}
@@ -0,0 +1,46 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// StatusCategory defined from schema:
+// {
+//   "title": "Status Category",
+//   "type": "object",
+//   "properties": {
+//     "colorName": {
+//       "title": "colorName",
+//       "type": "string"
+//     },
+//     "id": {
+//       "title": "id",
+//       "type": "integer"
+//     },
+//     "key": {
+//       "title": "key",
+//       "type": "string"
+//     },
+//     "name": {
+//       "title": "name",
+//       "type": "string"
+//     },
+//     "self": {
+//       "title": "self",
+//       "type": "string"
+//     }
+//   }
+// }
+type StatusCategory struct {
+	ColorName string `json:"colorName,omitempty" yaml:"colorName,omitempty"`
+	ID        int    `json:"id,omitempty" yaml:"id,omitempty"`
+	Key       string `json:"key,omitempty" yaml:"key,omitempty"`
+	Name      string `json:"name,omitempty" yaml:"name,omitempty"`
+	Self      string `json:"self,omitempty" yaml:"self,omitempty"`
+}
@@ -0,0 +1,169 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// Transition defined from schema:
+// {
+//   "title": "Transition",
+//   "type": "object",
+//   "properties": {
+//     "expand": {
+//       "title": "expand",
+//       "type": "string"
+//     },
+//     "fields": {
+//       "title": "fields",
+//       "type": "object",
+//       "patternProperties": {
+//         ".+": {
+//           "title": "Field Meta",
+//           "type": "object",
+//           "properties": {
+//             "allowedValues": {
+//               "title": "allowedValues",
+//               "type": "array",
+//               "items": {}
+//             },
+//             "autoCompleteUrl": {
+//               "title": "autoCompleteUrl",
+//               "type": "string"
+//             },
+//             "hasDefaultValue": {
+//               "title": "hasDefaultValue",
+//               "type": "boolean"
+//             },
+//             "key": {
+//               "title": "key",
+//               "type": "string"
+//             },
+//             "name": {
+//               "title": "name",
+//               "type": "string"
+//             },
+//             "operations": {
+//               "title": "operations",
+//               "type": "array",
+//               "items": {
+//                 "type": "string"
+//               }
+//             },
+//             "required": {
+//               "title": "required",
+//               "type": "boolean"
+//             },
+//             "schema": {
+//               "title": "Json Type",
+//               "type": "object",
+//               "properties": {
+//                 "custom": {
+//                   "title": "custom",
+//                   "type": "string"
+//                 },
+//                 "customId": {
+//                   "title": "customId",
+//                   "type": "integer"
+//                 },
+//                 "items": {
+//                   "title": "items",
+//                   "type": "string"
+//                 },
+//                 "system": {
+//                   "title": "system",
+//                   "type": "string"
+//                 },
+//                 "type": {
+//                   "title": "type",
+//                   "type": "string"
+//                 }
+//               }
+//             }
+//           }
+//         }
+//       }
+//     },
+//     "hasScreen": {
+//       "title": "hasScreen",
+//       "type": "boolean"
+//     },
+//     "id": {
+//       "title": "id",
+//       "type": "string"
+//     },
+//     "name": {
+//       "title": "name",
+//       "type": "string"
+//     },
+//     "to": {
+//       "title": "Status",
+//       "type": "object",
+//       "properties": {
+//         "description": {
+//           "title": "description",
+//           "type": "string"
+//         },
+//         "iconUrl": {
+//           "title": "iconUrl",
+//           "type": "string"
+//         },
+//         "id": {
+//           "title": "id",
+//           "type": "string"
+//         },
+//         "name": {
+//           "title": "name",
+//           "type": "string"
+//         },
+//         "self": {
+//           "title": "self",
+//           "type": "string"
+//         },
+//         "statusCategory": {
+//           "title": "Status Category",
+//           "type": "object",
+//           "properties": {
+//             "colorName": {
+//               "title": "colorName",
+//               "type": "string"
+//             },
+//             "id": {
+//               "title": "id",
+//               "type": "integer"
+//             },
+//             "key": {
+//               "title": "key",
+//               "type": "string"
+//             },
+//             "name": {
+//               "title": "name",
+//               "type": "string"
+//             },
+//             "self": {
+//               "title": "self",
+//               "type": "string"
+//             }
+//           }
+//         },
+//         "statusColor": {
+//           "title": "statusColor",
+//           "type": "string"
+//         }
+//       }
+//     }
+//   }
+// }
+type Transition struct {
+	Expand    string       `json:"expand,omitempty" yaml:"expand,omitempty"`
+	Fields    FieldMetaMap `json:"fields,omitempty" yaml:"fields,omitempty"`
+	HasScreen bool         `json:"hasScreen,omitempty" yaml:"hasScreen,omitempty"`
+	ID        string       `json:"id,omitempty" yaml:"id,omitempty"`
+	Name      string       `json:"name,omitempty" yaml:"name,omitempty"`
+	To        *Status      `json:"to,omitempty" yaml:"to,omitempty"`
+}
@@ -0,0 +1,166 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// Transitions defined from schema:
+// {
+//   "title": "transitions",
+//   "type": "array",
+//   "items": {
+//     "title": "Transition",
+//     "type": "object",
+//     "properties": {
+//       "expand": {
+//         "title": "expand",
+//         "type": "string"
+//       },
+//       "fields": {
+//         "title": "fields",
+//         "type": "object",
+//         "patternProperties": {
+//           ".+": {
+//             "title": "Field Meta",
+//             "type": "object",
+//             "properties": {
+//               "allowedValues": {
+//                 "title": "allowedValues",
+//                 "type": "array",
+//                 "items": {}
+//               },
+//               "autoCompleteUrl": {
+//                 "title": "autoCompleteUrl",
+//                 "type": "string"
+//               },
+//               "hasDefaultValue": {
+//                 "title": "hasDefaultValue",
+//                 "type": "boolean"
+//               },
+//               "key": {
+//                 "title": "key",
+//                 "type": "string"
+//               },
+//               "name": {
+//                 "title": "name",
+//                 "type": "string"
+//               },
+//               "operations": {
+//                 "title": "operations",
+//                 "type": "array",
+//                 "items": {
+//                   "type": "string"
+//                 }
+//               },
+//               "required": {
+//                 "title": "required",
+//                 "type": "boolean"
+//               },
+//               "schema": {
+//                 "title": "Json Type",
+//                 "type": "object",
+//                 "properties": {
+//                   "custom": {
+//                     "title": "custom",
+//                     "type": "string"
+//                   },
+//                   "customId": {
+//                     "title": "customId",
+//                     "type": "integer"
+//                   },
+//                   "items": {
+//                     "title": "items",
+//                     "type": "string"
+//                   },
+//                   "system": {
+//                     "title": "system",
+//                     "type": "string"
+//                   },
+//                   "type": {
+//                     "title": "type",
+//                     "type": "string"
+//                   }
+//                 }
+//               }
+//             }
+//           }
+//         }
+//       },
+//       "hasScreen": {
+//         "title": "hasScreen",
+//         "type": "boolean"
+//       },
+//       "id": {
+//         "title": "id",
+//         "type": "string"
+//       },
+//       "name": {
+//         "title": "name",
+//         "type": "string"
+//       },
+//       "to": {
+//         "title": "Status",
+//         "type": "object",
+//         "properties": {
+//           "description": {
+//             "title": "description",
+//             "type": "string"
+//           },
+//           "iconUrl": {
+//             "title": "iconUrl",
+//             "type": "string"
+//           },
+//           "id": {
+//             "title": "id",
+//             "type": "string"
+//           },
+//           "name": {
+//             "title": "name",
+//             "type": "string"
+//           },
+//           "self": {
+//             "title": "self",
+//             "type": "string"
+//           },
+//           "statusCategory": {
+//             "title": "Status Category",
+//             "type": "object",
+//             "properties": {
+//               "colorName": {
+//                 "title": "colorName",
+//                 "type": "string"
+//               },
+//               "id": {
+//                 "title": "id",
+//                 "type": "integer"
+//               },
+//               "key": {
+//                 "title": "key",
+//                 "type": "string"
+//               },
+//               "name": {
+//                 "title": "name",
+//                 "type": "string"
+//               },
+//               "self": {
+//                 "title": "self",
+//                 "type": "string"
+//               }
+//             }
+//           },
+//           "statusColor": {
+//             "title": "statusColor",
+//             "type": "string"
+//           }
+//         }
+//       }
+//     }
+//   }
+// }
+type Transitions []*Transition
@@ -0,0 +1,18 @@
+package jiradata
+
+import (
+	"strings"
+)
+
+// Find will search the transitions for one that matches
+// the given name.  It will return a valid trantion that matches
+// or nil
+func (t Transitions) Find(name string) *Transition {
+	name = strings.ToLower(name)
+	for _, trans := range t {
+		if strings.Contains(strings.ToLower(trans.Name), name) {
+			return trans
+		}
+	}
+	return nil
+}
@@ -0,0 +1,180 @@
+package jiradata
+
+/////////////////////////////////////////////////////////////////////////
+// This Code is Generated by SlipScheme Project:
+// https://github.com/coryb/slipscheme
+//
+// Generated with command:
+// slipscheme -pkg jiradata -overwrite ../schemas/TransitionsMeta.json
+/////////////////////////////////////////////////////////////////////////
+//                            DO NOT EDIT                              //
+/////////////////////////////////////////////////////////////////////////
+
+// TransitionsMeta defined from schema:
+// {
+//   "title": "Transitions Meta",
+//   "id": "https://docs.atlassian.com/jira/REST/schema/transitions-meta#",
+//   "type": "object",
+//   "properties": {
+//     "expand": {
+//       "title": "expand",
+//       "type": "string"
+//     },
+//     "transitions": {
+//       "title": "transitions",
+//       "type": "array",
+//       "items": {
+//         "title": "Transition",
+//         "type": "object",
+//         "properties": {
+//           "expand": {
+//             "title": "expand",
+//             "type": "string"
+//           },
+//           "fields": {
+//             "title": "fields",
+//             "type": "object",
+//             "patternProperties": {
+//               ".+": {
+//                 "title": "Field Meta",
+//                 "type": "object",
+//                 "properties": {
+//                   "allowedValues": {
+//                     "title": "allowedValues",
+//                     "type": "array",
+//                     "items": {}
+//                   },
+//                   "autoCompleteUrl": {
+//                     "title": "autoCompleteUrl",
+//                     "type": "string"
+//                   },
+//                   "hasDefaultValue": {
+//                     "title": "hasDefaultValue",
+//                     "type": "boolean"
+//                   },
+//                   "key": {
+//                     "title": "key",
+//                     "type": "string"
+//                   },
+//                   "name": {
+//                     "title": "name",
+//                     "type": "string"
+//                   },
+//                   "operations": {
+//                     "title": "operations",
+//                     "type": "array",
+//                     "items": {
+//                       "type": "string"
+//                     }
+//                   },
+//                   "required": {
+//                     "title": "required",
+//                     "type": "boolean"
+//                   },
+//                   "schema": {
+//                     "title": "Json Type",
+//                     "type": "object",
+//                     "properties": {
+//                       "custom": {
+//                         "title": "custom",
+//                         "type": "string"
+//                       },
+//                       "customId": {
+//                         "title": "customId",
+//                         "type": "integer"
+//                       },
+//                       "items": {
+//                         "title": "items",
+//                         "type": "string"
+//                       },
+//                       "system": {
+//                         "title": "system",
+//                         "type": "string"
+//                       },
+//                       "type": {
+//                         "title": "type",
+//                         "type": "string"
+//                       }
+//                     }
+//                   }
+//                 }
+//               }
+//             }
+//           },
+//           "hasScreen": {
+//             "title": "hasScreen",
+//             "type": "boolean"
+//           },
+//           "id": {
+//             "title": "id",
+//             "type": "string"
+//           },
+//           "name": {
+//             "title": "name",
+//             "type": "string"
+//           },
+//           "to": {
+//             "title": "Status",
+//             "type": "object",
+//             "properties": {
+//               "description": {
+//                 "title": "description",
+//                 "type": "string"
+//               },
+//               "iconUrl": {
+//                 "title": "iconUrl",
+//                 "type": "string"
+//               },
+//               "id": {
+//                 "title": "id",
+//                 "type": "string"
+//               },
+//               "name": {
+//                 "title": "name",
+//                 "type": "string"
+//               },
+//               "self": {
+//                 "title": "self",
+//                 "type": "string"
+//               },
+//               "statusCategory": {
+//                 "title": "Status Category",
+//                 "type": "object",
+//                 "properties": {
+//                   "colorName": {
+//                     "title": "colorName",
+//                     "type": "string"
+//                   },
+//                   "id": {
+//                     "title": "id",
+//                     "type": "integer"
+//                   },
+//                   "key": {
+//                     "title": "key",
+//                     "type": "string"
+//                   },
+//                   "name": {
+//                     "title": "name",
+//                     "type": "string"
+//                   },
+//                   "self": {
+//                     "title": "self",
+//                     "type": "string"
+//                   }
+//                 }
+//               },
+//               "statusColor": {
+//                 "title": "statusColor",
+//                 "type": "string"
+//               }
+//             }
+//           }
+//         }
+//       }
+//     }
+//   }
+// }
+type TransitionsMeta struct {
+	Expand      string      `json:"expand,omitempty" yaml:"expand,omitempty"`
+	Transitions Transitions `json:"transitions,omitempty" yaml:"transitions,omitempty"`
+}
@@ -1,437 +0,0 @@
-package cli
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"github.com/kballard/go-shellquote"
-	"github.com/op/go-logging"
-	"gopkg.in/coryb/yaml.v2"
-	"io/ioutil"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-	"os"
-	"os/exec"
-	"runtime"
-	"strings"
-	"time"
-)
-
-var log = logging.MustGetLogger("jira.cli")
-
-type Cli struct {
-	endpoint   *url.URL
-	opts       map[string]interface{}
-	cookieFile string
-	ua         *http.Client
-}
-
-func New(opts map[string]interface{}) *Cli {
-	homedir := os.Getenv("HOME")
-	cookieJar, _ := cookiejar.New(nil)
-	endpoint, _ := opts["endpoint"].(string)
-	url, _ := url.Parse(strings.TrimRight(endpoint, "/"))
-
-	if project, ok := opts["project"].(string); ok {
-		opts["project"] = strings.ToUpper(project)
-	}
-
-	cli := &Cli{
-		endpoint:   url,
-		opts:       opts,
-		cookieFile: fmt.Sprintf("%s/.jira.d/cookies.js", homedir),
-		ua:         &http.Client{Jar: cookieJar},
-	}
-
-	cli.ua.Jar.SetCookies(url, cli.loadCookies())
-
-	return cli
-}
-
-func (c *Cli) saveCookies(cookies []*http.Cookie) {
-	// expiry in one week from now
-	expiry := time.Now().Add(24 * 7 * time.Hour)
-	for _, cookie := range cookies {
-		cookie.Expires = expiry
-	}
-
-	if currentCookies := c.loadCookies(); currentCookies != nil {
-		currentCookiesByName := make(map[string]*http.Cookie)
-		for _, cookie := range currentCookies {
-			currentCookiesByName[cookie.Name] = cookie
-		}
-
-		for _, cookie := range cookies {
-			currentCookiesByName[cookie.Name] = cookie
-		}
-
-		mergedCookies := make([]*http.Cookie, 0, len(currentCookiesByName))
-		for _, v := range currentCookiesByName {
-			mergedCookies = append(mergedCookies, v)
-		}
-		jsonWrite(c.cookieFile, mergedCookies)
-	} else {
-		jsonWrite(c.cookieFile, cookies)
-	}
-}
-
-func (c *Cli) loadCookies() []*http.Cookie {
-	bytes, err := ioutil.ReadFile(c.cookieFile)
-	if err != nil && os.IsNotExist(err) {
-		// dont load cookies if the file does not exist
-		return nil
-	}
-	if err != nil {
-		log.Error("Failed to open %s: %s", c.cookieFile, err)
-		os.Exit(1)
-	}
-	cookies := make([]*http.Cookie, 0)
-	err = json.Unmarshal(bytes, &cookies)
-	if err != nil {
-		log.Error("Failed to parse json from file %s: %s", c.cookieFile, err)
-	}
-	log.Debug("Loading Cookies: %s", cookies)
-	return cookies
-}
-
-func (c *Cli) post(uri string, content string) (*http.Response, error) {
-	return c.makeRequestWithContent("POST", uri, content)
-}
-
-func (c *Cli) put(uri string, content string) (*http.Response, error) {
-	return c.makeRequestWithContent("PUT", uri, content)
-}
-
-func (c *Cli) makeRequestWithContent(method string, uri string, content string) (*http.Response, error) {
-	buffer := bytes.NewBufferString(content)
-	req, _ := http.NewRequest(method, uri, buffer)
-
-	log.Info("%s %s", req.Method, req.URL.String())
-	if log.IsEnabledFor(logging.DEBUG) {
-		logBuffer := bytes.NewBuffer(make([]byte, 0, len(content)))
-		req.Write(logBuffer)
-		log.Debug("%s", logBuffer)
-		// need to recreate the buffer since the offset is now at the end
-		// need to be able to rewind the buffer offset, dont know how yet
-		req, _ = http.NewRequest(method, uri, bytes.NewBufferString(content))
-	}
-
-	if resp, err := c.makeRequest(req); err != nil {
-		return nil, err
-	} else {
-		if resp.StatusCode == 401 {
-			if err := c.CmdLogin(); err != nil {
-				return nil, err
-			}
-			req, _ = http.NewRequest(method, uri, bytes.NewBufferString(content))
-			return c.makeRequest(req)
-		}
-		return resp, err
-	}
-}
-
-func (c *Cli) get(uri string) (*http.Response, error) {
-	req, _ := http.NewRequest("GET", uri, nil)
-	log.Info("%s %s", req.Method, req.URL.String())
-	if log.IsEnabledFor(logging.DEBUG) {
-		logBuffer := bytes.NewBuffer(make([]byte, 0))
-		req.Write(logBuffer)
-		log.Debug("%s", logBuffer)
-	}
-
-	if resp, err := c.makeRequest(req); err != nil {
-		return nil, err
-	} else {
-		if resp.StatusCode == 401 {
-			if err := c.CmdLogin(); err != nil {
-				return nil, err
-			}
-			return c.makeRequest(req)
-		}
-		return resp, err
-	}
-}
-
-func (c *Cli) makeRequest(req *http.Request) (resp *http.Response, err error) {
-	req.Header.Set("Content-Type", "application/json")
-	if resp, err = c.ua.Do(req); err != nil {
-		log.Error("Failed to %s %s: %s", req.Method, req.URL.String(), err)
-		return nil, err
-	} else {
-		if resp.StatusCode < 200 || resp.StatusCode >= 300 && resp.StatusCode != 401 {
-			log.Error("response status: %s", resp.Status)
-		}
-
-		runtime.SetFinalizer(resp, func(r *http.Response) {
-			r.Body.Close()
-		})
-
-		if _, ok := resp.Header["Set-Cookie"]; ok {
-			c.saveCookies(resp.Cookies())
-		}
-	}
-	return resp, nil
-}
-
-func (c *Cli) getTemplate(name string) string {
-	if override, ok := c.opts["template"].(string); ok {
-		if _, err := os.Stat(override); err == nil {
-			return readFile(override)
-		} else {
-			if file, err := FindClosestParentPath(fmt.Sprintf(".jira.d/templates/%s", override)); err == nil {
-				return readFile(file)
-			}
-			if dflt, ok := all_templates[override]; ok {
-				return dflt
-			}
-		}
-	}
-	if file, err := FindClosestParentPath(fmt.Sprintf(".jira.d/templates/%s", name)); err != nil {
-		// create-bug etc are special, if we dont find it in the path
-		// then just return a generic create template
-		if strings.HasPrefix(name, "create-") {
-			if file, err := FindClosestParentPath(".jira.d/templates/create"); err != nil {
-				return all_templates["create"]
-			} else {
-				return readFile(file)
-			}
-		}
-		return all_templates[name]
-	} else {
-		return readFile(file)
-	}
-}
-
-type NoChangesFound struct{}
-
-func (f NoChangesFound) Error() string {
-	return "No changes found, aborting"
-}
-
-func (c *Cli) editTemplate(template string, tmpFilePrefix string, templateData map[string]interface{}, templateProcessor func(string) error) error {
-
-	tmpdir := fmt.Sprintf("%s/.jira.d/tmp", os.Getenv("HOME"))
-	if err := mkdir(tmpdir); err != nil {
-		return err
-	}
-
-	fh, err := ioutil.TempFile(tmpdir, tmpFilePrefix)
-	if err != nil {
-		log.Error("Failed to make temp file in %s: %s", tmpdir, err)
-		return err
-	}
-	defer fh.Close()
-
-	tmpFileName := fmt.Sprintf("%s.yml", fh.Name())
-	if err := os.Rename(fh.Name(), tmpFileName); err != nil {
-		log.Error("Failed to rename %s to %s: %s", fh.Name(), fmt.Sprintf("%s.yml", fh.Name()), err)
-		return err
-	}
-	defer func() {
-		os.Remove(tmpFileName)
-	}()
-
-	err = runTemplate(template, templateData, fh)
-	if err != nil {
-		return err
-	}
-
-	fh.Close()
-
-	editor, ok := c.opts["editor"].(string)
-	if !ok {
-		editor = os.Getenv("JIRA_EDITOR")
-		if editor == "" {
-			editor = os.Getenv("EDITOR")
-			if editor == "" {
-				editor = "vim"
-			}
-		}
-	}
-
-	editing := c.getOptBool("edit", true)
-
-	tmpFileNameOrig := fmt.Sprintf("%s.orig", tmpFileName)
-	copyFile(tmpFileName, tmpFileNameOrig)
-	defer func() {
-		os.Remove(tmpFileNameOrig)
-	}()
-
-	for true {
-		if editing {
-			shell, _ := shellquote.Split(editor)
-			shell = append(shell, tmpFileName)
-			log.Debug("Running: %#v", shell)
-			cmd := exec.Command(shell[0], shell[1:]...)
-			cmd.Stdout, cmd.Stderr, cmd.Stdin = os.Stdout, os.Stderr, os.Stdin
-			if err := cmd.Run(); err != nil {
-				log.Error("Failed to edit template with %s: %s", editor, err)
-				if promptYN("edit again?", true) {
-					continue
-				}
-				return err
-			}
-
-			diff := exec.Command("diff", "-q", tmpFileNameOrig, tmpFileName)
-			// if err == nil then diff found no changes
-			if err := diff.Run(); err == nil {
-				return NoChangesFound{}
-			}
-		}
-
-		edited := make(map[string]interface{})
-		if fh, err := ioutil.ReadFile(tmpFileName); err != nil {
-			log.Error("Failed to read tmpfile %s: %s", tmpFileName, err)
-			if editing && promptYN("edit again?", true) {
-				continue
-			}
-			return err
-		} else {
-			if err := yaml.Unmarshal(fh, &edited); err != nil {
-				log.Error("Failed to parse YAML: %s", err)
-				if editing && promptYN("edit again?", true) {
-					continue
-				}
-				return err
-			}
-		}
-
-		if fixed, err := yamlFixup(edited); err != nil {
-			return err
-		} else {
-			edited = fixed.(map[string]interface{})
-		}
-
-		// if you want to abort editing a jira issue then
-		// you can add the "abort: true" flag to the document
-		// and we will abort now
-		if val, ok := edited["abort"].(bool); ok && val {
-			log.Info("abort flag found in template, quiting")
-			return fmt.Errorf("abort flag found in template, quiting")
-		}
-
-		if _, ok := templateData["meta"]; ok {
-			mf := templateData["meta"].(map[string]interface{})["fields"]
-			if f, ok := edited["fields"].(map[string]interface{}); ok {
-				for k := range f {
-					if _, ok := mf.(map[string]interface{})[k]; !ok {
-						err := fmt.Errorf("Field %s is not editable", k)
-						log.Error("%s", err)
-						if editing && promptYN("edit again?", true) {
-							continue
-						}
-						return err
-					}
-				}
-			}
-		}
-
-		json, err := jsonEncode(edited)
-		if err != nil {
-			return err
-		}
-
-		if err := templateProcessor(json); err != nil {
-			log.Error("%s", err)
-			if editing && promptYN("edit again?", true) {
-				continue
-			}
-		}
-		return nil
-	}
-	return nil
-}
-
-func (c *Cli) Browse(issue string) error {
-	if val, ok := c.opts["browse"].(bool); ok && val {
-		if runtime.GOOS == "darwin" {
-			return exec.Command("open", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run()
-		} else if runtime.GOOS == "linux" {
-			return exec.Command("xdg-open", fmt.Sprintf("%s/browse/%s", c.endpoint, issue)).Run()
-		}
-	}
-	return nil
-}
-
-func (c *Cli) FindIssues() (interface{}, error) {
-	var query string
-	var ok bool
-	// project = BAKERY and status not in (Resolved, Closed)
-	if query, ok = c.opts["query"].(string); !ok {
-		qbuff := bytes.NewBufferString("resolution = unresolved")
-		if project, ok := c.opts["project"]; !ok {
-			err := fmt.Errorf("Missing required arguments, either 'query' or 'project' are required")
-			log.Error("%s", err)
-			return nil, err
-		} else {
-			qbuff.WriteString(fmt.Sprintf(" AND project = '%s'", project))
-		}
-
-		if component, ok := c.opts["component"]; ok {
-			qbuff.WriteString(fmt.Sprintf(" AND component = '%s'", component))
-		}
-
-		if assignee, ok := c.opts["assignee"]; ok {
-			qbuff.WriteString(fmt.Sprintf(" AND assignee = '%s'", assignee))
-		}
-
-		if issuetype, ok := c.opts["issuetype"]; ok {
-			qbuff.WriteString(fmt.Sprintf(" AND issuetype = '%s'", issuetype))
-		}
-
-		if watcher, ok := c.opts["watcher"]; ok {
-			qbuff.WriteString(fmt.Sprintf(" AND watcher = '%s'", watcher))
-		}
-
-		if reporter, ok := c.opts["reporter"]; ok {
-			qbuff.WriteString(fmt.Sprintf(" AND reporter = '%s'", reporter))
-		}
-
-		if sort, ok := c.opts["sort"]; ok && sort != "" {
-			qbuff.WriteString(fmt.Sprintf(" ORDER BY %s", sort))
-		}
-
-		query = qbuff.String()
-	}
-
-	fields := make([]string, 0)
-	if qf, ok := c.opts["queryfields"].(string); ok {
-		fields = strings.Split(qf, ",")
-	} else {
-		fields = append(fields, "summary")
-	}
-
-	json, err := jsonEncode(map[string]interface{}{
-		"jql":        query,
-		"startAt":    "0",
-		"maxResults": c.opts["max_results"],
-		"fields":     fields,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	uri := fmt.Sprintf("%s/rest/api/2/search", c.endpoint)
-	if data, err := responseToJson(c.post(uri, json)); err != nil {
-		return nil, err
-	} else {
-		return data, nil
-	}
-}
-
-func (c *Cli) getOptString(optName string, dflt string) string {
-	if val, ok := c.opts[optName].(string); ok {
-		return val
-	} else {
-		return dflt
-	}
-}
-
-func (c *Cli) getOptBool(optName string, dflt bool) bool {
-	if val, ok := c.opts[optName].(bool); ok {
-		return val
-	} else {
-		return dflt
-	}
-}
@@ -1,587 +0,0 @@
-package cli
-
-import (
-	"bytes"
-	"fmt"
-	"golang.org/x/crypto/ssh/terminal"
-	"net/http"
-	"net/http/httputil"
-	"os"
-	"strings"
-	// "github.com/kr/pretty"
-)
-
-func (c *Cli) CmdLogin() error {
-	uri := fmt.Sprintf("%s/rest/auth/1/session", c.endpoint)
-	for true {
-		req, _ := http.NewRequest("GET", uri, nil)
-		user, _ := c.opts["user"].(string)
-
-		fmt.Printf("Enter Password for %s: ", user)
-		pwbytes, _ := terminal.ReadPassword(int(os.Stdin.Fd()))
-		passwd := string(pwbytes)
-
-		req.SetBasicAuth(user, passwd)
-		log.Info("%s %s", req.Method, req.URL.String())
-		if resp, err := c.makeRequest(req); err != nil {
-			return err
-		} else {
-			out, _ := httputil.DumpResponse(resp, true)
-			log.Debug("%s", out)
-			if resp.StatusCode == 403 {
-				// probably got this, need to redirect the user to login manually
-				// X-Authentication-Denied-Reason: CAPTCHA_CHALLENGE; login-url=https://jira/login.jsp
-				if reason := resp.Header.Get("X-Authentication-Denied-Reason"); reason != "" {
-					err := fmt.Errorf("Authenticaion Failed: %s", reason)
-					log.Error("%s", err)
-					return err
-				}
-				err := fmt.Errorf("Authentication Failed: Unknown Reason")
-				log.Error("%s", err)
-				return err
-
-			} else if resp.StatusCode == 200 {
-				// https://confluence.atlassian.com/display/JIRA043/JIRA+REST+API+%28Alpha%29+Tutorial#JIRARESTAPI%28Alpha%29Tutorial-CAPTCHAs
-				// probably bad password, try again
-				if reason := resp.Header.Get("X-Seraph-Loginreason"); reason == "AUTHENTICATION_DENIED" {
-					log.Warning("Authentication Failed: %s", reason)
-					continue
-				}
-			} else {
-				log.Warning("Login failed")
-				continue
-			}
-		}
-		return nil
-	}
-	return nil
-}
-
-func (c *Cli) CmdFields() error {
-	log.Debug("fields called")
-	uri := fmt.Sprintf("%s/rest/api/2/field", c.endpoint)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	return runTemplate(c.getTemplate("fields"), data, nil)
-}
-
-func (c *Cli) CmdList() error {
-	log.Debug("list called")
-	if data, err := c.FindIssues(); err != nil {
-		return err
-	} else {
-		return runTemplate(c.getTemplate("list"), data, nil)
-	}
-}
-
-func (c *Cli) CmdView(issue string) error {
-	log.Debug("view called")
-	c.Browse(issue)
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	return runTemplate(c.getTemplate("view"), data, nil)
-}
-
-func (c *Cli) CmdEdit(issue string) error {
-	log.Debug("edit called")
-
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/editmeta", c.endpoint, issue)
-	editmeta, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	uri = fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
-	var issueData map[string]interface{}
-	if data, err := responseToJson(c.get(uri)); err != nil {
-		return err
-	} else {
-		issueData = data.(map[string]interface{})
-	}
-
-	issueData["meta"] = editmeta.(map[string]interface{})
-	issueData["overrides"] = c.opts
-
-	return c.editTemplate(
-		c.getTemplate("edit"),
-		fmt.Sprintf("%s-edit-", issue),
-		issueData,
-		func(json string) error {
-			if c.getOptBool("dryrun", false) {
-				log.Debug("PUT: %s", json)
-				log.Debug("Dryrun mode, skipping PUT")
-				return nil
-			}
-			resp, err := c.put(uri, json)
-			if err != nil {
-				return err
-			}
-
-			if resp.StatusCode == 204 {
-				c.Browse(issueData["key"].(string))
-				fmt.Printf("OK %s %s/browse/%s\n", issueData["key"], c.endpoint, issueData["key"])
-				return nil
-			} else {
-				logBuffer := bytes.NewBuffer(make([]byte, 0))
-				resp.Write(logBuffer)
-				err := fmt.Errorf("Unexpected Response From PUT")
-				log.Error("%s:\n%s", err, logBuffer)
-				return err
-			}
-		},
-	)
-}
-
-func (c *Cli) CmdEditMeta(issue string) error {
-	log.Debug("editMeta called")
-	c.Browse(issue)
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/editmeta", c.endpoint, issue)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	return runTemplate(c.getTemplate("editmeta"), data, nil)
-}
-
-func (c *Cli) CmdTransitionMeta(issue string) error {
-	log.Debug("tranisionMeta called")
-	c.Browse(issue)
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/transitions?expand=transitions.fields", c.endpoint, issue)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	return runTemplate(c.getTemplate("transmeta"), data, nil)
-}
-
-func (c *Cli) CmdIssueTypes() error {
-	project := c.opts["project"].(string)
-	log.Debug("issueTypes called")
-	uri := fmt.Sprintf("%s/rest/api/2/issue/createmeta?projectKeys=%s", c.endpoint, project)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	return runTemplate(c.getTemplate("issuetypes"), data, nil)
-}
-
-func (c *Cli) CmdCreateMeta() error {
-	project := c.opts["project"].(string)
-	issuetype := c.getOptString("issuetype", "Bug")
-
-	log.Debug("createMeta called")
-	uri := fmt.Sprintf("%s/rest/api/2/issue/createmeta?projectKeys=%s&issuetypeNames=%s&expand=projects.issuetypes.fields", c.endpoint, project, issuetype)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	if val, ok := data.(map[string]interface{})["projects"]; ok {
-		if len(val.([]interface{})) == 0 {
-			err = fmt.Errorf("Project '%s' or issuetype '%s' unknown.  Unable to createmeta.", project, issuetype)
-			log.Error("%s", err)
-			return err
-		}
-		if val, ok = val.([]interface{})[0].(map[string]interface{})["issuetypes"]; ok {
-			data = val.([]interface{})[0]
-		}
-	}
-
-	return runTemplate(c.getTemplate("createmeta"), data, nil)
-}
-
-func (c *Cli) CmdTransitions(issue string) error {
-	log.Debug("Transitions called")
-	c.Browse(issue)
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/transitions", c.endpoint, issue)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-	return runTemplate(c.getTemplate("transitions"), data, nil)
-}
-
-func (c *Cli) CmdCreate() error {
-	project := c.opts["project"].(string)
-	issuetype := c.getOptString("issuetype", "Bug")
-	log.Debug("create called")
-
-	uri := fmt.Sprintf("%s/rest/api/2/issue/createmeta?projectKeys=%s&issuetypeNames=%s&expand=projects.issuetypes.fields", c.endpoint, project, issuetype)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	issueData := make(map[string]interface{})
-	issueData["overrides"] = c.opts
-	issueData["overrides"].(map[string]interface{})["issuetype"] = issuetype
-
-	if val, ok := data.(map[string]interface{})["projects"]; ok {
-		if len(val.([]interface{})) == 0 {
-			err = fmt.Errorf("Project '%s' or issuetype '%s' unknown.  Unable to create issue.", project, issuetype)
-			log.Error("%s", err)
-			return err
-		}
-		if val, ok = val.([]interface{})[0].(map[string]interface{})["issuetypes"]; ok {
-			issueData["meta"] = val.([]interface{})[0]
-		}
-	}
-
-	sanitizedType := strings.ToLower(strings.Replace(issuetype, " ", "", -1))
-	return c.editTemplate(
-		c.getTemplate(fmt.Sprintf("create-%s", sanitizedType)),
-		fmt.Sprintf("create-%s-", sanitizedType),
-		issueData,
-		func(json string) error {
-			log.Debug("JSON: %s", json)
-			uri := fmt.Sprintf("%s/rest/api/2/issue", c.endpoint)
-			if c.getOptBool("dryrun", false) {
-				log.Debug("POST: %s", json)
-				log.Debug("Dryrun mode, skipping POST")
-				return nil
-			}
-			resp, err := c.post(uri, json)
-			if err != nil {
-				return err
-			}
-
-			if resp.StatusCode == 201 {
-				// response: {"id":"410836","key":"PROJ-238","self":"https://jira/rest/api/2/issue/410836"}
-				if json, err := responseToJson(resp, nil); err != nil {
-					return err
-				} else {
-					key := json.(map[string]interface{})["key"]
-					c.Browse(key.(string))
-					fmt.Printf("OK %s %s/browse/%s\n", key, c.endpoint, key)
-
-				}
-				return nil
-			} else {
-				logBuffer := bytes.NewBuffer(make([]byte, 0))
-				resp.Write(logBuffer)
-				err := fmt.Errorf("Unexpected Response From POST")
-				log.Error("%s:\n%s", err, logBuffer)
-				return err
-			}
-		},
-	)
-	return nil
-}
-
-func (c *Cli) CmdIssueLinkTypes() error {
-	log.Debug("Transitions called")
-	uri := fmt.Sprintf("%s/rest/api/2/issueLinkType", c.endpoint)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-	return runTemplate(c.getTemplate("issuelinktypes"), data, nil)
-}
-
-func (c *Cli) CmdBlocks(blocker string, issue string) error {
-	log.Debug("blocks called")
-
-	json, err := jsonEncode(map[string]interface{}{
-		"type": map[string]string{
-			"name": "Depends", // TODO This is probably not constant across Jira installs
-		},
-		"inwardIssue": map[string]string{
-			"key": issue,
-		},
-		"outwardIssue": map[string]string{
-			"key": blocker,
-		},
-	})
-	if err != nil {
-		return err
-	}
-
-	uri := fmt.Sprintf("%s/rest/api/2/issueLink", c.endpoint)
-	if c.getOptBool("dryrun", false) {
-		log.Debug("POST: %s", json)
-		log.Debug("Dryrun mode, skipping POST")
-		return nil
-	}
-	resp, err := c.post(uri, json)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode == 201 {
-		c.Browse(issue)
-		fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
-	} else {
-		logBuffer := bytes.NewBuffer(make([]byte, 0))
-		resp.Write(logBuffer)
-		err := fmt.Errorf("Unexpected Response From POST")
-		log.Error("%s:\n%s", err, logBuffer)
-		return err
-	}
-	return nil
-}
-
-func (c *Cli) CmdDups(duplicate string, issue string) error {
-	log.Debug("dups called")
-
-	json, err := jsonEncode(map[string]interface{}{
-		"type": map[string]string{
-			"name": "Duplicate", // TODO This is probably not constant across Jira installs
-		},
-		"inwardIssue": map[string]string{
-			"key": duplicate,
-		},
-		"outwardIssue": map[string]string{
-			"key": issue,
-		},
-	})
-	if err != nil {
-		return err
-	}
-
-	uri := fmt.Sprintf("%s/rest/api/2/issueLink", c.endpoint)
-	if c.getOptBool("dryrun", false) {
-		log.Debug("POST: %s", json)
-		log.Debug("Dryrun mode, skipping POST")
-		return nil
-	}
-	resp, err := c.post(uri, json)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode == 201 {
-		c.Browse(issue)
-		fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
-	} else {
-		logBuffer := bytes.NewBuffer(make([]byte, 0))
-		resp.Write(logBuffer)
-		err := fmt.Errorf("Unexpected Response From POST")
-		log.Error("%s:\n%s", err, logBuffer)
-		return err
-	}
-	return nil
-}
-
-func (c *Cli) CmdWatch(issue string) error {
-	watcher := c.getOptString("watcher", c.opts["user"].(string))
-	log.Debug("watch called")
-
-	json, err := jsonEncode(watcher)
-	if err != nil {
-		return err
-	}
-
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/watchers", c.endpoint, issue)
-	if c.getOptBool("dryrun", false) {
-		log.Debug("POST: %s", json)
-		log.Debug("Dryrun mode, skipping POST")
-		return nil
-	}
-	resp, err := c.post(uri, json)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode == 204 {
-		c.Browse(issue)
-		fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
-	} else {
-		logBuffer := bytes.NewBuffer(make([]byte, 0))
-		resp.Write(logBuffer)
-		err := fmt.Errorf("Unexpected Response From POST")
-		log.Error("%s:\n%s", err, logBuffer)
-		return err
-	}
-	return nil
-}
-
-func (c *Cli) CmdTransition(issue string, trans string) error {
-	log.Debug("transition called")
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/transitions?expand=transitions.fields", c.endpoint, issue)
-	data, err := responseToJson(c.get(uri))
-	if err != nil {
-		return err
-	}
-
-	transitions := data.(map[string]interface{})["transitions"].([]interface{})
-	var transId, transName string
-	var transMeta map[string]interface{}
-	found := make([]string, 0, len(transitions))
-	for _, transition := range transitions {
-		name := transition.(map[string]interface{})["name"].(string)
-		id := transition.(map[string]interface{})["id"].(string)
-		found = append(found, name)
-		if strings.Contains(strings.ToLower(name), trans) {
-			transName = name
-			transId = id
-			transMeta = transition.(map[string]interface{})
-		}
-	}
-	if transId == "" {
-		err := fmt.Errorf("Invalid Transition '%s', Available: %s", trans, strings.Join(found, ", "))
-		log.Error("%s", err)
-		return err
-	}
-
-	handlePost := func(json string) error {
-		log.Debug("POST: %s", json)
-		// os.Exit(0)
-		uri = fmt.Sprintf("%s/rest/api/2/issue/%s/transitions", c.endpoint, issue)
-		if c.getOptBool("dryrun", false) {
-			log.Debug("POST: %s", json)
-			log.Debug("Dryrun mode, skipping POST")
-			return nil
-		}
-		resp, err := c.post(uri, json)
-		if err != nil {
-			return err
-		}
-		if resp.StatusCode == 204 {
-			c.Browse(issue)
-			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
-		} else {
-			logBuffer := bytes.NewBuffer(make([]byte, 0))
-			resp.Write(logBuffer)
-			err := fmt.Errorf("Unexpected Response From POST")
-			log.Error("%s:\n%s", err, logBuffer)
-			return err
-		}
-		return nil
-	}
-
-	uri = fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
-	var issueData map[string]interface{}
-	if data, err := responseToJson(c.get(uri)); err != nil {
-		return err
-	} else {
-		issueData = data.(map[string]interface{})
-	}
-	issueData["meta"] = transMeta
-	issueData["overrides"] = c.opts
-	issueData["transition"] = map[string]interface{}{
-		"name": transName,
-		"id":   transId,
-	}
-
-	return c.editTemplate(
-		c.getTemplate("transition"),
-		fmt.Sprintf("%s-trans-%s-", issue, trans),
-		issueData,
-		handlePost,
-	)
-}
-
-func (c *Cli) CmdComment(issue string) error {
-	log.Debug("comment called")
-
-	handlePost := func(json string) error {
-		log.Debug("JSON: %s", json)
-		uri := fmt.Sprintf("%s/rest/api/2/issue/%s/comment", c.endpoint, issue)
-		if c.getOptBool("dryrun", false) {
-			log.Debug("POST: %s", json)
-			log.Debug("Dryrun mode, skipping POST")
-			return nil
-		}
-		resp, err := c.post(uri, json)
-		if err != nil {
-			return err
-		}
-
-		if resp.StatusCode == 201 {
-			c.Browse(issue)
-			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
-			return nil
-		} else {
-			logBuffer := bytes.NewBuffer(make([]byte, 0))
-			resp.Write(logBuffer)
-			err := fmt.Errorf("Unexpected Response From POST")
-			log.Error("%s:\n%s", err, logBuffer)
-			return err
-		}
-	}
-
-	if comment, ok := c.opts["comment"]; ok && comment != "" {
-		json, err := jsonEncode(map[string]interface{}{
-			"body": comment,
-		})
-		if err != nil {
-			return err
-		}
-		return handlePost(json)
-	} else {
-		return c.editTemplate(
-			c.getTemplate("comment"),
-			fmt.Sprintf("%s-create-", issue),
-			map[string]interface{}{},
-			handlePost,
-		)
-	}
-	return nil
-}
-
-func (c *Cli) CmdAssign(issue string, user string) error {
-	log.Debug("assign called")
-
-	json, err := jsonEncode(map[string]interface{}{
-		"name": user,
-	})
-	if err != nil {
-		return err
-	}
-
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s/assignee", c.endpoint, issue)
-	if c.getOptBool("dryrun", false) {
-		log.Debug("PUT: %s", json)
-		log.Debug("Dryrun mode, skipping PUT")
-		return nil
-	}
-	resp, err := c.put(uri, json)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode == 204 {
-		c.Browse(issue)
-		fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
-	} else {
-		logBuffer := bytes.NewBuffer(make([]byte, 0))
-		resp.Write(logBuffer)
-		err := fmt.Errorf("Unexpected Response From PUT")
-		log.Error("%s:\n%s", err, logBuffer)
-		return err
-	}
-	return nil
-}
-
-func (c *Cli) CmdExportTemplates() error {
-	dir := c.opts["directory"].(string)
-	if err := mkdir(dir); err != nil {
-		return err
-	}
-
-	for name, template := range all_templates {
-		if wanted, ok := c.opts["template"]; ok && wanted != name {
-			continue
-		}
-		templateFile := fmt.Sprintf("%s/%s", dir, name)
-		if _, err := os.Stat(templateFile); err == nil {
-			log.Warning("Skipping %s, already exists", templateFile)
-			continue
-		}
-		if fh, err := os.OpenFile(templateFile, os.O_WRONLY|os.O_CREATE, 0644); err != nil {
-			log.Error("Failed to open %s for writing: %s", templateFile, err)
-			return err
-		} else {
-			defer fh.Close()
-			log.Notice("Creating %s", templateFile)
-			fh.Write([]byte(template))
-		}
-	}
-	return nil
-}
@@ -1,146 +0,0 @@
-package cli
-
-var all_templates = map[string]string{
-	"debug":          default_debug_template,
-	"fields":         default_debug_template,
-	"editmeta":       default_debug_template,
-	"transmeta":      default_debug_template,
-	"createmeta":     default_debug_template,
-	"issuelinktypes": default_debug_template,
-	"list":           default_list_template,
-	"table":          default_table_template,
-	"view":           default_view_template,
-	"edit":           default_edit_template,
-	"transitions":    default_transitions_template,
-	"issuetypes":     default_issuetypes_template,
-	"create":         default_create_template,
-	"comment":        default_comment_template,
-	"transition":     default_transition_template,
-}
-
-const default_debug_template = "{{ . | toJson}}\n"
-
-const default_list_template = "{{ range .issues }}{{ .key | append \":\" | printf \"%-12s\"}} {{ .fields.summary }}\n{{ end }}"
-
-const default_table_template = `+{{ "-" | rep 16 }}+{{ "-" | rep 57 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
-| {{ "Issue" | printf "%-14s" }} | {{ "Summary" | printf "%-55s" }} | {{ "Priority" | printf "%-12s" }} | {{ "Status" | printf "%-12s" }} | {{ "Age" | printf "%-10s" }} | {{ "Reporter" | printf "%-12s" }} | {{ "Assignee" | printf "%-12s" }} |
-+{{ "-" | rep 16 }}+{{ "-" | rep 57 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
-{{ range .issues }}| {{ .key | printf "%-14s"}} | {{ .fields.summary | abbrev 55 | printf "%-55s" }} | {{.fields.priority.name | printf "%-12s" }} | {{.fields.status.name | printf "%-12s" }} | {{.fields.created | age | printf "%-10s" }} | {{if .fields.reporter}}{{ .fields.reporter.name | printf "%-12s"}}{{else}}<unassigned>{{end}} | {{if .fields.assignee }}{{.fields.assignee.name | printf "%-12s" }}{{else}}<unassigned>{{end}} |
-{{ end }}+{{ "-" | rep 16 }}+{{ "-" | rep 57 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
-`
-
-const default_view_template = `issue: {{ .key }}
-created: {{ .fields.created }}
-status: {{ .fields.status.name }}
-summary: {{ .fields.summary }}
-project: {{ .fields.project.key }}
-components: {{ range .fields.components }}{{ .name }} {{end}}
-issuetype: {{ .fields.issuetype.name }}
-assignee: {{ if .fields.assignee }}{{ .fields.assignee.name }}{{end}}
-reporter: {{ if .fields.reporter }}{{ .fields.reporter.name }}{{end}}
-watchers: {{ range .fields.customfield_10110 }}{{ .name }} {{end}}
-blockers: {{ range .fields.issuelinks }}{{if .outwardIssue}}{{ .outwardIssue.key }}[{{.outwardIssue.fields.status.name}}]{{end}}{{end}}
-depends: {{ range .fields.issuelinks }}{{if .inwardIssue}}{{ .inwardIssue.key }}[{{.inwardIssue.fields.status.name}}]{{end}}{{end}}
-priority: {{ .fields.priority.name }}
-description: |
-  {{ or .fields.description "" | indent 2 }}
-
-comments:
-{{ range .fields.comment.comments }}  - | # {{.author.name}} at {{.created}}
-    {{ or .body "" | indent 4}}
-{{end}}
-`
-const default_edit_template = `# issue: {{ .key }}
-update:
-  comment:
-    - add: 
-        body: |~
-          {{ or .overrides.comment "" | indent 10 }}
-fields:
-  summary: {{ or .overrides.summary .fields.summary }}
-  components: # Values: {{ range .meta.fields.components.allowedValues }}{{.name}}, {{end}}{{if .overrides.components }}{{ range (split "," .overrides.components)}}
-    - name: {{.}}{{end}}{{else}}{{ range .fields.components }}
-    - name: {{ .name }}{{end}}{{end}}
-  assignee:
-    name: {{ if .overrides.assignee }}{{.overrides.assignee}}{{else}}{{if .fields.assignee }}{{ .fields.assignee.name }}{{end}}{{end}}
-  reporter:
-    name: {{ if .overrides.reporter }}{{ .overrides.reporter }}{{else if .fields.reporter}}{{ .fields.reporter.name }}{{end}}
-  # watchers
-  customfield_10110: {{ range .fields.customfield_10110 }}
-    - name: {{ .name }}{{end}}{{if .overrides.watcher}}
-    - name: {{ .overrides.watcher}}{{end}}
-  priority: # Values: {{ range .meta.fields.priority.allowedValues }}{{.name}}, {{end}}
-    name: {{ or .overrides.priority .fields.priority.name }}
-  description: |~
-    {{ or .overrides.description (or .fields.description "") | indent 4 }}
-# comments:
-# {{ range .fields.comment.comments }}  - | # {{.author.name}} at {{.created}}
-#     {{ or .body "" | indent 4 | comment}}
-# {{end}}
-`
-const default_transitions_template = `{{ range .transitions }}{{.id }}: {{.name}}
-{{end}}`
-
-const default_issuetypes_template = `{{ range .projects }}{{ range .issuetypes }}{{color "+bh"}}{{.name | append ":" | printf "%-13s" }}{{color "reset"}} {{.description}}
-{{end}}{{end}}`
-
-const default_create_template = `fields:
-  project:
-    key: {{ .overrides.project }}
-  issuetype:
-    name: {{ .overrides.issuetype }}
-  summary: {{ or .overrides.summary "" }}
-  priority: # Values: {{ range .meta.fields.priority.allowedValues }}{{.name}}, {{end}}
-    name: {{ or .overrides.priority "unassigned" }}
-  components: # Values: {{ range .meta.fields.components.allowedValues }}{{.name}}, {{end}}{{ range split "," (or .overrides.components "")}}
-    - name: {{ . }}{{end}}
-  description: |~
-    {{ or .overrides.description "" | indent 4 }}
-  assignee:
-    name: {{ or .overrides.assignee "" }}
-  reporter:
-    name: {{ or .overrides.reporter .overrides.user }}
-  # watchers
-  customfield_10110: {{ range split "," (or .overrides.watchers "")}}
-    - name: {{.}}{{end}}
-    - name:
-`
-
-const default_comment_template = `body: |~
-  {{ or .overrides.comment "" | indent 2 }}
-`
-
-const default_transition_template = `update:
-  comment:
-    - add: 
-        body: |~
-          {{ or .overrides.comment "" | indent 10 }}
-fields:{{if .meta.fields.assignee}}
-  assignee:
-    name: {{if .overrides.assignee}}{{.overrides.assignee}}{{else}}{{if .fields.assignee}}{{.fields.assignee.name}}{{end}}{{end}}{{end}}{{if .meta.fields.components}}
-  components: # Values: {{ range .meta.fields.components.allowedValues }}{{.name}}, {{end}}{{if .overrides.components }}{{ range (split "," .overrides.components)}}
-    - name: {{.}}{{end}}{{else}}{{ range .fields.components }}
-    - name: {{ .name }}{{end}}{{end}}{{end}}{{if .meta.fields.description}}
-  description: {{or .overrides.description .fields.description }}{{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: {{.}}{{end}}{{else}}{{range .fields.fixVersions}}
-    - name: {{.}}{{end}}{{end}}{{end}}{{end}}{{if .meta.fields.issuetype}}
-  issuetype: # Values: {{ range .meta.fields.issuetype.allowedValues }}{{.name}}, {{end}}
-    name: {{if .overrides.issuetype}}{{.overrides.issuetype}}{{else}}{{if .fields.issuetype}}{{.fields.issuetype.name}}{{end}}{{end}}{{end}}{{if .meta.fields.labels}}
-  labels: {{range .fields.labels}}
-    - {{.}}{{end}}{{if .overrides.labels}}{{range (split "," .overrides.labels)}}
-    - {{.}}{{end}}{{end}}{{end}}{{if .meta.fields.priority}}
-  priority: # Values: {{ range .meta.fields.priority.allowedValues }}{{.name}}, {{end}}
-    name: {{ or .overrides.priority "unassigned" }}{{end}}{{if .meta.fields.reporter}}
-  reporter:
-    name: {{if .overrides.reporter}}{{.overrides.reporter}}{{else}}{{if .fields.reporter}}{{.fields.reporter.name}}{{end}}{{end}}{{end}}{{if .meta.fields.resolution}}
-  resolution: # Values: {{ range .meta.fields.resolution.allowedValues }}{{.name}}, {{end}}
-    name: {{if .overrides.resolution}}{{.overrides.resolution}}{{else if .fields.resolution}}{{.fields.resolution.name}}{{else}}Fixed{{end}}{{end}}{{if .meta.fields.summary}}
-  summary: {{or .overrides.summary .fields.summary}}{{end}}{{if .meta.fields.versions.allowedValues}}
-  versions: # Values: {{ range .meta.fields.versions.allowedValues }}{{.name}}, {{end}}{{if .overrides.versions}}{{ range (split "," .overrides.versions)}}
-    - name: {{.}}{{end}}{{else}}{{range .fields.versions}}
-    - name: {{.}}{{end}}{{end}}{{end}}
-transition:
-  id: {{ .transition.id }}
-  name: {{ .transition.name }}
-`
@@ -3,21 +3,28 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"github.com/Netflix-Skunkworks/go-jira/jira/cli"
-	"github.com/coryb/optigo"
-	"github.com/op/go-logging"
-	"gopkg.in/coryb/yaml.v2"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/coryb/optigo"
+	"gopkg.in/Netflix-Skunkworks/go-jira.v0"
+	"gopkg.in/coryb/yaml.v2"
+	"gopkg.in/op/go-logging.v1"
 )

-var log = logging.MustGetLogger("jira")
-var format = "%{color}%{time:2006-01-02T15:04:05.000Z07:00} %{level:-5s} [%{shortfile}]%{color:reset} %{message}"
+var (
+	log           = logging.MustGetLogger("jira")
+	defaultFormat = "%{color}%{time:2006-01-02T15:04:05.000Z07:00} %{level:-5s} [%{shortfile}]%{color:reset} %{message}"
+)

 func main() {
 	logBackend := logging.NewLogBackend(os.Stderr, "", 0)
+	format := os.Getenv("JIRA_LOG_FORMAT")
+	if format == "" {
+		format = defaultFormat
+	}
 	logging.SetBackend(
 		logging.NewBackendFormatter(
 			logBackend,
@@ -29,7 +36,7 @@ func main() {
 	user := os.Getenv("USER")
 	home := os.Getenv("HOME")
 	defaultQueryFields := "summary,created,updated,priority,status,reporter,assignee"
-	defaultSort := "priority asc, created"
+	defaultSort := "priority asc, key"
 	defaultMaxResults := 500

 	usage := func(ok bool) {
@@ -50,11 +57,16 @@ func main() {
 Usage:
  jira (ls|list) <Query Options> 
  jira view ISSUE
+  jira worklog ISSUE
+  jira add worklog ISSUE <Worklog Options>
  jira edit [--noedit] <Edit Options> [ISSUE | <Query Options>]
  jira create [--noedit] [-p PROJECT] <Create Options>
+  jira subtask ISSUE [--noedit] <Create Options>
  jira DUPLICATE dups ISSUE
  jira BLOCKER blocks ISSUE
-  jira watch ISSUE [-w WATCHER]
+  jira vote ISSUE [--down]
+  jira rank ISSUE (after|before) ISSUE
+  jira watch ISSUE [-w WATCHER] [--remove]
  jira (trans|transition) TRANSITION ISSUE [--noedit] <Edit Options>
  jira ack ISSUE [--edit] <Edit Options>
  jira close ISSUE [--edit] <Edit Options>
@@ -62,28 +74,39 @@ Usage:
  jira reopen ISSUE [--edit] <Edit Options>
  jira start ISSUE [--edit] <Edit Options>
  jira stop ISSUE [--edit] <Edit Options>
+  jira todo ISSUE [--edit] <Edit Options>
+  jira backlog ISSUE [--edit] <Edit Options>
+  jira done ISSUE [--edit] <Edit Options>
+  jira prog|progress|in-progress [--edit] <Edit Options>
  jira comment ISSUE [--noedit] <Edit Options>
+  jira (set,add,remove) labels ISSUE [LABEL] ...
  jira take ISSUE
  jira (assign|give) ISSUE ASSIGNEE
  jira fields
  jira issuelinktypes
  jira transmeta ISSUE
  jira editmeta ISSUE
+  jira add component [-p PROJECT] NAME DESCRIPTION LEAD
+  jira components [-p PROJECT]
  jira issuetypes [-p PROJECT] 
  jira createmeta [-p PROJECT] [-i ISSUETYPE] 
  jira transitions ISSUE
  jira export-templates [-d DIR] [-t template]
  jira (b|browse) ISSUE
  jira login
+  jira logout
+  jira request [-M METHOD] URI [DATA]
  jira ISSUE

 General Options:
  -b --browse         Open your browser to the Jira issue
  -e --endpoint=URI   URI to use for jira
+  -k --insecure       disable TLS certificate verification
  -h --help           Show this usage
  -t --template=FILE  Template file to use for output/editing
  -u --user=USER      Username to use for authenticaion (default: %s)
  -v --verbose        Increase output logging
+  --unixproxy=PATH    Path for a unix-socket proxy (eg., --unixproxy /tmp/proxy.sock)
  --version           Print version

 Query Options:
@@ -108,6 +131,10 @@ Create Options:
  -m --comment=COMMENT      Comment message for transition
  -o --override=KEY=VAL     Set custom key/value pairs

+Worklog Options:
+  -T --time-spent=TIMESPENT Time spent working on issue
+  -m --comment=COMMENT      Comment message for worklog
+
 Command Options:
  -d --directory=DIR        Directory to export templates to (default: %s)
 `, user, defaultQueryFields, defaultMaxResults, defaultSort, user, fmt.Sprintf("%s/.jira.d/templates", home))
@@ -120,6 +147,7 @@ Command Options:
 		"view":             "view",
 		"edit":             "edit",
 		"create":           "create",
+		"subtask":          "subtask",
 		"dups":             "dups",
 		"blocks":           "blocks",
 		"watch":            "watch",
@@ -132,7 +160,17 @@ Command Options:
 		"reopen":           "reopen",
 		"start":            "start",
 		"stop":             "stop",
+		"todo":             "todo",
+		"backlog":          "backlog",
+		"done":             "done",
+		"prog":             "in-progress",
+		"progress":         "in-progress",
+		"in-progress":      "in-progress",
 		"comment":          "comment",
+		"label":            "labels",
+		"labels":           "labels",
+		"component":        "component",
+		"components":       "components",
 		"take":             "take",
 		"assign":           "assign",
 		"give":             "assign",
@@ -146,6 +184,13 @@ Command Options:
 		"export-templates": "export-templates",
 		"browse":           "browse",
 		"login":            "login",
+		"logout":           "logout",
+		"req":              "request",
+		"request":          "request",
+		"vote":             "vote",
+		"rank":             "rank",
+		"worklog":          "worklog",
+		"addworklog":       "addworklog",
 	}

 	defaults := map[string]interface{}{
@@ -154,11 +199,11 @@ Command Options:
 		"directory":   fmt.Sprintf("%s/.jira.d/templates", home),
 		"sort":        defaultSort,
 		"max_results": defaultMaxResults,
+		"method":      "GET",
+		"quiet":       false,
 	}
 	opts := make(map[string]interface{})

-	overrides := make(map[string]string)
-
 	setopt := func(name string, value interface{}) {
 		opts[name] = value
 	}
@@ -166,7 +211,7 @@ Command Options:
 	op := optigo.NewDirectAssignParser(map[string]interface{}{
 		"h|help": usage,
 		"version": func() {
-			fmt.Println("version: 0.0.14")
+			fmt.Println(fmt.Sprintf("version: %s", jira.VERSION))
 			os.Exit(0)
 		},
 		"v|verbose+": func() {
@@ -177,6 +222,7 @@ Command Options:
 		"editor=s":              setopt,
 		"u|user=s":              setopt,
 		"endpoint=s":            setopt,
+		"k|insecure":            setopt,
 		"t|template=s":          setopt,
 		"q|query=s":             setopt,
 		"p|project=s":           setopt,
@@ -184,23 +230,30 @@ Command Options:
 		"a|assignee=s":          setopt,
 		"i|issuetype=s":         setopt,
 		"w|watcher=s":           setopt,
+		"remove":                setopt,
 		"r|reporter=s":          setopt,
 		"f|queryfields=s":       setopt,
+		"x|expand=s":            setopt,
 		"s|sort=s":              setopt,
 		"l|limit|max_results=i": setopt,
-		"o|override=s%":         &overrides,
+		"o|override=s%":         &opts,
 		"noedit":                setopt,
 		"edit":                  setopt,
 		"m|comment=s":           setopt,
 		"d|dir|directory=s":     setopt,
+		"M|method=s":            setopt,
+		"S|saveFile=s":          setopt,
+		"T|time-spent=s":        setopt,
+		"Q|quiet":               setopt,
+		"unixproxy":             setopt,
+		"down":                  setopt,
 	})

 	if err := op.ProcessAll(os.Args[1:]); err != nil {
-		log.Error("%s", err)
+		log.Errorf("%s", err)
 		usage(false)
 	}
 	args := op.Args
-	opts["overrides"] = overrides

 	var command string
 	if len(args) > 0 {
@@ -209,6 +262,7 @@ Command Options:
 			args = args[1:]
 		} else if len(args) > 1 {
 			// look at second arg for "dups" and "blocks" commands
+			// also for 'set/add/remove' actions like 'labels'
 			if alias, ok := jiraCommands[args[1]]; ok {
 				command = alias
 				args = append(args[:1], args[2:]...)
@@ -216,7 +270,7 @@ Command Options:
 		}
 	}

-	if command == "" {
+	if command == "" && len(args) > 0 {
 		command = args[0]
 		args = args[1:]
 	}
@@ -228,52 +282,63 @@ Command Options:
 	if value, ok := opts["command"].(string); ok {
 		command = value
 	} else if _, ok := jiraCommands[command]; !ok || command == "" {
-		args = append([]string{command}, args...)
+		if command != "" {
+			args = append([]string{command}, args...)
+		}
 		command = "view"
 	}

 	// apply defaults
 	for k, v := range defaults {
 		if _, ok := opts[k]; !ok {
-			log.Debug("Setting %q to %#v from defaults", k, v)
+			log.Debugf("Setting %q to %#v from defaults", k, v)
 			opts[k] = v
 		}
 	}

-	log.Debug("opts: %v", opts)
-	log.Debug("args: %v", args)
+	log.Debugf("opts: %v", opts)
+	log.Debugf("args: %v", args)

 	if _, ok := opts["endpoint"]; !ok {
-		log.Error("endpoint option required.  Either use --endpoint or set a endpoint option in your ~/.jira.d/config.yml file")
+		log.Errorf("endpoint option required.  Either use --endpoint or set a endpoint option in your ~/.jira.d/config.yml file")
 		os.Exit(1)
 	}

-	c := cli.New(opts)
+	c := jira.New(opts)

-	log.Debug("opts: %s", opts)
+	log.Debugf("opts: %s", opts)

 	setEditing := func(dflt bool) {
-		log.Debug("Default Editing: %t", dflt)
+		log.Debugf("Default Editing: %t", dflt)
 		if dflt {
 			if val, ok := opts["noedit"].(bool); ok && val {
-				log.Debug("Setting edit = false")
+				log.Debugf("Setting edit = false")
 				opts["edit"] = false
 			} else {
-				log.Debug("Setting edit = true")
+				log.Debugf("Setting edit = true")
 				opts["edit"] = true
 			}
 		} else {
 			if _, ok := opts["edit"].(bool); !ok {
-				log.Debug("Setting edit = %t", dflt)
+				log.Debugf("Setting edit = %t", dflt)
 				opts["edit"] = dflt
 			}
 		}
 	}

+	requireArgs := func(count int) {
+		if len(args) < count {
+			log.Errorf("Not enough arguments. %d required, %d provided", count, len(args))
+			usage(false)
+		}
+	}
+
 	var err error
 	switch command {
 	case "login":
 		err = c.CmdLogin()
+	case "logout":
+		err = c.CmdLogout()
 	case "fields":
 		err = c.CmdFields()
 	case "list":
@@ -289,7 +354,7 @@ Command Options:
 				for _, issue := range issues {
 					if err = c.CmdEdit(issue.(map[string]interface{})["key"].(string)); err != nil {
 						switch err.(type) {
-						case cli.NoChangesFound:
+						case jira.NoChangesFound:
 							log.Warning("No Changes found: %s", err)
 							err = nil
 							continue
@@ -300,8 +365,10 @@ Command Options:
 			}
 		}
 	case "editmeta":
+		requireArgs(1)
 		err = c.CmdEditMeta(args[0])
 	case "transmeta":
+		requireArgs(1)
 		err = c.CmdTransitionMeta(args[0])
 	case "issuelinktypes":
 		err = c.CmdIssueLinkTypes()
@@ -312,59 +379,165 @@ Command Options:
 	case "create":
 		setEditing(true)
 		err = c.CmdCreate()
+	case "subtask":
+		setEditing(true)
+		err = c.CmdSubtask(args[0])
 	case "transitions":
+		requireArgs(1)
 		err = c.CmdTransitions(args[0])
 	case "blocks":
+		requireArgs(2)
 		err = c.CmdBlocks(args[0], args[1])
 	case "dups":
+		setEditing(true)
+		requireArgs(2)
 		if err = c.CmdDups(args[0], args[1]); err == nil {
 			opts["resolution"] = "Duplicate"
-			err = c.CmdTransition(args[0], "close")
+			trans, err := c.ValidTransitions(args[0])
+			if err == nil {
+				if trans.Find("close") != nil {
+					err = c.CmdTransition(args[0], "close")
+				} else if trans.Find("done") != nil {
+					// for now just assume if there is no "close", then
+					// there is a "done" state
+					err = c.CmdTransition(args[0], "done")
+				} else if trans.Find("start") != nil {
+					err = c.CmdTransition(args[0], "start")
+					if err == nil {
+						err = c.CmdTransition(args[0], "stop")
+					}
+				}
+			}
+
 		}
 	case "watch":
-		err = c.CmdWatch(args[0])
+		requireArgs(1)
+		watcher := c.GetOptString("watcher", opts["user"].(string))
+		remove := c.GetOptBool("remove", false)
+		err = c.CmdWatch(args[0], watcher, remove)
 	case "transition":
+		requireArgs(2)
 		setEditing(true)
-		err = c.CmdTransition(args[0], args[1])
+		err = c.CmdTransition(args[1], args[0])
 	case "close":
+		requireArgs(1)
 		setEditing(false)
 		err = c.CmdTransition(args[0], "close")
 	case "acknowledge":
+		requireArgs(1)
 		setEditing(false)
 		err = c.CmdTransition(args[0], "acknowledge")
 	case "reopen":
+		requireArgs(1)
 		setEditing(false)
 		err = c.CmdTransition(args[0], "reopen")
 	case "resolve":
+		requireArgs(1)
 		setEditing(false)
 		err = c.CmdTransition(args[0], "resolve")
 	case "start":
+		requireArgs(1)
 		setEditing(false)
 		err = c.CmdTransition(args[0], "start")
 	case "stop":
+		requireArgs(1)
 		setEditing(false)
 		err = c.CmdTransition(args[0], "stop")
+	case "todo":
+		requireArgs(1)
+		setEditing(false)
+		err = c.CmdTransition(args[0], "To Do")
+	case "backlog":
+		requireArgs(1)
+		setEditing(false)
+		err = c.CmdTransition(args[0], "Backlog")
+	case "done":
+		requireArgs(1)
+		setEditing(false)
+		err = c.CmdTransition(args[0], "Done")
+	case "in-progress":
+		requireArgs(1)
+		setEditing(false)
+		err = c.CmdTransition(args[0], "Progress")
 	case "comment":
+		requireArgs(1)
 		setEditing(true)
 		err = c.CmdComment(args[0])
+	case "labels":
+		requireArgs(2)
+		action := args[0]
+		issue := args[1]
+		labels := args[2:]
+		err = c.CmdLabels(action, issue, labels)
+	case "component":
+		requireArgs(2)
+		action := args[0]
+		project := opts["project"].(string)
+		name := args[1]
+		var lead string
+		var description string
+		if len(args) > 2 {
+			description = args[2]
+		}
+		if len(args) > 3 {
+			lead = args[2]
+		}
+		err = c.CmdComponent(action, project, name, description, lead)
+	case "components":
+		project := opts["project"].(string)
+		err = c.CmdComponents(project)
 	case "take":
+		requireArgs(1)
 		err = c.CmdAssign(args[0], opts["user"].(string))
 	case "browse":
+		requireArgs(1)
 		opts["browse"] = true
 		err = c.Browse(args[0])
 	case "export-templates":
 		err = c.CmdExportTemplates()
 	case "assign":
+		requireArgs(2)
 		err = c.CmdAssign(args[0], args[1])
 	case "view":
+		requireArgs(1)
 		err = c.CmdView(args[0])
+	case "worklog":
+		if len(args) > 0 && args[0] == "add" {
+			setEditing(true)
+			requireArgs(2)
+			err = c.CmdWorklog(args[0], args[1])
+		} else {
+			requireArgs(1)
+			err = c.CmdWorklogs(args[0])
+		}
+	case "vote":
+		requireArgs(1)
+		if val, ok := opts["down"]; ok {
+			err = c.CmdVote(args[0], !val.(bool))
+		} else {
+			err = c.CmdVote(args[0], true)
+		}
+	case "rank":
+		requireArgs(3)
+		if args[1] == "after" {
+			err = c.CmdRankAfter(args[0], args[2])
+		} else {
+			err = c.CmdRankBefore(args[0], args[2])
+		}
+	case "request":
+		requireArgs(1)
+		data := ""
+		if len(args) > 1 {
+			data = args[1]
+		}
+		err = c.CmdRequest(args[0], data)
 	default:
-		log.Error("Unknown command %s", command)
+		log.Errorf("Unknown command %s", command)
 		os.Exit(1)
 	}

 	if err != nil {
-		log.Error("%s", err)
+		log.Errorf("%s", err)
 		os.Exit(1)
 	}
 	os.Exit(0)
@@ -372,8 +545,10 @@ Command Options:

 func parseYaml(file string, opts map[string]interface{}) {
 	if fh, err := ioutil.ReadFile(file); err == nil {
-		log.Debug("Found Config file: %s", file)
-		yaml.Unmarshal(fh, &opts)
+		log.Debugf("Found Config file: %s", file)
+		if err := yaml.Unmarshal(fh, &opts); err != nil {
+			log.Errorf("Unable to parse %s: %s", file, err)
+		}
 	}
 }

@@ -399,12 +574,12 @@ func populateEnv(opts map[string]interface{}) {

 func loadConfigs(opts map[string]interface{}) {
 	populateEnv(opts)
-	paths := cli.FindParentPaths(".jira.d/config.yml")
+	paths := jira.FindParentPaths(".jira.d/config.yml")
 	// prepend
-	paths = append([]string{"/etc/jira-cli.yml"}, paths...)
+	paths = append(paths, "/etc/go-jira.yml")

 	// iterate paths in reverse
-	for i := len(paths) - 1; i >= 0; i-- {
+	for i := 0; i < len(paths); i++ {
 		file := paths[i]
 		if stat, err := os.Stat(file); err == nil {
 			tmp := make(map[string]interface{})
@@ -412,21 +587,21 @@ func loadConfigs(opts map[string]interface{}) {
 			if stat.Mode()&0111 == 0 {
 				parseYaml(file, tmp)
 			} else {
-				log.Debug("Found Executable Config file: %s", file)
+				log.Debugf("Found Executable Config file: %s", file)
 				// it is executable, so run it and try to parse the output
 				cmd := exec.Command(file)
 				stdout := bytes.NewBufferString("")
 				cmd.Stdout = stdout
 				cmd.Stderr = bytes.NewBufferString("")
 				if err := cmd.Run(); err != nil {
-					log.Error("%s is exectuable, but it failed to execute: %s\n%s", file, err, cmd.Stderr)
+					log.Errorf("%s is exectuable, but it failed to execute: %s\n%s", file, err, cmd.Stderr)
 					os.Exit(1)
 				}
 				yaml.Unmarshal(stdout.Bytes(), &tmp)
 			}
 			for k, v := range tmp {
 				if _, ok := opts[k]; !ok {
-					log.Debug("Setting %q to %#v from %s", k, v, file)
+					log.Debugf("Setting %q to %#v from %s", k, v, file)
 					opts[k] = v
 				}
 			}
@@ -0,0 +1,75 @@
+package jira
+
+import (
+	"bytes"
+	"fmt"
+	"os/exec"
+	"strings"
+
+	"github.com/howeyc/gopass"
+	"github.com/tmc/keyring"
+)
+
+func (c *Cli) GetPass(user string) string {
+	passwd := ""
+	if source, ok := c.opts["password-source"].(string); ok {
+		if source == "keyring" {
+			passwd, _ = keyring.Get("go-jira", user)
+		} else if source == "pass" {
+			if bin, err := exec.LookPath("pass"); err == nil {
+				buf := bytes.NewBufferString("")
+				cmd := exec.Command(bin, fmt.Sprintf("GoJira/%s", user))
+				cmd.Stdout = buf
+				cmd.Stderr = buf
+				if err := cmd.Run(); err == nil {
+					passwd = strings.TrimSpace(buf.String())
+				}
+			}
+		} else {
+			log.Warningf("Unknown password-source: %s", source)
+		}
+	}
+
+	if passwd != "" {
+		return passwd
+	}
+	fmt.Printf("Jira Password [%s]: ", user)
+	pw, err := gopass.GetPasswdMasked()
+	if err != nil {
+		return ""
+	}
+	passwd = string(pw)
+	return passwd
+}
+
+func (c *Cli) SetPass(user, passwd string) error {
+	log.Debugf("SetPass called: %s => %s", user, passwd)
+	if source, ok := c.opts["password-source"].(string); ok {
+		log.Debugf("password-source: %s", source)
+		if source == "keyring" {
+			// save password in keychain so that it can be used for subsequent http requests
+			err := keyring.Set("go-jira", user, passwd)
+			if err != nil {
+				log.Errorf("Failed to set password in keyring: %s", err)
+				return err
+			}
+		} else if source == "pass" {
+			log.Debugf("processing %s", source)
+			if bin, err := exec.LookPath("pass"); err == nil {
+				log.Debugf("using %s", bin)
+				in := bytes.NewBufferString(fmt.Sprintf("%s\n%s\n", passwd, passwd))
+				out := bytes.NewBufferString("")
+				cmd := exec.Command(bin, "insert", "--force", fmt.Sprintf("GoJira/%s", user))
+				cmd.Stdin = in
+				cmd.Stdout = out
+				cmd.Stderr = out
+				if err := cmd.Run(); err != nil {
+					return fmt.Errorf("Failed to insert password: %s", out.String())
+				}
+			}
+		} else {
+			return fmt.Errorf("Unknown password-source: %s", source)
+		}
+	}
+	return nil
+}
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+from lxml import html
+import requests
+import json
+
+page = requests.get('https://docs.atlassian.com/jira/REST/cloud')
+tree = html.fromstring(page.content)
+
+schemas = tree.xpath("//div[@class='representation-doc-block']//code/text()")
+
+for schema in schemas:
+    try:
+        data = json.loads(schema)
+        if "title" in data:
+            title = data["title"].replace(" ", "")
+            print "Writing {}.json".format(title)
+            with open("{}.json".format(title), 'w') as f:
+                f.write(schema)
+    except:
+        True
+
@@ -0,0 +1 @@
+!src/
@@ -0,0 +1,236 @@
+# Options for GnuPG
+# Copyright 1998, 1999, 2000, 2001, 2002, 2003,
+#           2010 Free Software Foundation, Inc.
+# 
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+# 
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Unless you specify which option file to use (with the command line
+# option "--options filename"), GnuPG uses the file ~/.gnupg/gpg.conf
+# by default.
+#
+# An options file can contain any long options which are available in
+# GnuPG. If the first non white space character of a line is a '#',
+# this line is ignored.  Empty lines are also ignored.
+#
+# See the man page for a list of options.
+
+# Uncomment the following option to get rid of the copyright notice
+
+#no-greeting
+
+# If you have more than 1 secret key in your keyring, you may want to
+# uncomment the following option and set your preferred keyid.
+
+#default-key 621CC013
+
+# If you do not pass a recipient to gpg, it will ask for one.  Using
+# this option you can encrypt to a default key.  Key validation will
+# not be done in this case.  The second form uses the default key as
+# default recipient.
+
+#default-recipient some-user-id
+#default-recipient-self
+
+# Use --encrypt-to to add the specified key as a recipient to all
+# messages.  This is useful, for example, when sending mail through a
+# mail client that does not automatically encrypt mail to your key.
+# In the example, this option allows you to read your local copy of
+# encrypted mail that you've sent to others.
+
+#encrypt-to some-key-id
+
+# By default GnuPG creates version 4 signatures for data files as
+# specified by OpenPGP.  Some earlier (PGP 6, PGP 7) versions of PGP
+# require the older version 3 signatures.  Setting this option forces
+# GnuPG to create version 3 signatures.
+
+#force-v3-sigs
+
+# Because some mailers change lines starting with "From " to ">From "
+# it is good to handle such lines in a special way when creating
+# cleartext signatures; all other PGP versions do it this way too.
+
+#no-escape-from-lines
+
+# If you do not use the Latin-1 (ISO-8859-1) charset, you should tell
+# GnuPG which is the native character set.  Please check the man page
+# for supported character sets.  This character set is only used for
+# metadata and not for the actual message which does not undergo any
+# translation.  Note that future version of GnuPG will change to UTF-8
+# as default character set.  In most cases this option is not required
+# as GnuPG is able to figure out the correct charset at runtime.
+
+#charset utf-8
+
+# Group names may be defined like this:
+#   group mynames = paige 0x12345678 joe patti
+#
+# Any time "mynames" is a recipient (-r or --recipient), it will be
+# expanded to the names "paige", "joe", and "patti", and the key ID
+# "0x12345678".  Note there is only one level of expansion - you
+# cannot make an group that points to another group.  Note also that
+# if there are spaces in the recipient name, this will appear as two
+# recipients.  In these cases it is better to use the key ID.
+
+#group mynames = paige 0x12345678 joe patti
+
+# Lock the file only once for the lifetime of a process.  If you do
+# not define this, the lock will be obtained and released every time
+# it is needed, which is usually preferable.
+
+#lock-once
+
+# GnuPG can send and receive keys to and from a keyserver.  These
+# servers can be HKP, email, or LDAP (if GnuPG is built with LDAP
+# support).
+#
+# Example HKP keyserver:
+#      hkp://keys.gnupg.net
+#      hkp://subkeys.pgp.net
+#
+# Example email keyserver:
+#      mailto:pgp-public-keys@keys.pgp.net
+#
+# Example LDAP keyservers:
+#      ldap://keyserver.pgp.com
+#
+# Regular URL syntax applies, and you can set an alternate port
+# through the usual method:
+#      hkp://keyserver.example.net:22742
+#
+# Most users just set the name and type of their preferred keyserver.
+# Note that most servers (with the notable exception of
+# ldap://keyserver.pgp.com) synchronize changes with each other.  Note
+# also that a single server name may actually point to multiple
+# servers via DNS round-robin.  hkp://keys.gnupg.net is an example of
+# such a "server", which spreads the load over a number of physical
+# servers.  To see the IP address of the server actually used, you may use
+# the "--keyserver-options debug".
+
+keyserver hkp://keys.gnupg.net
+#keyserver mailto:pgp-public-keys@keys.nl.pgp.net
+#keyserver ldap://keyserver.pgp.com
+
+# Common options for keyserver functions:
+#
+# include-disabled : when searching, include keys marked as "disabled"
+#                    on the keyserver (not all keyservers support this).
+#
+# no-include-revoked : when searching, do not include keys marked as
+#                      "revoked" on the keyserver.
+#
+# verbose : show more information as the keys are fetched.
+#           Can be used more than once to increase the amount
+#           of information shown.
+#
+# use-temp-files : use temporary files instead of a pipe to talk to the
+#                  keyserver.  Some platforms (Win32 for one) always
+#                  have this on.
+#
+# keep-temp-files : do not delete temporary files after using them
+#                   (really only useful for debugging)
+#
+# http-proxy="proxy" : set the proxy to use for HTTP and HKP keyservers.
+#                      This overrides the "http_proxy" environment variable,
+#                      if any.
+#
+# auto-key-retrieve : automatically fetch keys as needed from the keyserver
+#                     when verifying signatures or when importing keys that
+#                     have been revoked by a revocation key that is not
+#                     present on the keyring.
+#
+# no-include-attributes : do not include attribute IDs (aka "photo IDs")
+#                         when sending keys to the keyserver.
+
+#keyserver-options auto-key-retrieve
+
+# Display photo user IDs in key listings
+
+# list-options show-photos
+
+# Display photo user IDs when a signature from a key with a photo is
+# verified
+
+# verify-options show-photos
+
+# Use this program to display photo user IDs
+#
+# %i is expanded to a temporary file that contains the photo.
+# %I is the same as %i, but the file isn't deleted afterwards by GnuPG.
+# %k is expanded to the key ID of the key.
+# %K is expanded to the long OpenPGP key ID of the key.
+# %t is expanded to the extension of the image (e.g. "jpg").
+# %T is expanded to the MIME type of the image (e.g. "image/jpeg").
+# %f is expanded to the fingerprint of the key.
+# %% is %, of course.
+#
+# If %i or %I are not present, then the photo is supplied to the
+# viewer on standard input.  If your platform supports it, standard
+# input is the best way to do this as it avoids the time and effort in
+# generating and then cleaning up a secure temp file.
+#
+# If no photo-viewer is provided, GnuPG will look for xloadimage, eog,
+# or display (ImageMagick).  On Mac OS X and Windows, the default is
+# to use your regular JPEG image viewer.
+#
+# Some other viewers:
+# photo-viewer "qiv %i"
+# photo-viewer "ee %i"
+#
+# This one saves a copy of the photo ID in your home directory:
+# photo-viewer "cat > ~/photoid-for-key-%k.%t"
+#
+# Use your MIME handler to view photos:
+# photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG"
+
+# Passphrase agent
+#
+# We support the old experimental passphrase agent protocol as well as
+# the new Assuan based one (currently available in the "newpg" package
+# at ftp.gnupg.org/gcrypt/alpha/aegypten/).  To make use of the agent,
+# you have to run an agent as daemon and use the option
+#
+# use-agent
+# 
+# which tries to use the agent but will fallback to the regular mode
+# if there is a problem connecting to the agent.  The normal way to
+# locate the agent is by looking at the environment variable
+# GPG_AGENT_INFO which should have been set during gpg-agent startup.
+# In certain situations the use of this variable is not possible, thus
+# the option
+# 
+# --gpg-agent-info=<path>:<pid>:1
+#
+# may be used to override it.
+
+# Automatic key location
+#
+# GnuPG can automatically locate and retrieve keys as needed using the
+# auto-key-locate option.  This happens when encrypting to an email
+# address (in the "user@example.com" form), and there are no
+# user@example.com keys on the local keyring.  This option takes the
+# following arguments, in the order they are to be tried:
+# 
+# cert = locate a key using DNS CERT, as specified in RFC-4398.
+#        GnuPG can handle both the PGP (key) and IPGP (URL + fingerprint)
+#        CERT methods.
+#
+# pka = locate a key using DNS PKA.
+#
+# ldap = locate a key using the PGP Universal method of checking
+#        "ldap://keys.(thedomain)".  For example, encrypting to
+#        user@example.com will check ldap://keys.example.com.
+#
+# keyserver = locate a key using whatever keyserver is defined using
+#             the keyserver option.
+#
+# You may also list arbitrary keyservers here by URL.
+#
+# Try CERT, then PKA, then LDAP, then hkp://subkeys.net:
+#auto-key-locate cert pka ldap hkp://subkeys.pgp.net
@@ -0,0 +1,9 @@
+#!/bin/sh
+echo password-source: pass
+if [ -z "$JIRACLOUD" ]; then
+    echo endpoint: http://localhost:8080
+    echo user: gojira
+else
+    echo endpoint: https://go-jira.atlassian.net
+    echo user: gojira@example.com
+fi    
@@ -0,0 +1 @@
+Go Jira <gojira@example.com>
@@ -0,0 +1 @@
+…(ΡαΆω GΈώ20,ΧΎ„¶ι―’«$Ggu©y1_a-ΟI'ΥΈοΘ}�Ν£4
¨s@,]?.£�Pξs>uθ¤QpΓx�ΛΠΡA�|x]"‘*ΒΎf„ς—λΫ£B2ΕνytΌΡ±c…¥ο	β8L	Ιvg�ΗΚi]��ΙKΥzu0yKΩ.“ 	§ΣBΑw|ƒ†_K�'zθ΅Ύ“c¦ύυάά…ύ)?ΔoT	#�G8PΧΙπΩ=�υP-–,Ί}¥άώΝX:,�ΊfB'=WG²I±¨ 
0BΈ£ξJΞ3Η εϋο��ΛΞσ;�;;)Iι_UMf�α•τ�’}·’,―CΒhπ�Ομ£ο®μ\‰�kκtΞ&ωµNύΌΐ½άjξ™�}ςά
@@ -0,0 +1 @@
+…(Ñá¢ù G¸ü�©oCº™*šâj0OÊ!=ldÿ§ô~2%p7•>´·kbñ�#d›‹'¥d|_à{±�ºa¶[EŠÔÎ¿�=mÂm½ð°Lí&‹À',^‰ý$¡¨!HÞ>]Ð4WïôêÔi+q=†N	‘2¿1´K;_% ~Ø ™¶£Õ‡ØÄ~\¶'–
:	Ï[*:ï´ËFÃáSÌooApö¦*dËËH¬ôz‘È-vÝÞ#¼5†¡Ü[…«Ü„zê,e¸˜È¤H‘„e#"=¾$y5kÐ+$Ë Ô¸šÇÏ¨~Õç�’÷�¾Ë3×ÏÃ§j®¹3O£|WéÝÿîA#TI)ö±
«âU}ô¹Ò;M3³ÞŒžëÁ9.ª}i�TÎ‚Š
Ëì0S	s…Jp…ìå’*½çÑ¶Pob‘¼™(*ò
@@ -0,0 +1,59 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira --user admin"
+
+SKIP test -n "$JIRACLOUD" # using Jira Cloud at go-jira.atlassian.net
+PLAN 15
+
+# clean out any old containers
+docker rm -f go-jira-test
+
+RUNS docker build . -t go-jira-test
+
+mkdir -p $(pwd)/.maven-cache
+
+# start newt jira service, cache the users m2 directory to make startup faster
+RUNS docker run --detach -v $(pwd)/.maven-cache:/root/.m2/repository --name go-jira-test --publish 8080:8080 go-jira-test:latest
+
+# wait for docker service to get started
+RUNS sleep 5
+
+echo "# Waiting for jira service to be listening on port 8080"
+docker exec -i go-jira-test tail -f screenlog.0 | grep -m 1 'jira started successfully' | sed 's/^/# /'
+
+# wait for healthchecks to pass, curl will retry 900 times over 15 min waiting
+RUNS curl -q -L --retry 900 --retry-delay 1 -f -s "http://localhost:8080/rest/api/2/serverInfo?doHealthCheck=1"
+
+# login to jira as admin user
+RUNS $jira login
+
+# create gojira user
+RUNS $jira req -M POST /rest/api/2/user '{"name":"gojira","password":"gojira123","emailAddress":"gojira@example.com","displayName":"GoJira"}'
+
+# create mothra user (need secondary user for voting)
+RUNS $jira req -M POST /rest/api/2/user '{"name":"mothra","password":"mothra123","emailAddress":"mothra@example.com","displayName":"Mothra"}'
+
+# create SCRUM softwareproject
+RUNS $jira req -M POST /rest/api/2/project '{"key":"SCRUM","name":"Scrum","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:gh-scrum-template","lead":"gojira"}'
+
+# create KANBAN software project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"KANBAN","name":"Kanban","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:gh-kanban-template","lead":"gojira"}'
+
+# create BAISC software project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"BASIC","name":"Basic","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:basic-software-development-template","lead":"gojira"}'
+
+# create PROJECT business project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"PROJECT","name":"Project","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-project-management","lead":"gojira"}'
+
+# create PROCESS business project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"PROCESS","name":"Process","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-process-management","lead":"gojira"}'
+
+# create TASK business project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"TASK","name":"Task","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-task-management","lead":"gojira"}'
+
+RUNS $jira logout
+
+# export new templates so we are always using whatever is latest
+# and not whatever is in the test-runners homedir
+RUNS $jira export-templates -d .jira.d/templates
@@ -0,0 +1,31 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira=../jira
+
+SKIP test -n "$JIRACLOUD" # using Jira Cloud at go-jira.atlassian.net
+
+PLAN 7
+
+###############################################################################
+## Verify logout works, we expect when we call the session api
+## that we will get a 401 and prompt user for password
+################################################################################
+RUNS $jira logout
+
+NRUNS $jira req /rest/auth/1/session </dev/null
+ODIFF <<EOF
+Jira Password [gojira]: 
+EOF
+
+###############################################################################
+## Verify login works (password read from stdin) and verify that the
+## sesion api no longer prompts
+###############################################################################
+echo "gojira123" | RUNS $jira login
+
+RUNS $jira req /rest/auth/1/session </dev/null
+GREP '"name": "gojira"'
+GREP "\"self\": \"$ENDPOINT/rest/api/latest/user?username=gojira\""
+
+
@@ -0,0 +1,526 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira --project BASIC"
+export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
+
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
+PLAN 86
+
+# reset login
+RUNS $jira logout
+RUNS $jira login
+
+# cleanup from previous failed test executions
+($jira ls | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## View the issue we just created
+###############################################################################
+
+RUNS $jira view $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: BASIC
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## List all issues, should be just the one we created
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## List all issues, using the table template
+###############################################################################
+
+RUNS $jira ls --template table
+DIFF <<EOF
+----------------+---------------------------------------------------------+--------------+--------------+------------+--------------+--------------+
+| Issue          | Summary                                                 | Priority     | Status       | Age        | Reporter     | Assignee     |
+----------------+---------------------------------------------------------+--------------+--------------+------------+--------------+--------------+
+| $(printf %-14s $issue) | summary                                                 | Medium       | To Do        | a minute   | gojira       | gojira       |
+----------------+---------------------------------------------------------+--------------+--------------+------------+--------------+--------------+
+EOF
+
+###############################################################################
+## Try to close the issue, bug Basic projects do not allow that state
+###############################################################################
+
+NRUNS $jira close $issue
+EDIFF <<EOF
+ERROR Invalid Transition 'close', Available: To Do, In Progress, In Review, Done
+EOF
+
+###############################################################################
+## put the issue into Done state, resolving it.
+###############################################################################
+
+RUNS $jira done $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Verify there are no unresolved issues
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+EOF
+
+###############################################################################
+## Setup 2 more issues so we can test duping
+###############################################################################
+
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
+dup=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+###############################################################################
+## Mark issue as duplicate, expect both issues to be updated and when viewing
+## the main issue there should be a "depends" line showing the dup'd issue, and
+## that issue should be resolved
+###############################################################################
+
+RUNS $jira $dup dups $issue --noedit
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+OK $dup $ENDPOINT/browse/$dup
+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
+blockers: 
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## We should see only one unresolved issue, the Dup should be resolved
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Setup for testing blocking issues
+###############################################################################
+
+RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
+blocker=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set blocker and verify it shows up when viewing the main issue
+###############################################################################
+
+RUNS $jira $blocker blocks $issue
+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
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Both issues are unresolved now
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+$(printf %-12s $blocker:) blocks
+EOF
+
+###############################################################################
+# reset login for mothra for voting
+###############################################################################
+
+jira="$jira --user mothra"
+
+RUNS $jira logout
+RUNS $jira login
+
+###############################################################################
+## vote for main issue, verify it shows when viewing the issue
+###############################################################################
+
+RUNS $jira vote $issue
+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
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 1
+description: |
+  description
+EOF
+
+###############################################################################
+## downvote the main issue, verify the vote count goes back to 0
+###############################################################################
+
+RUNS $jira vote $issue --down
+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
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## set mothra user as watcher to issue and verify from REST api
+###############################################################################
+
+RUNS $jira watch $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+# FIXME we probably need a watchers command to wrap this?
+RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name | sort"
+DIFF <<EOF
+gojira
+mothra
+EOF
+
+###############################################################################
+## set issue to In Progress state
+###############################################################################
+
+RUNS $jira trans "In Progress" $blocker --noedit
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## set it back to "To Do"
+###############################################################################
+
+RUNS $jira todo $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set issue to "In Review" state
+###############################################################################
+
+RUNS $jira trans "review" $blocker --noedit
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set it back to "To Do"
+###############################################################################
+
+RUNS $jira todo $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set it to "In Progress"
+###############################################################################
+
+RUNS $jira prog $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set it to "Done"
+###############################################################################
+
+RUNS $jira done $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Verify issue is now in Done state (the "blocker" issue is now Done)
+###############################################################################
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: BASIC
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Verify we can add a comment
+###############################################################################
+
+RUNS $jira comment $issue --noedit -m "Yo, Comment"
+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
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+
+comments:
+  - | # mothra, a minute ago
+    Yo, Comment
+
+EOF
+
+###############################################################################
+## Verify we can add labels to an issue
+###############################################################################
+
+RUNS $jira add labels $blocker test-label another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: BASIC
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: another-label, test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can remove a label
+###############################################################################
+
+RUNS $jira remove labels $blocker another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: BASIC
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can replace the labels with a new set
+###############################################################################
+
+RUNS $jira set labels $blocker more-label better-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: BASIC
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify that "mothra" user can take the issue (reassign to self)
+###############################################################################
+
+RUNS $jira take $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: BASIC
+issuetype: Bug
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can give the issue back go "gojira" user
+###############################################################################
+
+RUNS $jira give $blocker gojira
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: BASIC
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
@@ -0,0 +1,48 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira --project BASIC"
+export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
+
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
+PLAN 8
+
+# reset login
+RUNS $jira logout
+RUNS $jira login
+
+# cleanup from previous failed test executions
+($jira ls | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Add a worklog to an issue
+###############################################################################
+RUNS $jira add worklog $issue --comment "work is hard" --time-spent "1h 12m" --noedit
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Verify worklog got added to issue
+###############################################################################
+RUNS $jira worklog $issue
+DIFF <<EOF
+- # gojira, a minute ago
+  comment: work is hard
+  timeSpent: 1h 12m
+
+EOF
@@ -0,0 +1,513 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira --project SCRUM"
+export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
+
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
+PLAN 84
+
+# cleanup from previous failed test executions
+($jira ls | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+# reset login
+RUNS $jira logout
+echo "gojira123" | RUNS $jira login
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## View the issue we just created
+###############################################################################
+
+RUNS $jira view $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## List all issues, should be just the one we created
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Try to close the issue, bug Basic projects do not allow that state
+###############################################################################
+
+NRUNS $jira close $issue
+EDIFF <<EOF
+ERROR Invalid Transition 'close', Available: To Do, In Progress, Done
+EOF
+
+###############################################################################
+## put the issue into Done state, resolving it.
+###############################################################################
+
+RUNS $jira done $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Verify there are no unresolved issues
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+EOF
+
+###############################################################################
+## Setup 2 more issues so we can test duping
+###############################################################################
+
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
+dup=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+###############################################################################
+## Mark issue as duplicate, expect both issues to be updated and when viewing
+## the main issue there should be a "depends" line showing the dup'd issue, and
+## that issue should be resolved
+###############################################################################
+
+RUNS $jira $dup dups $issue --noedit
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## We should see only one unresolved issue, the Dup should be resolved
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Setup for testing blocking issues
+###############################################################################
+
+RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
+blocker=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set blocker and verify it shows up when viewing the main issue
+###############################################################################
+
+RUNS $jira $blocker blocks $issue
+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: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Both issues are unresolved now
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+$(printf %-12s $blocker:) blocks
+EOF
+
+###############################################################################
+# reset login for mothra for voting
+###############################################################################
+
+jira="$jira --user mothra"
+
+RUNS $jira logout
+echo "mothra123" | RUNS $jira login
+
+###############################################################################
+## vote for main issue, verify it shows when viewing the issue
+###############################################################################
+
+RUNS $jira vote $issue
+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: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 1
+description: |
+  description
+EOF
+
+###############################################################################
+## downvote the main issue, verify the vote count goes back to 0
+###############################################################################
+
+RUNS $jira vote $issue --down
+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: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## set mothra user as watcher to issue and verify from REST api
+###############################################################################
+
+RUNS $jira watch $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+# FIXME we probably need a watchers command to wrap this?
+RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name | sort"
+DIFF <<EOF
+gojira
+mothra
+EOF
+
+###############################################################################
+## set issue to In Progress state
+###############################################################################
+
+RUNS $jira trans "In Progress" $blocker --noedit
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## set it back to "To Do"
+###############################################################################
+
+RUNS $jira todo $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set issue to "In Review" state, which is an invalid state for SCRUM
+###############################################################################
+
+NRUNS $jira trans "review" $blocker --noedit
+DIFF <<EOF
+ERROR Invalid Transition 'review', Available: To Do, In Progress, Done
+EOF
+
+###############################################################################
+## Set it back to "To Do"
+###############################################################################
+
+RUNS $jira todo $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set it to "In Progress"
+###############################################################################
+
+RUNS $jira prog $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set it to "Done"
+###############################################################################
+
+RUNS $jira done $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Verify issue is now in Done state (the "blocker" issue is now Done)
+###############################################################################
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Verify we can add a comment
+###############################################################################
+
+RUNS $jira comment $issue --noedit -m "Yo, Comment"
+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: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+
+comments:
+  - | # mothra, a minute ago
+    Yo, Comment
+
+EOF
+
+###############################################################################
+## Verify we can add labels to an issue
+###############################################################################
+
+RUNS $jira add labels $blocker test-label another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: another-label, test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can remove a label
+###############################################################################
+
+RUNS $jira remove labels $blocker another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can replace the labels with a new set
+###############################################################################
+
+RUNS $jira set labels $blocker more-label better-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify that "mothra" user can take the issue (reassign to self)
+###############################################################################
+
+RUNS $jira take $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: SCRUM
+issuetype: Bug
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can give the issue back go "gojira" user
+###############################################################################
+
+RUNS $jira give $blocker gojira
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: SCRUM
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
@@ -0,0 +1,522 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira --project KANBAN"
+export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
+
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
+PLAN 86
+
+# cleanup from previous failed test executions
+($jira ls | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+# reset login
+RUNS $jira logout
+echo "gojira123" | RUNS $jira login
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## View the issue we just created
+###############################################################################
+
+RUNS $jira view $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Backlog
+summary: summary
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## List all issues, should be just the one we created
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Try to close the issue, bug Basic projects do not allow that state
+###############################################################################
+
+NRUNS $jira close $issue
+EDIFF <<EOF
+ERROR Invalid Transition 'close', Available: Backlog, Selected for Development, In Progress, Done
+EOF
+
+###############################################################################
+## put the issue into Done state, resolving it.
+###############################################################################
+
+RUNS $jira done $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Verify there are no unresolved issues
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+EOF
+
+###############################################################################
+## Setup 2 more issues so we can test duping
+###############################################################################
+
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
+dup=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+###############################################################################
+## Mark issue as duplicate, expect both issues to be updated and when viewing
+## the main issue there should be a "depends" line showing the dup'd issue, and
+## that issue should be resolved
+###############################################################################
+
+RUNS $jira $dup dups $issue --noedit
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Backlog
+summary: summary
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## We should see only one unresolved issue, the Dup should be resolved
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Setup for testing blocking issues
+###############################################################################
+
+RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
+blocker=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set blocker and verify it shows up when viewing the main issue
+###############################################################################
+
+RUNS $jira $blocker blocks $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Backlog
+summary: summary
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Backlog]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Both issues are unresolved now
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+$(printf %-12s $blocker:) blocks
+EOF
+
+###############################################################################
+# reset login for mothra for voting
+###############################################################################
+
+jira="$jira --user mothra"
+
+RUNS $jira logout
+echo "mothra123" | RUNS $jira login
+
+###############################################################################
+## vote for main issue, verify it shows when viewing the issue
+###############################################################################
+
+RUNS $jira vote $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Backlog
+summary: summary
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Backlog]
+depends: $dup[Done]
+priority: Medium
+votes: 1
+description: |
+  description
+EOF
+
+###############################################################################
+## downvote the main issue, verify the vote count goes back to 0
+###############################################################################
+
+RUNS $jira vote $issue --down
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Backlog
+summary: summary
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Backlog]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## set mothra user as watcher to issue and verify from REST api
+###############################################################################
+
+RUNS $jira watch $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+# FIXME we probably need a watchers command to wrap this?
+RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name | sort"
+DIFF <<EOF
+gojira
+mothra
+EOF
+
+###############################################################################
+## set issue to In Progress state
+###############################################################################
+
+RUNS $jira trans "In Progress" $blocker --noedit
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## set it to "To Do", which is not a valid state for KANBAN issues
+###############################################################################
+
+NRUNS $jira todo $blocker
+DIFF <<EOF
+ERROR Invalid Transition 'To Do', Available: Backlog, Selected for Development, In Progress, Done
+EOF
+
+###############################################################################
+## set issue back to backlog state
+###############################################################################
+
+RUNS $jira backlog $blocker --noedit
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set issue to "In Review" state, which is an invalid state for KANBAN
+###############################################################################
+
+NRUNS $jira trans "review" $blocker --noedit
+DIFF <<EOF
+ERROR Invalid Transition 'review', Available: Backlog, Selected for Development, In Progress, Done
+EOF
+
+###############################################################################
+## Set it back to "Backlog"
+###############################################################################
+
+RUNS $jira backlog $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set it to "In Progress"
+###############################################################################
+
+RUNS $jira prog $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set it to "Done"
+###############################################################################
+
+RUNS $jira done $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Verify issue is now in Done state (the "blocker" issue is now Done)
+###############################################################################
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Backlog
+summary: summary
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Verify we can add a comment
+###############################################################################
+
+RUNS $jira comment $issue --noedit -m "Yo, Comment"
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Backlog
+summary: summary
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+
+comments:
+  - | # mothra, a minute ago
+    Yo, Comment
+
+EOF
+
+###############################################################################
+## Verify we can add labels to an issue
+###############################################################################
+
+RUNS $jira add labels $blocker test-label another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[Backlog]
+priority: Medium
+votes: 0
+labels: another-label, test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can remove a label
+###############################################################################
+
+RUNS $jira remove labels $blocker another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[Backlog]
+priority: Medium
+votes: 0
+labels: test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can replace the labels with a new set
+###############################################################################
+
+RUNS $jira set labels $blocker more-label better-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[Backlog]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify that "mothra" user can take the issue (reassign to self)
+###############################################################################
+
+RUNS $jira take $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: KANBAN
+issuetype: Bug
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[Backlog]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can give the issue back go "gojira" user
+###############################################################################
+
+RUNS $jira give $blocker gojira
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: KANBAN
+issuetype: Bug
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[Backlog]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
@@ -0,0 +1,525 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira --project PROJECT"
+export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
+
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
+PLAN 84
+
+# cleanup from previous failed test executions
+($jira ls | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+# reset login
+RUNS $jira logout
+echo "gojira123" | RUNS $jira login
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## View the issue we just created
+###############################################################################
+
+RUNS $jira view $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: PROJECT
+issuetype: Task
+assignee: gojira
+reporter: gojira
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## List all issues, should be just the one we created
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Try to close the issue, bug Basic projects do not allow that state
+###############################################################################
+
+NRUNS $jira close $issue
+EDIFF <<EOF
+ERROR Invalid Transition 'close', Available: Start Progress, Done
+EOF
+
+###############################################################################
+## put the issue into Done state, resolving it.
+###############################################################################
+
+RUNS $jira done $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Verify there are no unresolved issues
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+EOF
+
+###############################################################################
+## Setup 2 more issues so we can test duping
+###############################################################################
+
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
+dup=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+###############################################################################
+## Mark issue as duplicate, expect both issues to be updated and when viewing
+## the main issue there should be a "depends" line showing the dup'd issue, and
+## that issue should be resolved
+###############################################################################
+
+RUNS $jira $dup dups $issue --noedit
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: PROJECT
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## We should see only one unresolved issue, the Dup should be resolved
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Setup for testing blocking issues
+###############################################################################
+
+RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
+blocker=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set blocker and verify it shows up when viewing the main issue
+###############################################################################
+
+RUNS $jira $blocker blocks $issue
+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: PROJECT
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Both issues are unresolved now
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+$(printf %-12s $blocker:) blocks
+EOF
+
+###############################################################################
+# reset login for mothra for voting
+###############################################################################
+
+jira="$jira --user mothra"
+
+RUNS $jira logout
+echo "mothra123" | RUNS $jira login
+
+###############################################################################
+## vote for main issue, verify it shows when viewing the issue
+###############################################################################
+
+RUNS $jira vote $issue
+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: PROJECT
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 1
+description: |
+  description
+EOF
+
+###############################################################################
+## downvote the main issue, verify the vote count goes back to 0
+###############################################################################
+
+RUNS $jira vote $issue --down
+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: PROJECT
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## set mothra user as watcher to issue and verify from REST api
+###############################################################################
+
+RUNS $jira watch $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+# FIXME we probably need a watchers command to wrap this?
+RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name | sort"
+DIFF <<EOF
+gojira
+mothra
+EOF
+
+###############################################################################
+## set issue to In Progress state, which is an invalid state for PROJECT
+###############################################################################
+
+NRUNS $jira trans "In Progress" $blocker --noedit
+DIFF <<EOF
+ERROR Invalid Transition 'In Progress', Available: Start Progress, Done
+EOF
+
+
+###############################################################################
+## Set issue to "In Review" state, which is an invalid state for PROJECT
+###############################################################################
+
+NRUNS $jira trans "review" $blocker --noedit
+DIFF <<EOF
+ERROR Invalid Transition 'review', Available: Start Progress, Done
+EOF
+
+###############################################################################
+## Set it to "Start Progress" and verify that assignee is set to mothra
+###############################################################################
+
+RUNS $jira start $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: In Progress
+summary: blocks
+project: PROJECT
+issuetype: Task
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Set it back to "Stop Progress"
+###############################################################################
+
+RUNS $jira stop $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+
+###############################################################################
+## Set it to "Done"
+###############################################################################
+
+RUNS $jira done $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Verify issue is now in Done state (the "blocker" issue is now Done)
+###############################################################################
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: PROJECT
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Verify we can add a comment
+###############################################################################
+
+RUNS $jira comment $issue --noedit -m "Yo, Comment"
+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: PROJECT
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+
+comments:
+  - | # mothra, a minute ago
+    Yo, Comment
+
+EOF
+
+###############################################################################
+## Verify we can add labels to an issue
+###############################################################################
+
+RUNS $jira add labels $blocker test-label another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: PROJECT
+issuetype: Task
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: another-label, test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can remove a label
+###############################################################################
+
+RUNS $jira remove labels $blocker another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: PROJECT
+issuetype: Task
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can replace the labels with a new set
+###############################################################################
+
+RUNS $jira set labels $blocker more-label better-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: PROJECT
+issuetype: Task
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can give the issue back go "gojira" user
+###############################################################################
+
+RUNS $jira give $blocker gojira
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: PROJECT
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify that "mothra" user can take the issue (reassign to self)
+###############################################################################
+
+RUNS $jira take $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: PROJECT
+issuetype: Task
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
@@ -0,0 +1,518 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira --project PROCESS"
+export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
+
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
+PLAN 84
+
+# cleanup from previous failed test executions
+($jira ls | awk -F: '{print $1}' | while read issue; do ../jira start $issue; done) | sed 's/^/# CLEANUP: /g'
+($jira ls | awk -F: '{print $1}' | while read issue; do ../jira stop $issue; done) | sed 's/^/# CLEANUP: /g'
+
+# reset login
+RUNS $jira logout
+echo "gojira123" | RUNS $jira login
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## View the issue we just created
+###############################################################################
+
+RUNS $jira view $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Open
+summary: summary
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## List all issues, should be just the one we created
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Try to close the issue, but PROCESS projects do not allow that state
+###############################################################################
+
+NRUNS $jira close $issue
+EDIFF <<EOF
+ERROR Invalid Transition 'close', Available: Start Progress
+EOF
+
+###############################################################################
+## put the issue into Start Progress state, then Stop Progress state
+## which will resolve the issue
+###############################################################################
+
+RUNS $jira start $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+
+RUNS $jira stop $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Verify there are no unresolved issues
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+EOF
+
+###############################################################################
+## Setup 2 more issues so we can test duping
+###############################################################################
+
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
+dup=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+###############################################################################
+## Mark issue as duplicate, expect both issues to be updated and when viewing
+## the main issue there should be a "depends" line showing the dup'd issue, and
+## that issue should be resolved. For PROCESSS projects it has to go through
+## 2 steps to resolve, one is "Start Progress" then resolved with "Stop
+## Progress", so we see 3 updates in total
+###############################################################################
+
+RUNS $jira $dup dups $issue --noedit
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+OK $dup $ENDPOINT/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Open
+summary: summary
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $dup[Cancelled]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## We should see only one unresolved issue, the Dup should be resolved
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Setup for testing blocking issues
+###############################################################################
+
+RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
+blocker=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set blocker and verify it shows up when viewing the main issue
+###############################################################################
+
+RUNS $jira $blocker blocks $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Open
+summary: summary
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Open]
+depends: $dup[Cancelled]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Both issues are unresolved now
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+$(printf %-12s $blocker:) blocks
+EOF
+
+###############################################################################
+# reset login for mothra for voting
+###############################################################################
+
+jira="$jira --user mothra"
+
+RUNS $jira logout
+echo "mothra123" | RUNS $jira login
+
+###############################################################################
+## vote for main issue, verify it shows when viewing the issue
+###############################################################################
+
+RUNS $jira vote $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Open
+summary: summary
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Open]
+depends: $dup[Cancelled]
+priority: Medium
+votes: 1
+description: |
+  description
+EOF
+
+###############################################################################
+## downvote the main issue, verify the vote count goes back to 0
+###############################################################################
+
+RUNS $jira vote $issue --down
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Open
+summary: summary
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Open]
+depends: $dup[Cancelled]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## set mothra user as watcher to issue and verify from REST api
+###############################################################################
+
+RUNS $jira watch $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+# FIXME we probably need a watchers command to wrap this?
+RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name | sort"
+DIFF <<EOF
+gojira
+mothra
+EOF
+
+###############################################################################
+## set issue to In Progress state, which is an invalid state for PROCESS
+###############################################################################
+
+NRUNS $jira trans "In Progress" $blocker --noedit
+DIFF <<EOF
+ERROR Invalid Transition 'In Progress', Available: Start Progress
+EOF
+
+
+###############################################################################
+## Set issue to "In Review" state, which is an invalid state for PROCESS
+###############################################################################
+
+NRUNS $jira trans "review" $blocker --noedit
+DIFF <<EOF
+ERROR Invalid Transition 'review', Available: Start Progress
+EOF
+
+###############################################################################
+## Set it to "Start Progress"
+###############################################################################
+
+RUNS $jira start $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set it back to "Stop Progress"
+###############################################################################
+
+RUNS $jira stop $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+
+###############################################################################
+## Set it to "Done"
+###############################################################################
+
+RUNS $jira reopen $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Verify issue is now in Done state (the "blocker" issue is now Done)
+###############################################################################
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Open
+summary: summary
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Open]
+depends: $dup[Cancelled]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Verify we can add a comment
+###############################################################################
+
+RUNS $jira comment $issue --noedit -m "Yo, Comment"
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: Open
+summary: summary
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Open]
+depends: $dup[Cancelled]
+priority: Medium
+votes: 0
+description: |
+  description
+
+comments:
+  - | # mothra, a minute ago
+    Yo, Comment
+
+EOF
+
+###############################################################################
+## Verify we can add labels to an issue
+###############################################################################
+
+RUNS $jira add labels $blocker test-label another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Open
+summary: blocks
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[Open]
+priority: Medium
+votes: 0
+labels: another-label, test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can remove a label
+###############################################################################
+
+RUNS $jira remove labels $blocker another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Open
+summary: blocks
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[Open]
+priority: Medium
+votes: 0
+labels: test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can replace the labels with a new set
+###############################################################################
+
+RUNS $jira set labels $blocker more-label better-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Open
+summary: blocks
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[Open]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify that "mothra" user can take the issue (reassign to self)
+###############################################################################
+
+RUNS $jira take $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Open
+summary: blocks
+project: PROCESS
+issuetype: Task
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[Open]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can give the issue back go "gojira" user
+###############################################################################
+
+RUNS $jira give $blocker gojira
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Open
+summary: blocks
+project: PROCESS
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[Open]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
@@ -0,0 +1,509 @@
+#!/bin/bash
+eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
+cd $(dirname $0)
+jira="../jira --project TASK"
+export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
+
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
+PLAN 82
+
+# cleanup from previous failed test executions
+($jira ls | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
+
+# reset login
+RUNS $jira logout
+echo "gojira123" | RUNS $jira login
+
+###############################################################################
+## Create an issue
+###############################################################################
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## View the issue we just created
+###############################################################################
+
+RUNS $jira view $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## List all issues, should be just the one we created
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Try to close the issue, but TASK projects do not allow that state
+###############################################################################
+
+NRUNS $jira close $issue
+EDIFF <<EOF
+ERROR Invalid Transition 'close', Available: Done
+EOF
+
+###############################################################################
+## put the issue into Done state, which will resolve the issue
+###############################################################################
+
+RUNS $jira done $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+###############################################################################
+## Verify there are no unresolved issues
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+EOF
+
+###############################################################################
+## Setup 2 more issues so we can test duping
+###############################################################################
+
+RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+issue=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
+dup=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+###############################################################################
+## Mark issue as duplicate, expect both issues to be updated and when viewing
+## the main issue there should be a "depends" line showing the dup'd issue, and
+## that issue should be resolved. For TASKS projects it has to go through
+## 2 steps to resolve, one is "Start Progress" then resolved with "Stop
+## Progress", so we see 3 updates in total
+###############################################################################
+
+RUNS $jira $dup dups $issue --noedit
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+OK $dup $ENDPOINT/browse/$dup
+EOF
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## We should see only one unresolved issue, the Dup should be resolved
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+EOF
+
+###############################################################################
+## Setup for testing blocking issues
+###############################################################################
+
+RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
+blocker=$(awk '/issue/{print $2}' issue.props)
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Set blocker and verify it shows up when viewing the main issue
+###############################################################################
+
+RUNS $jira $blocker blocks $issue
+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: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Both issues are unresolved now
+###############################################################################
+
+RUNS $jira ls
+DIFF <<EOF
+$(printf %-12s $issue:) summary
+$(printf %-12s $blocker:) blocks
+EOF
+
+###############################################################################
+# reset login for mothra for voting
+###############################################################################
+
+jira="$jira --user mothra"
+
+RUNS $jira logout
+echo "mothra123" | RUNS $jira login
+
+###############################################################################
+## vote for main issue, verify it shows when viewing the issue
+###############################################################################
+
+RUNS $jira vote $issue
+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: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 1
+description: |
+  description
+EOF
+
+###############################################################################
+## downvote the main issue, verify the vote count goes back to 0
+###############################################################################
+
+RUNS $jira vote $issue --down
+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: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[To Do]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## set mothra user as watcher to issue and verify from REST api
+###############################################################################
+
+RUNS $jira watch $issue
+DIFF <<EOF
+OK $issue $ENDPOINT/browse/$issue
+EOF
+
+# FIXME we probably need a watchers command to wrap this?
+RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name | sort"
+DIFF <<EOF
+gojira
+mothra
+EOF
+
+###############################################################################
+## set issue to In Progress state, which is an invalid state for TASK
+###############################################################################
+
+NRUNS $jira trans "In Progress" $blocker --noedit
+DIFF <<EOF
+ERROR Invalid Transition 'In Progress', Available: Done
+EOF
+
+
+###############################################################################
+## Set issue to "In Review" state, which is an invalid state for TASK
+###############################################################################
+
+NRUNS $jira trans "review" $blocker --noedit
+DIFF <<EOF
+ERROR Invalid Transition 'review', Available: Done
+EOF
+
+###############################################################################
+## Set it to "Start Progress", which is an invalid state for TASK
+###############################################################################
+
+NRUNS $jira start $blocker
+DIFF <<EOF
+ERROR Invalid Transition 'start', Available: Done
+EOF
+
+###############################################################################
+## Set it back to "Stop Progress", which is an invalid state for TASK
+###############################################################################
+
+NRUNS $jira stop $blocker
+DIFF <<EOF
+ERROR Invalid Transition 'stop', Available: Done
+EOF
+
+
+###############################################################################
+## Set it to "Done"
+###############################################################################
+
+RUNS $jira done $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+###############################################################################
+## Verify issue is now in Done state (the "blocker" issue is now Done)
+###############################################################################
+
+RUNS $jira $issue
+DIFF <<EOF
+issue: $issue
+created: a minute ago
+status: To Do
+summary: summary
+project: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+EOF
+
+###############################################################################
+## Verify we can add a comment
+###############################################################################
+
+RUNS $jira comment $issue --noedit -m "Yo, Comment"
+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: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: $blocker[Done]
+depends: $dup[Done]
+priority: Medium
+votes: 0
+description: |
+  description
+
+comments:
+  - | # mothra, a minute ago
+    Yo, Comment
+
+EOF
+
+###############################################################################
+## Verify we can add labels to an issue
+###############################################################################
+
+RUNS $jira add labels $blocker test-label another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: another-label, test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can remove a label
+###############################################################################
+
+RUNS $jira remove labels $blocker another-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: test-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can replace the labels with a new set
+###############################################################################
+
+RUNS $jira set labels $blocker more-label better-label
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify that "mothra" user can take the issue (reassign to self)
+###############################################################################
+
+RUNS $jira take $blocker
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: TASK
+issuetype: Task
+assignee: mothra
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
+###############################################################################
+## Verify we can give the issue back go "gojira" user
+###############################################################################
+
+RUNS $jira give $blocker gojira
+DIFF <<EOF
+OK $blocker $ENDPOINT/browse/$blocker
+EOF
+
+RUNS $jira $blocker
+DIFF <<EOF
+issue: $blocker
+created: a minute ago
+status: Done
+summary: blocks
+project: TASK
+issuetype: Task
+assignee: gojira
+reporter: gojira
+blockers: 
+depends: $issue[To Do]
+priority: Medium
+votes: 0
+labels: better-label, more-label
+description: |
+  blocks
+EOF
+
@@ -0,0 +1,20 @@
+FROM alpine:latest
+RUN apk --update add openjdk8-jre curl screen && \
+    curl -s -L https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz | tar xzf - && \
+    ln -s /atlassian* /atlassian
+
+ENV PATH=/bin:/usr/bin:/atlassian/bin
+
+# Copy in the serivce and also the root .m2 settings to force cache everything.
+# We also copy in /root/.java settings to prevent the dumb spam prompt from
+# the atlas-run command:
+# Would you like to subscribe to the Atlassian developer mailing list? (Y/y/N/n) Y: :
+COPY dockerroot /
+WORKDIR /jiratestservice
+
+EXPOSE 8080
+
+# we wrap the command with screen so that the dumb atlas-run has a tty to watch. Without screen
+# there is no tty so atlas-run will immediately read an EOF (aka CTRL-D) and interpret that to
+# mean we want the service to begin the "graceful shutdown" and exit
+CMD ["screen", "-DmL", "atlas-run", "--http-port", "8080", "--context-path", "ROOT", "--server", "localhost"]
@@ -0,0 +1,37 @@
+## Tests
+
+The test are written using the `osht` bash testing framework.  Please read the [documentation](https://github.com/coryb/osht/blob/master/README.md) for `osht`.
+
+## Running Test:
+
+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
+prove
+```
+
+### Running individual tests
+To run a specific test you can run it directly like:
+```
+./100basic.t
+```
+There is a useful `-v` option to make the test more verbose and an `-a` option to casue the test to abort after the first failure.
+
+The tests all require the jira service to be running from the docker container, so you will have to manually run the setup script:
+```
+./000setup.t
+```
+
+After than you can run the other tests over and over.  The jira service is just a test instance started for local development.  It comes with
+a temporary license (I think it is 8 hours) so you will have to run the `./000setup.t` script at least once daily.
+
+## API Documentation:
+https://docs.atlassian.com/jira/REST/cloud/
+https://docs.atlassian.com/jira-software/REST/cloud
+
+## projectTempalteKey missing documentation
+https://answers.atlassian.com/questions/36176301/jira-api-7.1.0-create-project
+
@@ -0,0 +1,6 @@
+To avoid future confusion, we recommend that you include a license with your plugin.
+This file is simply a reminder.
+
+For a template license you can have a look at: http://www.opensource.org/licenses/
+
+Atlassian releases most of its modules under the Apache2 license: http://opensource.org/licenses/Apache-2.0
@@ -0,0 +1,13 @@
+You have successfully created an Atlassian Plugin!
+
+Here are the SDK commands you'll use immediately:
+
+* atlas-run   -- installs this plugin into the product and starts it on localhost
+* atlas-debug -- same as atlas-run, but allows a debugger to attach at port 5005
+* atlas-cli   -- after atlas-run or atlas-debug, opens a Maven command line window:
+                 - 'pi' reinstalls the plugin into the running product instance
+* atlas-help  -- prints description for all commands in the SDK
+
+Full documentation is always available at:
+
+https://developer.atlassian.com/display/DOCS/Introduction+to+the+Atlassian+Plugin+SDK
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.netflixskunkworks</groupId>
+    <artifactId>jiratestservice</artifactId>
+    <version>1.0</version>
+
+    <organization>
+        <name>Example Company</name>
+        <url>http://www.example.com/</url>
+    </organization>
+
+    <name>jiratestservice</name>
+    <description>This is the com.netflixskunkworks:jiratestservice plugin for Atlassian JIRA.</description>
+    <packaging>atlassian-plugin</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.atlassian.jira</groupId>
+            <artifactId>jira-api</artifactId>
+            <version>${jira.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Add dependency on jira-core if you want access to JIRA implementation classes as well as the sanctioned API. -->
+        <!-- This is not normally recommended, but may be required eg when migrating a plugin originally developed against JIRA 4.x -->
+        <!--
+        <dependency>
+            <groupId>com.atlassian.jira</groupId>
+            <artifactId>jira-core</artifactId>
+            <version>${jira.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.atlassian.plugin</groupId>
+            <artifactId>atlassian-spring-scanner-annotation</artifactId>
+            <version>${atlassian.spring.scanner.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.atlassian.plugin</groupId>
+            <artifactId>atlassian-spring-scanner-runtime</artifactId>
+            <version>${atlassian.spring.scanner.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- WIRED TEST RUNNER DEPENDENCIES -->
+        <dependency>
+            <groupId>com.atlassian.plugins</groupId>
+            <artifactId>atlassian-plugins-osgi-testrunner</artifactId>
+            <version>${plugin.testrunner.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.2.2-atlassian-1</version>
+        </dependency>
+
+		<!-- Uncomment to use TestKit in your project. Details at https://bitbucket.org/atlassian/jira-testkit -->
+		<!-- You can read more about TestKit at https://developer.atlassian.com/display/JIRADEV/Plugin+Tutorial+-+Smarter+integration+testing+with+TestKit -->
+		<!--
+		<dependency>
+			<groupId>com.atlassian.jira.tests</groupId>
+			<artifactId>jira-testkit-client</artifactId>
+			<version>${testkit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		-->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.atlassian.maven.plugins</groupId>
+                <artifactId>maven-jira-plugin</artifactId>
+                <version>${amps.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <applications>
+                        <application>
+                            <applicationKey>jira-software</applicationKey>
+                            <version>${jira.version}</version>
+                        </application>
+                    </applications>
+                    <productVersion>${jira.version}</productVersion>
+                    <productDataVersion>${jira.version}</productDataVersion>
+					<!-- Uncomment to install TestKit backdoor in JIRA. -->
+					<!--
+					<pluginArtifacts>
+						<pluginArtifact>
+							<groupId>com.atlassian.jira.tests</groupId>
+							<artifactId>jira-testkit-plugin</artifactId>
+							<version>${testkit.version}</version>
+						</pluginArtifact>
+					</pluginArtifacts>
+					-->
+                    <enableQuickReload>true</enableQuickReload>
+                    <enableFastdev>false</enableFastdev>
+
+                    <!-- See here for an explanation of default instructions: -->
+                    <!-- https://developer.atlassian.com/docs/advanced-topics/configuration-of-instructions-in-atlassian-plugins -->
+                    <instructions>
+                        <Atlassian-Plugin-Key>${atlassian.plugin.key}</Atlassian-Plugin-Key>
+
+                        <!-- Add package to export here -->
+                        <Export-Package>
+                            com.netflixskunkworks.api,
+                        </Export-Package>
+
+                        <!-- Add package import here -->
+                        <Import-Package>
+                            org.springframework.osgi.*;resolution:="optional",
+                            org.eclipse.gemini.blueprint.*;resolution:="optional",
+                            *
+                        </Import-Package>
+
+                        <!-- Ensure plugin is spring powered -->
+                        <Spring-Context>*</Spring-Context>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>com.atlassian.plugin</groupId>
+                <artifactId>atlassian-spring-scanner-maven-plugin</artifactId>
+                <version>${atlassian.spring.scanner.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>atlassian-spring-scanner</goal>
+                        </goals>
+                        <phase>process-classes</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scannedDependencies>
+                        <dependency>
+                            <groupId>com.atlassian.plugin</groupId>
+                            <artifactId>atlassian-spring-scanner-external-jar</artifactId>
+                        </dependency>
+                    </scannedDependencies>
+                    <verbose>false</verbose>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <jira.version>7.2.0</jira.version>
+        <amps.version>6.2.6</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. -->
+        <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
+		<!-- TestKit version 6.x for JIRA 6.x -->
+		<testkit.version>6.3.11</testkit.version>
+    </properties>
+
+</project>
@@ -0,0 +1,7 @@
+<atlassian-plugin key="${atlassian.plugin.key}" name="${project.name}" plugins-version="2">
+    <plugin-info>
+        <description>${project.description}</description>
+        <version>${project.version}</version>
+        <vendor name="${project.organization.name}" url="${project.organization.url}" />
+    </plugin-info>
+</atlassian-plugin>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+<map MAP_XML_VERSION="1.0">
+  <entry key="sdk-email-subscribe" value="true"/>
+</map>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+<map MAP_XML_VERSION="1.0">
+  <entry key="last_update_check" value="2016-08-29"/>
+  <entry key="sdk-pom-update-check-6.2.6-cbc3c672c37f65828d50132ed303cf7a" value="true"/>
+</map>
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <profiles>
+    <!-- Default profile containing Atlassian servers -->
+    <profile>
+      <id>defaultProfile</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+
+      <repositories>
+        <repository>
+          <id>atlassian-public</id>
+          <url>https://maven.atlassian.com/repository/public</url>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+            <checksumPolicy>warn</checksumPolicy>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>warn</checksumPolicy>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+        </repository>
+       <repository>
+         <id>atlassian-plugin-sdk</id>
+          <url>file://${env.ATLAS_HOME}/repository</url>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>warn</checksumPolicy>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+        </repository>
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>atlassian-public</id>
+          <url>https://maven.atlassian.com/repository/public</url>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>warn</checksumPolicy>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <updatePolicy>never</updatePolicy>
+            <checksumPolicy>warn</checksumPolicy>
+          </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+          <id>atlassian-plugin-sdk</id>
+          <url>file://${env.ATLAS_HOME}/repository</url>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>warn</checksumPolicy>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+      <properties>
+        <downloadSources>true</downloadSources>
+        <downloadJavadocs>true</downloadJavadocs>
+      </properties>
+   </profile>
+  </profiles>
+</settings>
@@ -0,0 +1,245 @@
+package jira
+
+var allTemplates = map[string]string{
+	"debug":          defaultDebugTemplate,
+	"fields":         defaultDebugTemplate,
+	"editmeta":       defaultDebugTemplate,
+	"transmeta":      defaultDebugTemplate,
+	"createmeta":     defaultDebugTemplate,
+	"issuelinktypes": defaultDebugTemplate,
+	"list":           defaultListTemplate,
+	"table":          defaultTableTemplate,
+	"view":           defaultViewTemplate,
+	"edit":           defaultEditTemplate,
+	"transitions":    defaultTransitionsTemplate,
+	"components":     defaultComponentsTemplate,
+	"issuetypes":     defaultIssuetypesTemplate,
+	"create":         defaultCreateTemplate,
+	"subtask":        defaultSubtaskTemplate,
+	"comment":        defaultCommentTemplate,
+	"transition":     defaultTransitionTemplate,
+	"request":        defaultDebugTemplate,
+	"worklog":        defaultWorklogTemplate,
+	"worklogs":       defaultWorklogsTemplate,
+}
+
+const defaultDebugTemplate = "{{ . | toJson}}\n"
+
+const defaultListTemplate = "{{ range .issues }}{{ .key | append \":\" | printf \"%-12s\"}} {{ .fields.summary }}\n{{ end }}"
+
+const defaultTableTemplate = `+{{ "-" | rep 16 }}+{{ "-" | rep 57 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
+| {{ "Issue" | printf "%-14s" }} | {{ "Summary" | printf "%-55s" }} | {{ "Priority" | printf "%-12s" }} | {{ "Status" | printf "%-12s" }} | {{ "Age" | printf "%-10s" }} | {{ "Reporter" | printf "%-12s" }} | {{ "Assignee" | printf "%-12s" }} |
+{{ "-" | rep 16 }}+{{ "-" | rep 57 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
+{{ range .issues -}}
+  | {{ .key | printf "%-14s"}} | {{ .fields.summary | abbrev 55 | printf "%-55s" }} | {{.fields.priority.name | printf "%-12s" }} | {{.fields.status.name | printf "%-12s" }} | {{.fields.created | age | printf "%-10s" }} | {{if .fields.reporter}}{{ .fields.reporter.name | printf "%-12s"}}{{else}}<unassigned>{{end}} | {{if .fields.assignee }}{{.fields.assignee.name | printf "%-12s" }}{{else}}<unassigned> {{end}} |
+{{ end -}}
+{{ "-" | rep 16 }}+{{ "-" | rep 57 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+{{ "-" | rep 12 }}+{{ "-" | rep 14 }}+{{ "-" | rep 14 }}+
+`
+
+const defaultViewTemplate = `{{/* view template */ -}}
+issue: {{ .key }}
+{{if .fields.created -}}
+created: {{ .fields.created | age }} ago
+{{end -}}
+{{if .fields.status -}}
+status: {{ .fields.status.name }}
+{{end -}}
+summary: {{ .fields.summary }}
+project: {{ .fields.project.key }}
+{{if .fields.components -}}
+components: {{ range .fields.components }}{{ .name }} {{end}}
+{{end -}}
+{{if .fields.issuetype -}}
+issuetype: {{ .fields.issuetype.name }}
+{{end -}}
+{{if .fields.assignee -}}
+assignee: {{ .fields.assignee.name }}
+{{end -}}
+reporter: {{ if .fields.reporter }}{{ .fields.reporter.name }}{{end}}
+{{if .fields.customfield_10110 -}}
+watchers: {{ range .fields.customfield_10110 }}{{ .name }} {{end}}
+{{end -}}
+{{if .fields.issuelinks -}}
+blockers: {{ range .fields.issuelinks }}{{if .outwardIssue}}{{ .outwardIssue.key }}[{{.outwardIssue.fields.status.name}}]{{end}}{{end}}
+depends: {{ range .fields.issuelinks }}{{if .inwardIssue}}{{ .inwardIssue.key }}[{{.inwardIssue.fields.status.name}}]{{end}}{{end}}
+{{end -}}
+{{if .fields.priority -}}
+priority: {{ .fields.priority.name }}
+{{end -}}
+{{if .fields.votes -}}
+votes: {{ .fields.votes.votes}}
+{{end -}}
+{{if .fields.labels -}}
+labels: {{ join ", " .fields.labels }}
+{{end -}}
+description: |
+  {{ or .fields.description "" | indent 2 }}
+{{if .fields.comment.comments}}
+comments:
+{{ range .fields.comment.comments }}  - | # {{.author.name}}, {{.created | age}} ago
+    {{ or .body "" | indent 4}}
+{{end}}
+{{end -}}
+`
+const defaultEditTemplate = `{{/* edit template */ -}}
+# issue: {{ .key }}
+update:
+  comment:
+    - add: 
+        body: |~
+          {{ or .overrides.comment "" | indent 10 }}
+fields:
+  summary: {{ or .overrides.summary .fields.summary }}
+  components: # Values: {{ range .meta.fields.components.allowedValues }}{{.name}}, {{end}}{{if .overrides.components }}{{ range (split "," .overrides.components)}}
+    - name: {{.}}{{end}}{{else}}{{ range .fields.components }}
+    - name: {{ .name }}{{end}}{{end}}
+  assignee:
+    name: {{ if .overrides.assignee }}{{.overrides.assignee}}{{else}}{{if .fields.assignee }}{{ .fields.assignee.name }}{{end}}{{end}}
+  reporter:
+    name: {{ if .overrides.reporter }}{{ .overrides.reporter }}{{else if .fields.reporter}}{{ .fields.reporter.name }}{{end}}
+  # watchers
+  customfield_10110: {{ range .fields.customfield_10110 }}
+    - name: {{ .name }}{{end}}{{if .overrides.watcher}}
+    - name: {{ .overrides.watcher}}{{end}}
+  priority: # Values: {{ range .meta.fields.priority.allowedValues }}{{.name}}, {{end}}
+    name: {{ or .overrides.priority .fields.priority.name }}
+  description: |~
+    {{ or .overrides.description (or .fields.description "") | indent 4 }}
+# comments:
+# {{ range .fields.comment.comments }}  - | # {{.author.name}}, {{.created | age}} ago
+#     {{ or .body "" | indent 4 | comment}}
+# {{end}}
+`
+const defaultTransitionsTemplate = `{{ range .transitions }}{{.id }}: {{.name}}
+{{end}}`
+
+const defaultComponentsTemplate = `{{ range . }}{{.id }}: {{.name}}
+{{end}}`
+
+const defaultIssuetypesTemplate = `{{ range .projects }}{{ range .issuetypes }}{{color "+bh"}}{{.name | append ":" | printf "%-13s" }}{{color "reset"}} {{.description}}
+{{end}}{{end}}`
+
+const defaultCreateTemplate = `{{/* create template */ -}}
+fields:
+  project:
+    key: {{ or .overrides.project "" }}
+  issuetype:
+    name: {{ or .overrides.issuetype "" }}
+  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}}`
+
+const defaultSubtaskTemplate = `{{/* create subtask template */ -}}
+fields:
+  project:
+    key: {{ .parent.fields.project.key }}
+  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: Sub-task
+  parent:
+    key: {{ .parent.key }}`
+
+const defaultCommentTemplate = `body: |~
+  {{ or .overrides.comment "" | indent 2 }}
+`
+
+const defaultTransitionTemplate = `{{/* transition template */ -}}
+update:
+  comment:
+    - add: 
+        body: |~
+          {{ or .overrides.comment "" | indent 10 }}
+fields:
+{{- if .meta.fields.assignee}}
+  assignee:
+    name: {{if .overrides.assignee}}{{.overrides.assignee}}{{else}}{{if .fields.assignee}}{{.fields.assignee.name}}{{end}}{{end}}
+{{- end -}}
+{{if .meta.fields.components}}
+  components: # Values: {{ range .meta.fields.components.allowedValues }}{{.name}}, {{end}}{{if .overrides.components }}{{ range (split "," .overrides.components)}}
+    - name: {{.}}{{end}}{{else}}{{ range .fields.components }}
+    - name: {{ .name }}{{end}}{{end}}
+{{- end -}}
+{{if .meta.fields.description}}
+  description: {{or .overrides.description .fields.description }}
+{{- 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: {{.}}{{end}}{{else}}{{range .fields.fixVersions}}
+    - name: {{.}}{{end}}{{end}}
+  {{- end -}}
+{{- end -}}
+{{if .meta.fields.issuetype}}
+  issuetype: # Values: {{ range .meta.fields.issuetype.allowedValues }}{{.name}}, {{end}}
+    name: {{if .overrides.issuetype}}{{.overrides.issuetype}}{{else}}{{if .fields.issuetype}}{{.fields.issuetype.name}}{{end}}{{end}}
+{{- end -}}
+{{if .meta.fields.labels}}
+  labels: {{range .fields.labels}}
+    - {{.}}{{end}}{{if .overrides.labels}}{{range (split "," .overrides.labels)}}
+    - {{.}}{{end}}{{end}}
+{{- end -}}
+{{if .meta.fields.priority}}
+  priority: # Values: {{ range .meta.fields.priority.allowedValues }}{{.name}}, {{end}}
+    name: {{ or .overrides.priority "unassigned" }}
+{{- end -}}
+{{if .meta.fields.reporter}}
+  reporter:
+    name: {{if .overrides.reporter}}{{.overrides.reporter}}{{else}}{{if .fields.reporter}}{{.fields.reporter.name}}{{end}}{{end}}
+{{- end -}}
+{{if .meta.fields.resolution}}
+  resolution: # Values: {{ range .meta.fields.resolution.allowedValues }}{{.name}}, {{end}}
+    name: {{if .overrides.resolution}}{{.overrides.resolution}}{{else if .fields.resolution}}{{.fields.resolution.name}}{{else}}{{or .overrides.defaultResolution "Fixed"}}{{end}}
+{{- end -}}
+{{if .meta.fields.summary}}
+  summary: {{or .overrides.summary .fields.summary}}
+{{- end -}}
+{{if .meta.fields.versions.allowedValues}}
+  versions: # Values: {{ range .meta.fields.versions.allowedValues }}{{.name}}, {{end}}{{if .overrides.versions}}{{ range (split "," .overrides.versions)}}
+    - name: {{.}}{{end}}{{else}}{{range .fields.versions}}
+    - name: {{.}}{{end}}{{end}}
+{{- end}}
+transition:
+  id: {{ .transition.id }}
+  name: {{ .transition.name }}
+`
+
+const defaultWorklogTemplate = `{{/* worklog template */ -}}
+# issue: {{ .issue }}
+comment: |~
+  {{ or .comment "" }}
+timeSpent: {{ or .timeSpent "" }}
+started:
+`
+
+const defaultWorklogsTemplate = `{{/* worklogs template */ -}}
+{{ range .worklogs }}- # {{.author.name}}, {{.created | age}} ago
+  comment: {{ or .comment "" }}
+  timeSpent: {{ .timeSpent }}
+
+{{end}}`
@@ -0,0 +1,41 @@
+package jira
+
+import (
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+	"time"
+)
+
+type Transport struct {
+	shadow http.Transport
+}
+
+func NewUnixProxyTransport(path string) *Transport {
+	dial := func(network, addr string) (net.Conn, error) {
+		return net.Dial("unix", path)
+	}
+
+	shadow := http.Transport{
+		Dial:                  dial,
+		DialTLS:               dial,
+		DisableKeepAlives:     true,
+		ResponseHeaderTimeout: 30 * time.Second,
+		ExpectContinueTimeout: 10 * time.Second,
+	}
+
+	return &Transport{shadow}
+}
+
+func UnixProxy(path string) *Transport {
+	return NewUnixProxyTransport(os.ExpandEnv(path))
+}
+
+func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
+	req2 := *req
+	url2 := *req.URL
+	req2.URL = &url2
+	req2.URL.Opaque = fmt.Sprintf("//%s%s", req.URL.Host, req.URL.EscapedPath())
+	return t.shadow.RoundTrip(&req2)
+}
@@ -1,63 +1,79 @@
-package cli
+package jira

 import (
 	"bufio"
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"github.com/mgutz/ansi"
+	"gopkg.in/coryb/yaml.v2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
+	"path/filepath"
+	"runtime"
 	"strings"
 	"text/template"
 	"time"
 )

+func homedir() string {
+	if runtime.GOOS == "windows" {
+		return os.Getenv("USERPROFILE")
+	}
+	return os.Getenv("HOME")
+}
+
+// FindParentPaths will find all available paths from the current path up to the root
+// that matches the given fileName path
 func FindParentPaths(fileName string) []string {
 	cwd, _ := os.Getwd()

-	paths := make([]string, 0)
+	paths := []string{}

 	// special case if homedir is not in current path then check there anyway
-	homedir := os.Getenv("HOME")
-	if !strings.HasPrefix(cwd, homedir) {
-		file := fmt.Sprintf("%s/%s", homedir, fileName)
-		if _, err := os.Stat(file); err == nil {
-			paths = append(paths, file)
+	homedir := homedir()
+	if !filepath.HasPrefix(cwd, homedir) {
+		path := filepath.Join(homedir, fileName)
+		if _, err := os.Stat(path); err == nil {
+			paths = append(paths, path)
 		}
 	}

-	var dir string
-	for _, part := range strings.Split(cwd, string(os.PathSeparator)) {
-		if dir == "/" {
-			dir = fmt.Sprintf("/%s", part)
-		} else {
-			dir = fmt.Sprintf("%s/%s", dir, part)
+	path := filepath.Join(cwd, fileName)
+	if _, err := os.Stat(path); err == nil {
+		paths = append(paths, path)
+	}
+	for true {
+		cwd = filepath.Dir(cwd)
+		path := filepath.Join(cwd, fileName)
+		if _, err := os.Stat(path); err == nil {
+			paths = append(paths, path)
 		}
-		file := fmt.Sprintf("%s/%s", dir, fileName)
-		if _, err := os.Stat(file); err == nil {
-			paths = append(paths, file)
+		if cwd[len(cwd)-1] == filepath.Separator {
+			break
 		}
 	}
 	return paths
 }

+// FindClosestParentPath finds the path that matches the given fileName path that is
+// closest to the current working directory
 func FindClosestParentPath(fileName string) (string, error) {
 	paths := FindParentPaths(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 readFile(file string) string {
 	var bytes []byte
 	var err error
+	log.Debugf("readFile: reading %q", file)
 	if bytes, err = ioutil.ReadFile(file); err != nil {
-		log.Error("Failed to read file %s: %s", file, err)
+		log.Errorf("Failed to read file %s: %s", file, err)
 		os.Exit(1)
 	}
 	return string(bytes)
@@ -79,48 +95,52 @@ func copyFile(src, dst string) (err error) {
 }

 func fuzzyAge(start string) (string, error) {
-	if t, err := time.Parse("2006-01-02T15:04:05.000-0700", start); err != nil {
+	t, err := time.Parse("2006-01-02T15:04:05.000-0700", start)
+	if err != nil {
 		return "", err
-	} else {
-		delta := time.Now().Sub(t)
-		if delta.Minutes() < 2 {
-			return "a minute", nil
-		} else if dm := delta.Minutes(); dm < 45 {
-			return fmt.Sprintf("%d minutes", int(dm)), nil
-		} else if dm := delta.Minutes(); dm < 90 {
-			return "an hour", nil
-		} else if dh := delta.Hours(); dh < 24 {
-			return fmt.Sprintf("%d hours", int(dh)), nil
-		} else if dh := delta.Hours(); dh < 48 {
-			return "a day", nil
-		} else {
-			return fmt.Sprintf("%d days", int(delta.Hours()/24)), nil
-		}
 	}
-	return "unknown", nil
+	delta := time.Now().Sub(t)
+	if delta.Minutes() < 2 {
+		return "a minute", nil
+	} else if dm := delta.Minutes(); dm < 45 {
+		return fmt.Sprintf("%d minutes", int(dm)), nil
+	} else if dm := delta.Minutes(); dm < 90 {
+		return "an hour", nil
+	} else if dh := delta.Hours(); dh < 24 {
+		return fmt.Sprintf("%d hours", int(dh)), nil
+	} else if dh := delta.Hours(); dh < 48 {
+		return "a day", nil
+	}
+	return fmt.Sprintf("%d days", int(delta.Hours()/24)), nil
 }

 func dateFormat(format string, content string) (string, error) {
-	if t, err := time.Parse("2006-01-02T15:04:05.000-0700", content); err != nil {
+	t, err := time.Parse("2006-01-02T15:04:05.000-0700", content)
+	if err != nil {
 		return "", err
-	} else {
-		return t.Format(format), nil
 	}
+	return t.Format(format), nil
+}
+
+// RunTemplate will run the give templateContent as a golang text/template
+// and pass the provided data to the template execution.  It will write
+// the output to the provided "out" writer.
+func RunTemplate(templateContent string, data interface{}, out io.Writer) error {
+	return runTemplate(templateContent, data, out)
 }

 func runTemplate(templateContent string, data interface{}, out io.Writer) error {
-
 	if out == nil {
 		out = os.Stdout
 	}

 	funcs := map[string]interface{}{
 		"toJson": func(content interface{}) (string, error) {
-			if bytes, err := json.MarshalIndent(content, "", "    "); err != nil {
+			bytes, err := json.MarshalIndent(content, "", "    ")
+			if err != nil {
 				return "", err
-			} else {
-				return string(bytes), nil
 			}
+			return string(bytes), nil
 		},
 		"append": func(more string, content interface{}) (string, error) {
 			switch value := content.(type) {
@@ -129,13 +149,13 @@ func runTemplate(templateContent string, data interface{}, out io.Writer) error
 			case []byte:
 				return string(append(content.([]byte), []byte(more)...)), nil
 			default:
-				return "", errors.New(fmt.Sprintf("Unknown type: %s", value))
+				return "", fmt.Errorf("Unknown type: %s", value)
 			}
 		},
 		"indent": func(spaces int, content string) string {
 			indent := make([]rune, spaces+1, spaces+1)
 			indent[0] = '\n'
-			for i := 1; i < spaces+1; i += 1 {
+			for i := 1; i < spaces+1; i++ {
 				indent[i] = ' '
 			}

@@ -160,6 +180,13 @@ func runTemplate(templateContent string, data interface{}, out io.Writer) error
 		"split": func(sep string, content string) []string {
 			return strings.Split(content, sep)
 		},
+		"join": func(sep string, content []interface{}) string {
+			vals := make([]string, len(content))
+			for i, v := range content {
+				vals[i] = v.(string)
+			}
+			return strings.Join(vals, sep)
+		},
 		"abbrev": func(max int, content string) string {
 			if len(content) > max {
 				var buffer bytes.Buffer
@@ -171,7 +198,7 @@ func runTemplate(templateContent string, data interface{}, out io.Writer) error
 		},
 		"rep": func(count int, content string) string {
 			var buffer bytes.Buffer
-			for i := 0; i < count; i += 1 {
+			for i := 0; i < count; i++ {
 				buffer.WriteString(content)
 			}
 			return buffer.String()
@@ -183,19 +210,19 @@ func runTemplate(templateContent string, data interface{}, out io.Writer) error
 			return dateFormat(format, content)
 		},
 	}
-	if tmpl, err := template.New("template").Funcs(funcs).Parse(templateContent); err != nil {
-		log.Error("Failed to parse template: %s", err)
+	tmpl, err := template.New("template").Funcs(funcs).Parse(templateContent)
+	if err != nil {
+		log.Errorf("Failed to parse template: %s", err)
+		return err
+	}
+	if err := tmpl.Execute(out, data); err != nil {
+		log.Errorf("Failed to execute template: %s", err)
 		return err
-	} else {
-		if err := tmpl.Execute(out, data); err != nil {
-			log.Error("Failed to execute template: %s", err)
-			return err
-		}
 	}
 	return nil
 }

-func responseToJson(resp *http.Response, err error) (interface{}, error) {
+func responseToJSON(resp *http.Response, err error) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
@@ -204,7 +231,7 @@ func responseToJson(resp *http.Response, err error) (interface{}, error) {
 	if resp.StatusCode == 400 {
 		if val, ok := data.(map[string]interface{})["errorMessages"]; ok {
 			for _, errMsg := range val.([]interface{}) {
-				log.Error("%s", errMsg)
+				log.Errorf("%s", errMsg)
 			}
 		}
 	}
@@ -217,7 +244,7 @@ func jsonDecode(io io.Reader) interface{} {
 	var data interface{}
 	err = json.Unmarshal(content, &data)
 	if err != nil {
-		log.Error("JSON Parse Error: %s from %s", err, content)
+		log.Errorf("JSON Parse Error: %s from %s", err, content)
 	}
 	return data
 }
@@ -228,7 +255,7 @@ func jsonEncode(data interface{}) (string, error) {

 	err := enc.Encode(data)
 	if err != nil {
-		log.Error("Failed to encode data %s: %s", data, err)
+		log.Errorf("Failed to encode data %s: %s", data, err)
 		return "", err
 	}
 	return buffer.String(), nil
@@ -238,13 +265,28 @@ func jsonWrite(file string, data interface{}) {
 	fh, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
 	defer fh.Close()
 	if err != nil {
-		log.Error("Failed to open %s: %s", file, err)
+		log.Errorf("Failed to open %s: %s", file, err)
 		os.Exit(1)
 	}
 	enc := json.NewEncoder(fh)
 	enc.Encode(data)
 }

+func yamlWrite(file string, data interface{}) {
+	fh, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
+	defer fh.Close()
+	if err != nil {
+		log.Errorf("Failed to open %s: %s", file, err)
+		os.Exit(1)
+	}
+	if out, err := yaml.Marshal(data); err != nil {
+		log.Errorf("Failed to marshal yaml %v: %s", data, err)
+		os.Exit(1)
+	} else {
+		fh.Write(out)
+	}
+}
+
 func promptYN(prompt string, yes bool) bool {
 	reader := bufio.NewReader(os.Stdin)
 	if !yes {
@@ -280,10 +322,13 @@ func yamlFixup(data interface{}) (interface{}, error) {
 				}
 			default:
 				err := fmt.Errorf("YAML: key %s is type '%T', require 'string'", key, k)
-				log.Error("%s", err)
+				log.Errorf("%s", err)
 				return nil, err
 			}
 		}
+		if len(copy) == 0 {
+			return nil, nil
+		}
 		return copy, nil
 	case map[string]interface{}:
 		copy := make(map[string]interface{})
@@ -294,6 +339,9 @@ func yamlFixup(data interface{}) (interface{}, error) {
 				copy[k] = fixed
 			}
 		}
+		if len(copy) == 0 {
+			return nil, nil
+		}
 		return copy, nil
 	case []interface{}:
 		copy := make([]interface{}, 0, len(d))
@@ -304,6 +352,9 @@ func yamlFixup(data interface{}) (interface{}, error) {
 				copy = append(copy, fixed)
 			}
 		}
+		if len(copy) == 0 {
+			return nil, nil
+		}
 		return copy, nil
 	case string:
 		if d == "" || d == "\n" {
@@ -317,16 +368,16 @@ func yamlFixup(data interface{}) (interface{}, error) {

 func mkdir(dir string) error {
 	if stat, err := os.Stat(dir); err != nil && !os.IsNotExist(err) {
-		log.Error("Failed to stat %s: %s", dir, err)
+		log.Errorf("Failed to stat %s: %s", dir, err)
 		return err
 	} else if err == nil && !stat.IsDir() {
-		err := fmt.Errorf("%s exists and is not a directory!", dir)
-		log.Error("%s", err)
+		err := fmt.Errorf("%s exists and is not a directory", dir)
+		log.Errorf("%s", err)
 		return err
 	} else {
 		// dir does not exist, so try to create it
 		if err := os.MkdirAll(dir, 0755); err != nil {
-			log.Error("Failed to mkdir -p %s: %s", dir, err)
+			log.Errorf("Failed to mkdir -p %s: %s", dir, err)
 			return err
 		}
 	}
				`@@ -0,0 +1 @@`
				`…(ΡαΆω GΈώ20,ΧΎ„¶ι―’«$Ggu©y1_a-ΟI'ΥΈοΘ}�Ν£4 ¨s@,]?.£�Pξs>uθ¤QpΓx�ΛΠΡA�\|x]"‘*ΒΎf„ς—λΫ£B2ΕνytΌΡ±c…¥ο β8L Ιvg�ΗΚi]��ΙKΥzu0yKΩ.“ §ΣBΑw\|ƒ†_K�'zθ΅Ύ“c¦ύυάά…ύ)?ΔoT #�G8PΧΙπΩ=�υP-–,Ί}¥άώΝX:,�ΊfB'=WG²I±¨ 0BΈ£ξJΞ3Η εϋο��ΛΞσ;�;;)Iι_UMf�α•τ�’}·’,―CΒhπ�Ομ£ο®μ\‰�kκtΞ&ωµNύΌΐ½άjξ™�}ςά`
				`@@ -0,0 +1 @@`
				`…(Ñá¢ù G¸ü�©oCº™šâj0OÊ!=ldÿ§ô~2%p7•>´·kbñ�#d›‹'¥d\|_à{±�ºa¶[EŠÔÎ¿�=mÂm½ð°Lí&‹À',^‰ý$¡¨!HÞ>]Ð4WïôêÔi+q=†N ‘2¿1´K;_% ~Ø ™¶£Õ‡ØÄ~\¶'– : Ï[:ï´ËFÃáSÌooApö¦dËËH¬ôz‘È-vÝÞ#¼5†¡Ü[…«Ü„zê,e¸˜È¤H‘„e#"=¾$y5kÐ+$Ë Ô¸šÇÏ¨~Õç�’÷�¾Ë3×ÏÃ§j®¹3O£\|WéÝÿîA#TI)ö± «âU}ô¹Ò;M3³ÞŒžëÁ9.ª}i�TÎ‚Š Ëì0S s…Jp…ìå’½çÑ¶Pob‘¼™(*ò`