mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-25 09:35:54 +02:00
jw.build.cmds: Move build.cmds -> cmds.projects
Reorganize the Python module structure. Placing the command classes under jw.cmds.projects instead of jw.build.cmds will allow to add a nested command structure, with the current commands, being mostly related to building software, found below a "projects" toplevel command. Other conceivable commands could be "package" for packaging, or "distro" for commands wrapping the distribution's package manager. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
c8c5788aeb
commit
0b83c863a2
43 changed files with 49 additions and 13 deletions
|
|
@ -8,8 +8,6 @@ import os, sys, argparse, pwd, re
|
|||
from .lib.App import App as Base
|
||||
from .lib.log import *
|
||||
|
||||
from .cmds.build import *
|
||||
|
||||
# meaning of pkg.requires.xxx variables
|
||||
# build: needs to be built and installed before this can be built
|
||||
# devel: needs to be installed before this-devel can be installed, i.e. before _other_ packages can be built against this
|
||||
|
|
@ -52,7 +50,7 @@ class ResultCache(object):
|
|||
class App(Base):
|
||||
|
||||
def __init__(self):
|
||||
super().__init__("jw-pkg swiss army knife", modules=["jw.pkg.cmds.build"])
|
||||
super().__init__("jw-pkg swiss army knife", modules=["jw.pkg.cmds"])
|
||||
|
||||
self.global_args = []
|
||||
self.opt_os = None
|
||||
|
|
|
|||
|
|
@ -1,17 +1,24 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import annotations
|
||||
from typing import Type, Union, TypeVar
|
||||
import inspect, abc, argparse
|
||||
|
||||
from argparse import ArgumentParser
|
||||
|
||||
from ..lib.Cmd import Cmd as Base
|
||||
from ..lib.Types import LoadTypes
|
||||
|
||||
class Cmd(Base): # export
|
||||
|
||||
def __init__(self, name: str, help: str) -> None:
|
||||
super().__init__(name, help)
|
||||
from ..App import App
|
||||
|
||||
def _add_subcommands(self) -> None:
|
||||
self.add_subcommands(
|
||||
LoadTypes(
|
||||
[__name__.rsplit('.', 1)[0] + '.' + self.name],
|
||||
type_name_filter=r'Cmd[^.]'
|
||||
)
|
||||
)
|
||||
|
||||
async def run(self, args):
|
||||
return self._run(args)
|
||||
19
src/python/jw/pkg/cmds/CmdProjects.py
Normal file
19
src/python/jw/pkg/cmds/CmdProjects.py
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
import sys, inspect, re
|
||||
from argparse import ArgumentParser
|
||||
|
||||
from .Cmd import Cmd as CmdBase
|
||||
|
||||
class CmdProjects(CmdBase): # export
|
||||
|
||||
def __init__(self) -> None:
|
||||
super().__init__('projects', help='Project metadata evaluation for building packages')
|
||||
self._add_subcommands()
|
||||
|
||||
def add_arguments(self, p: ArgumentParser) -> None:
|
||||
super().add_arguments(p)
|
||||
|
||||
def _run(self, args):
|
||||
breakpoint()
|
||||
raise Exception("Running with args", args)
|
||||
1
src/python/jw/pkg/cmds/__init__.py
Normal file
1
src/python/jw/pkg/cmds/__init__.py
Normal file
|
|
@ -0,0 +1 @@
|
|||
from .CmdProjects import CmdProjects
|
||||
11
src/python/jw/pkg/cmds/projects/__init__.py
Normal file
11
src/python/jw/pkg/cmds/projects/__init__.py
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
import importlib, pkgutil
|
||||
|
||||
__all__ = []
|
||||
|
||||
for finder, module_name, ispkg in pkgutil.iter_modules(__path__):
|
||||
if not module_name.startswith("Cmd"):
|
||||
continue
|
||||
module = importlib.import_module(f".{module_name}", __name__)
|
||||
cls = getattr(module, module_name)
|
||||
globals()[module_name] = cls
|
||||
__all__.append(module_name)
|
||||
Loading…
Add table
Add a link
Reference in a new issue