Merge branch PR 4132 into jira-prefix-and-help-and-stuff

This commit is contained in:
Andrew Janke 2015-08-18 04:10:56 -04:00
commit caf667fb30

View File

@ -1,6 +1,7 @@
# To use: add a .jira-url file in the base of your project # To use: add a .jira-url file in the base of your project
# You can also set JIRA_URL in your .zshrc or put .jira-url in your home directory # You can also set JIRA_URL in your .zshrc or put .jira-url in your home directory
# .jira-url in the current directory takes precedence # .jira-url in the current directory takes precedence. The same goes with .jira-prefix
# and JIRA_PREFIX.
# #
# If you use Rapid Board, set: # If you use Rapid Board, set:
#JIRA_RAPID_BOARD="true" #JIRA_RAPID_BOARD="true"
@ -15,17 +16,20 @@ open_jira_issue () {
jira_url=$(cat .jira-url) jira_url=$(cat .jira-url)
elif [ -f ~/.jira-url ]; then elif [ -f ~/.jira-url ]; then
jira_url=$(cat ~/.jira-url) jira_url=$(cat ~/.jira-url)
elif [[ "x$JIRA_URL" != "x" ]]; then elif [[ "${JIRA_URL}" != "" ]]; then
jira_url=$JIRA_URL jira_url=${JIRA_URL}
else else
echo "JIRA url is not specified anywhere." echo "JIRA url is not specified anywhere."
return 1 return 1
fi fi
local jira_prefix
if [ -f .jira-prefix ]; then if [ -f .jira-prefix ]; then
jira_prefix=$(cat .jira-prefix) jira_prefix=$(cat .jira-prefix)
elif [ -f ~/.jira-prefix ]; then elif [ -f ~/.jira-prefix ]; then
jira_prefix=$(cat ~/.jira-prefix) jira_prefix=$(cat ~/.jira-prefix)
elif [[ "${JIRA_PREFIX}" != "" ]]; then
jira_prefix=${JIRA_PREFIX}
else else
jira_prefix="" jira_prefix=""
fi fi
@ -43,18 +47,17 @@ open_jira_issue () {
else else
echo "Opening issue #$1" echo "Opening issue #$1"
fi fi
if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then open_command "${jira_url}/issues/${jira_prefix}${1}${addcomment}"
open_command "$jira_url/issues/$jira_prefix$1$addcomment"
else else
open_command "$jira_url/browse/$jira_prefix$1$addcomment" open_command "${jira_url}/browse/${jira_prefix}${1}${addcomment}"
fi fi
fi fi
} }
jira_name () { jira_name () {
if [[ -z "$1" ]]; then if [[ -z "$1" ]]; then
if [[ "x${JIRA_NAME}" != "x" ]]; then if [[ "${JIRA_NAME}" != "" ]]; then
jira_name=${JIRA_NAME} jira_name=${JIRA_NAME}
else else
echo "JIRA_NAME not specified" echo "JIRA_NAME not specified"
@ -66,7 +69,8 @@ jira_name () {
} }
jira_query () { jira_query () {
verb="$1" local verb="$1"
local jira_name lookup preposition
if [[ "${verb}" = "reported" ]]; then if [[ "${verb}" = "reported" ]]; then
lookup=reporter lookup=reporter
preposition=by preposition=by