Change default values: .env => .autoenv.zsh etc

This changes the defaults:
 - AUTOENV_FILE_ENTER:   .env       => .autoenv.zsh
 - AUTOENV_FILE_LEAVE:   .env_leave => .autoenv_leave.zsh

`.env` is usually used only for key-value pairs for environment
settings, e.g. with foreman.  We do not want to interfere with this.

This also renames the setting/variable AUTOENV_ENV_FILENAME to
AUTOENV_AUTH_FILE, and uses the [XDG
spec](http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables)
for the default location.

The new default location for the auth file will be
~/.local/share/autoenv_auth.

When the old setting is used, or the previous default exists, a warning
is given with instructions.

Fixes https://github.com/Tarrasch/zsh-autoenv/issues/31.
Closes https://github.com/Tarrasch/zsh-autoenv/pull/32.

diff --git a/README.md b/README.md
index d755996e3a063a00b79bd90d525e147c246cc245..78578ccdea7ec2aff218c7b087c8e05db85ee4e5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 
 # Autoenv for Zsh
 
 
 # Autoenv for Zsh
 

-zsh-autoenv automatically sources (known/whitelisted) `.env` files, typically
-used in project root directories.
+zsh-autoenv automatically sources (known/whitelisted) `.autoenv.zsh` files,
+typically used in project root directories.

 
 It handles "enter" and leave" events, nesting, and stashing of
 variables (overwriting and restoring).
 
 It handles "enter" and leave" events, nesting, and stashing of
 variables (overwriting and restoring).


@@ -13,23 +13,25 @@ variables (overwriting and restoring).
 ## Features
 
  - Support for enter and leave events, which can use the same file.
 ## Features
 
  - Support for enter and leave events, which can use the same file.

-   By default `.env` is used for entering, and `.env_leave` for leaving.
+   By default `.autoenv.zsh` is used for entering, and `.autoenv_leave.zsh`
+   for leaving.

  - Interactively asks for confirmation / authentication before sourcing an
  - Interactively asks for confirmation / authentication before sourcing an

-   unknown `.env` file, and remembers whitelisted files by their hashed
-   content.
+   unknown `.autoenv.zsh` file, and remembers whitelisted files by their
+   hashed content.

  - Test suite.
  - Written in Zsh.
 
 ### Variable stashing
 
  - Test suite.
  - Written in Zsh.
 
 ### Variable stashing
 

-You can use `autostash` in your `.env` files to overwrite some variable, e.g.
-`$PATH`.  When leaving the directory, it will be automatically restored.
+You can use `autostash` in your `.autoenv.zsh` files to overwrite some
+variable, e.g.  `$PATH`.  When leaving the directory, it will be automatically
+restored.

 
 

-    % echo 'echo ENTERED; autostash FOO=changed' > project/.env
+    % echo 'echo ENTERED; autostash FOO=changed' > project/.autoenv.zsh

     % FOO=orig
     % cd project
     Attempting to load unauthorized env file!
     % FOO=orig
     % cd project
     Attempting to load unauthorized env file!

-    -rw-rw-r-- 1 user user 36 Mai  6 20:38 /tmp/project/.env
+    -rw-rw-r-- 1 user user 36 Mai  6 20:38 /tmp/project/.autoenv.zsh

 
     **********************************************
 
 
     **********************************************
 


@@ -51,13 +53,13 @@ have more control.
 The varstash library has been taken from smartcd, and was optimized for Zsh.
 
 
 The varstash library has been taken from smartcd, and was optimized for Zsh.
 
 

-## Writing your .env file
+## Writing your .autoenv.zsh file

 
 ### `autoenv_source_parent()`
 
 
 ### `autoenv_source_parent()`
 

-zsh-autoenv will stop looking for `.env` files after the first one has been
-found.  But you can use the function `autoenv_source_parent` to source a
-parent `.env` file from there.
+zsh-autoenv will stop looking for `.autoenv.zsh` files after the first one has
+been found.  But you can use the function `autoenv_source_parent` to source a
+parent `.autoenv.zsh` file from there.

 
 
 ## Installation
 
 
 ## Installation


