Allow calling direnv-cache from subdirectories of $DIRENV_DIR

checkPhase still requires term-test

Closes #1

Makefile

@@ -0,0 +1,9 @@
+build:
+
+install:
+	mkdir -p $(PREFIX)/bin $(PREFIX)/share
+	cp direnv-cache $(PREFIX)/bin
+	cp direnvrc $(PREFIX)/share
+
+check:
+	term-test -s tests

default.nix

@@ -1,3 +1,19 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ stdenv
-(pkgs.writers.writeBashBin "direnv-cache" ./direnv-cache).overrideAttrs
+, direnv
-  (o: { passthru = { direnvrc = ./direnvrc; }; })
+, term-test ? null
+, doCheck ? true
+}:
+assert doCheck -> term-test != null;
+
+stdenv.mkDerivation {
+  name = "direnv-cache";
+  src = ./.;
+  propagatedBuildInputs = [ direnv ];
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+  checkInputs = [ term-test ];
+  inherit doCheck;
+  passthru = { direnvrc = ./direnvrc; };
+  preferLocalBuild = true;
+}

direnv-cache

@@ -32,22 +32,26 @@ diffEnvs() {
 
     while IFS= read -r -d '' line; do
         name=$(tr -d '\0' <<<"$line" | head -n1 | cut -f1 -d'=')
-        if ! getByName "$name" "$new" >/dev/null; then
+        if ! [[ "$name" = DIRENV_* ]]; then
-            echo "export -n '${name}'"
+            if ! getByName "$name" "$new" >/dev/null; then
+                echo "export -n '${name}'"
+            fi
         fi
     done <"$old"
 
     while IFS= read -rd $'\0' line; do
         name=$(tr -d '\0' <<<"$line" | head -n1 | cut -f1 -d'=')
-        if getByName "$name" "$old" >/dev/null; then
+        if ! [[ "$name" = DIRENV_* ]]; then
-            # found in old env, check if values match
+            if getByName "$name" "$old" >/dev/null; then
-            if ! grep -z "^${line}\$" "$old" >/dev/null; then
+                # found in old env, check if values match
-                # variable has changed
+                if ! grep -z "^${line}\$" "$old" >/dev/null; then
+                    # variable has changed
+                    echo "export ${line@Q}"
+                fi
+            else
+                # variable is new
                 echo "export ${line@Q}"
             fi
-        else
-            # variable is new
-            echo "export ${line@Q}"
         fi
     done <"$new"
 }
@@ -66,9 +70,23 @@ getCacheFilePath() {
     echo "${cacheDir}/$(pwd | sha1sum | tr -d ' -')"
 }
 
+switchToDirenvDir() {
+    # Find directory that contains the current .envrc.  Allows direnv-cache to
+    # be called from subdirectories.
+    wd="$(pwd)"
+
+    if [[ -n $DIRENV_DIR ]]; then
+        wd="${DIRENV_DIR#-}"
+    fi
+
+    cd "$wd"
+}
+
 cmd="$1"
 
-if ! [[ -e .envrc ]]; then
+switchToDirenvDir
+
+if ! [[ -e ".envrc" ]]; then
     echo "Error, no .envrc found in current directory"
     exit 1
 fi
@@ -80,15 +98,15 @@ case $cmd in
         if [[ -n $DIRENV_DIR ]]; then
             # run self in clean environment (i.e. outside of the current direnv
             # environment)
+            echo "Switching to clean environment"
             exec direnv exec /proc "${BASH_SOURCE[0]}" "$@"
         fi
         echo "Re-creating cache"
         mkdir -p "$(dirname ${cacheFile})"
         dumpEnv > "${cacheFile}.pre"
         source <(direnv stdlib)
-        if [[ .envrc -nt ${cacheFile}.recipe ]]; then
+        echo "Re-creating recipe"
-            direnv exec . true > /dev/null
+        direnv exec . true > /dev/null
-        fi
         source "${cacheFile}.recipe"
         dumpEnv > "${cacheFile}.post"
         diffEnvs "${cacheFile}.pre" "${cacheFile}.post" > "$cacheFile"
@@ -104,6 +122,7 @@ case $cmd in
         if [[ -e "$cacheFile" ]]; then
             rm "$cacheFile"
         fi
+        direnv reload
         ;;
     *)
         usage

direnvrc

@@ -14,4 +14,3 @@ cache() {
         echo "Environment not cached"
     fi
 }
-

shell.nix

@@ -0,0 +1,2 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.callPackage ./. {}

tests/test_direnv_stable_behavior

@@ -0,0 +1,33 @@
+# -*- mode: sh -*-
+
+function initDirenv {
+    # direnv needs a writable home:
+    run "export HOME=$(pwd)"
+    run 'eval "$(direnv hook bash)"'
+}
+
+function test_simpleEnvrcWorks {
+    initDirenv
+
+    writeFile .envrc <<EOF
+          export FOO=bar
+EOF
+    run "direnv allow"
+    assert "$(getEnv FOO)" == bar
+}
+
+function test_direnvExecRunsInCleanEnv {
+    initDirenv
+
+    run "export FOO=baz"
+
+    writeFile .envrc <<EOF
+          export FOO=bar
+EOF
+
+    run "direnv allow"
+    assert "$(getEnv FOO)" == bar
+    #captureShell 'echo $FOO'
+    #captureShell 'direnv exec /proc env | grep FOO'
+    assert "$(captureShell 'direnv exec /proc env | grep FOO')" == "FOO=baz"
+}