envstack 0.5.0__tar.gz → 0.5.2__tar.gz

{envstack-0.5.0 → envstack-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.5.0
+Version: 0.5.2
 Summary: Stacked environment variable management system.
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway
@@ -15,9 +15,9 @@ Stacked environment variable management system. The lightweight, easy to use
 "rez" alternative for production pipelines.
 
 Environment variables are declared in namespaced .env files using yaml syntax.
-The default stack declares env variables in `stack.env` files. You can create any
-new stack by creating new `.env` files, e.g. to create a new `thing` stack just
-create `thing.env` files in any given context.
+The default stack declares env variables in `stack.env` files. You can create
+any new stack by creating new `.env` files, e.g. to create a new `thing` stack
+just create `thing.env` files in any given context.
 
 ## Installation
 
@@ -35,11 +35,15 @@ $ cd envstack
 $ python setup.py install
 ```
 
-The install process will automatically attempt to install the default `stack.env` file to the
-default env file directory defined `$DEFAULT_ENV_DIR`. **Note:** The [siteconf](https://github.com/rsgalloway/siteconf) sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
+The install process will automatically attempt to install the default
+`stack.env` file to the default env file directory defined `$DEFAULT_ENV_DIR`.
+**Note:** The [siteconf](https://github.com/rsgalloway/siteconf)
+sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
 
-If installing from source, you can use [distman](https://github.com/rsgalloway/distman) to
-install envstack and the default `stack.env` file using the provided `dist.json` file:
+If installing from source, you can use
+[distman](https://github.com/rsgalloway/distman) to
+install envstack and the default `stack.env` file using the provided
+`dist.json` file:
 
 ```bash
 $ distman
@@ -47,8 +51,8 @@ $ distman
 
 ## Quickstart
 
-The `stack` namespace is the default environment stack. Running the `envstack` command
-should show you the default environment stack:
+The `stack` namespace is the default environment stack. Running the `envstack`
+command should show you the default environment stack:
 
 ```bash
 $ envstack
@@ -60,30 +64,18 @@ DEPLOY_ROOT=${ROOT}/${ENV}
 ROOT=${HOME}/.local/envstack
 ```
 
-Modify the environment stack by editing `stack.env` or by creating new contextual
-`stack.env` files up on the filesystem.
-
-You can execute any command inside the default stacked environment like this:
+You can override anything in the environment stack by setting values in the
+local environment first:
 
 ```bash
-$ envstack -- [COMMAND]
-```
-
-For example, use the `echo` command to see the resolved value of `$HELLO` (note: we
-have to escape it first to it's not pre-expanded in the shell):
-
-```bash 
-$ envstack -- echo \$HELLO
-world
+$ envstack -- echo \$ENV
+prod
+$ ENV=dev envstack -- echo \$ENV
+dev
 ```
 
-Any command can be run in an envstack environment by preceeding the command
-with `--`:
-
-```bash
-$ envstack -- python -c "import os; print(os.environ['HELLO'])"
-world
-```
+Modify the environment stack by editing `stack.env` or by creating new
+contextual `stack.env` files up on the filesystem.
 
 ## Creating Stacks
 
@@ -102,7 +94,8 @@ $ envstack thing
 FOO 'bar'
 ```
 
-Variables can reference other variables defined elsewhere (but cannot be circular):
+Variables can reference other variables defined elsewhere (but cannot be
+circular):
 
 ```yaml
 all: &default
@@ -117,7 +110,8 @@ linux:
   HELLO: world
 ```
 
-Environment files can include other namespaced environments (all stacks inherit the default stack.env automatically).
+Environment files can include other namespaced environments (all stacks inherit
+the default stack.env automatically).
 
 ```yaml
 include: ['other']
@@ -125,8 +119,9 @@ include: ['other']
 
 ## Context
 
-Environment stacks are hierarchical, so values for `$FOO` defined in .env files lower
-in the filesystem (lower in scope) override those defined higher up (higher in scope):
+Environment stacks are hierarchical, so values for `$FOO` defined in .env files
+lower in the filesystem (lower in scope) override those defined higher up
+(higher in scope):
 
 ```
 ${DEFAULT_ENV_DIR}
@@ -140,7 +135,6 @@ ${DEFAULT_ENV_DIR}
 If you are working in the task directory, those envstack $VARs will override the
 $VARs defined in the shot, seq, show and root directories.
 
-
 ## Usage
 
 To see the default environment for any given stack:
@@ -177,8 +171,8 @@ To init the environment stack, use the `init` function:
 'bar'
 ```
 
-Alternatively, `envstack.getenv` uses the default environment stack `stack` and can be
-a drop-in replacement for `os.getenv` 
+Alternatively, `envstack.getenv` uses the default environment stack `stack` and
+can be a drop-in replacement for `os.getenv` 
 
 ```python
 >>> import envstack
@@ -188,20 +182,34 @@ a drop-in replacement for `os.getenv`
 
 ## Running Commands
 
-To run any command line executable inside of an environment stack, where `[COMMAND]`
-is the command to run:
+To run any command line executable inside of an environment stack, where
+`[COMMAND]` is the command to run:
 
 ```bash
 $ envstack [STACK] -- [COMMAND]
 ```
 
-For example, running python in the default stack (reading from the default `stack.env` file):
+For example:
+
+```bash 
+$ envstack -- echo \$HELLO
+world
+```
+
+Running Python commands in the default stack:
 
 ```bash
 $ envstack -- python -c "import os; print(os.environ['HELLO'])"
 world
 ```
 
+Overriding values in the stack:
+
+```bash
+$ HELLO=goodbye envstack -- python -c "import os; print(os.environ['HELLO'])"
+goodbye
+```
+
 Same command but using the "thing" stack"
 
 ```bash
@@ -209,12 +217,12 @@ $ envstack thing -- python -c "import os; print(os.environ['FOO'])"
 bar
 ```
 
-To source the environment in your current shell, source the output of --export (and create
-an alias for convenience):
+To source the environment in your current shell, source the output of --export
+(and create an alias for convenience):
 
 ```bash
 $ source <(envstack --export)
-$ alias esinit='source <(envstack $ARG --export)'
+$ alias stack='source <(envstack $ARG --export)'
 ```
 
 In Windows command prompt:
@@ -225,9 +233,10 @@ for /f "usebackq" %i in (`envstack --export`) do %i
 
 ## Config
 
-Default config settings are in the config.py module. The following environment variables are supported:
+Default config settings are in the config.py module. The following environment
+variables are supported:
 
 | Variable            | Description |
 |---------------------|-------------|
 | $DEFAULT_ENV_DIR    | the folder containing the default env stack files |
-| $DEFAULT_ENV_STACK  | the name of the default env stack namespace (default "stack") |
+| $DEFAULT_ENV_STACK  | the name of the default env stack namespace |

{envstack-0.5.0 → envstack-0.5.2}/README.md

@@ -5,9 +5,9 @@ Stacked environment variable management system. The lightweight, easy to use
 "rez" alternative for production pipelines.
 
 Environment variables are declared in namespaced .env files using yaml syntax.
-The default stack declares env variables in `stack.env` files. You can create any
-new stack by creating new `.env` files, e.g. to create a new `thing` stack just
-create `thing.env` files in any given context.
+The default stack declares env variables in `stack.env` files. You can create
+any new stack by creating new `.env` files, e.g. to create a new `thing` stack
+just create `thing.env` files in any given context.
 
 ## Installation
 
@@ -25,11 +25,15 @@ $ cd envstack
 $ python setup.py install
 ```
 
-The install process will automatically attempt to install the default `stack.env` file to the
-default env file directory defined `$DEFAULT_ENV_DIR`. **Note:** The [siteconf](https://github.com/rsgalloway/siteconf) sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
+The install process will automatically attempt to install the default
+`stack.env` file to the default env file directory defined `$DEFAULT_ENV_DIR`.
+**Note:** The [siteconf](https://github.com/rsgalloway/siteconf)
+sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
 
-If installing from source, you can use [distman](https://github.com/rsgalloway/distman) to
-install envstack and the default `stack.env` file using the provided `dist.json` file:
+If installing from source, you can use
+[distman](https://github.com/rsgalloway/distman) to
+install envstack and the default `stack.env` file using the provided
+`dist.json` file:
 
 ```bash
 $ distman
@@ -37,8 +41,8 @@ $ distman
 
 ## Quickstart
 
-The `stack` namespace is the default environment stack. Running the `envstack` command
-should show you the default environment stack:
+The `stack` namespace is the default environment stack. Running the `envstack`
+command should show you the default environment stack:
 
 ```bash
 $ envstack
@@ -50,30 +54,18 @@ DEPLOY_ROOT=${ROOT}/${ENV}
 ROOT=${HOME}/.local/envstack
 ```
 
-Modify the environment stack by editing `stack.env` or by creating new contextual
-`stack.env` files up on the filesystem.
-
-You can execute any command inside the default stacked environment like this:
+You can override anything in the environment stack by setting values in the
+local environment first:
 
 ```bash
-$ envstack -- [COMMAND]
-```
-
-For example, use the `echo` command to see the resolved value of `$HELLO` (note: we
-have to escape it first to it's not pre-expanded in the shell):
-
-```bash 
-$ envstack -- echo \$HELLO
-world
+$ envstack -- echo \$ENV
+prod
+$ ENV=dev envstack -- echo \$ENV
+dev
 ```
 
-Any command can be run in an envstack environment by preceeding the command
-with `--`:
-
-```bash
-$ envstack -- python -c "import os; print(os.environ['HELLO'])"
-world
-```
+Modify the environment stack by editing `stack.env` or by creating new
+contextual `stack.env` files up on the filesystem.
 
 ## Creating Stacks
 
@@ -92,7 +84,8 @@ $ envstack thing
 FOO 'bar'
 ```
 
-Variables can reference other variables defined elsewhere (but cannot be circular):
+Variables can reference other variables defined elsewhere (but cannot be
+circular):
 
 ```yaml
 all: &default
@@ -107,7 +100,8 @@ linux:
   HELLO: world
 ```
 
-Environment files can include other namespaced environments (all stacks inherit the default stack.env automatically).
+Environment files can include other namespaced environments (all stacks inherit
+the default stack.env automatically).
 
 ```yaml
 include: ['other']
@@ -115,8 +109,9 @@ include: ['other']
 
 ## Context
 
-Environment stacks are hierarchical, so values for `$FOO` defined in .env files lower
-in the filesystem (lower in scope) override those defined higher up (higher in scope):
+Environment stacks are hierarchical, so values for `$FOO` defined in .env files
+lower in the filesystem (lower in scope) override those defined higher up
+(higher in scope):
 
 ```
 ${DEFAULT_ENV_DIR}
@@ -130,7 +125,6 @@ ${DEFAULT_ENV_DIR}
 If you are working in the task directory, those envstack $VARs will override the
 $VARs defined in the shot, seq, show and root directories.
 
-
 ## Usage
 
 To see the default environment for any given stack:
@@ -167,8 +161,8 @@ To init the environment stack, use the `init` function:
 'bar'
 ```
 
-Alternatively, `envstack.getenv` uses the default environment stack `stack` and can be
-a drop-in replacement for `os.getenv` 
+Alternatively, `envstack.getenv` uses the default environment stack `stack` and
+can be a drop-in replacement for `os.getenv` 
 
 ```python
 >>> import envstack
@@ -178,20 +172,34 @@ a drop-in replacement for `os.getenv`
 
 ## Running Commands
 
-To run any command line executable inside of an environment stack, where `[COMMAND]`
-is the command to run:
+To run any command line executable inside of an environment stack, where
+`[COMMAND]` is the command to run:
 
 ```bash
 $ envstack [STACK] -- [COMMAND]
 ```
 
-For example, running python in the default stack (reading from the default `stack.env` file):
+For example:
+
+```bash 
+$ envstack -- echo \$HELLO
+world
+```
+
+Running Python commands in the default stack:
 
 ```bash
 $ envstack -- python -c "import os; print(os.environ['HELLO'])"
 world
 ```
 
+Overriding values in the stack:
+
+```bash
+$ HELLO=goodbye envstack -- python -c "import os; print(os.environ['HELLO'])"
+goodbye
+```
+
 Same command but using the "thing" stack"
 
 ```bash
@@ -199,12 +207,12 @@ $ envstack thing -- python -c "import os; print(os.environ['FOO'])"
 bar
 ```
 
-To source the environment in your current shell, source the output of --export (and create
-an alias for convenience):
+To source the environment in your current shell, source the output of --export
+(and create an alias for convenience):
 
 ```bash
 $ source <(envstack --export)
-$ alias esinit='source <(envstack $ARG --export)'
+$ alias stack='source <(envstack $ARG --export)'
 ```
 
 In Windows command prompt:
@@ -215,9 +223,10 @@ for /f "usebackq" %i in (`envstack --export`) do %i
 
 ## Config
 
-Default config settings are in the config.py module. The following environment variables are supported:
+Default config settings are in the config.py module. The following environment
+variables are supported:
 
 | Variable            | Description |
 |---------------------|-------------|
 | $DEFAULT_ENV_DIR    | the folder containing the default env stack files |
-| $DEFAULT_ENV_STACK  | the name of the default env stack namespace (default "stack") |
+| $DEFAULT_ENV_STACK  | the name of the default env stack namespace |

{envstack-0.5.0 → envstack-0.5.2}/lib/envstack/__init__.py

@@ -34,7 +34,7 @@ Stacked environment variable management system.
 """
 
 __prog__ = "envstack"
-__version__ = "0.5.0"
+__version__ = "0.5.2"
 
 from envstack.env import Env
 from envstack.env import getenv, init, load_file

{envstack-0.5.0 → envstack-0.5.2}/lib/envstack/config.py

@@ -84,5 +84,7 @@ DEFAULT_ENV_DIR = os.getenv(
         "darwin": "{HOME}/Library/Application Support/envstack",
         "linux": "{HOME}/.local/envstack",
         "windows": "C:\\ProgramData\\envstack",
-    }.get(PLATFORM).format(**DEFAULT_ENV),
+    }
+    .get(PLATFORM)
+    .format(**DEFAULT_ENV),
 )

{envstack-0.5.0 → envstack-0.5.2}/lib/envstack/env.py

@@ -261,21 +261,12 @@ class Env(dict):
         return self.get(key, resolved=False).template
 
     def merge(self, env):
-        """Merges another environ `env` into this one.
+        """Merges another env into this one, i.e. env[k] will replace self[k].
 
         :param env: env to merge into this one
         """
-        merged = env.copy()
-        for key, value in self.items():
-            if isinstance(value, str):
-                # replace ${KEY} vars with values from env
-                value = re.sub(
-                    r"\${(\w+)}",
-                    lambda match: env.get(match.group(1), match.group(0)),
-                    value,
-                )
-            merged[key] = value
-        return merged
+        for k, v in env.items():
+            self[k] = v
 
     def set_namespace(self, name):
         """Stores the namespace for this environment.
@@ -406,16 +397,17 @@ def build_sources(
     includes=True,
     default=config.DEFAULT_NAMESPACE,
 ):
-    """Builds the list of env source files for a given name.
-    Where the source is in the list of sources depends on its
-    position in the directory tree. Lower scope sources will
-    override higher scope sources, with the default source
-    at the lowest scope position:
-
-        /show/envstack.env
-        /show/seq/envstack.env
-        /show/seq/shot/envstack.env
-        /show/seq/shot/task/envstack.env
+    """Builds the list of env source files for a given name. Where the source
+    is in the list of sources depends on its position in the directory tree.
+    Lower scope sources will override higher scope sources, with the default
+    source at the lowest scope position:
+
+        $DEFAULT_ENV_DIR/stack.env
+        /stack.env
+        /show/stack.env
+        /show/seq/stack.env
+        /show/seq/shot/stack.env
+        /show/seq/shot/task/stack.env
 
     :param name: namespace (base name of .env file).
     :param scope: environment scope (default: cwd).
@@ -424,37 +416,47 @@ def build_sources(
     :returns: list of source files sorted by scope.
     """
 
-    # stores set of source env files
+    # list of source .env files
     sources = []
 
+    # list of included .env files
+    include_sources = []
+
     # scope, or root, of env tree
     path = scope or os.getcwd()
     scope = Scope(scope)
     level, levels = 0, len(scope.levels())
 
-    # the namespaced and default env file names
+    # the namespaced and default .env file names
     named_env = f"{name}.env"
     default_env = f"{default}.env"
 
     def add_source(path):
+        """Adds a source to the list of sources."""
         if not os.path.exists(path):
             return
         if not sources or (sources[0].path != path):
-            s = Source(path)
-            sources.insert(0, s)
-            return s
+            this_source = Source(path)
+            sources.insert(0, this_source)
+            return this_source
 
-    # walk up the directory tree looking for env files
+    def add_includes(src):
+        """Adds included sources to the list of sources and includes."""
+        included = [f"{i}.env" for i in src.includes()]
+        for include_env in included:
+            include_file = os.path.join(config.DEFAULT_ENV_DIR, include_env)
+            if include_env not in include_sources:
+                include_sources.append(include_env)
+            add_source(include_file)
+
+    # walk up the directory tree looking for .env files
     while level < levels:
         named_file = os.path.join(path, named_env)
         src = add_source(named_file)
         if src and includes:
-            included = [f"{i}.env" for i in src.includes()]
-            for include_env in included:
-                include_file = os.path.join(path, include_env)
-                add_source(include_file)
+            add_includes(src)
 
-        # look for a default env file in this scope
+        # look for a default .env file in this scope
         default_file = os.path.join(path, default_env)
         add_source(default_file)
 
@@ -464,18 +466,22 @@ def build_sources(
 
         level += 1
 
-    # check for default namespaced env file
-    named_default = os.path.join(config.DEFAULT_ENV_DIR, named_env)
-    src = add_source(named_default)
+    # look for default include .env files (and their includes)
+    for include_source in include_sources:
+        default_inc_src = add_source(
+            os.path.join(config.DEFAULT_ENV_DIR, include_source)
+        )
+        if default_inc_src and includes:
+            add_includes(default_inc_src)
+
+    # check for default .env file
+    default_src = add_source(os.path.join(config.DEFAULT_ENV_DIR, named_env))
 
     # add included sources
-    if src and includes:
-        included = ["{}.env".format(i) for i in src.includes()]
-        for include_env in included:
-            include_file = os.path.join(config.DEFAULT_ENV_DIR, include_env)
-            add_source(include_file)
+    if default_src and includes:
+        add_includes(default_src)
 
-    # check for global default env file
+    # check for global default .env file
     global_default = os.path.join(config.DEFAULT_ENV_DIR, default_env)
     add_source(global_default)
 
@@ -583,7 +589,7 @@ def load_environ(
 
     # merge values from given environment
     if environ:
-        env.merge(environ)
+        return merge(env, environ)
 
     return env
 
@@ -620,11 +626,31 @@ def load_file(path):
     return data
 
 
+def merge(env, other):
+    """Merges values from other into env. For example, to merge values from
+    the local environment into an env instance:
+
+        >>> merge(env, os.environ)
+
+    To merge values from env into the local environment:
+
+        >>> merge(os.environ, env)
+
+    :param env: source env
+    :param other: env to merge
+    :returns: merged env
+    """
+    merged = env.copy()
+    for key in merged:
+        if key in other:
+            merged[key] = other.get(key)
+    return merged
+
+
 def safe_eval(value):
     """Returns template value preserving original class.
     Useful for preserving nested values in wrappers.
     """
-
     try:
         from ast import literal_eval
 

{envstack-0.5.0 → envstack-0.5.2}/lib/envstack/wrapper.py

@@ -95,7 +95,7 @@ class Wrapper(object):
         # get subprocess env, cmd and args
         env = self.get_subprocess_env()
         cmd = expandvars(self.executable(), env, recursive=True)
-        args = " ".join(["\"%s\"" % arg for arg in to_args(cmd) + self.args])
+        args = " ".join(['"%s"' % arg for arg in to_args(cmd) + self.args])
 
         # run command in subprocess
         try:

{envstack-0.5.0 → envstack-0.5.2}/lib/envstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.5.0
+Version: 0.5.2
 Summary: Stacked environment variable management system.
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway
@@ -15,9 +15,9 @@ Stacked environment variable management system. The lightweight, easy to use
 "rez" alternative for production pipelines.
 
 Environment variables are declared in namespaced .env files using yaml syntax.
-The default stack declares env variables in `stack.env` files. You can create any
-new stack by creating new `.env` files, e.g. to create a new `thing` stack just
-create `thing.env` files in any given context.
+The default stack declares env variables in `stack.env` files. You can create
+any new stack by creating new `.env` files, e.g. to create a new `thing` stack
+just create `thing.env` files in any given context.
 
 ## Installation
 
@@ -35,11 +35,15 @@ $ cd envstack
 $ python setup.py install
 ```
 
-The install process will automatically attempt to install the default `stack.env` file to the
-default env file directory defined `$DEFAULT_ENV_DIR`. **Note:** The [siteconf](https://github.com/rsgalloway/siteconf) sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
+The install process will automatically attempt to install the default
+`stack.env` file to the default env file directory defined `$DEFAULT_ENV_DIR`.
+**Note:** The [siteconf](https://github.com/rsgalloway/siteconf)
+sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
 
-If installing from source, you can use [distman](https://github.com/rsgalloway/distman) to
-install envstack and the default `stack.env` file using the provided `dist.json` file:
+If installing from source, you can use
+[distman](https://github.com/rsgalloway/distman) to
+install envstack and the default `stack.env` file using the provided
+`dist.json` file:
 
 ```bash
 $ distman
@@ -47,8 +51,8 @@ $ distman
 
 ## Quickstart
 
-The `stack` namespace is the default environment stack. Running the `envstack` command
-should show you the default environment stack:
+The `stack` namespace is the default environment stack. Running the `envstack`
+command should show you the default environment stack:
 
 ```bash
 $ envstack
@@ -60,30 +64,18 @@ DEPLOY_ROOT=${ROOT}/${ENV}
 ROOT=${HOME}/.local/envstack
 ```
 
-Modify the environment stack by editing `stack.env` or by creating new contextual
-`stack.env` files up on the filesystem.
-
-You can execute any command inside the default stacked environment like this:
+You can override anything in the environment stack by setting values in the
+local environment first:
 
 ```bash
-$ envstack -- [COMMAND]
-```
-
-For example, use the `echo` command to see the resolved value of `$HELLO` (note: we
-have to escape it first to it's not pre-expanded in the shell):
-
-```bash 
-$ envstack -- echo \$HELLO
-world
+$ envstack -- echo \$ENV
+prod
+$ ENV=dev envstack -- echo \$ENV
+dev
 ```
 
-Any command can be run in an envstack environment by preceeding the command
-with `--`:
-
-```bash
-$ envstack -- python -c "import os; print(os.environ['HELLO'])"
-world
-```
+Modify the environment stack by editing `stack.env` or by creating new
+contextual `stack.env` files up on the filesystem.
 
 ## Creating Stacks
 
@@ -102,7 +94,8 @@ $ envstack thing
 FOO 'bar'
 ```
 
-Variables can reference other variables defined elsewhere (but cannot be circular):
+Variables can reference other variables defined elsewhere (but cannot be
+circular):
 
 ```yaml
 all: &default
@@ -117,7 +110,8 @@ linux:
   HELLO: world
 ```
 
-Environment files can include other namespaced environments (all stacks inherit the default stack.env automatically).
+Environment files can include other namespaced environments (all stacks inherit
+the default stack.env automatically).
 
 ```yaml
 include: ['other']
@@ -125,8 +119,9 @@ include: ['other']
 
 ## Context
 
-Environment stacks are hierarchical, so values for `$FOO` defined in .env files lower
-in the filesystem (lower in scope) override those defined higher up (higher in scope):
+Environment stacks are hierarchical, so values for `$FOO` defined in .env files
+lower in the filesystem (lower in scope) override those defined higher up
+(higher in scope):
 
 ```
 ${DEFAULT_ENV_DIR}
@@ -140,7 +135,6 @@ ${DEFAULT_ENV_DIR}
 If you are working in the task directory, those envstack $VARs will override the
 $VARs defined in the shot, seq, show and root directories.
 
-
 ## Usage
 
 To see the default environment for any given stack:
@@ -177,8 +171,8 @@ To init the environment stack, use the `init` function:
 'bar'
 ```
 
-Alternatively, `envstack.getenv` uses the default environment stack `stack` and can be
-a drop-in replacement for `os.getenv` 
+Alternatively, `envstack.getenv` uses the default environment stack `stack` and
+can be a drop-in replacement for `os.getenv` 
 
 ```python
 >>> import envstack
@@ -188,20 +182,34 @@ a drop-in replacement for `os.getenv`
 
 ## Running Commands
 
-To run any command line executable inside of an environment stack, where `[COMMAND]`
-is the command to run:
+To run any command line executable inside of an environment stack, where
+`[COMMAND]` is the command to run:
 
 ```bash
 $ envstack [STACK] -- [COMMAND]
 ```
 
-For example, running python in the default stack (reading from the default `stack.env` file):
+For example:
+
+```bash 
+$ envstack -- echo \$HELLO
+world
+```
+
+Running Python commands in the default stack:
 
 ```bash
 $ envstack -- python -c "import os; print(os.environ['HELLO'])"
 world
 ```
 
+Overriding values in the stack:
+
+```bash
+$ HELLO=goodbye envstack -- python -c "import os; print(os.environ['HELLO'])"
+goodbye
+```
+
 Same command but using the "thing" stack"
 
 ```bash
@@ -209,12 +217,12 @@ $ envstack thing -- python -c "import os; print(os.environ['FOO'])"
 bar
 ```
 
-To source the environment in your current shell, source the output of --export (and create
-an alias for convenience):
+To source the environment in your current shell, source the output of --export
+(and create an alias for convenience):
 
 ```bash
 $ source <(envstack --export)
-$ alias esinit='source <(envstack $ARG --export)'
+$ alias stack='source <(envstack $ARG --export)'
 ```
 
 In Windows command prompt:
@@ -225,9 +233,10 @@ for /f "usebackq" %i in (`envstack --export`) do %i
 
 ## Config
 
-Default config settings are in the config.py module. The following environment variables are supported:
+Default config settings are in the config.py module. The following environment
+variables are supported:
 
 | Variable            | Description |
 |---------------------|-------------|
 | $DEFAULT_ENV_DIR    | the folder containing the default env stack files |
-| $DEFAULT_ENV_STACK  | the name of the default env stack namespace (default "stack") |
+| $DEFAULT_ENV_STACK  | the name of the default env stack namespace |

{envstack-0.5.0 → envstack-0.5.2}/setup.py

@@ -74,7 +74,7 @@ class PostInstallCommand(install):
 
 setup(
     name="envstack",
-    version="0.5.0",
+    version="0.5.2",
     description="Stacked environment variable management system.",
     long_description=long_description,
     long_description_content_type="text/markdown",

{envstack-0.5.0 → envstack-0.5.2}/stack.env

@@ -1,4 +1,4 @@
-# default envstack file
+# stack.env is the default envstack file
 #
 # https://github.com/rsgalloway/envstack