mj / zsh-config

Commit ab0f2f9d577352a488e68c3a0f9cf810b2afd034

Authored by mj 2015-07-14 23:38:22 +0200

Exists in master and in 2 other branches

Squashed 'repos/robbyrussell/oh-my-zsh/' changes from 599831b..3ea3384

3ea3384 Merge pull request #4041 from apjanke/fix-jira-prefix-comment-merge
c968346 Merge pull request #4106 from apjanke/venvw-no-realpath
c1f1f91 virtualenvwrapper: Replace "realpath" with portable zsh-native `:A` and `:h` modifiers
d0670aa Fix merge conflict for jira-prefix and jira add comment

git-subtree-dir: repos/robbyrussell/oh-my-zsh
git-subtree-split: 3ea33841863c4f5f22a27e64ae7950d901b674af

Showing 2 changed files with 7 additions and 13 deletions Inline Diff

plugins/jira/jira.plugin.zsh
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh

plugins/jira/jira.plugin.zsh

Diff comments View file @ ab0f2f9

 # 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
 #         .jira-url in the current directory takes precedence
 #
 # If you use Rapid Board, set:
 #JIRA_RAPID_BOARD="true"
 # in you .zshrc
 #
 # Setup: cd to/my/project
 #        echo "https://name.jira.com" >> .jira-url
 # Usage: jira           # opens a new issue
 #        jira ABC-123   # Opens an existing issue
 open_jira_issue () {
   local open_cmd
   if [[ "$OSTYPE" = darwin* ]]; then
     open_cmd='open'
   else
     open_cmd='xdg-open'
   fi
   if [ -f .jira-url ]; then
     jira_url=$(cat .jira-url)
   elif [ -f ~/.jira-url ]; then
     jira_url=$(cat ~/.jira-url)
   elif [[ "x$JIRA_URL" != "x" ]]; then
     jira_url=$JIRA_URL
   else
     echo "JIRA url is not specified anywhere."
     return 1
   fi
   if [ -f .jira-prefix ]; then
     jira_prefix=$(cat .jira-prefix)
   elif [ -f ~/.jira-prefix ]; then
     jira_prefix=$(cat ~/.jira-prefix)
   else
     jira_prefix=""
   fi
   if [ -z "$1" ]; then
     echo "Opening new issue"
     $open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
   elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
     jira_query $@
-  else
-    echo "Opening issue #$1"
-    if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
-      $open_cmd  "$jira_url/issues/$jira_prefix$1"
-    else
-      $open_cmd  "$jira_url/browse/$jira_prefix$1"
-    fi
   else
     local addcomment=''
     if [[ "$2" == "m" ]]; then
       addcomment="#add-comment"
       echo "Add comment to issue #$1"
     else
       echo "Opening issue #$1"
     fi
     if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
-      $open_cmd  "$jira_url/issues/$1$addcomment"
+      $open_cmd  "$jira_url/issues/$jira_prefix$1$addcomment"
     else
-      $open_cmd  "$jira_url/browse/$1$addcomment"
+      $open_cmd  "$jira_url/browse/$jira_prefix$1$addcomment"
     fi
   fi
 }
 jira_name () {
   if [[ -z "$1" ]]; then
     if [[ "x${JIRA_NAME}" != "x" ]]; then
       jira_name=${JIRA_NAME}
     else
       echo "JIRA_NAME not specified"
       return 1
     fi
   else
     jira_name=$@
   fi
 }
 jira_query () {
     verb="$1"
     if [[ "${verb}" = "reported" ]]; then
       lookup=reporter
       preposition=by
     elif [[ "${verb}" = "assigned" ]]; then
       lookup=assignee
       preposition=to
     else
       echo "not a valid lookup $verb"
       return 1
     fi
     shift 1
     jira_name $@
     if [[ $? = 1 ]]; then
         return 1
     fi
     echo "Browsing issues ${verb} ${preposition} ${jira_name}"
     $open_cmd "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
 }
 alias jira='open_jira_issue'

plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh

Diff comments View file @ ab0f2f9

 virtualenvwrapper='virtualenvwrapper.sh'
 if (( $+commands[$virtualenvwrapper] )); then
   function {
     setopt local_options
     unsetopt equals
     source ${${virtualenvwrapper}:c}
   }
 elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
   function {
     setopt local_options
     unsetopt equals
     virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper"
     source "/etc/bash_completion.d/virtualenvwrapper"
   }
 else
   print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\
         "Please install with \`pip install virtualenvwrapper\`" >&2
   return
 fi
 if ! type workon &>/dev/null; then
   print "zsh virtualenvwrapper plugin: shell function 'workon' not defined.\n"\
         "Please check ${virtualenvwrapper}" >&2
   return
 fi
 if [[ "$WORKON_HOME" == "" ]]; then
   print "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" >&2
   return
 fi
 if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
-  # Automatically activate Git projects's virtual environments based on the
+  # Automatically activate Git projects' virtual environments based on the
   # directory name of the project. Virtual environment name can be overridden
   # by placing a .venv file in the project root with a virtualenv name in it
   function workon_cwd {
     if [ ! $WORKON_CWD ]; then
       WORKON_CWD=1
       # Check if this is a Git repo
-      PROJECT_ROOT=`pwd`
+      # Get absolute path, resolving symlinks
+      PROJECT_ROOT="${PWD:A}"
       while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do
-        PROJECT_ROOT=`realpath $PROJECT_ROOT/..`
+        PROJECT_ROOT="${PROJECT_ROOT:h}"
       done
       if [[ "$PROJECT_ROOT" == "/" ]]; then
         PROJECT_ROOT="."
       fi
       # Check for virtualenv name override
       if [[ -f "$PROJECT_ROOT/.venv" ]]; then
         ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
       elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
         ENV_NAME="$PROJECT_ROOT/.venv"
       elif [[ "$PROJECT_ROOT" != "." ]]; then
-        ENV_NAME=`basename "$PROJECT_ROOT"`
+        ENV_NAME="${PROJECT_ROOT:t}"
       else
         ENV_NAME=""
       fi
       if [[ "$ENV_NAME" != "" ]]; then
         # Activate the environment only if it is not already active
         if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
           if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
             workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
           elif [[ -e "$ENV_NAME/bin/activate" ]]; then
             source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
           fi
         fi
       elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
         # We've just left the repo, deactivate the environment
         # Note: this only happens if the virtualenv was activated automatically
         deactivate && unset CD_VIRTUAL_ENV
       fi
       unset PROJECT_ROOT
       unset WORKON_CWD
     fi
   }
   # Append workon_cwd to the chpwd_functions array, so it will be called on cd
   # http://zsh.sourceforge.net/Doc/Release/Functions.html
   if ! (( $chpwd_functions[(I)workon_cwd] )); then
     chpwd_functions+=(workon_cwd)
   fi
 fi

Link here
mj 2015-07-14 21:40:13 UTC

mentioned in commit 446eab

_mentioned in commit 446eab_

Choose File ... File name...
Cancel
Link here
mj 2015-10-21 01:11:14 UTC

mentioned in commit 446eab

_mentioned in commit 446eab_

Choose File ... File name...
Cancel