Version 0.9.4 (#87)

* make envstack canonical entrypoint, deprecate envshell, adds default prompt string
* run commands in non-interactive shell by default
* addresses command quote issue
* adds --unresolved cli option
* update shebang to python3
* adds cache env file
* bump version to 0.9.4

Author: rsgalloway

Makefile

@@ -35,9 +35,10 @@ build: clean
 # Combined target to build for both platforms
 all: build
 
-# Install dryrun target to simulate installation
+# Test target to verify the build
 test:
-	$(ENVSTACK_CMD) -- l {ROOT}
+	$(ENVSTACK_CMD) -- ls -al
+	${ENVSTACK_CMD} -- which python
 
 # Install dryrun target to simulate installation
 dryrun:

README.md

@@ -592,6 +592,7 @@ The following environment variables are used to help manage functionality:
 | DEFAULT_ENV_STACK | Name of the default environment stack (default) |
 | ENVPATH | Colon-separated paths to search for stack files |
 | IGNORE_MISSING | Ignore missing stack files when resolving environments |
+| INTERACTIVE | Run one-off commands in an interactive shell |
 | STACK | Stores the name of the current environment stack |
 
 # Tests

bin/envshell

@@ -50,6 +50,7 @@ class HelloWrapper(Wrapper):
     """A simple wrapper that prints the value of an environment variable."""
     def __init__(self, *args, **kwargs):
         super(HelloWrapper, self).__init__(*args, **kwargs)
+        self.shell = True
 
     def executable(self):
         """Return the executable to run."""

bin/envshell.bat

@@ -0,0 +1,15 @@
+#!/usr/bin/env envstack
+include: [default]
+all: &all
+  ENVPATH: ${CACHE_ROOT}/env:${DEPLOY_ROOT}/env:${ENVPATH}
+  PATH: ${CACHE_ROOT}/bin:${DEPLOY_ROOT}/bin:${PATH}
+  PYTHONPATH: ${CACHE_ROOT}/lib/python:${DEPLOY_ROOT}/lib/python:${PYTHONPATH}
+darwin:
+  <<: *all
+  CACHE_ROOT: ${HOME}/Library/Caches/pipe/${ENV}
+linux:
+  <<: *all
+  CACHE_ROOT: ${HOME}/.cache/pipe/${ENV}
+windows:
+  <<: *all
+  CACHE_ROOT: ${USERPROFILE}/AppData/Local/pipe/cache/${ENV}

bin/hello

@@ -10,12 +10,12 @@ all: &all
 darwin:
   <<: *all
   ROOT: /Volumes/pipe
-  PS1: '\[\e[32m\](${ENV})\[\e[0m\] \w\$ '
+  PS1: '\[\e[32m\](${ENV:=${STACK}})\[\e[0m\] \w\$ '
 linux:
   <<: *all
   ROOT: /mnt/pipe
-  PS1: '\[\e[32m\](${ENV})\[\e[0m\] \w\$ '
+  PS1: '\[\e[32m\](${ENV:=${STACK}})\[\e[0m\] \w\$ '
 windows:
   <<: *all
   ROOT: //tools/pipe
-  PROMPT: $E[32m(${ENV})$E[0m $P$G
+  PROMPT: $E[32m(${ENV:=${STACK}})$E[0m $P$G

env/cache.env

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2024-2025, Ryan Galloway (ryan@rsgalloway.com)
 #
@@ -34,6 +34,6 @@
 """
 
 __prog__ = "envstack"
-__version__ = "0.9.3"
+__version__ = "0.9.4"
 
 from envstack.env import clear, init, revert, save  # noqa: F401

env/default.env

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2024-2025, Ryan Galloway (ryan@rsgalloway.com)
 #
@@ -161,11 +161,6 @@ def parse_args():
         action="store_true",
         help="create a bare environment",
     )
-    parser.add_argument(
-        "--shell",
-        action="store_true",
-        help="drop into a shell with the environment loaded",
-    )
     encrypt_group = parser.add_argument_group("encryption options")
     encrypt_group.add_argument(
         "-e",
@@ -226,6 +221,12 @@ def parse_args():
         metavar="SCOPE",
         help="search scope for environment stack files",
     )
+    parser.add_argument(
+        "-u",
+        "--unresolved",
+        action="store_true",
+        help="dump unresolved environment variables to stdout",
+    )
     parser.add_argument(
         "-r",
         "--resolve",
@@ -263,11 +264,11 @@ def envshell(namespace: List[str] = None):
     """Run a shell in the given environment stack."""
     from .envshell import EnvshellWrapper
 
-    print("\U0001F680 Launching envshell... CTRL+D to exit")
+    print("\U0001F680 Launching envstack shell... CTRL+D to exit")
 
     name = (namespace or [config.DEFAULT_NAMESPACE])[:]
-    envshell = EnvshellWrapper(name)
-    return envshell.launch()
+    shell = EnvshellWrapper(name)
+    return shell.launch()
 
 
 def whichenv():
@@ -292,9 +293,6 @@ def main():
         if command:
             return run_command(command, args.namespace)
 
-        elif args.shell:
-            return envshell(args.namespace)
-
         elif args.keygen:
             from envstack.encrypt import generate_keys
 
@@ -445,13 +443,16 @@ def main():
             for source in env.sources:
                 print(source.path)
 
-        else:
+        elif args.unresolved:
             env = load_environ(
                 args.namespace, platform=args.platform, encrypt=args.encrypt
             )
             for k, v in sorted(env.items(), key=lambda x: str(x[0])):
                 print(f"{k}={v}")
 
+        else:
+            return envshell(args.namespace)
+
     except KeyboardInterrupt:
         print("Stopping...")
         return 2