29 Commits
Author SHA1 Message Date
shmyga f14f697428 feat(action): add action haxetool setup
test / test (push) Successful in 46s
2026-11-12 00:37:59 +03:00
shmyga 4f518e78a5 feat(action): add action setup-nodejs input
test / test (push) Successful in 39s
2026-10-24 19:39:26 +03:00
shmyga 5bb659f76c ci(version): 0.6.1
test / test (push) Successful in 34s
release / release (push) Successful in 28s
2026-10-23 00:17:40 +03:00
shmyga 0fe81a0d42 fix: add ignore task not found runner flag 2026-10-23 00:17:29 +03:00
shmyga c70d561c53 ci(version): 0.6.0
release / release (push) Successful in 32s
test / test (push) Failing after 18s
2026-10-22 23:45:11 +03:00
shmyga cc2d62c22b fix: raise error when task not found
test / test (push) Successful in 40s
2026-10-22 23:43:15 +03:00
shmyga e54d8dd23f test: fix entry test
test / test (push) Successful in 1m1s
2026-10-18 15:50:33 +03:00
shmyga dc566087fb feat(preset): add preset tasks template support
test / test (push) Failing after 1m49s
2026-10-16 15:38:58 +03:00
shmyga 6c15ab4d0f ci(version): 0.5.1
release / release (push) Successful in 27s
test / test (push) Successful in 1m0s
2026-10-13 18:10:49 +03:00
shmyga 58e3c2446a fix(preset): fix target arg in docker build command 2026-10-13 18:10:29 +03:00
shmyga 1a3217115f ci(version): 0.5.0
release / release (push) Successful in 27s
test / test (push) Successful in 1m2s
2026-10-09 15:06:29 +03:00
shmyga 7daec2caa3 feat(preset): add gitea release tasks
test / test (push) Successful in 1m23s
2026-10-09 15:03:27 +03:00
shmyga 4f426637c8 feat(command): add command result 2026-10-09 14:59:55 +03:00
shmyga c061296022 feat(preset): add haxe preset
test / test (push) Successful in 1m10s
2026-10-09 00:01:32 +03:00
shmyga c4e2352cb5 ci(version): 0.4.2
release / release (push) Failing after 17s
test / test (push) Successful in 1m19s
2026-10-08 17:25:04 +03:00
shmyga cef665be88 fix: fix version detection 2026-10-08 17:24:48 +03:00
shmyga e4328deaac fix(action): add '--upgrade' flag to project-manager install
test / test (push) Failing after 29s
2026-10-08 17:12:40 +03:00
shmyga 3aef3b22bf docs(readme): update README.md 2026-10-08 17:11:24 +03:00
shmyga 79bc6ad519 ci(version): 0.4.1
release / release (push) Successful in 28s
test / test (push) Successful in 1m5s
2026-10-08 12:53:51 +03:00
shmyga db30814b54 feat: add --version arg support 2026-10-08 12:43:56 +03:00
shmyga a42e1cd1a7 ci(version): 0.4.0
release / release (push) Failing after 28s
test / test (push) Successful in 1m17s
2026-10-07 21:54:48 +03:00
shmyga 549979ced6 feat(logging): mask sensetive data in log output
test / test (push) Successful in 2m0s
2026-10-04 16:29:08 +03:00
shmyga b459eef34b feat(preset): add gitea preset
test / test (push) Successful in 2m20s
2026-10-03 16:34:32 +03:00
shmyga 244f995490 ci(action): add gitea actions
test / test (push) Successful in 2m18s
2026-09-30 15:03:56 +03:00
shmyga 75adb282e7 ci(version): 0.3.1 2026-09-29 19:24:02 +03:00
shmyga eacfa17e40 feat(preset): add '--all-extras' flag to poetry install command 2026-09-29 19:23:41 +03:00
shmyga f4448835ab docs: update README 2026-09-15 19:35:00 +03:00
shmyga 732cec8771 ci(version): 0.3.0 2026-09-15 17:21:45 +03:00
shmyga 5cf71fcae1 feat: update default presets 2026-09-15 17:21:23 +03:00
29 changed files with 474 additions and 92 deletions
+20
View File
@@ -0,0 +1,20 @@
name: release
on:
push:
tags: ["*"]
env:
POETRY_HTTP_BASIC_INFERNALGAMES_USERNAME: ${{ vars.PUBLISH_USERNAME }}
POETRY_HTTP_BASIC_INFERNALGAMES_PASSWORD: ${{ secrets.PUBLISH_TOKEN }}
jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- uses: https://git.shmyga.ru/InfernalGames/project-manager@master
with:
setup-python: true
- run: pm build -vv
- run: pm publish -vv
+14
View File
@@ -0,0 +1,14 @@
name: test
on: push
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- uses: https://git.shmyga.ru/InfernalGames/project-manager@master
with:
setup-python: true
- run: pm lint -vv
- run: pm test -vv
+30 -7
View File
@@ -1,9 +1,27 @@
# Project Manager # Project Manager
[![test](https://git.shmyga.ru/InfernalGames/project-manager/actions/workflows/test.yaml/badge.svg?branch=master)](https://git.shmyga.ru/InfernalGames/project-manager/actions?workflow=test.yaml)
Automatically detects modules and executes commands
Supported types:
- python (poetry)
- nodejs (npm)
- docker
## Install ## Install
With pipx
```bash ```bash
pipx install project-manager -i https://git.shmyga.ru/InfernalGames/project-manager/packages pipx install project-manager -i https://git.shmyga.ru/api/packages/InfernalGames/pypi/simple/ --pip-args="--extra-index-url https://pypi.org/simple"
```
With pip
```bash
pip install project-manager --index-url https://git.shmyga.ru/api/packages/InfernalGames/pypi/simple/ --extra-index-url https://pypi.org/simple
``` ```
## Usage ## Usage
@@ -14,17 +32,16 @@ pipx install project-manager -i https://git.shmyga.ru/InfernalGames/project-mana
pm [-v] [-vv] pm [-v] [-vv]
``` ```
![pm show](docs/Screenshot_0.png "pm show")
### Run task ### Run task
```bash ```bash
pm <task>[:<tag>] [-v] [-vv] pm <task>[:<tag>][:<sub_tag>] [-v] [-vv]
``` ```
## Presets locations ![pm lint](docs/Screenshot_1.png "pm lint")
![pm build](docs/Screenshot_2.png "pm build")
- default presets [`project_manager/preset/default/*.toml`](./project_manager/preset/default)
- user preset `$HOME/.pm.toml`
- project preset `./.pm.toml`
## Preset format ## Preset format
@@ -39,3 +56,9 @@ commands = ["<command>"]
### Examples ### Examples
[Default presets](./project_manager/preset/default) [Default presets](./project_manager/preset/default)
## Presets locations
- default presets [`project_manager/preset/default/*.toml`](./project_manager/preset/default)
- user preset `$HOME/.pm.toml`
- project preset `./.pm.toml`
+92
View File
@@ -0,0 +1,92 @@
name: "Project Manager"
inputs:
# python
python-version:
default: "3.14"
setup-python:
type: boolean
required: false
venv-version:
default: "1"
# nodejs
nodejs-version:
default: "24.x"
setup-nodejs:
type: boolean
required: false
node_modules-version:
default: "1"
# haxetool
setup-haxetool:
type: boolean
required: false
haxetool_sdk-version:
default: "1"
env:
NPM_CONFIG_AUDIT: false
NPM_CONFIG_FUND: false
runs:
using: "composite"
steps:
- id: setup-python
uses: actions/setup-python@v7
with:
python-version: ${{ inputs.python-version }}
cache: "pip"
- run: |
pip install --upgrade project-manager \
--index-url https://git.shmyga.ru/api/packages/InfernalGames/pypi/simple/ \
--extra-index-url https://pypi.org/simple
- run: pm setup:config -i -vv
# setup python
- if: inputs.setup-python
run: pip install poetry
- id: cache-venv
if: inputs.setup-python
uses: actions/cache@v6
with:
path: .venv
key: venv-${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-v${{ inputs.venv-version }}
- if: ${{ inputs.setup-python && steps.cache-venv.outputs.cache-hit != 'true' }}
run: pm setup:python -vv
# setup nodejs
- if: ${{ inputs.setup-haxetool || inputs.setup-nodejs }}
uses: actions/setup-node@v7
with:
node-version: ${{ inputs.nodejs-version }}
cache: "npm"
- id: cache-node_modules
if: ${{ inputs.setup-haxetool || inputs.setup-nodejs }}
uses: actions/cache@v6
with:
path: node_modules
key: node_modules-${{ runner.os }}-nodejs-${{ inputs.nodejs-version }}-${{ hashFiles('**/package-lock.json') }}-v${{ inputs.node_modules-version }}
- if: ${{ (inputs.setup-haxetool || inputs.setup-nodejs) && steps.cache-node_modules.outputs.cache-hit != 'true' }}
run: pm setup:nodejs -vv
# setup haxetool
- if: inputs.setup-haxetool
uses: actions/cache/restore@v6
id: cache-haxetool
with:
key: ${{ runner.os }}-haxetool-${{ hashFiles('**/haxetool.json') }}-v${{ inputs.haxetool_sdk-version }}
path: /root/sdk
- if: steps.cache-haxetool.outputs.cache-hit != 'true'
run: |
npx hxt app:flash:setup
- if: steps.cache-haxetool.outputs.cache-hit != 'true'
uses: actions/cache/save@v6
with:
key: ${{ steps.cache-haxetool.outputs.cache-primary-key }}
path: /root/sdk
Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

+11 -1
View File
@@ -1,3 +1,4 @@
import json
import logging import logging
import os import os
import subprocess import subprocess
@@ -43,13 +44,14 @@ class CommandExecutor:
def __init__(self, command: str): def __init__(self, command: str):
self._command = command self._command = command
def run(self, basepath: Path): def run(self, basepath: Path) -> dict | None:
self._logger.debug(self._command) self._logger.debug(self._command)
out_logger = CommandLogger(logging.TRACE) out_logger = CommandLogger(logging.TRACE)
err_logger = CommandLogger(logging.TRACE) err_logger = CommandLogger(logging.TRACE)
try: try:
result = subprocess.run( result = subprocess.run(
self._command, self._command,
executable="bash",
cwd=basepath, cwd=basepath,
stdout=out_logger, # type: ignore stdout=out_logger, # type: ignore
stderr=err_logger, # type: ignore stderr=err_logger, # type: ignore
@@ -58,5 +60,13 @@ class CommandExecutor:
finally: finally:
out_logger.close() out_logger.close()
err_logger.close() err_logger.close()
out_logger.join()
err_logger.join()
if result.returncode != 0: if result.returncode != 0:
raise CommandError("".join(err_logger.lines or out_logger.lines)) raise CommandError("".join(err_logger.lines or out_logger.lines))
if out_logger.lines:
try:
return json.loads(out_logger.lines[0])
except json.JSONDecodeError:
pass
return None
+8 -1
View File
@@ -60,6 +60,8 @@ addLoggingLevel("TRACE", logging.DEBUG - 5)
class ColoredFormatter(logging.Formatter): class ColoredFormatter(logging.Formatter):
sensetive = set() # TODO: chain formatters?
def __init__(self, fmt): def __init__(self, fmt):
super().__init__() super().__init__()
self.fmt = fmt self.fmt = fmt
@@ -72,7 +74,12 @@ class ColoredFormatter(logging.Formatter):
logging.CRITICAL: colored(self.fmt, "red", attrs=["bold"]), logging.CRITICAL: colored(self.fmt, "red", attrs=["bold"]),
} }
def _mask_sensetive_data(self, message: str) -> str:
for value in self.sensetive:
message = message.replace(value, "*****")
return message
def format(self, record: logging.LogRecord): def format(self, record: logging.LogRecord):
log_fmt = self.FORMATS.get(record.levelno) log_fmt = self.FORMATS.get(record.levelno)
formatter = logging.Formatter(log_fmt) formatter = logging.Formatter(log_fmt)
return formatter.format(record) return self._mask_sensetive_data(formatter.format(record))
+28 -5
View File
@@ -1,27 +1,34 @@
import json import json
import os
import re import re
import tomllib import tomllib
from pathlib import Path from pathlib import Path
from typing import Any
import dotenv import dotenv
from jinja2 import Environment from jinja2 import Environment
from ..preset.model import Variables from ..preset.model import Variables
from .util import get_environ
def do_bool(data: str | None) -> bool: def do_bool(data: str | None) -> bool:
return not (data is None or data.lower() in ["false", "null", "none", "0", ""]) if data is None:
return False
if not isinstance(data, str):
data = str(data)
return data.lower() not in ["false", "null", "none", "0", ""]
def do_env(key: str, default: str | None = None) -> str | None: def do_not(value: Any | None) -> bool:
return os.environ.get(key=key.upper(), default=default) return not do_bool(str(value))
def _build_env(basepath: Path) -> Environment: def _build_env(basepath: Path) -> Environment:
env = Environment() env = Environment()
def do_file(filename: str) -> Path | None: def do_file(filename: str) -> Path | None:
if not filename:
return None
result = Path(filename) result = Path(filename)
if not result.is_absolute(): if not result.is_absolute():
result = basepath / result result = basepath / result
@@ -64,6 +71,11 @@ def _build_env(basepath: Path) -> Environment:
keys = list(data.keys()) keys = list(data.keys())
return keys[keyindex] return keys[keyindex]
env_data = get_environ(basepath)
def do_env(key: str, default: str | None = None) -> str | None:
return env_data.get(key.upper(), default)
env.filters["file"] = do_file env.filters["file"] = do_file
env.filters["read"] = do_read env.filters["read"] = do_read
env.filters["get"] = do_get env.filters["get"] = do_get
@@ -71,6 +83,7 @@ def _build_env(basepath: Path) -> Environment:
env.filters["key"] = do_key env.filters["key"] = do_key
env.filters["bool"] = do_bool env.filters["bool"] = do_bool
env.filters["env"] = do_env env.filters["env"] = do_env
env.filters["not"] = do_not
return env return env
@@ -81,7 +94,17 @@ class PathTemplate:
def update_variables(self, templates: Variables, variables: Variables): def update_variables(self, templates: Variables, variables: Variables):
for k, v in templates.items(): for k, v in templates.items():
variables[k] = self._env.from_string(v).render(**variables) if isinstance(v, dict):
variables[k] = {
kk: self._env.from_string(vv).render(**variables)
for kk, vv in v.items()
}
elif isinstance(v, list):
variables[k] = [
self._env.from_string(vv).render(**variables) for vv in v
]
else:
variables[k] = self._env.from_string(v).render(**variables)
def fill_template(self, template: str, variables: Variables) -> str: def fill_template(self, template: str, variables: Variables) -> str:
return self._env.from_string(template).render(**variables) return self._env.from_string(template).render(**variables)
+13
View File
@@ -1,3 +1,9 @@
import os
from pathlib import Path
import dotenv
def merge_dicts(target: dict, enhancer: dict) -> dict: def merge_dicts(target: dict, enhancer: dict) -> dict:
for key, val in enhancer.items(): for key, val in enhancer.items():
if key not in target: if key not in target:
@@ -9,3 +15,10 @@ def merge_dicts(target: dict, enhancer: dict) -> dict:
else: else:
target[key] = val target[key] = val
return target return target
def get_environ(path: Path) -> dict[str, str]:
result = os.environ.copy()
if (env_file := path / ".env").exists():
result.update(dotenv.dotenv_values(env_file))
return result
+1 -1
View File
@@ -5,7 +5,7 @@ from .entry import Entry
class EmptyEntry(Entry): class EmptyEntry(Entry):
def __init__(self): def __init__(self):
super().__init__([], Path(), Path()) super().__init__([], {}, Path(), Path())
def __bool__(self): def __bool__(self):
return False return False
+17 -5
View File
@@ -3,6 +3,7 @@ from pathlib import Path
from typing import NamedTuple, Self from typing import NamedTuple, Self
from ..common.command import CommandExecutor from ..common.command import CommandExecutor
from ..preset.model import Variables
logger = logging.getLogger("entry") logger = logging.getLogger("entry")
@@ -52,17 +53,28 @@ class Task(NamedTuple):
class Entry: class Entry:
DEFAULT_EXECUTOR: type[CommandExecutor] = CommandExecutor
_logger = logger _logger = logger
def __init__( def __init__(
self, self,
tasks: list[Task], tasks: list[Task],
variables: Variables,
basepath: Path, basepath: Path,
rootpath: Path, rootpath: Path,
executor: type[CommandExecutor] | None = None,
): ):
self._tasks = tasks self._tasks = tasks
self._variables = variables
self._basepath = basepath self._basepath = basepath
self._roopath = rootpath self._roopath = rootpath
self._executor = executor or self.DEFAULT_EXECUTOR
@property
def sensentive_data(self):
for k, v in self._variables.items():
if "pass" in k.lower() and v:
yield v
def show(self): def show(self):
self._logger.info("🔵 %s", self) self._logger.info("🔵 %s", self)
@@ -85,20 +97,20 @@ class Entry:
for command in task.commands: for command in task.commands:
self._logger.debug(" %s", command) self._logger.debug(" %s", command)
def run_task(self, key: PartialTaskKey) -> bool: def run_task(self, key: PartialTaskKey) -> int:
if key.name == "show": if key.name == "show":
self.show() self.show()
return True return True
runned = False c = 0
for task in self._tasks: for task in self._tasks:
if key == task.key: if key == task.key:
self._logger.info("🔵 %s %s", task.key, self) self._logger.info("🔵 %s %s", task.key, self)
runned = True
for command in task.commands: for command in task.commands:
CommandExecutor(command).run( self._executor(command).run(
(task.cwd and Path(task.cwd)) or self._basepath (task.cwd and Path(task.cwd)) or self._basepath
) )
return runned c += 1
return c
def __repr__(self): def __repr__(self):
path = self._basepath.relative_to(self._roopath.parent) path = self._basepath.relative_to(self._roopath.parent)
+1 -1
View File
@@ -9,7 +9,7 @@ from .entry import Entry
class EntryResolver: class EntryResolver:
def __init__(self, detector: EntryDetector, ignore: PathSpec, max_depth: int = 4): def __init__(self, detector: EntryDetector, ignore: PathSpec, max_depth: int = 2):
self._detector = detector self._detector = detector
self._ignore = ignore self._ignore = ignore
self._max_depth = max_depth self._max_depth = max_depth
+10 -5
View File
@@ -1,11 +1,12 @@
import logging import logging
from collections import Counter from collections import Counter
from enum import StrEnum from enum import StrEnum, auto
from pathlib import Path from pathlib import Path
from typing import Iterable from typing import Iterable
from .common.command import CommandError from .common.command import CommandError
from .common.ignore import create_ignore from .common.ignore import create_ignore
from .common.logging_colored import ColoredFormatter
from .entry.entry import Entry, PartialTaskKey from .entry.entry import Entry, PartialTaskKey
from .entry.resolver import EntryResolver from .entry.resolver import EntryResolver
from .preset.detector import PresetEntryDetector from .preset.detector import PresetEntryDetector
@@ -14,8 +15,8 @@ logger = logging.getLogger("project")
class ResultType(StrEnum): class ResultType(StrEnum):
SUCCESS = "success" SUCCESS = auto()
FAILED = "failed" FAILED = auto()
RESULT_ICONS = { RESULT_ICONS = {
@@ -38,10 +39,13 @@ class ProjectManager:
def run_task(self, key: PartialTaskKey) -> dict[str, int]: def run_task(self, key: PartialTaskKey) -> dict[str, int]:
counter = Counter() counter = Counter()
sensetive = set()
ColoredFormatter.sensetive = sensetive
for entry in self._iter_entries(): for entry in self._iter_entries():
sensetive.update(set(entry.sensentive_data))
try: try:
if entry.run_task(key): if count := entry.run_task(key):
counter[ResultType.SUCCESS] += 1 counter[ResultType.SUCCESS] += count
except CommandError as error: except CommandError as error:
self._logger.error("%s\n%s", entry, error.output) self._logger.error("%s\n%s", entry, error.output)
counter[ResultType.FAILED] += 1 counter[ResultType.FAILED] += 1
@@ -51,4 +55,5 @@ class ProjectManager:
self._logger.info( self._logger.info(
"%s", "\n".join(f"{RESULT_ICONS[k]} {v}" for k, v in counter.items()) "%s", "\n".join(f"{RESULT_ICONS[k]} {v}" for k, v in counter.items())
) )
ColoredFormatter.sensetive = set()
return counter return counter
@@ -0,0 +1,16 @@
[presets.config.tasks.setup.env]
priority = 1
conditions = ["{{ ('.env-base' | file) and ('.env' | file | not ) }}"]
commands = ["cp .env-base .env"]
[presets.config.tasks.setup.env2]
priority = 1
conditions = ["{{ ('.env.default' | file) and ('.env' | file | not ) }}"]
commands = ["cp .env.default .env"]
[presets.config.tasks.setup.json]
priority = 1
conditions = [
"{{ ('config.example.json' | file) and ('config.json' | file | not ) }}",
]
commands = ["cp config.example.json config.json"]
+22 -6
View File
@@ -1,15 +1,21 @@
[presets.docker] [presets.docker]
conditions = ["{{ 'Dockerfile' | file }}"] conditions = ["{{ 'Dockerfile' | file }}"]
variables.docker_name = "{{ 'pyproject.toml' | read | get('project.name') or 'package.json' | read | get('name') }}" variables.docker_name = "{{ project_name }}"
variables.docker_version = "{{ 'pyproject.toml' | read | get('project.version') or 'package.json' | read | get('version') }}" variables.docker_version = "{{ project_version }}"
variables.docker_repo = "{{ '.env' | read | get('DOCKER_REPO') }}" variables.docker_repo = "{{ 'DOCKER_REPO' | env }}"
variables.docker_group = "{{ '.env' | read | get('DOCKER_GROUP') }}" variables.docker_group = "{{ 'DOCKER_GROUP' | env }}"
variables.docker_image = "{% if docker_group | bool %}{{ docker_group }}/{% endif %}{{ docker_name }}" variables.docker_image = "{% if docker_group | bool %}{{ docker_group }}/{% endif %}{{ docker_name }}"
variables.docker_tag = "{{ '.env' | read | get('DOCKER_TAG') or 'latest' }}" variables.docker_tag = "{{ 'DOCKER_TAG' | env('latest') }}"
variables.docker_target = "{{ 'DOCKER_TARGET' | env }}"
variables.docker_target_str = "{{ ('--target ' + docker_target) if docker_target | bool else '' }}"
variables.docker_build_args = {}
variables.docker_build_args_str = "{% for item in docker_build_args.items() %}--build-arg \"{{ item[0] }}={{ item[1] }}\" {% endfor %}"
# build # build
[presets.docker.tasks.build.default] [presets.docker.tasks.build.default]
commands = ["docker build -t {{ docker_image }} . -f Dockerfile"] commands = [
"docker build {{ docker_build_args_str }} {{ docker_target_str }} -t {{ docker_image }} . -f Dockerfile",
]
# publish version # publish version
[presets.docker.tasks.publish.version] [presets.docker.tasks.publish.version]
@@ -34,3 +40,13 @@ commands = [
"mkdir -p {{ docker_output }}", "mkdir -p {{ docker_output }}",
"docker save --output {{ docker_output }}/{{ docker_name }}-{{ docker_version }}.tar {{ docker_image }}", "docker save --output {{ docker_output }}/{{ docker_name }}-{{ docker_version }}.tar {{ docker_image }}",
] ]
# run
[presets.docker.tasks.run.compose]
conditions = ["{{ 'docker-compose.yaml' | file }}"]
commands = ["docker compose -f docker-compose.yaml up"]
# develop
[presets.docker.tasks.develop.compose]
conditions = ["{{ 'docker-compose-develop.yaml' | file }}"]
commands = ["docker compose -f docker-compose-develop.yaml up --build --watch"]
+43
View File
@@ -0,0 +1,43 @@
[presets.gitea]
variables.publish_repo = "{{ 'PUBLISH_REPO' | env }}"
variables.publish_group = "{{ 'PUBLISH_GROUP' | env }}"
variables.publish_password = "{{ 'PUBLISH_PASSWORD' | env }}"
variables.publish_artefacts = {}
variables.publish_auth_header = "-H 'Authorization: token {{ publish_password }}'"
variables.publish_api_url = "https://{{ publish_repo }}/api"
variables.publish_packages_url = "{{ publish_api_url }}/packages/{{ publish_group }}"
variables.publish_generic_url = "{{ publish_packages_url }}/generic/{{ project_name }}/{{ project_version }}"
variables.publish_releases_url = "{{ publish_api_url }}/v1/repos/{{ publish_group }}/{{ project_name }}/releases"
variables.publish_release_tag_url = "{{ publish_releases_url }}/tags/{{ project_version }}"
[presets.gitea.tasks.publish."{{ publish_artefacts | tojson }}"]
conditions = ["{{ item | file }}"]
variables.artefact_file = "{{ item }}"
variables.artefact_name = "{{ (artefact_file | file).name }}"
commands = [
"curl -s {{ publish_auth_header }} -X DELETE '{{ publish_generic_url }}/{{ artefact_name }}'",
"curl -s {{ publish_auth_header }} --fail-with-body --upload-file '{{ artefact_file }}' '{{ publish_generic_url }}/{{ artefact_name }}'",
]
[presets.gitea.tasks.publish.debian_repo]
conditions = ["{{ publish_artefacts.debian | file }}"]
variables.artefact_file = "{{ publish_artefacts.debian }}"
commands = [
"curl -s {{ publish_auth_header }} -X DELETE '{{ publish_packages_url }}/debian/pool/noble/main/{{ project_name }}/{{ project_version }}/all'",
"curl -s {{ publish_auth_header }} --fail-with-body --upload-file '{{ artefact_file }}' '{{ publish_packages_url }}/debian/pool/noble/main/upload'",
]
[presets.gitea.tasks.release.create]
conditions = ["{{ publish_repo }}"]
commands = [
"curl -s {{ publish_auth_header }} -X DELETE '{{ publish_release_tag_url }}'",
"curl -s {{ publish_auth_header }} --fail-with-body -X POST '{{ publish_releases_url }}' -H 'Content-Type: application/json' --data '{ \"name\": \"{{ project_version }}\", \"tag_name\": \"{{ project_version }}\" }'",
]
[presets.gitea.tasks.release."{{ publish_artefacts | tojson }}"]
conditions = ["{{ item | file }}"]
variables.artefact_file = "{{ item }}"
commands = [
"(export RELEASE_ID=$(curl -s {{ publish_auth_header }} --fail {{ publish_release_tag_url }} | jq '.id') && curl -s {{ publish_auth_header }} --fail-with-body -X POST \"{{ publish_releases_url }}/$RELEASE_ID/assets\" -H 'Content-Type: multipart/form-data' -F 'attachment=@{{ artefact_file }}')",
]
@@ -1,5 +1,8 @@
[presets.'*'] [presets.'*']
priority = 1000 priority = 1000
conditions = ["{{ true }}"] conditions = ["{{ true }}"]
variables.project_name = "{{ 'pyproject.toml' | read | get('project.name') or 'package.json' | read | get('name') }}"
variables.project_version = "{{ 'pyproject.toml' | read | get('project.version') or 'package.json' | read | get('version') }}"
variables.version = "{{ 'version' | env }}" variables.version = "{{ 'version' | env }}"
variables.home = "{{ 'home' | env }}"
tasks = {} tasks = {}
+24
View File
@@ -0,0 +1,24 @@
[presets.haxe]
variables.haxe_version_default = "{{ 'package.json' | read | get('haxe') }}"
variables.haxe_version = "{{ 'HAXE_VERSION' | env(haxe_version_default) }}"
variables.neko_version_default = "{{ 'package.json' | read | get('neko') or '2.2.0' }}"
variables.neko_version = "{{ 'NEKO_VERSION' | env(neko_version_default) }}"
variables.neko_sdk = "{{ 'NEKO_SDK' | env(home + '/sdk/neko/' + neko_version) }}"
variables.haxe_sdk = "{{ 'HAXE_SDK' | env(home + '/sdk/haxe/' + haxe_version) }}"
variables.haxe_activate = ". {{ neko_sdk }}/activate && . {{ haxe_sdk }}/activate &&"
variables.haxe_sources = []
variables.haxe_sources_str = "{% for item in haxe_sources %}-s \"{{ item }}\" {% endfor %}"
variables.haxe_formatter = "{{ ((haxe_sdk + '/lib/formatter') | file) and ('./hxformat.json' | file) }}"
conditions = ["{{ haxe_sdk | file }}"]
[presets.haxe.tasks.lint.formatter]
conditions = ["{{ haxe_formatter }}"]
commands = [
"{{ haxe_activate }} haxelib run formatter --check {{ haxe_sources_str or '.' }}",
]
[presets.haxe.tasks.format.formatter]
conditions = ["{{ haxe_formatter }}"]
commands = [
"{{ haxe_activate }} haxelib run formatter {{ haxe_sources_str or '.' }}",
]
+11 -17
View File
@@ -1,30 +1,22 @@
[presets.nodejs] [presets.nodejs]
conditions = ["{{ 'package.json' | file }}"] conditions = ["{{ 'package.json' | file }}"]
variables.use_nvm = "{{ (((('home' | env) + '/.nvm/nvm.sh') | file) and ('.nvmrc' | file)) | bool }}"
variables.nvm = "{{ '. ~/.nvm/nvm.sh && nvm use && ' if use_nvm | bool else '' }}"
variables.npm_scripts = "{{ 'package.json' | read | get('scripts') | tojson }}"
# install # install
[presets.nodejs.tasks.setup.npm] [presets.nodejs.tasks.setup.npm]
conditions = ["{{ 'package-lock.json' | file }}"] conditions = ["{{ 'package-lock.json' | file }}"]
commands = ["npm install-clean"] commands = ["{{ nvm }}npm install-clean"]
# install legacy # install legacy
[presets.nodejs.tasks.setup.npm-legacy] [presets.nodejs.tasks.setup.npm-legacy]
conditions = ["{{ not ('package-lock.json' | file) }}"] conditions = ["{{ not ('package-lock.json' | file) }}"]
commands = ["npm install"] commands = ["{{ nvm }}npm install"]
# test # scripts
[presets.nodejs.tasks.test.jest] [presets.nodejs.tasks."{{ npm_scripts | tojson }}".npm]
conditions = ["{{ 'node_modules/jest' | file }}"] commands = ["{{ nvm }}npm run {{ task }}"]
commands = ["npx jest"]
# build
[presets.nodejs.tasks.build.npm]
conditions = ["{{ 'package.json' | read | get('scripts.build') }}"]
commands = ["npm run build"]
# publish
[presets.nodejs.tasks.publish.npm]
conditions = ["{{ 'package.json' | read | get('scripts.publish') }}"]
commands = ["npm run publish"]
# clean # clean
[presets.nodejs.tasks.clean.node_modules] [presets.nodejs.tasks.clean.node_modules]
@@ -34,4 +26,6 @@ commands = ["rm -rf node_modules"]
# version # version
[presets.nodejs.tasks.version.npm] [presets.nodejs.tasks.version.npm]
conditions = ["{{ version }}"] conditions = ["{{ version }}"]
commands = ["npm version {{ version }} --allow-same-version"] commands = [
"{{ nvm }}npm version {{ version }} --allow-same-version --commit-hooks false --git-tag-version false",
]
+7 -2
View File
@@ -5,8 +5,13 @@ variables.python_poetry = "{{ 'pyproject.toml' | read | get('build-system.build-
# setup # setup
[presets.python.tasks.setup.poetry] [presets.python.tasks.setup.poetry]
conditions = ["{{ python_poetry }}"] conditions = ["{{ python_poetry }}"]
variables.python_version = "{{ 'pyproject.toml' | read | get('project.requires-python') | search('(\\d+.\\d+)') }}" variables.python_version = "{{ 'pyproject.toml' | read | get('project.requires-python') | search('(\\\\d+.\\\\d+)') }}"
commands = ["poetry env use {{ python_version }}", "poetry install"] commands = ["poetry env use {{ python_version }}", "poetry install --all-extras"]
# playwright
[presets.python.tasks.setup.playwright]
conditions = ["{{ '.venv/bin/playwright' | file }}"]
commands = [".venv/bin/playwright install chromium --with-deps --only-shell"]
# build # build
[presets.python.tasks.build.poetry] [presets.python.tasks.build.poetry]
+58 -18
View File
@@ -1,3 +1,4 @@
import json
import operator import operator
from os import environ from os import environ
from pathlib import Path from pathlib import Path
@@ -14,45 +15,84 @@ class PresetEntryDetector(EntryDetector):
def __init__(self, preset_loader_config: PresetLoaderConfig | None = None): def __init__(self, preset_loader_config: PresetLoaderConfig | None = None):
self._preset_loader_config = preset_loader_config self._preset_loader_config = preset_loader_config
def _expand_section(
self,
section: str,
template: PathTemplate,
variables: Variables,
) -> dict[str, str | None]:
data = template.fill_template(section, variables)
try:
sections: dict[str, str | None] = json.loads(data)
if isinstance(sections, str):
sections = json.loads(sections)
except ValueError:
sections = {data: None}
return sections
# pylint:disable=too-many-locals,too-many-nested-blocks,too-many-branches
def detect_entry(self, basepath: Path, rootpath: Path) -> Entry: def detect_entry(self, basepath: Path, rootpath: Path) -> Entry:
template = PathTemplate(basepath) template = PathTemplate(basepath)
preset = PresetLoader(basepath, self._preset_loader_config).load() preset = PresetLoader(basepath, self._preset_loader_config).load()
if preset.modules:
modules = [Path(item).resolve() for item in preset.modules]
if basepath not in modules:
return ENTRY_SKIP
if preset.skip: if preset.skip:
return ENTRY_SKIP return ENTRY_SKIP
tasks = [] tasks = []
global_variables = {f"env_{k.lower()}": v for k, v in environ.items()} global_variables = {f"env_{k.lower()}": v for k, v in environ.items()}
entry_variables = {}
presets = sorted( presets = sorted(
preset.presets.items(), key=lambda item: item[1].priority, reverse=True preset.presets.items(), key=lambda item: item[1].priority, reverse=True
) )
for tag, preset in presets: for tag, preset in presets:
preset_variables: Variables = {**global_variables, "entry_path": basepath} preset_variables: Variables = {
**global_variables,
"entry_path": str(basepath),
}
if preset.variables: if preset.variables:
if tag == "*": if tag == "*":
template.update_variables(preset.variables, global_variables) template.update_variables(preset.variables, global_variables)
template.update_variables(preset.variables, preset_variables) template.update_variables(preset.variables, preset_variables)
entry_variables.update(preset_variables)
if preset.conditions and not template.check_conditions( if preset.conditions and not template.check_conditions(
preset.conditions, preset_variables preset.conditions, preset_variables
): ):
continue continue
for task_name, task_pack in preset.tasks.items(): for task_name, task_pack in preset.tasks.items():
for sub_tag, task_preset in task_pack.items(): task_names = self._expand_section(task_name, template, preset_variables)
if not task_preset.conditions or template.check_conditions( for i_task_name, i_task_value in task_names.items():
task_preset.conditions, preset_variables if i_task_value:
): preset_variables["task"] = i_task_name
variables = preset_variables.copy() preset_variables["item"] = i_task_value
if task_preset.variables: for sub_tag, task_preset in task_pack.items():
template.update_variables(task_preset.variables, variables) sub_tags = self._expand_section(
task = Task( sub_tag, template, preset_variables
key=TaskKey(task_name, tag, sub_tag),
commands=[
template.fill_template(command, variables)
for command in task_preset.commands
],
priority=task_preset.priority,
cwd=task_preset.cwd,
) )
tasks.append(task) for i_sub_tag, i_sub_tag_value in sub_tags.items():
if i_sub_tag_value:
preset_variables["sub_tag"] = i_sub_tag
preset_variables["item"] = i_sub_tag_value
if not task_preset.conditions or template.check_conditions(
task_preset.conditions, preset_variables
):
variables = preset_variables.copy()
if task_preset.variables:
template.update_variables(
task_preset.variables, variables
)
task = Task(
key=TaskKey(i_task_name, tag, i_sub_tag),
commands=[
template.fill_template(command, variables)
for command in task_preset.commands
],
priority=task_preset.priority,
cwd=task_preset.cwd,
)
tasks.append(task)
if tasks: if tasks:
tasks = sorted(tasks, key=operator.attrgetter("priority"), reverse=True) tasks = sorted(tasks, key=operator.attrgetter("priority"), reverse=True)
return Entry(tasks, basepath, rootpath) return Entry(tasks, entry_variables, basepath, rootpath)
return ENTRY_NONE return ENTRY_NONE
+4 -1
View File
@@ -1,6 +1,8 @@
from typing import Any
from pydantic import BaseModel from pydantic import BaseModel
Variables = dict[str, str] Variables = dict[str, Any]
class TaskPreset(BaseModel): class TaskPreset(BaseModel):
@@ -20,4 +22,5 @@ class EntryPreset(BaseModel):
class Preset(BaseModel): class Preset(BaseModel):
skip: bool | None = None skip: bool | None = None
modules: list[str] | None = None
presets: dict[str, EntryPreset] presets: dict[str, EntryPreset]
+13 -1
View File
@@ -1,6 +1,7 @@
import logging import logging
import sys import sys
from argparse import ArgumentParser from argparse import ArgumentParser
from importlib.metadata import version
from pathlib import Path from pathlib import Path
from typing import Self from typing import Self
@@ -15,10 +16,12 @@ class ProjectManagerRunner:
*, *,
path: Path, path: Path,
task_key: PartialTaskKey, task_key: PartialTaskKey,
ignore: bool = False,
verbose: int = 0, verbose: int = 0,
): ):
self._path = path self._path = path
self._task_key = task_key self._task_key = task_key
self._ignore = ignore
self._verbose = verbose self._verbose = verbose
@classmethod @classmethod
@@ -46,6 +49,8 @@ class ProjectManagerRunner:
self._setup_logging(self._verbose) self._setup_logging(self._verbose)
manager = ProjectManager(self._path) manager = ProjectManager(self._path)
result = manager.run_task(self._task_key) result = manager.run_task(self._task_key)
if not self._ignore and not result:
raise RuntimeError(f'Task not found "{self._task_key}"')
if result["failed"] > 0: if result["failed"] > 0:
sys.exit(1) sys.exit(1)
@@ -58,9 +63,16 @@ class ProjectManagerRunner:
default="show", default="show",
) )
parser.add_argument("-p", "--path", type=Path, default=Path.cwd()) parser.add_argument("-p", "--path", type=Path, default=Path.cwd())
parser.add_argument("-i", "--ignore", action="store_true")
parser.add_argument("-v", "--verbose", action="count", default=1) parser.add_argument("-v", "--verbose", action="count", default=1)
parser.add_argument("-q", "--quiet", action="store_true") parser.add_argument("-q", "--quiet", action="store_true")
parser.add_argument("--version", action="store_true")
args = parser.parse_args() args = parser.parse_args()
if args.version:
print(version("project-manager"))
sys.exit(0)
verbose = -1 if args.quiet else args.verbose verbose = -1 if args.quiet else args.verbose
task_key = PartialTaskKey.from_str(args.task) task_key = PartialTaskKey.from_str(args.task)
return cls(path=args.path, task_key=task_key, verbose=verbose) return cls(
path=args.path, task_key=task_key, ignore=args.ignore, verbose=verbose
)
+1 -1
View File
@@ -1,7 +1,7 @@
[project] [project]
name = "project-manager" name = "project-manager"
description = "" description = ""
version = "0.2.0" version = "0.6.1"
readme = "README.md" readme = "README.md"
authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }] authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }]
requires-python = ">=3.14,<4.0" requires-python = ">=3.14,<4.0"
+4 -1
View File
@@ -3,7 +3,10 @@
"version": "0.1.0", "version": "0.1.0",
"description": "", "description": "",
"scripts": { "scripts": {
"build": "echo build" "build": "echo build",
"test": "echo test",
"format": "echo format",
"lint": "echo lint"
}, },
"devDependencies": { "devDependencies": {
"jest": "^29.2.2" "jest": "^29.2.2"
-17
View File
@@ -1,17 +0,0 @@
[tool.poetry]
name = "example"
version = "0.1.0"
description = ""
authors = []
[tool.poetry.dependencies]
python = "^3.8"
[tool.poetry.group.dev.dependencies]
black = "^23.1.0"
pytest = "^7.2.2"
isort = "^5.12.0"
[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
+23 -2
View File
@@ -4,6 +4,7 @@ from pathlib import Path
import pytest import pytest
from project_manager.common.command import CommandExecutor
from project_manager.entry.detector import EntryDetector from project_manager.entry.detector import EntryDetector
from project_manager.entry.entry import Entry, PartialTaskKey from project_manager.entry.entry import Entry, PartialTaskKey
from project_manager.preset.detector import PresetEntryDetector from project_manager.preset.detector import PresetEntryDetector
@@ -29,6 +30,24 @@ def entry(entry_detector: EntryDetector, entry_path: Path, tmp_path: Path):
return entry_detector.detect_entry(destination, destination) return entry_detector.detect_entry(destination, destination)
class FakeCommandExecutor(CommandExecutor):
def run(self, basepath: Path) -> dict | None:
if self._command == "npm install":
(basepath / "node_modules").mkdir(exist_ok=True)
elif self._command == "poetry install --all-extras":
bin_dir = basepath / ".venv/bin"
bin_dir.mkdir(parents=True, exist_ok=True)
(bin_dir / "pytest").write_text("")
(bin_dir / "pylint").write_text("")
(bin_dir / "isort").write_text("")
(bin_dir / "black").write_text("")
@pytest.fixture(scope="module", autouse=True)
def entry_command_executor():
Entry.DEFAULT_EXECUTOR = FakeCommandExecutor
@pytest.mark.parametrize("entry_path", [Path(__file__).parent / "python"]) @pytest.mark.parametrize("entry_path", [Path(__file__).parent / "python"])
def test_python_entry(entry: Entry | None, entry_detector: EntryDetector): def test_python_entry(entry: Entry | None, entry_detector: EntryDetector):
assert entry is not None assert entry is not None
@@ -44,10 +63,12 @@ def test_python_entry(entry: Entry | None, entry_detector: EntryDetector):
@pytest.mark.parametrize("entry_path", [Path(__file__).parent / "nodejs"]) @pytest.mark.parametrize("entry_path", [Path(__file__).parent / "nodejs"])
def test_nodejs_entry(entry: Entry | None, entry_detector: EntryDetector): def test_nodejs_entry(entry: Entry | None, entry_detector: EntryDetector):
assert entry is not None assert entry is not None
assert {"setup", "build"} == {task.key.name for task in entry._tasks} assert {"setup", "build", "lint", "format", "test"} == {
task.key.name for task in entry._tasks
}
entry.run_task(PartialTaskKey.from_str("setup")) entry.run_task(PartialTaskKey.from_str("setup"))
entry = entry_detector.detect_entry(entry._basepath, entry._basepath) entry = entry_detector.detect_entry(entry._basepath, entry._basepath)
assert entry is not None assert entry is not None
assert {"setup", "build", "test", "clean"} == { assert {"setup", "build", "lint", "format", "test", "clean"} == {
task.key.name for task in entry._tasks task.key.name for task in entry._tasks
} }