From eda963ba49a395c538756024e77ae48f7ad596ef Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 14 Sep 2024 00:33:55 +0200 Subject: [PATCH 1/5] mypy/project,util --- spcd/project.py | 2 +- spcd/util.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/spcd/project.py b/spcd/project.py index de8b164..709d554 100644 --- a/spcd/project.py +++ b/spcd/project.py @@ -41,7 +41,7 @@ class Project: # root for variable in ROOT: if value := projects.environment.get(variable, None): - self.root = value + self.root = Path(value) # url self.url = add_url_path(projects.url, self.name) diff --git a/spcd/util.py b/spcd/util.py index 9ea9dca..2dd7718 100644 --- a/spcd/util.py +++ b/spcd/util.py @@ -16,7 +16,7 @@ def add_url_path(url: str, extra_path: str) -> str: return urlunparse(parts) -def browse(root: str) -> None: +def browse(root: Path) -> None: """Frame the browsing of a root directory in the log output.""" paths = [] for directory, _, files in os.walk(root): @@ -24,17 +24,19 @@ def browse(root: str) -> None: absolute_path = Path(directory) / file relative_path = os.path.relpath(absolute_path, start=root) paths.append(relative_path) - frame(root) + text = str(root) + frame(text) for path in sorted(paths): log.info(path) - shut(root) + shut(text) -def cat(file: str) -> None: +def cat(file: Path) -> None: """Frame the content of a file in the log output.""" - frame(file) + text = str(file) + frame(text) log.info(fs.read_file_text(file).rstrip()) - shut(file) + shut(text) def frame(text: str) -> None: From 6142dd763d56bbe1bf0f07be769a12eef06975d4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 14 Sep 2024 00:35:47 +0200 Subject: [PATCH 2/5] shadow --- spcd/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd/__init__.py b/spcd/__init__.py index 0c17d01..3d5ec2a 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -101,8 +101,8 @@ def main(main: str) -> None: install_commands(main) install_python_packages() else: - function = getattr(cmd, name.replace("-", "_")) - function(*arguments) + f = getattr(cmd, name.replace("-", "_")) + f(*arguments) def set_ssh() -> None: From 051c91a1952adca7a5649412553eb17cdc270955 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 14 Sep 2024 01:24:43 +0200 Subject: [PATCH 3/5] env/main --- spcd/__main__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd/__main__.py b/spcd/__main__.py index 6aeca41..520540c 100755 --- a/spcd/__main__.py +++ b/spcd/__main__.py @@ -2,11 +2,11 @@ """Entry point.""" +import importlib import sys -import env - if __name__ == "__main__": + env = importlib.import_module("env") if env.SPCD_PYTHON_VENV_PACKAGES not in sys.path: sys.path.insert(0, env.SPCD_PYTHON_VENV_PACKAGES) from spcd import main From 96d08df70dd621bd6ea1611867a1a6a7b533ee4c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 14 Sep 2024 01:42:36 +0200 Subject: [PATCH 4/5] env/init,cmd,util --- spcd/__init__.py | 4 +++- spcd/cmd.py | 2 +- spcd/util.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spcd/__init__.py b/spcd/__init__.py index 3d5ec2a..5114a6a 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -2,11 +2,11 @@ __version__ = "0.0.1" +import importlib import sys from os import environ, pathsep from pathlib import Path -import env from rwx import fs from rwx.log import stream as log from rwx.ps import run @@ -15,6 +15,8 @@ from spcd import cmd from spcd.ci import project, projects from spcd.util import browse, cat, split, step +env = importlib.import_module("env") + COMMANDS_PREFIX = "spcd-" diff --git a/spcd/cmd.py b/spcd/cmd.py index a1108ee..9df7ed3 100644 --- a/spcd/cmd.py +++ b/spcd/cmd.py @@ -3,9 +3,9 @@ import os from pathlib import Path -import env from rwx import ps +from spcd import env from spcd.ci import project, projects from spcd.util import browse diff --git a/spcd/util.py b/spcd/util.py index 2dd7718..dd29da4 100644 --- a/spcd/util.py +++ b/spcd/util.py @@ -4,10 +4,11 @@ import os from pathlib import Path from urllib.parse import urlparse, urlunparse -import env from rwx import fs from rwx.log import stream as log +from spcd import env + def add_url_path(url: str, extra_path: str) -> str: """Append an extra segment to an existing URL.""" From 3e85c6e42182cba29f1fc31b3dad18a1f669a756 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 14 Sep 2024 02:44:50 +0200 Subject: [PATCH 5/5] mypy --- spcd/__init__.py | 2 +- spcd/cmd.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spcd/__init__.py b/spcd/__init__.py index 5114a6a..11db87f 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -39,7 +39,7 @@ def clone_project_branch() -> None: project.branch, "--", project.url, - project.root, + str(project.root), ) diff --git a/spcd/cmd.py b/spcd/cmd.py index 9df7ed3..fe00db4 100644 --- a/spcd/cmd.py +++ b/spcd/cmd.py @@ -18,12 +18,10 @@ def spcd_browse_workspace() -> None: def spcd_build_project() -> None: """Perform the actual building process.""" for extension in ["py", "sh"]: - path = Path(project.root) / f"build.{extension}" + path = project.root / f"build.{extension}" if path.exists(): - ps.run(path) + ps.run(str(path)) break - else: - pass def spcd_check_project() -> None: