envstack 0.6.0__tar.gz → 0.6.2__tar.gz

{envstack-0.6.0 → envstack-0.6.2}/PKG-INFO

@@ -1,10 +1,22 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.6.0
+Version: 0.6.2
 Summary: Stacked environment variable management system
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway
 Author-email: ryan@rsgalloway.com
+License: BSD 3-Clause License
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=5.1.2
@@ -45,13 +57,15 @@ sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
 
 If installing from source to a network location, you can use
 [distman](https://github.com/rsgalloway/distman) to
-install envstack and the default `stack.env` file using the provided
-`dist.json` file:
+install envstack using the provided `dist.json` file:
 
 ```bash
 $ distman [-d]
 ```
 
+Using distman will deploy the targets defined in the `dist.json` file to the
+root folder defined by `$DEPLOY_ROOT` (defined in `stack.env`).
+
 ## Quickstart
 
 The `stack` namespace is the default environment stack. Running the `envstack`
@@ -64,21 +78,25 @@ HELLO=world
 LOG_LEVEL=INFO
 DEFAULT_ENV_DIR=${DEPLOY_ROOT}/env
 DEPLOY_ROOT=${ROOT}/${ENV}
-ROOT=${HOME}/.local/envstack
+ROOT=${HOME}/.local/pipe
+BIN=${DEPLOY_ROOT}/bin
+LIB=${DEPLOY_ROOT}/lib/python
+PATH=${BIN}:${PATH}
+PYTHONPATH=${LIB}:${PYTHONPATH}
 ```
 
 You can override anything in the environment stack by setting values in the
 local environment first:
 
 ```bash
-$ envstack -- echo \$ENV
-prod
-$ ENV=dev envstack -- echo \$ENV
-dev
+$ envstack -- echo {HELLO}
+world
+$ HELLO=goodbye envstack -- echo {HELLO}
+goodbye
 ```
 
-Modify the environment stack by editing `stack.env` or by creating new
-contextual `stack.env` files up on the filesystem.
+Modify the environment stack by editing `stack.env` or by creating additional
+contextual `stack.env` files in parent folders on the filesystem.
 
 ## Creating Stacks
 
@@ -195,7 +213,7 @@ $ envstack [STACK] -- [COMMAND]
 For example:
 
 ```bash 
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
 ```
 

{envstack-0.6.0 → envstack-0.6.2}/README.md

@@ -34,13 +34,15 @@ sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
 
 If installing from source to a network location, you can use
 [distman](https://github.com/rsgalloway/distman) to
-install envstack and the default `stack.env` file using the provided
-`dist.json` file:
+install envstack using the provided `dist.json` file:
 
 ```bash
 $ distman [-d]
 ```
 
+Using distman will deploy the targets defined in the `dist.json` file to the
+root folder defined by `$DEPLOY_ROOT` (defined in `stack.env`).
+
 ## Quickstart
 
 The `stack` namespace is the default environment stack. Running the `envstack`
@@ -53,21 +55,25 @@ HELLO=world
 LOG_LEVEL=INFO
 DEFAULT_ENV_DIR=${DEPLOY_ROOT}/env
 DEPLOY_ROOT=${ROOT}/${ENV}
-ROOT=${HOME}/.local/envstack
+ROOT=${HOME}/.local/pipe
+BIN=${DEPLOY_ROOT}/bin
+LIB=${DEPLOY_ROOT}/lib/python
+PATH=${BIN}:${PATH}
+PYTHONPATH=${LIB}:${PYTHONPATH}
 ```
 
 You can override anything in the environment stack by setting values in the
 local environment first:
 
 ```bash
-$ envstack -- echo \$ENV
-prod
-$ ENV=dev envstack -- echo \$ENV
-dev
+$ envstack -- echo {HELLO}
+world
+$ HELLO=goodbye envstack -- echo {HELLO}
+goodbye
 ```
 
-Modify the environment stack by editing `stack.env` or by creating new
-contextual `stack.env` files up on the filesystem.
+Modify the environment stack by editing `stack.env` or by creating additional
+contextual `stack.env` files in parent folders on the filesystem.
 
 ## Creating Stacks
 
@@ -184,7 +190,7 @@ $ envstack [STACK] -- [COMMAND]
 For example:
 
 ```bash 
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
 ```
 

envstack-0.6.2/dev.env

@@ -0,0 +1,23 @@
+# Stacked environment variable management system.
+#
+# Environment variables are declared in namespaced .env files using yaml syntax.
+# The default stack declares env variables in stack.env files.
+# Create any new stack by creating new .env files, e.g. to create a new stack
+# called "thing", just create thing.env files in any given context.
+#
+# $ pip install envstack
+
+all: &default
+  ENV: dev
+  LOG_LEVEL: DEBUG
+  PATH: "${ROOT}/dev/bin:${ROOT}/prod/bin:${PATH}"
+  PYTHONPATH: "${ROOT}/dev/lib/python:${ROOT}/prod/lib/python:${PYTHONPATH}"
+
+darwin:
+  <<: *default
+
+linux:
+  <<: *default
+
+windows:
+  <<: *default

envstack-0.6.2/dist.json

@@ -0,0 +1,29 @@
+{
+    "author": "ryan@rsg.io",
+    "targets": {
+        "env-envstack": {
+            "source": "stack.env",
+            "destination": "{DEPLOY_ROOT}/env/stack.env"
+        },
+        "env-dev": {
+            "source": "dev.env",
+            "destination": "{DEPLOY_ROOT}/env/dev.env"
+        },
+        "bin-envstack": {
+            "source": "bin/envstack",
+            "destination": "{DEPLOY_ROOT}/bin/envstack"
+        },
+        "bat-envstack": {
+            "source": "bin/envstack.bat",
+            "destination": "{DEPLOY_ROOT}/bin/envstack.bat"
+        },
+        "bin-hello": {
+            "source": "bin/hello",
+            "destination": "{DEPLOY_ROOT}/bin/hello"
+        },
+        "lib-envstack": {
+            "source": "lib/envstack",
+            "destination": "{DEPLOY_ROOT}/lib/python/envstack"
+        }
+    }
+}

{envstack-0.6.0 → envstack-0.6.2}/lib/envstack/__init__.py

@@ -34,6 +34,6 @@ Stacked environment variable management system.
 """
 
 __prog__ = "envstack"
-__version__ = "0.6.0"
+__version__ = "0.6.2"
 
 from envstack.env import Env, getenv, init, load_file

{envstack-0.6.0 → envstack-0.6.2}/lib/envstack/wrapper.py

@@ -49,6 +49,14 @@ def to_args(cmd):
     return shlex.split(cmd)
 
 
+def shell_join(args):
+    """Joins a list of arguments into a single quoted shell string."""
+    try:
+        return shlex.join(args)
+    except AttributeError:
+        return " ".join(shlex.quote(arg) for arg in args)
+
+
 class Wrapper(object):
     """Wrapper class for executables. Subprocessed with preconfigured environment.
 
@@ -233,15 +241,22 @@ def run_command(command, namespace=config.DEFAULT_NAMESPACE):
 
         >>> run_command(['ls', '-l'], 'my-stack')
 
+     - Automatically detects the shell to use based on the config.SHELL value.
+     - Converts {VAR} to $VAR for bash, sh, zsh, and %VAR% for cmd.
+
     :param command: command to run as a list of arguments
     :param namespace: environment stack namespace (default: 'stack')
-    :returns: exit code
+    :returns: command exit code
     """
     logger.setup_stream_handler()
     if config.SHELL in ["bash", "sh", "zsh"]:
-        cmd = ShellWrapper(namespace, shlex.join(command))
+        # convert {VAR} to ${VAR}, e.g. 'echo {VAR}' -> 'echo ${VAR}'
+        command = re.sub(r"\{(\w+)\}", r"${\1}", shell_join(command))
+        cmd = ShellWrapper(namespace, command)
     elif config.SHELL in ["cmd"]:
-        cmd = CmdWrapper(namespace, " ".join(command))
+        # convert {VAR} to %VAR%, e.g. 'echo {VAR}' -> 'echo %VAR%'
+        command = re.sub(r"\{(\w+)\}", r"%\1%", " ".join(command))
+        cmd = CmdWrapper(namespace, command)
     else:
         cmd = CommandWrapper(namespace, command)
     return cmd.launch()

{envstack-0.6.0 → envstack-0.6.2}/lib/envstack.egg-info/PKG-INFO

@@ -1,10 +1,22 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.6.0
+Version: 0.6.2
 Summary: Stacked environment variable management system
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway
 Author-email: ryan@rsgalloway.com
+License: BSD 3-Clause License
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=5.1.2
@@ -45,13 +57,15 @@ sitecustomize.py module may override `$DEFAULT_ENV_DIR`.
 
 If installing from source to a network location, you can use
 [distman](https://github.com/rsgalloway/distman) to
-install envstack and the default `stack.env` file using the provided
-`dist.json` file:
+install envstack using the provided `dist.json` file:
 
 ```bash
 $ distman [-d]
 ```
 
+Using distman will deploy the targets defined in the `dist.json` file to the
+root folder defined by `$DEPLOY_ROOT` (defined in `stack.env`).
+
 ## Quickstart
 
 The `stack` namespace is the default environment stack. Running the `envstack`
@@ -64,21 +78,25 @@ HELLO=world
 LOG_LEVEL=INFO
 DEFAULT_ENV_DIR=${DEPLOY_ROOT}/env
 DEPLOY_ROOT=${ROOT}/${ENV}
-ROOT=${HOME}/.local/envstack
+ROOT=${HOME}/.local/pipe
+BIN=${DEPLOY_ROOT}/bin
+LIB=${DEPLOY_ROOT}/lib/python
+PATH=${BIN}:${PATH}
+PYTHONPATH=${LIB}:${PYTHONPATH}
 ```
 
 You can override anything in the environment stack by setting values in the
 local environment first:
 
 ```bash
-$ envstack -- echo \$ENV
-prod
-$ ENV=dev envstack -- echo \$ENV
-dev
+$ envstack -- echo {HELLO}
+world
+$ HELLO=goodbye envstack -- echo {HELLO}
+goodbye
 ```
 
-Modify the environment stack by editing `stack.env` or by creating new
-contextual `stack.env` files up on the filesystem.
+Modify the environment stack by editing `stack.env` or by creating additional
+contextual `stack.env` files in parent folders on the filesystem.
 
 ## Creating Stacks
 
@@ -195,7 +213,7 @@ $ envstack [STACK] -- [COMMAND]
 For example:
 
 ```bash 
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
 ```
 

{envstack-0.6.0 → envstack-0.6.2}/lib/envstack.egg-info/SOURCES.txt

@@ -1,5 +1,7 @@
 LICENSE
 README.md
+dev.env
+dist.json
 setup.py
 stack.env
 lib/envstack/__init__.py

{envstack-0.6.0 → envstack-0.6.2}/setup.py

@@ -74,13 +74,30 @@ class PostInstallCommand(install):
 
 setup(
     name="envstack",
-    version="0.6.0",
+    version="0.6.2",
     description="Stacked environment variable management system",
     long_description=long_description,
     long_description_content_type="text/markdown",
     author="Ryan Galloway",
     author_email="ryan@rsgalloway.com",
     url="http://github.com/rsgalloway/envstack",
+    license="BSD 3-Clause License",
+    classifiers=[
+        # How mature is this project? Common values are
+        #   3 - Alpha
+        #   4 - Beta
+        #   5 - Production/Stable
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Libraries",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+    ],
     package_dir={"": "lib"},
     packages=find_packages("lib"),
     entry_points={
@@ -91,7 +108,8 @@ setup(
     install_requires=[
         "PyYAML>=5.1.2",
     ],
-    data_files=[(".", ["stack.env"])],
+    python_requires=">=3.6",
+    data_files=[(".", ["stack.env", "dev.env", "dist.json"])],
     cmdclass={"install": PostInstallCommand},
     zip_safe=False,
 )

{envstack-0.6.0 → envstack-0.6.2}/stack.env

@@ -20,15 +20,15 @@ all: &default
 
 darwin:
   <<: *default
-  ROOT: "${HOME}/Library/Application Support/envstack"
-  # ROOT: /Volumes/tools
+  ROOT: "${HOME}/Library/Application Support/pipe"
+  # ROOT: /Volumes/pipe
 
 linux:
   <<: *default
-  ROOT: ${HOME}/.local/envstack
-  # ROOT: /mnt/tools
+  ROOT: ${HOME}/.local/pipe
+  # ROOT: /mnt/pipe
 
 windows:
   <<: *default
-  ROOT: C:/ProgramData/envstack
-  # ROOT: //server/tools
+  ROOT: C:/ProgramData/pipe
+  # ROOT: //server/pipe