envstack 0.7.1__tar.gz → 0.7.3__tar.gz

{envstack-0.7.1/lib/envstack.egg-info → envstack-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.7.1
+Version: 0.7.3
 Summary: Stacked environment variable management system
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway
@@ -34,6 +34,7 @@ Environment variable management system.
 | Variable expansion modifiers | Supports bash-like variable expansion modifiers, allowing you to set default values for variables and override them in the environment or by higher scope stacks. |
 | Platform-specific variables | Stacks can have platform-specific variables and values. This allows you to define different values for variables based on the platform. |
 | Variable references | Variables can reference other variables, allowing for more flexibility and dynamic value assignment. |
+| Multi-line values | Supports variables with multi-line values. |
 | Includes | Stack files can include other stacks, making it easy to reuse and combine different stacks. |
 | Python API | Provides a Python API that allows you to initialize and work with environment stacks programmatically. Easily initialize pre-defined environments with Python scripts, tools, and wrappers. |
 | Running commands | Allows you to run command line executables inside an environment stack, providing a convenient way to execute commands with a pre-defined environment. |
@@ -127,6 +128,43 @@ scope to lower scope, left to right):
 $ envstack [STACK [STACK ...]]
 ```
 
+#### Executing Scripts
+
+Environment stack files are also executable scripts that can be run directly:
+
+
+```bash
+$ ./env/test.env
+DEPLOY_ROOT=${ROOT}/${STACK}
+ENV=${STACK}
+ENVPATH=${DEPLOY_ROOT}/env:${ROOT}/prod/env
+HELLO=${HELLO:=world}
+LOG_LEVEL=DEBUG
+PATH=${DEPLOY_ROOT}/bin:${ROOT}/prod/bin:${PATH}
+PYTHONPATH=${DEPLOY_ROOT}/lib/python:${ROOT}/prod/lib/python:${PYTHONPATH}
+ROOT=/mnt/pipe
+STACK=test
+```
+
+Run commands inside a specific environment stack file:
+
+```bash
+$ ./env/test.env -- <command>
+```
+
+For example:
+
+```bash
+$ ./env/hello.env -- echo {HELLO}
+world
+```
+
+Export a specific environment stack file:
+
+```bash
+$ ./env/hello.env --export
+```
+
 ## Setting Values
 
 Envstack uses bash-like variable expansion modifiers. Setting `$VAR` to a fixed
@@ -180,40 +218,67 @@ goodbye
 Several example or starter stacks are available in the [env folder of the
 envstack repo](https://github.com/rsgalloway/envstack/tree/master/env).
 
-To create a blank environment stack, create a new namespaced .env file and
-declare some variables.
+To create a blank environment stack, create a new envstack file and declare some
+variables.
 
-For example `foo.env` (the stack name is "foo"):
+Create a new stack file called "foobar.env" and make it executable (note: at
+least one VAR needs to be defined under all):
+
+#### foobar.env
 
 ```yaml
+#!/usr/bin/env envstack
+
 all: &default
   FOO: bar
   BAR: ${FOO}
+darwin:
+  <<: *default
+linux:
+  <<: *default
+windows:
+  <<: *default
+```
+
+Make it executable
+
+```bash
+$ chmod +x ./foobar.env
 ```
 
-To see the resolved environment for the `foo` environment stack, run:
+To see the resolved environment for the `foobar` stack, run:
 
 ```bash
-$ envstack foo
+$ envstack foobar
 FOO=bar
 BAR=$FOO
 ```
 
+or execute it directly:
+
+```bash
+$ ./foobar.env
+```
+
 To see resolved values:
 
 ```bash
-$ envstack foo -r
+$ ./foobar.env -r
 FOO=bar
 BAR=bar
 ```
 
-Variables can be platform specific (but always inherit from `all`):
+#### More Details
+
+Variables can be platform specific:
 
 ```yaml