@@ -86,16 +88,16 @@ Add them to your `~/.zshrc` file, before sourcing/loading zsh-autoenv.
 ### AUTOENV\_FILE\_ENTER
 Name of the file to look for when entering directories.
 
 ### AUTOENV\_FILE\_ENTER
 Name of the file to look for when entering directories.
 

-Default: `.env`
+Default: `.autoenv.zsh`

 
 ### AUTOENV\_FILE\_LEAVE
 Name of the file to look for when leaving directories.
 Requires `AUTOENV_HANDLE_LEAVE=1`.
 
 
 ### AUTOENV\_FILE\_LEAVE
 Name of the file to look for when leaving directories.
 Requires `AUTOENV_HANDLE_LEAVE=1`.
 

-Default: `.env_leave`
+Default: `.autoenv_leave.zsh`

 
 ### AUTOENV\_LOOK\_UPWARDS
 
 ### AUTOENV\_LOOK\_UPWARDS

-Look for .env files in parent dirs?
+Look for zsh-autoenv "enter" files in parent dirs?

 
 Default: `1`
 
 
 Default: `1`
 

diff --git a/autoenv.zsh b/autoenv.zsh
index 0587e2caa082664f5c361c30717bdca3c7af1309..ebc3611e054eeb175afb81880b382252275c5245 100644 (file)
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -2,16 +2,34 @@
 # https://github.com/joshuaclayton/dotfiles/blob/master/zsh_profile.d/autoenv.zsh
 
 # File to store confirmed authentication into.
 # https://github.com/joshuaclayton/dotfiles/blob/master/zsh_profile.d/autoenv.zsh
 
 # File to store confirmed authentication into.

-: ${AUTOENV_ENV_FILENAME:=~/.env_auth}
+# This handles the deprecated, old location(s).
+if [[ -z $AUTOENV_AUTH_FILE ]]; then
+  if [[ -n $AUTOENV_ENV_FILENAME ]]; then
+    echo "zsh-autoenv: using deprecated setting for AUTOENV_AUTH_FILE from AUTOENV_ENV_FILENAME." >&2
+    echo "Please set AUTOENV_AUTH_FILE instead." >&2
+    AUTOENV_AUTH_FILE=$AUTOENV_ENV_FILENAME
+  else
+    if [[ -n $XDG_DATA_HOME ]]; then
+      AUTOENV_AUTH_FILE=$XDG_DATA_HOME/autoenv_auth
+    else
+      AUTOENV_AUTH_FILE=~/.local/share/autoenv_auth
+    fi
+    if [[ -f ~/.env_auth ]]; then
+      echo "zsh-autoenv: using deprecated location for AUTOENV_AUTH_FILE." >&2
+      echo "Please move it: mv ~/.env_auth ${(D)AUTOENV_AUTH_FILE}." >&2
+      AUTOENV_AUTH_FILE=~/.env_auth
+    fi
+  fi
+fi

 
 # Name of the file to look for when entering directories.
 
 # Name of the file to look for when entering directories.

-: ${AUTOENV_FILE_ENTER:=.env}
+: ${AUTOENV_FILE_ENTER:=.autoenv.zsh}

 
 # Name of the file to look for when leaving directories.
 # Requires AUTOENV_HANDLE_LEAVE=1.
 
 # Name of the file to look for when leaving directories.
 # Requires AUTOENV_HANDLE_LEAVE=1.

-: ${AUTOENV_FILE_LEAVE:=.env_leave}
+: ${AUTOENV_FILE_LEAVE:=.autoenv_leave.zsh}

 
 

-# Look for .env files in parent dirs?
+# Look for zsh-autoenv "enter" files in parent dirs?

 : ${AUTOENV_LOOK_UPWARDS:=1}
 
 # Handle leave events when changing away from a subtree, where an "enter"
 : ${AUTOENV_LOOK_UPWARDS:=1}
 
 # Handle leave events when changing away from a subtree, where an "enter"


@@ -24,10 +42,11 @@
 # (Temporarily) disable zsh-autoenv. This gets looked at in the chpwd handler.
 : ${AUTOENV_DISABLED:=0}
 
 # (Temporarily) disable zsh-autoenv. This gets looked at in the chpwd handler.
 : ${AUTOENV_DISABLED:=0}
 

-# Public helper functions, which can be used from your .env files:
+# Public helper functions, which can be used from your .autoenv.zsh files:

 #
 #

