some tests

Author: ZeroIntensity

docs/building-projects/build_steps.md

@@ -17,9 +17,9 @@ $ view build
 
 This will export your app into a static folder called `build`, which can then be served via something like [http.server](https://docs.python.org/3/library/http.server.html). An exported route cannot contain:
 
-- Route Inputs
-- Path Parameters
-- A method other than `GET`
+-   Route Inputs
+-   Path Parameters
+-   A method other than `GET`
 
 As stated above, you can also build your app programatically via `build_app`:
 
@@ -37,7 +37,7 @@ build_app(app)
 
 ## Build Steps
 
-Instead of exporting static HTML, you might just want to call some build script at runtime for your app to use. For example, this could be something like a [Next.js](https://nextjs.org) app, which you want to use as the UI for your website. Each different build is called a **build step** in View. View's build system does not aim to be a full fledged build system, but instead a bridge to use other package managers or tools to build requirements for your app. It tries to be *extendable*, instead of batteries-included.
+Instead of exporting static HTML, you might just want to call some build script at runtime for your app to use. For example, this could be something like a [Next.js](https://nextjs.org) app, which you want to use as the UI for your website. Each different build is called a **build step** in View. View's build system does not aim to be a full fledged build system, but instead a bridge to use other package managers or tools to build requirements for your app. It tries to be _extendable_, instead of batteries-included.
 
 To specify a build step, add it under `build.steps` in your configuration. A build step should contain a list of requirements under `requires` and a `command`:
 
@@ -122,18 +122,18 @@ command = "php -f payment.php"
 
 ## Build Requirements
 
-As you've seen above, build requirements are specified via the `requires` value. Out of the box, view.py supports a number of different build tools, compilers, and interpreters. To specify a requirement for one, simply add the name of their executable (*i.e.*, how you access their CLI). For example, since `pip` is accessed via using the `pip` command in your terminal, `pip` is the name of the requirement.
+As you've seen above, build requirements are specified via the `requires` value. Out of the box, view.py supports a number of different build tools, compilers, and interpreters. To specify a requirement for one, simply add the name of their executable (_i.e._, how you access their CLI). For example, since `pip` is accessed via using the `pip` command in your terminal, `pip` is the name of the requirement.
 
 However, view.py might not support checking for a command by default (this is the case if you get a `Unknown build requirement` error). If so, you need a custom requirement. If you would like to, you can make an [issue](https://github.com/ZeroIntensity/view.py/issues) requesting support for it as well.
 
 ### Custom Requirements
 
 There are four types of custom requirements, which are specified by adding a prefix to the requirement name:
 
-- Importing a Python module (`mod+`)
-- Executing a Python script (`script+`)
-- Checking if a path exists (`path+`)
-- Checking if a command exists (`command+`)
+-   Importing a Python module (`mod+`)
+-   Executing a Python script (`script+`)
+-   Checking if a path exists (`path+`)
+-   Checking if a command exists (`command+`)
 
 For example, the `command+gcc` would make sure that `gcc --version` return `0`:
 
@@ -163,13 +163,12 @@ async def __view_requirement__() -> bool:
     return sys.version_info >= (3, 10)
 ```
 
-The above could actually be used via both `script+check_310.py` and `mod+check_310`. 
+The above could actually be used via both `script+check_310.py` and `mod+check_310`.
 
 !!! tip
 
     Don't use the view.py build system to check the Python version or if a Python package is installed. Instead, use the `dependencies` section of a `pyproject.toml` file, or [PEP 723](https://peps.python.org/pep-0723/) script metadata.
 
-
 ## Review
 
 View can build static HTML with the `view build` command, or via `view.build.build_app`. Build steps in view.py are used to call external build systems, which can then in turn be used to build things your app needs at runtime (such as static HTML generated by [Next.js](https://nextjs.org)). Builds can run commands, Python scripts, or both.

src/_view/app.c

@@ -155,8 +155,7 @@ static int lifespan(PyObject* awaitable, PyObject* result) {
         &self,
         NULL,
         &receive,
-        &send,
-        NULL
+        &send
         ) < 0)
         return -1;
 
@@ -308,6 +307,18 @@ static PyObject* app(
             return NULL;
         }
 
+        if (PyAwaitable_SaveValues(
+            awaitable,
+            4,
+            self,
+            scope,
+            receive,
+            send
+        ) < 0) {
+            Py_DECREF(awaitable);
+            return NULL;
+        }
+
         if (PyAwaitable_AddAwait(
             awaitable,
             recv_coro,

src/view/build.py

@@ -52,8 +52,10 @@ async def _call_script(path: Path, *, call_func: str | None = None) -> None:
     if call_func:
         func = globls.get(call_func)
         if func:
-            await func()
-
+            try:
+                await func()
+            except Exception as e:
+                raise BuildError(f"Script at {path} raised exception!") from e
 
 _COMMAND_REQS = [
     # C
@@ -163,6 +165,9 @@ async def _check_requirement(req: str) -> None:
     elif prefix == "path":
         if not Path(target).exists():
             raise MissingRequirementError(f"{target} does not exist")
+    elif prefix == "command":
+         if not await _check_version_command(target):
+            raise MissingRequirementError(f"{target} is not installed")
     else:
         raise BuildError(f"Invalid requirement prefix: {prefix}")
 
@@ -189,9 +194,9 @@ async def _build_step(step: _BuildStepWithName) -> None:
     if data.script:
         if isinstance(data.script, list):
             for script in data.script:
-                await _call_script(script)
+                await _call_script(script, call_func="__view_build__")
         else:
-            await _call_script(data.script)
+            await _call_script(data.script, call_func="__view_build__")
 
 
 async def run_step(app: App, name: str) -> None:

src/view/routing.py

@@ -86,6 +86,7 @@ async def wrap_step(app: App, step: str) -> None:
         await run_step(app, step)
     except Exception as e:
         Service.exception(e)
+        raise e
 
 
 @dataclass

tests/configs/build_commands.toml

@@ -0,0 +1,10 @@
+[build]
+default_steps = ["test"]
+
+[build.steps.test]
+requires = ["command+python3"]
+command = "python3 -c 'print()'"
+
+[build.steps.fail]
+requires = ["command+fdsafasdjfkhas"]
+command = "exit -1"

tests/configs/build_scripts.toml

@@ -0,0 +1,8 @@
+[build]
+default_steps = ["myscript"]
+
+[build.steps.myscript]
+script = ["./tests/build/my_build_script.py"]
+
+[build.steps.fail]
+script = "./tests/build/failing_build_script.py"

tests/test_build.py

@@ -1,3 +1,6 @@
+import os
+from contextlib import redirect_stdout
+from io import StringIO
 from pathlib import Path
 
 import pytest
@@ -19,8 +22,44 @@ async def index():
 
     @app.get("/foo", steps=("foo",))
     async def wont_work():
-        raise RuntimeError("shouldn't be here!")
+        return "shouldn't be here"
 
     async with app.test() as test:
         assert (await test.get("/")).message != ""
         assert (await test.get("/foo")).status == 500
+
+
+@pytest.mark.asyncio
+async def test_build_scripts():
+    app = new_app(
+        config_path=Path.cwd() / "tests" / "configs" / "build_scripts.toml"
+    )
+
+    called = False
+
+    @app.get("/", steps=("fail",))
+    async def index():
+        nonlocal called
+        called = True
+        return "..."
+
+    async with app.test() as test:
+        assert "_VIEW_TEST_BUILD_SCRIPT" in os.environ
+        assert (await test.get("/")).status == 500
+        assert not called
+
+
+@pytest.mark.asyncio
+async def test_build_commands():
+    app = new_app(
+        config_path=Path.cwd() / "tests" / "configs" / "build_commands.toml"
+    )
+
+    @app.get("/", steps=["fail"])
+    async def fail():
+        return "."
+
+    buffer = StringIO()
+    with redirect_stdout(buffer):
+        async with app.test() as test:
+            assert (await test.get("/")).status == 500