Compare commits
25
Commits
0.2.0
...
c70d561c53
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c70d561c53 | ||
|
|
cc2d62c22b | ||
|
|
e54d8dd23f | ||
|
|
dc566087fb | ||
|
|
6c15ab4d0f | ||
|
|
58e3c2446a | ||
|
|
1a3217115f | ||
|
|
7daec2caa3 | ||
|
|
4f426637c8 | ||
|
|
c061296022 | ||
|
|
c4e2352cb5 | ||
|
|
cef665be88 | ||
|
|
e4328deaac | ||
|
|
3aef3b22bf | ||
|
|
79bc6ad519 | ||
|
|
db30814b54 | ||
|
|
a42e1cd1a7 | ||
|
|
549979ced6 | ||
|
|
b459eef34b | ||
|
|
244f995490 | ||
|
|
75adb282e7 | ||
|
|
eacfa17e40 | ||
|
|
f4448835ab | ||
|
|
732cec8771 | ||
|
|
5cf71fcae1 |
@@ -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
|
||||
@@ -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
|
||||
@@ -1,9 +1,27 @@
|
||||
# Project Manager
|
||||
|
||||
[](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
|
||||
|
||||
With pipx
|
||||
|
||||
```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
|
||||
@@ -14,17 +32,16 @@ pipx install project-manager -i https://git.shmyga.ru/InfernalGames/project-mana
|
||||
pm [-v] [-vv]
|
||||
```
|
||||
|
||||

|
||||
|
||||
### Run task
|
||||
|
||||
```bash
|
||||
pm <task>[:<tag>] [-v] [-vv]
|
||||
pm <task>[:<tag>][:<sub_tag>] [-v] [-vv]
|
||||
```
|
||||
|
||||
## Presets locations
|
||||
|
||||
- default presets [`project_manager/preset/default/*.toml`](./project_manager/preset/default)
|
||||
- user preset `$HOME/.pm.toml`
|
||||
- project preset `./.pm.toml`
|
||||

|
||||

|
||||
|
||||
## Preset format
|
||||
|
||||
@@ -39,3 +56,9 @@ commands = ["<command>"]
|
||||
### Examples
|
||||
|
||||
[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`
|
||||
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
name: "Project Manager"
|
||||
inputs:
|
||||
python-version:
|
||||
default: "3.14"
|
||||
setup-python:
|
||||
default: false
|
||||
venv-version:
|
||||
default: "1"
|
||||
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 -vv
|
||||
|
||||
- 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
|
||||
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 |
@@ -1,3 +1,4 @@
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
@@ -43,13 +44,14 @@ class CommandExecutor:
|
||||
def __init__(self, command: str):
|
||||
self._command = command
|
||||
|
||||
def run(self, basepath: Path):
|
||||
def run(self, basepath: Path) -> dict | None:
|
||||
self._logger.debug(self._command)
|
||||
out_logger = CommandLogger(logging.TRACE)
|
||||
err_logger = CommandLogger(logging.TRACE)
|
||||
try:
|
||||
result = subprocess.run(
|
||||
self._command,
|
||||
executable="bash",
|
||||
cwd=basepath,
|
||||
stdout=out_logger, # type: ignore
|
||||
stderr=err_logger, # type: ignore
|
||||
@@ -58,5 +60,13 @@ class CommandExecutor:
|
||||
finally:
|
||||
out_logger.close()
|
||||
err_logger.close()
|
||||
out_logger.join()
|
||||
err_logger.join()
|
||||
if result.returncode != 0:
|
||||
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
|
||||
|
||||
@@ -60,6 +60,8 @@ addLoggingLevel("TRACE", logging.DEBUG - 5)
|
||||
|
||||
|
||||
class ColoredFormatter(logging.Formatter):
|
||||
sensetive = set() # TODO: chain formatters?
|
||||
|
||||
def __init__(self, fmt):
|
||||
super().__init__()
|
||||
self.fmt = fmt
|
||||
@@ -72,7 +74,12 @@ class ColoredFormatter(logging.Formatter):
|
||||
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):
|
||||
log_fmt = self.FORMATS.get(record.levelno)
|
||||
formatter = logging.Formatter(log_fmt)
|
||||
return formatter.format(record)
|
||||
return self._mask_sensetive_data(formatter.format(record))
|
||||
|
||||
@@ -1,27 +1,34 @@
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import tomllib
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
import dotenv
|
||||
from jinja2 import Environment
|
||||
|
||||
from ..preset.model import Variables
|
||||
from .util import get_environ
|
||||
|
||||
|
||||
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:
|
||||
return os.environ.get(key=key.upper(), default=default)
|
||||
def do_not(value: Any | None) -> bool:
|
||||
return not do_bool(str(value))
|
||||
|
||||
|
||||
def _build_env(basepath: Path) -> Environment:
|
||||
env = Environment()
|
||||
|
||||
def do_file(filename: str) -> Path | None:
|
||||
if not filename:
|
||||
return None
|
||||
result = Path(filename)
|
||||
if not result.is_absolute():
|
||||
result = basepath / result
|
||||
@@ -64,6 +71,11 @@ def _build_env(basepath: Path) -> Environment:
|
||||
keys = list(data.keys())
|
||||
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["read"] = do_read
|
||||
env.filters["get"] = do_get
|
||||
@@ -71,6 +83,7 @@ def _build_env(basepath: Path) -> Environment:
|
||||
env.filters["key"] = do_key
|
||||
env.filters["bool"] = do_bool
|
||||
env.filters["env"] = do_env
|
||||
env.filters["not"] = do_not
|
||||
return env
|
||||
|
||||
|
||||
@@ -81,7 +94,17 @@ class PathTemplate:
|
||||
|
||||
def update_variables(self, templates: Variables, variables: Variables):
|
||||
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:
|
||||
return self._env.from_string(template).render(**variables)
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
import dotenv
|
||||
|
||||
|
||||
def merge_dicts(target: dict, enhancer: dict) -> dict:
|
||||
for key, val in enhancer.items():
|
||||
if key not in target:
|
||||
@@ -9,3 +15,10 @@ def merge_dicts(target: dict, enhancer: dict) -> dict:
|
||||
else:
|
||||
target[key] = val
|
||||
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
|
||||
|
||||
@@ -5,7 +5,7 @@ from .entry import Entry
|
||||
|
||||
class EmptyEntry(Entry):
|
||||
def __init__(self):
|
||||
super().__init__([], Path(), Path())
|
||||
super().__init__([], {}, Path(), Path())
|
||||
|
||||
def __bool__(self):
|
||||
return False
|
||||
|
||||
@@ -3,6 +3,7 @@ from pathlib import Path
|
||||
from typing import NamedTuple, Self
|
||||
|
||||
from ..common.command import CommandExecutor
|
||||
from ..preset.model import Variables
|
||||
|
||||
logger = logging.getLogger("entry")
|
||||
|
||||
@@ -52,17 +53,28 @@ class Task(NamedTuple):
|
||||
|
||||
|
||||
class Entry:
|
||||
DEFAULT_EXECUTOR: type[CommandExecutor] = CommandExecutor
|
||||
_logger = logger
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
tasks: list[Task],
|
||||
variables: Variables,
|
||||
basepath: Path,
|
||||
rootpath: Path,
|
||||
executor: type[CommandExecutor] | None = None,
|
||||
):
|
||||
self._tasks = tasks
|
||||
self._variables = variables
|
||||
self._basepath = basepath
|
||||
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):
|
||||
self._logger.info("🔵 %s", self)
|
||||
@@ -85,20 +97,20 @@ class Entry:
|
||||
for command in task.commands:
|
||||
self._logger.debug(" %s", command)
|
||||
|
||||
def run_task(self, key: PartialTaskKey) -> bool:
|
||||
def run_task(self, key: PartialTaskKey) -> int:
|
||||
if key.name == "show":
|
||||
self.show()
|
||||
return True
|
||||
runned = False
|
||||
c = 0
|
||||
for task in self._tasks:
|
||||
if key == task.key:
|
||||
self._logger.info("🔵 %s %s", task.key, self)
|
||||
runned = True
|
||||
for command in task.commands:
|
||||
CommandExecutor(command).run(
|
||||
self._executor(command).run(
|
||||
(task.cwd and Path(task.cwd)) or self._basepath
|
||||
)
|
||||
return runned
|
||||
c += 1
|
||||
return c
|
||||
|
||||
def __repr__(self):
|
||||
path = self._basepath.relative_to(self._roopath.parent)
|
||||
|
||||
@@ -9,7 +9,7 @@ from .entry import Entry
|
||||
|
||||
|
||||
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._ignore = ignore
|
||||
self._max_depth = max_depth
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import logging
|
||||
from collections import Counter
|
||||
from enum import StrEnum
|
||||
from enum import StrEnum, auto
|
||||
from pathlib import Path
|
||||
from typing import Iterable
|
||||
|
||||
from .common.command import CommandError
|
||||
from .common.ignore import create_ignore
|
||||
from .common.logging_colored import ColoredFormatter
|
||||
from .entry.entry import Entry, PartialTaskKey
|
||||
from .entry.resolver import EntryResolver
|
||||
from .preset.detector import PresetEntryDetector
|
||||
@@ -14,8 +15,8 @@ logger = logging.getLogger("project")
|
||||
|
||||
|
||||
class ResultType(StrEnum):
|
||||
SUCCESS = "success"
|
||||
FAILED = "failed"
|
||||
SUCCESS = auto()
|
||||
FAILED = auto()
|
||||
|
||||
|
||||
RESULT_ICONS = {
|
||||
@@ -38,17 +39,23 @@ class ProjectManager:
|
||||
|
||||
def run_task(self, key: PartialTaskKey) -> dict[str, int]:
|
||||
counter = Counter()
|
||||
sensetive = set()
|
||||
ColoredFormatter.sensetive = sensetive
|
||||
for entry in self._iter_entries():
|
||||
sensetive.update(set(entry.sensentive_data))
|
||||
try:
|
||||
if entry.run_task(key):
|
||||
counter[ResultType.SUCCESS] += 1
|
||||
if count := entry.run_task(key):
|
||||
counter[ResultType.SUCCESS] += count
|
||||
except CommandError as error:
|
||||
self._logger.error("%s\n%s", entry, error.output)
|
||||
counter[ResultType.FAILED] += 1
|
||||
except:
|
||||
self._logger.exception(entry)
|
||||
counter[ResultType.FAILED] += 1
|
||||
if not counter:
|
||||
raise RuntimeError(f'Task not found "{key}"')
|
||||
self._logger.info(
|
||||
"%s", "\n".join(f"{RESULT_ICONS[k]} {v}" for k, v in counter.items())
|
||||
)
|
||||
ColoredFormatter.sensetive = set()
|
||||
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"]
|
||||
@@ -1,15 +1,21 @@
|
||||
[presets.docker]
|
||||
conditions = ["{{ 'Dockerfile' | file }}"]
|
||||
variables.docker_name = "{{ 'pyproject.toml' | read | get('project.name') or 'package.json' | read | get('name') }}"
|
||||
variables.docker_version = "{{ 'pyproject.toml' | read | get('project.version') or 'package.json' | read | get('version') }}"
|
||||
variables.docker_repo = "{{ '.env' | read | get('DOCKER_REPO') }}"
|
||||
variables.docker_group = "{{ '.env' | read | get('DOCKER_GROUP') }}"
|
||||
variables.docker_name = "{{ project_name }}"
|
||||
variables.docker_version = "{{ project_version }}"
|
||||
variables.docker_repo = "{{ 'DOCKER_REPO' | env }}"
|
||||
variables.docker_group = "{{ 'DOCKER_GROUP' | env }}"
|
||||
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
|
||||
[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
|
||||
[presets.docker.tasks.publish.version]
|
||||
@@ -34,3 +40,13 @@ commands = [
|
||||
"mkdir -p {{ docker_output }}",
|
||||
"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"]
|
||||
|
||||
@@ -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.'*']
|
||||
priority = 1000
|
||||
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.home = "{{ 'home' | env }}"
|
||||
tasks = {}
|
||||
|
||||
@@ -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 '.' }}",
|
||||
]
|
||||
@@ -1,30 +1,22 @@
|
||||
[presets.nodejs]
|
||||
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
|
||||
[presets.nodejs.tasks.setup.npm]
|
||||
conditions = ["{{ 'package-lock.json' | file }}"]
|
||||
commands = ["npm install-clean"]
|
||||
commands = ["{{ nvm }}npm install-clean"]
|
||||
|
||||
# install legacy
|
||||
[presets.nodejs.tasks.setup.npm-legacy]
|
||||
conditions = ["{{ not ('package-lock.json' | file) }}"]
|
||||
commands = ["npm install"]
|
||||
commands = ["{{ nvm }}npm install"]
|
||||
|
||||
# test
|
||||
[presets.nodejs.tasks.test.jest]
|
||||
conditions = ["{{ 'node_modules/jest' | file }}"]
|
||||
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"]
|
||||
# scripts
|
||||
[presets.nodejs.tasks."{{ npm_scripts | tojson }}".npm]
|
||||
commands = ["{{ nvm }}npm run {{ task }}"]
|
||||
|
||||
# clean
|
||||
[presets.nodejs.tasks.clean.node_modules]
|
||||
@@ -34,4 +26,6 @@ commands = ["rm -rf node_modules"]
|
||||
# version
|
||||
[presets.nodejs.tasks.version.npm]
|
||||
conditions = ["{{ version }}"]
|
||||
commands = ["npm version {{ version }} --allow-same-version"]
|
||||
commands = [
|
||||
"{{ nvm }}npm version {{ version }} --allow-same-version --commit-hooks false --git-tag-version false",
|
||||
]
|
||||
|
||||
@@ -5,8 +5,13 @@ variables.python_poetry = "{{ 'pyproject.toml' | read | get('build-system.build-
|
||||
# setup
|
||||
[presets.python.tasks.setup.poetry]
|
||||
conditions = ["{{ python_poetry }}"]
|
||||
variables.python_version = "{{ 'pyproject.toml' | read | get('project.requires-python') | search('(\\d+.\\d+)') }}"
|
||||
commands = ["poetry env use {{ python_version }}", "poetry install"]
|
||||
variables.python_version = "{{ 'pyproject.toml' | read | get('project.requires-python') | search('(\\\\d+.\\\\d+)') }}"
|
||||
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
|
||||
[presets.python.tasks.build.poetry]
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import json
|
||||
import operator
|
||||
from os import environ
|
||||
from pathlib import Path
|
||||
@@ -14,45 +15,84 @@ class PresetEntryDetector(EntryDetector):
|
||||
def __init__(self, preset_loader_config: PresetLoaderConfig | None = None):
|
||||
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:
|
||||
template = PathTemplate(basepath)
|
||||
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:
|
||||
return ENTRY_SKIP
|
||||
tasks = []
|
||||
global_variables = {f"env_{k.lower()}": v for k, v in environ.items()}
|
||||
entry_variables = {}
|
||||
presets = sorted(
|
||||
preset.presets.items(), key=lambda item: item[1].priority, reverse=True
|
||||
)
|
||||
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 tag == "*":
|
||||
template.update_variables(preset.variables, global_variables)
|
||||
template.update_variables(preset.variables, preset_variables)
|
||||
entry_variables.update(preset_variables)
|
||||
if preset.conditions and not template.check_conditions(
|
||||
preset.conditions, preset_variables
|
||||
):
|
||||
continue
|
||||
for task_name, task_pack in preset.tasks.items():
|
||||
for sub_tag, task_preset in task_pack.items():
|
||||
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(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,
|
||||
task_names = self._expand_section(task_name, template, preset_variables)
|
||||
for i_task_name, i_task_value in task_names.items():
|
||||
if i_task_value:
|
||||
preset_variables["task"] = i_task_name
|
||||
preset_variables["item"] = i_task_value
|
||||
for sub_tag, task_preset in task_pack.items():
|
||||
sub_tags = self._expand_section(
|
||||
sub_tag, template, preset_variables
|
||||
)
|
||||
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:
|
||||
tasks = sorted(tasks, key=operator.attrgetter("priority"), reverse=True)
|
||||
return Entry(tasks, basepath, rootpath)
|
||||
return Entry(tasks, entry_variables, basepath, rootpath)
|
||||
return ENTRY_NONE
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
from typing import Any
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
Variables = dict[str, str]
|
||||
Variables = dict[str, Any]
|
||||
|
||||
|
||||
class TaskPreset(BaseModel):
|
||||
@@ -20,4 +22,5 @@ class EntryPreset(BaseModel):
|
||||
|
||||
class Preset(BaseModel):
|
||||
skip: bool | None = None
|
||||
modules: list[str] | None = None
|
||||
presets: dict[str, EntryPreset]
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import logging
|
||||
import sys
|
||||
from argparse import ArgumentParser
|
||||
from importlib.metadata import version
|
||||
from pathlib import Path
|
||||
from typing import Self
|
||||
|
||||
@@ -60,7 +61,11 @@ class ProjectManagerRunner:
|
||||
parser.add_argument("-p", "--path", type=Path, default=Path.cwd())
|
||||
parser.add_argument("-v", "--verbose", action="count", default=1)
|
||||
parser.add_argument("-q", "--quiet", action="store_true")
|
||||
parser.add_argument("--version", action="store_true")
|
||||
args = parser.parse_args()
|
||||
if args.version:
|
||||
print(version("project-manager"))
|
||||
sys.exit(0)
|
||||
verbose = -1 if args.quiet else args.verbose
|
||||
task_key = PartialTaskKey.from_str(args.task)
|
||||
return cls(path=args.path, task_key=task_key, verbose=verbose)
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
[project]
|
||||
name = "project-manager"
|
||||
description = ""
|
||||
version = "0.2.0"
|
||||
version = "0.6.0"
|
||||
readme = "README.md"
|
||||
authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }]
|
||||
requires-python = ">=3.14,<4.0"
|
||||
|
||||
@@ -3,7 +3,10 @@
|
||||
"version": "0.1.0",
|
||||
"description": "",
|
||||
"scripts": {
|
||||
"build": "echo build"
|
||||
"build": "echo build",
|
||||
"test": "echo test",
|
||||
"format": "echo format",
|
||||
"lint": "echo lint"
|
||||
},
|
||||
"devDependencies": {
|
||||
"jest": "^29.2.2"
|
||||
|
||||
@@ -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
@@ -4,6 +4,7 @@ from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from project_manager.common.command import CommandExecutor
|
||||
from project_manager.entry.detector import EntryDetector
|
||||
from project_manager.entry.entry import Entry, PartialTaskKey
|
||||
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)
|
||||
|
||||
|
||||
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"])
|
||||
def test_python_entry(entry: Entry | None, entry_detector: EntryDetector):
|
||||
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"])
|
||||
def test_nodejs_entry(entry: Entry | None, entry_detector: EntryDetector):
|
||||
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 = entry_detector.detect_entry(entry._basepath, entry._basepath)
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user