+darwin:
+  <<: *default
+  HELLO: olleh
 linux:
   <<: *default
   HELLO: world
-
 windows:
   <<: *default
   HELLO: goodbye
@@ -333,6 +398,16 @@ $ envstack -- echo {HELLO}
 world
 ```
 
+Running a node command:
+
+```bash
+$ echo "console.log('Hello ' + process.env.HELLO)" > index.js
+$ node index.js 
+Hello undefined
+$ envstack hello -- node index.js 
+Hello world
+```
+
 Running Python commands in the default stack:
 
 ```bash
@@ -365,7 +440,7 @@ environment stack that sets a value for `${PYEXE}`:
 #### hello.env
 ```yaml
 all: &default
-  PYEXE: python
+  PYEXE: /usr/bin/python
 ```
 
 #### bin/hello
@@ -434,7 +509,7 @@ The following environment variables are used to help manage functionality:
 |------|-------------|
 | ENVPATH | Colon-separated paths to search for stack files |
 | IGNORE_MISSING | Ignore missing stack files when resolving environments |
-| STACK | Name of the current stack |
+| STACK | Name of the current environment stack |
 
 # Tests
 

{envstack-0.7.1 → envstack-0.7.3}/README.md

@@ -11,6 +11,7 @@ Environment variable management system.
 | Variable expansion modifiers | Supports bash-like variable expansion modifiers, allowing you to set default values for variables and override them in the environment or by higher scope stacks. |
 | Platform-specific variables | Stacks can have platform-specific variables and values. This allows you to define different values for variables based on the platform. |
 | Variable references | Variables can reference other variables, allowing for more flexibility and dynamic value assignment. |
+| Multi-line values | Supports variables with multi-line values. |
 | Includes | Stack files can include other stacks, making it easy to reuse and combine different stacks. |
 | Python API | Provides a Python API that allows you to initialize and work with environment stacks programmatically. Easily initialize pre-defined environments with Python scripts, tools, and wrappers. |
 | Running commands | Allows you to run command line executables inside an environment stack, providing a convenient way to execute commands with a pre-defined environment. |
@@ -104,6 +105,43 @@ scope to lower scope, left to right):
 $ envstack [STACK [STACK ...]]
 ```
 
+#### Executing Scripts
+
+Environment stack files are also executable scripts that can be run directly:
+
+
+```bash
+$ ./env/test.env
+DEPLOY_ROOT=${ROOT}/${STACK}
+ENV=${STACK}
+ENVPATH=${DEPLOY_ROOT}/env:${ROOT}/prod/env
+HELLO=${HELLO:=world}
+LOG_LEVEL=DEBUG
+PATH=${DEPLOY_ROOT}/bin:${ROOT}/prod/bin:${PATH}
+PYTHONPATH=${DEPLOY_ROOT}/lib/python:${ROOT}/prod/lib/python:${PYTHONPATH}
+ROOT=/mnt/pipe
+STACK=test
+```
+
+Run commands inside a specific environment stack file:
+
+```bash
+$ ./env/test.env -- <command>
+```
+
+For example:
+
+```bash
+$ ./env/hello.env -- echo {HELLO}
+world
+```
+
+Export a specific environment stack file:
+
+```bash
+$ ./env/hello.env --export
+```
+
 ## Setting Values
 
 Envstack uses bash-like variable expansion modifiers. Setting `$VAR` to a fixed
@@ -157,40 +195,67 @@ goodbye
 Several example or starter stacks are available in the [env folder of the
 envstack repo](https://github.com/rsgalloway/envstack/tree/master/env).
 
-To create a blank environment stack, create a new namespaced .env file and
-declare some variables.
+To create a blank environment stack, create a new envstack file and declare some
+variables.
 
-For example `foo.env` (the stack name is "foo"):
+Create a new stack file called "foobar.env" and make it executable (note: at
+least one VAR needs to be defined under all):
+
+#### foobar.env
 
 ```yaml
