envstack 0.6.1__tar.gz → 0.6.2__tar.gz

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

@@ -1,10 +1,22 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.6.1
+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
@@ -77,9 +89,9 @@ You can override anything in the environment stack by setting values in the
 local environment first:
 
 ```bash
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
-$ HELLO=goodbye envstack -- echo \$HELLO
+$ HELLO=goodbye envstack -- echo {HELLO}
 goodbye
 ```
 
@@ -201,7 +213,7 @@ $ envstack [STACK] -- [COMMAND]
 For example:
 
 ```bash 
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
 ```
 

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

@@ -66,9 +66,9 @@ You can override anything in the environment stack by setting values in the
 local environment first:
 
 ```bash
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
-$ HELLO=goodbye envstack -- echo \$HELLO
+$ HELLO=goodbye envstack -- echo {HELLO}
 goodbye
 ```
 
@@ -190,7 +190,7 @@ $ envstack [STACK] -- [COMMAND]
 For example:
 
 ```bash 
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
 ```
 

{envstack-0.6.1 → envstack-0.6.2}/dist.json

@@ -13,6 +13,10 @@
             "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"

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

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

{envstack-0.6.1 → 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.1 → envstack-0.6.2/lib/envstack.egg-info}/PKG-INFO

@@ -1,10 +1,22 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.6.1
+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
@@ -77,9 +89,9 @@ You can override anything in the environment stack by setting values in the
 local environment first:
 
 ```bash
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
-$ HELLO=goodbye envstack -- echo \$HELLO
+$ HELLO=goodbye envstack -- echo {HELLO}
 goodbye
 ```
 
@@ -201,7 +213,7 @@ $ envstack [STACK] -- [COMMAND]
 For example:
 
 ```bash 
-$ envstack -- echo \$HELLO
+$ envstack -- echo {HELLO}
 world
 ```
 

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

@@ -74,13 +74,30 @@ class PostInstallCommand(install):
 
 setup(
     name="envstack",
-    version="0.6.1",
+    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,6 +108,7 @@ setup(
     install_requires=[
         "PyYAML>=5.1.2",
     ],
+    python_requires=">=3.6",
     data_files=[(".", ["stack.env", "dev.env", "dist.json"])],
     cmdclass={"install": PostInstallCommand},
     zip_safe=False,