Load direnv directories by default, fix #14

Author: untitaker

README.md

@@ -144,6 +144,34 @@ QUICKENV_LOG=debug make
 # ...
 ```
 
+## Command Reference
+
+```
+An unintrusive environment manager
+
+Usage: quickenv <COMMAND>
+
+Commands:
+  reload  Execute .envrc in the current or parent directory, and cache the new variables
+  vars    Dump out cached environment variables
+  shim    Create a new shim binary in ~/.quickenv/bin/
+  unshim  Remove a shim binary from ~/.quickenv/bin/
+  exec    Run a program with .envrc loaded without having to shim it
+  which   Determine which program quickenv's shim would launch under the hood
+  help    Print this message or the help of the given subcommand(s)
+
+Options:
+  -h, --help     Print help
+  -V, --version  Print version
+
+Environment variables:
+    QUICKENV_LOG=debug to enable debug output (in shim commands as well)
+    QUICKENV_LOG=error to silence everything but errors
+    QUICKENV_NO_SHIM=1 to disable loading of .envrc, and effectively disable shims
+    QUICKENV_SHIM_EXEC=1 to directly exec() shims instead of spawning them as subprocess. This can help with attaching debuggers.
+    QUICKENV_NO_SHIM_WARNINGS=1 to disable nags about running 'quickenv shim' everytime a new binary is added
+    QUICKENV_PRELUDE can be overridden to customize the shell code injected before executing each envrc. By default, quickenv loads ~/.config/direnv/lib/*.sh files and then runs 'eval "$(direnv stdlib)"' to mimic direnv's behavior.
+```
 ## License
 
 Licensed under `MIT`, see `LICENSE`.

src/main.rs

@@ -33,7 +33,7 @@ use crate::core::resolve_envrc_context;
     QUICKENV_NO_SHIM=1 to disable loading of .envrc, and effectively disable shims
     QUICKENV_SHIM_EXEC=1 to directly exec() shims instead of spawning them as subprocess. This can help with attaching debuggers.
     QUICKENV_NO_SHIM_WARNINGS=1 to disable nags about running 'quickenv shim' everytime a new binary is added
-    QUICKENV_PRELUDE='eval \"$(direnv stdlib)\"' can be overridden to something else to get rid of the direnv stdlib and therefore direnv dependency, or to inject additional code before executing each envrc.
+    QUICKENV_PRELUDE can be overridden to customize the shell code injected before executing each envrc. By default, quickenv loads ~/.config/direnv/lib/*.sh files and then runs 'eval \"$(direnv stdlib)\"' to mimic direnv's behavior.
 "
 )]
 struct Args {
@@ -286,7 +286,19 @@ fn compute_envvars(quickenv_home: &Path) -> Result<(), Error> {
     };
 
     let prelude = std::env::var("QUICKENV_PRELUDE")
-        .unwrap_or_else(|_| r#"eval "$(direnv stdlib)""#.to_owned());
+        .unwrap_or_else(|_| {
+            // Load direnv lib files (mimicking direnv's default behavior)
+            // and then load direnv stdlib
+            let direnv_config_dir = std::env::var("XDG_CONFIG_HOME")
+                .unwrap_or_else(|_| {
+                    std::env::var("HOME")
+                        .map(|home| format!("{home}/.config"))
+                        .unwrap_or_else(|_| "/tmp/.config".to_string())
+                });
+            format!(
+                "for f in {direnv_config_dir}/direnv/lib/*.sh; do [ -r \"$f\" ] && . \"$f\"; done; eval \"$(direnv stdlib)\""
+            )
+        });
 
     write!(
         temp_script,

tests/acceptance.rs

@@ -713,3 +713,81 @@ sleep 1
 
     Ok(())
 }
+
+#[test]
+fn test_direnv_lib_loading() -> Result<(), Error> {
+    let harness = setup()?;
+
+    // Create a fake direnv lib directory and file
+    let direnv_lib_dir = harness.join(".config/direnv/lib");
+    create_dir_all(&direnv_lib_dir)?;
+
+    // Create a lib file that exports a custom function and variable
+    write(
+        direnv_lib_dir.join("test_lib.sh"),
+        r#"#!/bin/bash
+# Test direnv lib file
+export DIRENV_LIB_LOADED=true
+my_custom_function() {
+    echo "custom function from direnv lib"
+}
+"#,
+    )?;
+
+    // Create .envrc that uses the function and variable from the lib
+    write(
+        harness.join(".envrc"),
+        r#"my_custom_function
+echo "DIRENV_LIB_LOADED is: $DIRENV_LIB_LOADED"
+export PATH=test_bin:$PATH
+"#,
+    )?;
+
+    // Create a test binary
+    create_dir_all(harness.join("test_bin"))?;
+    write(
+        harness.join("test_bin/hello"),
+        "#!/bin/sh\necho hello from test bin",
+    )?;
+    set_executable(harness.join("test_bin/hello"))?;
+
+    // Set XDG_CONFIG_HOME to point to our test config
+    let mut test_harness = harness;
+    test_harness.set_var("XDG_CONFIG_HOME", test_harness.join(".config"));
+
+    // Test that lib loading works during reload
+    assert_cmd!(test_harness, quickenv "reload", @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    custom function from direnv lib
+    DIRENV_LIB_LOADED is: true
+
+    ----- stderr -----
+    [WARN quickenv] 1 unshimmed commands (1 new). Use 'quickenv shim' to make them available.
+    Set QUICKENV_NO_SHIM_WARNINGS=1 to silence this message.
+    "###);
+
+    // Test that lib loading works when executing shimmed commands
+    assert_cmd!(test_harness, quickenv "shim" "hello", @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    Created 1 new shims in [scrubbed $HOME]/.quickenv/bin/.
+    Use 'quickenv unshim <command>' to remove them again.
+    "###);
+
+    // The environment should be loaded properly when running the shimmed command
+    assert_cmd!(test_harness, hello, @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    hello from test bin
+
+    ----- stderr -----
+    "###);
+
+    Ok(())
+}