+#!/usr/bin/env envstack
+
 all: &default
   FOO: bar
   BAR: ${FOO}
+darwin:
+  <<: *default
+linux:
+  <<: *default
+windows:
+  <<: *default
+```
+
+Make it executable
+
+```bash
+$ chmod +x ./foobar.env
 ```
 
-To see the resolved environment for the `foo` environment stack, run:
+To see the resolved environment for the `foobar` stack, run:
 
 ```bash
-$ envstack foo
+$ envstack foobar
 FOO=bar
 BAR=$FOO
 ```
 
+or execute it directly:
+
+```bash
+$ ./foobar.env
+```
+
 To see resolved values:
 
 ```bash
-$ envstack foo -r
+$ ./foobar.env -r
 FOO=bar
 BAR=bar
 ```
 
-Variables can be platform specific (but always inherit from `all`):
+#### More Details
+
+Variables can be platform specific:
 
 ```yaml
+darwin:
+  <<: *default
+  HELLO: olleh
 linux:
   <<: *default
   HELLO: world
-
 windows:
   <<: *default
   HELLO: goodbye
@@ -310,6 +375,16 @@ $ envstack -- echo {HELLO}
 world
 ```
 
+Running a node command:
+
+```bash
+$ echo "console.log('Hello ' + process.env.HELLO)" > index.js
+$ node index.js 
+Hello undefined
+$ envstack hello -- node index.js 
+Hello world
+```
+
 Running Python commands in the default stack:
 
 ```bash
@@ -342,7 +417,7 @@ environment stack that sets a value for `${PYEXE}`:
 #### hello.env
 ```yaml
 all: &default
-  PYEXE: python
+  PYEXE: /usr/bin/python
 ```
 
 #### bin/hello
@@ -411,7 +486,7 @@ The following environment variables are used to help manage functionality:
 |------|-------------|
 | ENVPATH | Colon-separated paths to search for stack files |
 | IGNORE_MISSING | Ignore missing stack files when resolving environments |
-| STACK | Name of the current stack |
+| STACK | Name of the current environment stack |
 
 # Tests
 

{envstack-0.7.1 → envstack-0.7.3}/lib/envstack/__init__.py

@@ -34,6 +34,6 @@ Stacked environment variable management system.
 """
 
 __prog__ = "envstack"
-__version__ = "0.7.1"
+__version__ = "0.7.3"
 
 from envstack.env import clear, init, revert, save

{envstack-0.7.1 → envstack-0.7.3}/lib/envstack/cli.py

@@ -145,12 +145,11 @@ def main():
         if command:
             return run_command(command, args.namespace)
         elif args.resolve is not None:
-            if len(args.resolve) == 0:
-                args.resolve = load_environ(args.namespace).keys()
             resolved = resolve_environ(
                 load_environ(args.namespace, platform=args.platform)
             )
-            for key in sorted(args.resolve):
+            keys = args.resolve or resolved.keys()
+            for key in sorted(keys):
                 val = resolved.get(key)
                 print(f"{key}={val}")
         elif args.trace is not None:
@@ -160,8 +159,8 @@ def main():
                 path = trace_var(*args.namespace, var=trace)
                 print("{0}: {1}".format(trace, path))
         elif args.sources:
-            sources = get_sources(*args.namespace, scope=args.scope)
-            for source in sources:
+            env = load_environ(args.namespace, platform=args.platform)
+            for source in env.sources:
                 print(source.path)
         elif args.clear:
             print(clear(args.namespace, config.SHELL))
@@ -169,7 +168,7 @@ def main():
             print(export(args.namespace, config.SHELL))
         else:
             env = load_environ(args.namespace, platform=args.platform)
-            for k, v in sorted(env.items()):
+            for k, v in sorted(env.items(), key=lambda x: str(x[0])):
                 print(f"{k}={v}")
 
     except KeyboardInterrupt: