s/ENV_AUTHORIZATION_FILE/AUTOENV_ENV_FILENAME/

[zsh-autoenv.git] / autoenv.zsh

diff --git a/autoenv.zsh b/autoenv.zsh
index 1499103e5918216e5d5b28e7289d4453ecf5a4cb..5be6c315e3e2781a89f962b3145be620a0014f59 100644 (file)
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -1,8 +1,7 @@
 # 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
+export AUTOENV_ENV_FILENAME=$HOME/.env_auth
 
 # Name of file to look for when entering directories.
 : ${DOTENV_FILE_ENTER:=.env}
@@ -31,27 +30,27 @@ _dotenv_hash_pair() {
 _dotenv_authorized_env_file() {
   local env_file=$1
   local pair=$(_dotenv_hash_pair $env_file)
-  test -f $ENV_AUTHORIZATION_FILE \
-    && \grep -qF $pair $ENV_AUTHORIZATION_FILE
+  test -f $AUTOENV_ENV_FILENAME \
+    && \grep -qF $pair $AUTOENV_ENV_FILENAME
 }
 
 _dotenv_authorize() {
   local env_file=$1
   _dotenv_deauthorize $env_file
-  _dotenv_hash_pair $env_file >> $ENV_AUTHORIZATION_FILE
+  _dotenv_hash_pair $env_file >> $AUTOENV_ENV_FILENAME
 }
 
 _dotenv_deauthorize() {
   local env_file=$1
-  if [[ -f $ENV_AUTHORIZATION_FILE ]]; then
-    echo $(\grep -vF $env_file $ENV_AUTHORIZATION_FILE) > $ENV_AUTHORIZATION_FILE
+  if [[ -f $AUTOENV_ENV_FILENAME ]]; then
+    echo $(\grep -vF $env_file $AUTOENV_ENV_FILENAME) > $AUTOENV_ENV_FILENAME
   fi
 }
 
 # This function can be mocked in tests
 _dotenv_read_answer() {
   local answer
-  read -q answer
+  read $=_AUTOENV_TEST_READ_ARGS -q answer
   echo $answer
 }
 
@@ -82,14 +81,31 @@ _dotenv_check_authorized_env_file() {
   return 0
 }
 
+# Initialize $_dotenv_sourced_varstash, but do not overwrite an existing one
+# from e.g. `exec zsh` (to reload your shell config).
+: ${_dotenv_sourced_varstash:=0}
+
+# Get directory of this file (absolute, with resolved symlinks).
+_dotenv_this_dir=${0:A:h}
+
 _dotenv_source() {
   local env_file=$1
   _dotenv_event=$2
-  _dotenv_cwd=$PWD
+  _dotenv_cwd=$3
+
+  # Source varstash library once.
+  if [[ $_dotenv_sourced_varstash == 0 ]]; then
+    source $_dotenv_this_dir/lib/varstash
+    export _dotenv_sourced_varstash=1
+    # NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to
+    # ${env_file:h}.
+  fi
 
-  builtin cd -q ${env_file:h}
-  source $env_file
+  # 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
 }
@@ -103,7 +119,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_source $env_file_leave leave
+          _dotenv_source $env_file_leave leave $prev_dir
         fi
         # Remove this entry from the stack.
         _dotenv_stack_entered=(${_dotenv_stack_entered#$prev_dir})
@@ -136,7 +152,7 @@ _dotenv_chpwd_handler() {
 
   _dotenv_stack_entered+=(${env_file_dir})
 
-  _dotenv_source $env_file enter
+  _dotenv_source $env_file enter $PWD
 }
 
 autoload -U add-zsh-hook