Set NANCY_INPUT and NANCY_OUTPUT for $run (fix #25), and test

Alistair Turnbull · Alistair Turnbull · commit 307bbc0935f6 · 2025-05-04T08:46:18.000+01:00
diff --git a/nancy/__init__.py b/nancy/__init__.py
@@ -497,6 +497,8 @@ def run(self, args: Optional[list[bytes]], input: Optional[bytes]) -> bytes:
 
         exe_path = self._expand.file_arg(args[0], exe=True)
         expanded_input = None if input is None else self._expand.expand(input)
+        os.environ['NANCY_INPUT'] = str(self._expand.root)
+        os.environ['NANCY_OUTPUT'] = str(self._expand.trees.output)
         return filter_bytes(expanded_input, exe_path, args[1:])
 
 
diff --git a/tests/test-files/env-vars-expected/index.html b/tests/test-files/env-vars-expected/index.html
@@ -0,0 +1,16 @@
+<html>
+<head>
+</head>
+<body>
+<p>This is the index.</p>
+
+<p><a href="people/index.html">People</a></p>
+
+<p>NANCY_INPUT is webpage-src
+
+</p>
+<p>NANCY_OUTPUT is output
+
+</p>
+</body>
+</html>
diff --git a/tests/test-files/env-vars-expected/people/adam/index.html b/tests/test-files/env-vars-expected/people/adam/index.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+</head>
+<body>
+Adam's page has been overridden.
+
+<p>NANCY_INPUT is env-vars-src
+
+</p>
+<p>NANCY_OUTPUT is output
+
+</p>
+</body>
+</html>
diff --git a/tests/test-files/env-vars-expected/people/eve/index.html b/tests/test-files/env-vars-expected/people/eve/index.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+</head>
+<body>
+This is eve&apos;s page.
+
+<p>NANCY_INPUT is webpage-src
+
+</p>
+<p>NANCY_OUTPUT is output
+
+</p>
+</body>
+</html>
diff --git a/tests/test-files/env-vars-expected/people/index.html b/tests/test-files/env-vars-expected/people/index.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+</head>
+<body>
+This is people:
+
+<ul>
+<li><a href="adam/index.html">adam</a></li>
+<li><a href="eve/index.html">eve</a></li>
+</ul>
+
+<p>NANCY_INPUT is webpage-src
+
+</p>
+<p>NANCY_OUTPUT is output
+
+</p>
+</body>
+</html>
diff --git a/tests/test-files/env-vars-src/people/adam/body.in.html b/tests/test-files/env-vars-src/people/adam/body.in.html
@@ -0,0 +1 @@
+Adam's page has been overridden.
diff --git a/tests/test-files/env-vars-src/people/adam/index.nancy.html b/tests/test-files/env-vars-src/people/adam/index.nancy.html
@@ -0,0 +1 @@
+$include(template.in.html)
diff --git a/tests/test-files/env-vars-src/template.in.html b/tests/test-files/env-vars-src/template.in.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+</head>
+<body>
+$include(body.in.html)
+
+<p>NANCY_INPUT is $run(basename,$run(printenv,NANCY_INPUT))</p>
+<p>NANCY_OUTPUT is $run(basename,$run(printenv,NANCY_OUTPUT))</p>
+</body>
+</html>
diff --git a/tests/test_nancy.py b/tests/test_nancy.py
@@ -62,6 +62,11 @@ def test_two_trees() -> None:
         check_links("mergetrees-expected", "index.html")
 
 
+def test_env_vars() -> None:
+    with chdir(tests_dir):
+        passing_test(["env-vars-src", "webpage-src"], "env-vars-expected")
+
+
 def test_nested_macro_invocations() -> None:
     with chdir(tests_dir):
         passing_test(["nested-macro-src"], "nested-macro-expected")
