Spiri
/
j2cli
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42 from atomicptr/fix/env-stdin 

Fix not being able to use the env format with stdin
This commit is contained in:
Mark 2019-07-18 17:59:35 +03:00 committed by GitHub
parent a63336dcbb 8ae2a9cafc
commit d3d78db8ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -177,7 +177,7 @@ NGINX_LOGS=/var/log/nginx/
And render with:
$ j2 config.j2 data.env
$ env | j2 --format=env config.j2.
$ env | j2 --format=env config.j2
This is especially useful with Docker to link containers together.

2
j2cli/cli.py
View File

@ -138,7 +138,7 @@ def render_command(cwd, environ, stdin, argv):
}[os.path.splitext(args.data)[1]]
# Input: data
if args.data == '-' and args.format == 'env':
if args.data == '-' and args.format == 'env' and (stdin is None or stdin.isatty()):
input_data_f = None
else:
input_data_f = stdin if args.data == '-' else open(args.data)

2
j2cli/context.py
View File

@ -113,7 +113,7 @@ def _parse_env(data_string):
And render with:
$ j2 config.j2 data.env
$ env | j2 --format=env config.j2.
$ env | j2 --format=env config.j2
This is especially useful with Docker to link containers together.
"""

2
tests/render-test.py
View File

@ -98,6 +98,8 @@ class RenderTest(unittest.TestCase):
self._testme_std(['resources/nginx-env.j2', 'resources/data.env'])
# Format
self._testme_std(['--format=env', 'resources/nginx-env.j2', 'resources/data.env'])
# Stdin
self._testme_std(['--format=env', 'resources/nginx-env.j2'], stdin=open('resources/data.env'))
# Environment!
env = dict(NGINX_HOSTNAME='localhost', NGINX_WEBROOT='/var/www/project', NGINX_LOGS='/var/log/nginx/')