varstash integration

[zsh-autoenv.git] / autoenv.zsh

diff --git a/autoenv.zsh b/autoenv.zsh
index fe1fa8725fa4ebab9c6056cab1276fb8e8246a2f..a1acc3695060864874a79cfc48fd9fe1df142a0b 100644 (file)
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -12,7 +12,7 @@ export ENV_AUTHORIZATION_FILE=$HOME/.env_auth
 : ${DOTENV_FILE_LEAVE:=.env.leave}
 
 # Look for .env in parent dirs?
-: ${DOTENV_LOOK_UPWARDS:=0}
+: ${DOTENV_LOOK_UPWARDS:=1}
 
 # Handle leave events when changing away from a subtree, where an "enter"
 # event was handled?
@@ -25,8 +25,7 @@ _dotenv_stack_entered=()
 
 _dotenv_hash_pair() {
   local env_file=$1
-  env_shasum=$(shasum $env_file | cut -d' ' -f1)
-  echo "$env_file:$env_shasum"
+  echo "$env_file:$env_shasum:1"
 }
 
 _dotenv_authorized_env_file() {
@@ -52,10 +51,11 @@ _dotenv_deauthorize() {
 # This function can be mocked in tests
 _dotenv_read_answer() {
   local answer
-  read -q answer
+  read $=_AUTOENV_TEST_READ_ARGS -q answer
   echo $answer
 }
 
+# Args: 1: absolute path to env file (resolved symlinks).
 _dotenv_check_authorized_env_file() {
   if ! [[ -f $1 ]]; then
     return 1
@@ -82,6 +82,30 @@ _dotenv_check_authorized_env_file() {
   return 0
 }
 
+: ${_dotenv_sourced_varstash:=0}
+_dotenv_this_dir=${0:A:h}
+
+_dotenv_source() {
+  local env_file=$1
+  _dotenv_event=$2
+  _dotenv_cwd=$3
+
+  # Source varstash library once.
+  if [[ $_dotenv_sourced_varstash == 0 ]]; then
+    source $_dotenv_this_dir/lib/varstash
+    export _dotenv_sourced_varstash=1
+  fi
+  # varstash_dir=${env_file:h}
+
+  # Change to directory of env file, source it and cd back.
+  local new_dir=$PWD
+  builtin cd -q $_dotenv_cwd
+  source $env_file
+  builtin cd -q $new_dir
+
+  unset _dotenv_event _dotenv_cwd
+}
+
 _dotenv_chpwd_handler() {
   local env_file="$PWD/$DOTENV_FILE_ENTER"
 
@@ -91,9 +115,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 $prev_dir
         fi
         # Remove this entry from the stack.
         _dotenv_stack_entered=(${_dotenv_stack_entered#$prev_dir})
@@ -102,6 +124,7 @@ _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))
@@ -116,16 +139,16 @@ _dotenv_chpwd_handler() {
     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 $PWD
 }
 
 autoload -U add-zsh-hook