Merge pull request #4 from blueyed/improvements

[zsh-autoenv.git] / autoenv.zsh

diff --git a/autoenv.zsh b/autoenv.zsh
index 313378b2c93dcba97d8982952a3f3db507f8ab85..723fe608aa9d3d5ee4946bead5a936408622d332 100644 (file)
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -1,19 +1,28 @@
-# Stolen from
+# Initially based on
 # https://github.com/joshuaclayton/dotfiles/blob/master/zsh_profile.d/autoenv.zsh
 
 # TODO: move this to DOTENV_*?!
 export ENV_AUTHORIZATION_FILE=$HOME/.env_auth
 
+# Name of file to look for when entering directories.
 : ${DOTENV_FILE_ENTER:=.env}
+
+# Name of file to look for when leaving directories.
+# Requires DOTENV_HANDLE_LEAVE=1.
 : ${DOTENV_FILE_LEAVE:=.env.leave}
 
 # Look for .env in parent dirs?
 : ${DOTENV_LOOK_UPWARDS:=0}
 
-# Handle leave events, when leaving ?
+# Handle leave events when changing away from a subtree, where an "enter"
+# event was handled?
 : ${DOTENV_HANDLE_LEAVE:=1}
 
 
+# Internal: stack of entered (and handled) directories.
+_dotenv_stack_entered=()
+
+
 _dotenv_hash_pair() {
   local env_file=$1
   env_shasum=$(shasum $env_file | cut -d' ' -f1)
@@ -23,8 +32,8 @@ _dotenv_hash_pair() {
 _dotenv_authorized_env_file() {
   local env_file=$1
   local pair=$(_dotenv_hash_pair $env_file)
-  touch $ENV_AUTHORIZATION_FILE
-  \grep -Gq $pair $ENV_AUTHORIZATION_FILE
+  test -f $ENV_AUTHORIZATION_FILE \
+    && \grep -qF $pair $ENV_AUTHORIZATION_FILE
 }
 
 _dotenv_authorize() {
@@ -35,19 +44,9 @@ _dotenv_authorize() {
 
 _dotenv_deauthorize() {
   local env_file=$1
-  echo $(\grep -Gv $env_file $ENV_AUTHORIZATION_FILE) > $ENV_AUTHORIZATION_FILE
-}
-
-_dotenv_print_unauthorized_message() {
-  echo "Attempting to load unauthorized env file: $1"
-  echo ""
-  echo "**********************************************"
-  echo ""
-  cat $1
-  echo ""
-  echo "**********************************************"
-  echo ""
-  echo -n "Would you like to authorize it? [y/N] "
+  if [[ -f $ENV_AUTHORIZATION_FILE ]]; then
+    echo $(\grep -vF $env_file $ENV_AUTHORIZATION_FILE) > $ENV_AUTHORIZATION_FILE
+  fi
 }
 
 # This function can be mocked in tests
@@ -57,9 +56,21 @@ _dotenv_read_answer() {
   echo $answer
 }
 
+# Args: 1: absolute path to env file (resolved symlinks).
 _dotenv_check_authorized_env_file() {
+  if ! [[ -f $1 ]]; then
+    return 1
+  fi
   if ! _dotenv_authorized_env_file $1; then
-    _dotenv_print_unauthorized_message $1
+    echo "Attempting to load unauthorized env file: $1"
+    echo ""
+    echo "**********************************************"
+    echo ""
+    cat $1
+    echo ""
+    echo "**********************************************"
+    echo ""
+    echo -n "Would you like to authorize it? [y/N] "
 
     local answer=$(_dotenv_read_answer)
     echo
@@ -72,7 +83,17 @@ _dotenv_check_authorized_env_file() {
   return 0
 }
 
-_dotenv_stack_entered=()
+_dotenv_source() {
+  local env_file=$1
+  _dotenv_event=$2
+  _dotenv_cwd=$PWD
+
+  builtin cd -q ${env_file:h}
+  source $env_file
+  builtin cd -q $_dotenv_cwd
+
+  unset _dotenv_event _dotenv_cwd
+}
 
 _dotenv_chpwd_handler() {
   local env_file="$PWD/$DOTENV_FILE_ENTER"
@@ -83,9 +104,7 @@ _dotenv_chpwd_handler() {
       if ! [[ ${PWD}/ == ${prev_dir}/* ]]; then
         local env_file_leave=$prev_dir/$DOTENV_FILE_LEAVE
         if _dotenv_check_authorized_env_file $env_file_leave; then
-          _dotenv_event=leave
-          source $env_file_leave
-          unset _dotenv_event
+          _dotenv_source $env_file_leave leave
         fi
         # Remove this entry from the stack.
         _dotenv_stack_entered=(${_dotenv_stack_entered#$prev_dir})
@@ -94,32 +113,31 @@ _dotenv_chpwd_handler() {
   fi
 
   if ! [[ -f $env_file ]] && [[ $DOTENV_LOOK_UPWARDS == 1 ]]; then
+    # Look for files in parent dirs, using an extended Zsh glob.
     setopt localoptions extendedglob
     local m
     m=((../)#${DOTENV_FILE_ENTER}(N))
     if (( $#m )); then
-      env_file=$m[1]
+      env_file=${${m[1]}:A}
+    else
+      return
     fi
   fi
 
-  if ! [[ -f $env_file ]]; then
-    return
-  fi
-
   if ! _dotenv_check_authorized_env_file $env_file; then
     return
   fi
 
-  # Load the env file only once.
-  if (( ${+_dotenv_stack_entered[(r)${env_file:A:h}]} )); then
+  # Load the env file only once: check if $env_file's parent
+  # is in $_dotenv_stack_entered.
+  local env_file_dir=${env_file:A:h}
+  if (( ${+_dotenv_stack_entered[(r)${env_file_dir}]} )); then
     return
   fi
 
-  _dotenv_stack_entered+=(${env_file:A:h})
+  _dotenv_stack_entered+=(${env_file_dir})
 
-  _dotenv_event=enter
-  source $env_file
-  unset _dotenv_event
+  _dotenv_source $env_file enter
 }
 
 autoload -U add-zsh-hook