Search venv directories from bottom to top

Author: aohorodnyk

README.md

@@ -11,6 +11,7 @@ The project was forked because I wanted to add a few features and improve the pl
 * The plugin did not work with the new version of fish, and I wanted to keep it as simple as possible.
 * The plugin looked for virtual environments in the current directory, but not in the specified sub-directory. For example I store virtual env in a sub-directory called `.venv`.
 * Apply virtual environment when run a terminal in a directory with a custom virtual environment.
+* Search for virtual environments in the parent directories from bottom to top, instead of top to bottom it was implemented in the original plugin.
 
 ## Install
 Installation with [Fisher][fisher]:

conf.d/autoenv.fish

@@ -14,14 +14,12 @@ function applyAutoenv
   and return
   # We start by splitting our CWD path into individual elements and iterating over each element.
   # If our CWD is `/opt/my/hovercraft/eels` we split it into a variable containing 4 entries:
-  # `opt`, `my`, `hovercraft` and `eels`. We then build back up the path by iterating over the list
-  # and adding each element to the previous one. (We start with `/opt`, then `/opt/my` and so on.)
-  # During each run through the loop we test for a sub-directory/file called `bin/activate.fish`. If a
-  # venv is found we go ahead and break out of the loop, otherwise continue. We go through all of this
-  # instead of just checking the CWD to handle cases where the user moves into a sub-directory of the venv.
-  for _dir in (string split -n '/' "$PWD")
-    set -l _tree "$_tree/$_dir"
-
+  # `opt`, `my`, `hovercraft` and `eels`. We then iterate over each entry and check to see if it
+  # contains a `bin/activate.fish` file. If a venv is found we go ahead and break out of the loop,
+  # otherwise continue. We go through all of this instead of just checking the CWD to handle cases
+  # where the user moves into a sub-directory of the venv.
+  set _tree (pwd)
+  while test $_tree != "/"
     set -l _activate (string join '/' "$_tree" "$autovenv_dir" "bin/activate.fish")
     set -l _activate (string replace -a "//" "/" "$_activate")
 
@@ -33,6 +31,9 @@ function applyAutoenv
       end
       break
     end
+
+
+    set _tree (dirname $_tree)
   end
   # If we're *not* in an active venv and the venv source dir exists we activate it and return.
   if test -z "$VIRTUAL_ENV" -a -e "$_source"
@@ -43,7 +44,7 @@ function applyAutoenv
     # Next we check to see if we're already in an active venv. If so we proceed with further tests.
   else if test -n "$VIRTUAL_ENV"
     # Check to see if our CWD is inside the venv directory.
-    set _dir (string match -n "$VIRTUAL_ENV*" "$PWD")
+    set _dir (string match -n "$VIRTUAL_ENV*" "$_source")
     # If we're no longer inside the venv dirctory deactivate it and return.
     if test -z "$_dir" -a ! -e "$_source"
       deactivate