-# Source the next .env file from parent directories.
-# This is useful if you want to use a base .env file for a directory subtree.
+# Source the next .autoenv.zsh file from parent directories.
+# This is useful if you want to use a base .autoenv.zsh file for a directory
+# subtree.

 autoenv_source_parent() {
   local parent_env_file=$(_autoenv_get_file_upwards ${autoenv_env_file:h})
 
 autoenv_source_parent() {
   local parent_env_file=$(_autoenv_get_file_upwards ${autoenv_env_file:h})
 


@@ -166,14 +185,14 @@ _autoenv_hash_pair() {
 _autoenv_authorized_env_file() {
   local env_file=$1
   local pair=$(_autoenv_hash_pair $env_file)
 _autoenv_authorized_env_file() {
   local env_file=$1
   local pair=$(_autoenv_hash_pair $env_file)

-  test -f $AUTOENV_ENV_FILENAME \
-    && \grep -qF $pair $AUTOENV_ENV_FILENAME
+  test -f $AUTOENV_AUTH_FILE \
+    && \grep -qF $pair $AUTOENV_AUTH_FILE

 }
 
 _autoenv_authorize() {
   local env_file=${1:A}
   _autoenv_deauthorize $env_file
 }
 
 _autoenv_authorize() {
   local env_file=${1:A}
   _autoenv_deauthorize $env_file

-  _autoenv_hash_pair $env_file >>| $AUTOENV_ENV_FILENAME
+  _autoenv_hash_pair $env_file >>| $AUTOENV_AUTH_FILE

 }
 
 # Deauthorize a given filename, by removing it from the auth file.
 }
 
 # Deauthorize a given filename, by removing it from the auth file.


@@ -181,8 +200,8 @@ _autoenv_authorize() {
 # allow for writing to the same file again.
 _autoenv_deauthorize() {
   local env_file=${1:A}
 # allow for writing to the same file again.
 _autoenv_deauthorize() {
   local env_file=${1:A}

-  if [[ -s $AUTOENV_ENV_FILENAME ]]; then
-    echo "$(\grep -vF :${env_file}: $AUTOENV_ENV_FILENAME)" >| $AUTOENV_ENV_FILENAME
+  if [[ -s $AUTOENV_AUTH_FILE ]]; then
+    echo "$(\grep -vF :${env_file}: $AUTOENV_AUTH_FILE)" >| $AUTOENV_AUTH_FILE

   fi
 }
 
   fi
 }
 


@@ -213,6 +232,8 @@ _autoenv_check_authorized_env_file() {
     echo "**********************************************"
     echo ""
     echo -n "Would you like to authorize it? (type 'yes') "
     echo "**********************************************"
     echo ""
     echo -n "Would you like to authorize it? (type 'yes') "

+    # echo "Would you like to authorize it?"
+    # echo "('yes' to allow, 'no' to not being asked again; otherwise ignore it for the shell) "

 
     if ! _autoenv_ask_for_yes; then
       return 1
 
     if ! _autoenv_ask_for_yes; then
       return 1

diff --git a/tests/_autoenv_utils.t b/tests/_autoenv_utils.t
index 3c00b00e385b006dcd73a50722b5756f406124a2..ee5b306b43f57f3ef3e5ea57356b04a3843d7c04 100644 (file)
--- a/tests/_autoenv_utils.t
+++ b/tests/_autoenv_utils.t
@@ -21,27 +21,27 @@ Tests for _autoenv_authorize. {{{
 Auth file is empty.
 
   $ cd ../..
 Auth file is empty.
 
   $ cd ../..

-  $ cat $AUTOENV_ENV_FILENAME
+  $ cat $AUTOENV_AUTH_FILE

 
 Failed authorization should keep the auth file empty.
 
   $ _autoenv_authorize does-not-exist
   Missing file argument for _autoenv_hash_pair!
   [1]
 
 Failed authorization should keep the auth file empty.
 
   $ _autoenv_authorize does-not-exist
   Missing file argument for _autoenv_hash_pair!
   [1]

-  $ cat $AUTOENV_ENV_FILENAME
+  $ cat $AUTOENV_AUTH_FILE

 
 Now adding some auth pair.
 
   $ echo first > first
   $ _autoenv_authorize first
 
 Now adding some auth pair.
 
   $ echo first > first
   $ _autoenv_authorize first

-  $ cat $AUTOENV_ENV_FILENAME
+  $ cat $AUTOENV_AUTH_FILE

   :/tmp/cramtests-*/_autoenv_utils.t/first:271ac93c44ac198d92e706c6d6f1d84aefcfa337:1 (glob)
 
 And a second one.
 
   $ echo second > second
   $ _autoenv_authorize second
   :/tmp/cramtests-*/_autoenv_utils.t/first:271ac93c44ac198d92e706c6d6f1d84aefcfa337:1 (glob)
 
 And a second one.
 
   $ echo second > second
   $ _autoenv_authorize second

-  $ cat $AUTOENV_ENV_FILENAME
+  $ cat $AUTOENV_AUTH_FILE

   :/tmp/cramtests-*/_autoenv_utils.t/first:271ac93c44ac198d92e706c6d6f1d84aefcfa337:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)
 
   :/tmp/cramtests-*/_autoenv_utils.t/first:271ac93c44ac198d92e706c6d6f1d84aefcfa337:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)
 


@@ -49,7 +49,7 @@ And a third.
 
   $ echo third > third
   $ _autoenv_authorize third
 
   $ echo third > third
   $ _autoenv_authorize third

-  $ cat $AUTOENV_ENV_FILENAME
+  $ cat $AUTOENV_AUTH_FILE

   :/tmp/cramtests-*/_autoenv_utils.t/first:271ac93c44ac198d92e706c6d6f1d84aefcfa337:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/third:ad180453bf8a374a15df3e90a78c180230146a7c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/first:271ac93c44ac198d92e706c6d6f1d84aefcfa337:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/third:ad180453bf8a374a15df3e90a78c180230146a7c:1 (glob)


@@ -57,7 +57,7 @@ And a third.
 Re-add the second one, with the same hash.
 
   $ _autoenv_authorize second
 Re-add the second one, with the same hash.
 
   $ _autoenv_authorize second

-  $ cat $AUTOENV_ENV_FILENAME
+  $ cat $AUTOENV_AUTH_FILE

   :/tmp/cramtests-*/_autoenv_utils.t/first:271ac93c44ac198d92e706c6d6f1d84aefcfa337:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/third:ad180453bf8a374a15df3e90a78c180230146a7c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/first:271ac93c44ac198d92e706c6d6f1d84aefcfa337:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/third:ad180453bf8a374a15df3e90a78c180230146a7c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)


@@ -66,7 +66,7 @@ Re-add the first one, with a new hash.
 
   $ echo one more line >> first
   $ _autoenv_authorize first
 
   $ echo one more line >> first
   $ _autoenv_authorize first

-  $ cat $AUTOENV_ENV_FILENAME
+  $ cat $AUTOENV_AUTH_FILE

   :/tmp/cramtests-*/_autoenv_utils.t/third:ad180453bf8a374a15df3e90a78c180230146a7c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/first:65eb010197b73ddc109b7210080f97a87f53451e:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/third:ad180453bf8a374a15df3e90a78c180230146a7c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/second:7bee8f3b184e1e141ff76efe369c3b8bfc50e64c:1 (glob)
   :/tmp/cramtests-*/_autoenv_utils.t/first:65eb010197b73ddc109b7210080f97a87f53451e:1 (glob)

diff --git a/tests/autoenv.t b/tests/autoenv.t
index b0c520f90ea3cf1560777ef27e5560555f649fd8..aeeeea4963d22ea3c62e4e17d54fc0f55fb035bc 100644 (file)
--- a/tests/autoenv.t
+++ b/tests/autoenv.t
@@ -1,23 +1,23 @@
   $ source $TESTDIR/setup.zsh || return 1
 
   $ source $TESTDIR/setup.zsh || return 1
 

-Lets set a simple .env action
+Lets set a simple .autoenv.zsh action

 
 

-  $ echo 'echo ENTERED' > .env
+  $ echo 'echo ENTERED' > .autoenv.zsh

 
 Manually create auth file
 
 
 Manually create auth file
 

-  $ test_autoenv_add_to_env $PWD/.env
+  $ test_autoenv_add_to_env $PWD/.autoenv.zsh

   $ cd .
   ENTERED
 
 Now try to make it accept it
 
   $ _autoenv_stack_entered=()
   $ cd .
   ENTERED
 
 Now try to make it accept it
 
   $ _autoenv_stack_entered=()

-  $ rm $AUTOENV_ENV_FILENAME
+  $ rm $AUTOENV_AUTH_FILE

   $ _autoenv_ask_for_yes() { echo "yes" }
   $ cd .
   Attempting to load unauthorized env file!
   $ _autoenv_ask_for_yes() { echo "yes" }
   $ cd .
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/autoenv.t/.env (glob)
+  -* /tmp/cramtests-*/autoenv.t/.autoenv.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   


@@ -38,11 +38,11 @@ Now lets see that it actually checks the shasum value.
   ENTERED
 
   $ _autoenv_stack_entered=()
   ENTERED
 
   $ _autoenv_stack_entered=()

-  $ rm $AUTOENV_ENV_FILENAME
-  $ test_autoenv_add_to_env $PWD/.env mischief
+  $ rm $AUTOENV_AUTH_FILE
+  $ test_autoenv_add_to_env $PWD/.autoenv.zsh mischief

   $ cd .
   Attempting to load unauthorized env file!
   $ cd .
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/autoenv.t/.env (glob)
+  -* /tmp/cramtests-*/autoenv.t/.autoenv.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   


@@ -57,11 +57,11 @@ Now lets see that it actually checks the shasum value.
 Now, will it take no for an answer?
 
   $ _autoenv_stack_entered=()
 Now, will it take no for an answer?
 
   $ _autoenv_stack_entered=()

-  $ rm $AUTOENV_ENV_FILENAME
+  $ rm $AUTOENV_AUTH_FILE

   $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd .
   Attempting to load unauthorized env file!
   $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd .
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/autoenv.t/.env (glob)
+  -* /tmp/cramtests-*/autoenv.t/.autoenv.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   


@@ -77,7 +77,7 @@ Lets also try one more time to ensure it didn't add it.
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd .
   Attempting to load unauthorized env file!
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd .
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/autoenv.t/.env (glob)
+  -* /tmp/cramtests-*/autoenv.t/.autoenv.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   

diff --git a/tests/cwd.t b/tests/cwd.t
index 07ab881f465b89b329c1c38eacd9effe9bbb62fe..97bc5f8470c579d269ca6556b8956540a12a54e6 100644 (file)
--- a/tests/cwd.t
+++ b/tests/cwd.t
@@ -7,8 +7,8 @@ Setup env actions / output.
   $ AUTOENV_LOOK_UPWARDS=1
   $ mkdir -p sub/sub2
   $ cd sub
   $ AUTOENV_LOOK_UPWARDS=1
   $ mkdir -p sub/sub2
   $ cd sub

-  $ echo 'echo ENTERED: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env
-  $ echo 'echo LEFT: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env_leave
+  $ echo 'echo ENTERED: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .autoenv.zsh
+  $ echo 'echo LEFT: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .autoenv_leave.zsh

 
 Manually create auth files.
 
 
 Manually create auth files.
 

diff --git a/tests/leave.t b/tests/leave.t
index 7b804661c77d4960d6fd9d2467e5ab93a3961217..93ad7c13612d92db704b73eaeea2b1605521e884 100644 (file)
--- a/tests/leave.t
+++ b/tests/leave.t
@@ -1,18 +1,18 @@
   $ source $TESTDIR/setup.zsh || return 1
 
   $ source $TESTDIR/setup.zsh || return 1
 

-Lets set a simple .env action
+Lets set a simple .autoenv.zsh action

 
   $ mkdir sub
   $ cd sub
 
   $ mkdir sub
   $ cd sub

-  $ echo 'echo ENTERED' > .env
-  $ echo 'echo LEFT' > .env_leave
+  $ echo 'echo ENTERED' > .autoenv.zsh
+  $ echo 'echo LEFT' > .autoenv_leave.zsh

 
 Change to the directory.
 
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd .
   Attempting to load unauthorized env file!
 
 Change to the directory.
 
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd .
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/leave.t/sub/.env (glob)
+  -* /tmp/cramtests-*/leave.t/sub/.autoenv.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   


@@ -29,7 +29,7 @@ Leave the directory and answer "no".
   $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd ..
   Attempting to load unauthorized env file!
   $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd ..
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/leave.t/sub/.env_leave (glob)
+  -* /tmp/cramtests-*/leave.t/sub/.autoenv_leave.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   


@@ -45,7 +45,7 @@ Leave the directory and answer "no".
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd ..
   Attempting to load unauthorized env file!
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd ..
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/leave.t/sub/.env_leave (glob)
+  -* /tmp/cramtests-*/leave.t/sub/.autoenv_leave.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   


@@ -80,7 +80,7 @@ Now check with subdirs, not looking at parent dirs.
   LEFT
 
 
   LEFT
 
 

-Test that .env is sourced only once with AUTOENV_HANDLE_LEAVE=0.
+Test that .autoenv.zsh is sourced only once with AUTOENV_HANDLE_LEAVE=0.

 
   $ unset _autoenv_stack_entered
   $ AUTOENV_HANDLE_LEAVE=0
 
   $ unset _autoenv_stack_entered
   $ AUTOENV_HANDLE_LEAVE=0


@@ -97,8 +97,8 @@ Test that "leave" is not triggered when entering an outside dir via symlink.
   LEFT
   $ mkdir outside
   $ cd outside
   LEFT
   $ mkdir outside
   $ cd outside

-  $ echo 'echo ENTERED outside: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env
-  $ echo 'echo LEFT outside: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env_leave
+  $ echo 'echo ENTERED outside: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .autoenv.zsh
+  $ echo 'echo LEFT outside: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .autoenv_leave.zsh

   $ test_autoenv_auth_env_files
 
   $ cd ..
   $ test_autoenv_auth_env_files
 
   $ cd ..


@@ -117,7 +117,7 @@ Test that "leave" is not triggered when entering an outside dir via symlink.
 $autoenv_env_file should be reset when leaving.
 
   $ echo $autoenv_env_file
 $autoenv_env_file should be reset when leaving.
 
   $ echo $autoenv_env_file

-  */leave.t/sub/symlink/.env (glob)
+  */leave.t/sub/symlink/.autoenv.zsh (glob)

   $ cd ../..
   LEFT outside: PWD:leave.t pwd:leave.t from:symlink to:leave.t event:leave
   $ echo ${autoenv_env_file:-empty}
   $ cd ../..
   LEFT outside: PWD:leave.t pwd:leave.t from:symlink to:leave.t event:leave
   $ echo ${autoenv_env_file:-empty}

diff --git a/tests/recurse-upwards.t b/tests/recurse-upwards.t
index ff4fce65ba130d7c43213d4c5982683e7acfd823..c19e6b851d4b1e10c52a9dc1541ef68d45841838 100644 (file)
--- a/tests/recurse-upwards.t
+++ b/tests/recurse-upwards.t
@@ -1,4 +1,4 @@
-Test recursing into parent .env files.
+Test recursing into parent .autoenv.zsh files.

 
   $ source $TESTDIR/setup.zsh || return 1
 
 
   $ source $TESTDIR/setup.zsh || return 1
 


@@ -8,8 +8,8 @@ Setup env actions / output.
 
 Create env files in root dir.
 
 
 Create env files in root dir.
 

-  $ echo 'echo ENTERED_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env_leave
+  $ echo 'echo ENTERED_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .autoenv.zsh
+  $ echo 'echo LEFT_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .autoenv_leave.zsh

   $ test_autoenv_auth_env_files
 
 Create env files in sub dir.
   $ test_autoenv_auth_env_files
 
 Create env files in sub dir.


@@ -18,8 +18,8 @@ Create env files in sub dir.
   $ cd sub
   ENTERED_root: PWD:sub from:recurse-upwards.t to:sub
 
   $ cd sub
   ENTERED_root: PWD:sub from:recurse-upwards.t to:sub
 

-  $ echo 'echo ENTERED_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env_leave
+  $ echo 'echo ENTERED_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .autoenv.zsh
+  $ echo 'echo LEFT_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .autoenv_leave.zsh

   $ test_autoenv_auth_env_files
 
 The actual tests.
   $ test_autoenv_auth_env_files
 
 The actual tests.


@@ -35,45 +35,45 @@ The actual tests.
 
   $ cd ..
 
 
   $ cd ..
 

-Changing the .env file should re-source it.
+Changing the .autoenv.zsh file should re-source it.

 
 

-  $ echo 'echo ENTER2' >> .env
+  $ echo 'echo ENTER2' >> .autoenv.zsh

 
 Set timestamp of auth file into the past, so it gets seen as new below.
 
 
 Set timestamp of auth file into the past, so it gets seen as new below.
 

-  $ touch -t 201401010101 .env
+  $ touch -t 201401010101 .autoenv.zsh

 
   $ test_autoenv_auth_env_files
   $ cd .
   ENTERED_sub: PWD:sub from:sub to:sub
   ENTER2
 
 
   $ test_autoenv_auth_env_files
   $ cd .
   ENTERED_sub: PWD:sub from:sub to:sub
   ENTER2
 

-Add sub/sub2/.env file, with a call to autoenv_source_parent.
+Add sub/sub2/.autoenv.zsh file, with a call to autoenv_source_parent.

 
 

-  $ echo "echo autoenv_source_parent_from_sub2:\nautoenv_source_parent\necho done_sub2\n" > sub2/.env
-  $ test_autoenv_add_to_env sub2/.env
+  $ echo "echo autoenv_source_parent_from_sub2:\nautoenv_source_parent\necho done_sub2\n" > sub2/.autoenv.zsh
+  $ test_autoenv_add_to_env sub2/.autoenv.zsh

   $ cd sub2
   autoenv_source_parent_from_sub2:
   ENTERED_sub: PWD:sub2 from:sub to:sub2
   ENTER2
   done_sub2
 
   $ cd sub2
   autoenv_source_parent_from_sub2:
   ENTERED_sub: PWD:sub2 from:sub to:sub2
   ENTER2
   done_sub2
 

-Move sub/.env away, now the root .env file should get sourced.
+Move sub/.autoenv.zsh away, now the root .autoenv.zsh file should get sourced.

 
 

-  $ mv ../.env ../.env.out
-  $ touch -t 201401010102 .env
+  $ mv ../.autoenv.zsh ../.autoenv.zsh.out
+  $ touch -t 201401010102 .autoenv.zsh

   $ cd .
   autoenv_source_parent_from_sub2:
   ENTERED_root: PWD:sub2 from:sub2 to:sub2
   done_sub2
   $ cd .
   autoenv_source_parent_from_sub2:
   ENTERED_root: PWD:sub2 from:sub2 to:sub2
   done_sub2

-  $ mv ../.env.out ../.env
+  $ mv ../.autoenv.zsh.out ../.autoenv.zsh

 
 

-Prepend call to autoenv_source_parent to sub/.env file.
+Prepend call to autoenv_source_parent to sub/.autoenv.zsh file.

 
   $ cd ..
 
   $ cd ..

-  $ sed -i -e "1s/^/echo autoenv_source_parent_from_sub:\nautoenv_source_parent\n/" .env
-  $ echo "echo done_sub" >> .env
-  $ touch -t 201401010103 .env
+  $ sed -i -e "1s/^/echo autoenv_source_parent_from_sub:\nautoenv_source_parent\n/" .autoenv.zsh
+  $ echo "echo done_sub" >> .autoenv.zsh
+  $ touch -t 201401010103 .autoenv.zsh

   $ test_autoenv_auth_env_files
 
   $ cd .
   $ test_autoenv_auth_env_files
 
   $ cd .


@@ -84,10 +84,10 @@ Prepend call to autoenv_source_parent to sub/.env file.
   done_sub
 
 
   done_sub
 
 

-Add sub/sub2/.env file.
+Add sub/sub2/.autoenv.zsh file.

 
 

-  $ echo -e "echo autoenv_source_parent_from_sub2:\nautoenv_source_parent\necho done_sub2\n" >| sub2/.env
-  $ test_autoenv_add_to_env sub2/.env
+  $ echo -e "echo autoenv_source_parent_from_sub2:\nautoenv_source_parent\necho done_sub2\n" >| sub2/.autoenv.zsh
+  $ test_autoenv_add_to_env sub2/.autoenv.zsh

   $ cd sub2
   autoenv_source_parent_from_sub2:
   autoenv_source_parent_from_sub:
   $ cd sub2
   autoenv_source_parent_from_sub2:
   autoenv_source_parent_from_sub:


@@ -105,16 +105,17 @@ autoenv_source_parent already.
   LEFT_sub: PWD:recurse-upwards.t from:sub2 to:recurse-upwards.t
 
 
   LEFT_sub: PWD:recurse-upwards.t from:sub2 to:recurse-upwards.t
 
 

-Changing the root .env should trigger re-authentication via autoenv_source_parent.
+Changing the root .autoenv.zsh should trigger re-authentication via
+autoenv_source_parent.

 
 First, let's answer "no".
 
 
 First, let's answer "no".
 

-  $ echo "echo NEW" >| .env
+  $ echo "echo NEW" >| .autoenv.zsh

   $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd sub
   autoenv_source_parent_from_sub:
   Attempting to load unauthorized env file!
   $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd sub
   autoenv_source_parent_from_sub:
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/recurse-upwards.t/.env (glob)
+  -* /tmp/cramtests-*/recurse-upwards.t/.autoenv.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   


@@ -128,18 +129,18 @@ First, let's answer "no".
   done_sub
 
 Now with "yes".
   done_sub
 
 Now with "yes".

-This currently does not trigger re-execution of the .env file.
+This currently does not trigger re-execution of the .autoenv.zsh file.

 
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd .
 
 
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd .
 

-Touching the .env file will now source the parent env file.
+Touching the .autoenv.zsh file will now source the parent env file.

 
 

-  $ touch -t 201401010104 .env
+  $ touch -t 201401010104 .autoenv.zsh

   $ cd .
   autoenv_source_parent_from_sub:
   Attempting to load unauthorized env file!
   $ cd .
   autoenv_source_parent_from_sub:
   Attempting to load unauthorized env file!

-  -* /tmp/cramtests-*/recurse-upwards.t/.env (glob)
+  -* /tmp/cramtests-*/recurse-upwards.t/.autoenv.zsh (glob)

   
   **********************************************
   
   
   **********************************************
   

diff --git a/tests/setup.zsh b/tests/setup.zsh
index d8a018e173d0d26115c03107bcdf4598c63c93b5..bead06856e98d10b4c2a46aedc42043ecab3a67f 100644 (file)
--- a/tests/setup.zsh
+++ b/tests/setup.zsh
@@ -2,17 +2,17 @@
 #
 # It returns 1 in case of errors, and no tests should be run then!
 #
 #
 # It returns 1 in case of errors, and no tests should be run then!
 #

-# Ensure we have our mocked out AUTOENV_ENV_FILENAME
+# Ensure we have our mocked out AUTOENV_AUTH_FILE

 # (via .zshenv).
 
 # Treat unset variables as errors.
 # Not handled in varstash yet.
 # setopt nounset
 
 # (via .zshenv).
 
 # Treat unset variables as errors.
 # Not handled in varstash yet.
 # setopt nounset
 

-export AUTOENV_ENV_FILENAME="$CRAMTMP/.env_auth"
+export AUTOENV_AUTH_FILE="$CRAMTMP/.autoenv_auth"

 
 

-if [[ $AUTOENV_ENV_FILENAME[0,4] != '/tmp' ]]; then
-  echo "AUTOENV_ENV_FILENAME is not in /tmp. Aborting."
+if [[ $AUTOENV_AUTH_FILE[0,4] != '/tmp' ]]; then
+  echo "AUTOENV_AUTH_FILE is not in /tmp. Aborting."

   return 1
 fi
 
   return 1
 fi
 


@@ -24,11 +24,11 @@ set -e
 $TEST_SOURCE_AUTOENV
 
 # Reset any authentication.
 $TEST_SOURCE_AUTOENV
 
 # Reset any authentication.

-echo -n >| $AUTOENV_ENV_FILENAME
+echo -n >| $AUTOENV_AUTH_FILE

 
 # Add file $1 (with optional hash $2) to authentication file.
 test_autoenv_add_to_env() {
 
 # Add file $1 (with optional hash $2) to authentication file.
 test_autoenv_add_to_env() {

-  _autoenv_hash_pair $1 ${2:-} >>| $AUTOENV_ENV_FILENAME
+  _autoenv_hash_pair $1 ${2:-} >>| $AUTOENV_AUTH_FILE

 }
 
 # Add enter and leave env files to authentication file.
 }
 
 # Add enter and leave env files to authentication file.