makerrepo-cli 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- makerrepo_cli/cmds/artifacts/cli.py +11 -11
- makerrepo_cli/cmds/cli.py +57 -57
- makerrepo_cli/cmds/environment.py +33 -33
- makerrepo_cli/cmds/main.py +7 -7
- {makerrepo_cli-0.1.0.dist-info → makerrepo_cli-0.1.1.dist-info}/METADATA +1 -1
- {makerrepo_cli-0.1.0.dist-info → makerrepo_cli-0.1.1.dist-info}/RECORD +10 -10
- {makerrepo_cli-0.1.0.dist-info → makerrepo_cli-0.1.1.dist-info}/WHEEL +0 -0
- {makerrepo_cli-0.1.0.dist-info → makerrepo_cli-0.1.1.dist-info}/entry_points.txt +0 -0
- {makerrepo_cli-0.1.0.dist-info → makerrepo_cli-0.1.1.dist-info}/licenses/LICENSE +0 -0
- {makerrepo_cli-0.1.0.dist-info → makerrepo_cli-0.1.1.dist-info}/top_level.txt +0 -0
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
from ..aliase import AliasedGroup
|
|
2
|
-
from ..cli import cli as root_cli
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
@root_cli.group(
|
|
6
|
-
name="artifacts",
|
|
7
|
-
help="Operations for artifacts.",
|
|
8
|
-
cls=AliasedGroup,
|
|
9
|
-
)
|
|
10
|
-
def cli():
|
|
11
|
-
pass
|
|
1
|
+
from ..aliase import AliasedGroup
|
|
2
|
+
from ..cli import cli as root_cli
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
@root_cli.group(
|
|
6
|
+
name="artifacts",
|
|
7
|
+
help="Operations for artifacts.",
|
|
8
|
+
cls=AliasedGroup,
|
|
9
|
+
)
|
|
10
|
+
def cli():
|
|
11
|
+
pass
|
makerrepo_cli/cmds/cli.py
CHANGED
|
@@ -1,57 +1,57 @@
|
|
|
1
|
-
import logging
|
|
2
|
-
import os
|
|
3
|
-
|
|
4
|
-
import click
|
|
5
|
-
from rich.logging import RichHandler
|
|
6
|
-
|
|
7
|
-
from .environment import Environment
|
|
8
|
-
from .environment import LOG_LEVEL_MAP
|
|
9
|
-
from .environment import LogLevel
|
|
10
|
-
from .environment import pass_env
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
@click.group(help="Command line tools for MakerRepo")
|
|
14
|
-
@click.option(
|
|
15
|
-
"-l",
|
|
16
|
-
"--log-level",
|
|
17
|
-
type=click.Choice(
|
|
18
|
-
list(map(lambda key: key.value, LOG_LEVEL_MAP.keys())), case_sensitive=False
|
|
19
|
-
),
|
|
20
|
-
default=lambda: os.environ.get("LOG_LEVEL", "INFO"),
|
|
21
|
-
)
|
|
22
|
-
@click.option(
|
|
23
|
-
"--log-format",
|
|
24
|
-
type=str,
|
|
25
|
-
default="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
|
|
26
|
-
help="logging format (only used when rich log is disabled)",
|
|
27
|
-
)
|
|
28
|
-
@click.option(
|
|
29
|
-
"--disable-rich-log",
|
|
30
|
-
is_flag=True,
|
|
31
|
-
help="disable rich log handler",
|
|
32
|
-
)
|
|
33
|
-
@click.version_option(prog_name="mr", package_name="mr")
|
|
34
|
-
@pass_env
|
|
35
|
-
def cli(
|
|
36
|
-
env: Environment,
|
|
37
|
-
log_level: str,
|
|
38
|
-
log_format: str,
|
|
39
|
-
disable_rich_log: bool,
|
|
40
|
-
):
|
|
41
|
-
env.log_level = LogLevel(log_level)
|
|
42
|
-
|
|
43
|
-
if disable_rich_log:
|
|
44
|
-
logging.basicConfig(
|
|
45
|
-
level=LOG_LEVEL_MAP[env.log_level],
|
|
46
|
-
format=log_format,
|
|
47
|
-
force=True,
|
|
48
|
-
)
|
|
49
|
-
else:
|
|
50
|
-
FORMAT = "%(message)s"
|
|
51
|
-
logging.basicConfig(
|
|
52
|
-
level=LOG_LEVEL_MAP[env.log_level],
|
|
53
|
-
format=FORMAT,
|
|
54
|
-
datefmt="[%X]",
|
|
55
|
-
handlers=[RichHandler()],
|
|
56
|
-
force=True,
|
|
57
|
-
)
|
|
1
|
+
import logging
|
|
2
|
+
import os
|
|
3
|
+
|
|
4
|
+
import click
|
|
5
|
+
from rich.logging import RichHandler
|
|
6
|
+
|
|
7
|
+
from .environment import Environment
|
|
8
|
+
from .environment import LOG_LEVEL_MAP
|
|
9
|
+
from .environment import LogLevel
|
|
10
|
+
from .environment import pass_env
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
@click.group(help="Command line tools for MakerRepo")
|
|
14
|
+
@click.option(
|
|
15
|
+
"-l",
|
|
16
|
+
"--log-level",
|
|
17
|
+
type=click.Choice(
|
|
18
|
+
list(map(lambda key: key.value, LOG_LEVEL_MAP.keys())), case_sensitive=False
|
|
19
|
+
),
|
|
20
|
+
default=lambda: os.environ.get("LOG_LEVEL", "INFO"),
|
|
21
|
+
)
|
|
22
|
+
@click.option(
|
|
23
|
+
"--log-format",
|
|
24
|
+
type=str,
|
|
25
|
+
default="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
|
|
26
|
+
help="logging format (only used when rich log is disabled)",
|
|
27
|
+
)
|
|
28
|
+
@click.option(
|
|
29
|
+
"--disable-rich-log",
|
|
30
|
+
is_flag=True,
|
|
31
|
+
help="disable rich log handler",
|
|
32
|
+
)
|
|
33
|
+
@click.version_option(prog_name="mr", package_name="mr")
|
|
34
|
+
@pass_env
|
|
35
|
+
def cli(
|
|
36
|
+
env: Environment,
|
|
37
|
+
log_level: str,
|
|
38
|
+
log_format: str,
|
|
39
|
+
disable_rich_log: bool,
|
|
40
|
+
):
|
|
41
|
+
env.log_level = LogLevel(log_level)
|
|
42
|
+
|
|
43
|
+
if disable_rich_log:
|
|
44
|
+
logging.basicConfig(
|
|
45
|
+
level=LOG_LEVEL_MAP[env.log_level],
|
|
46
|
+
format=log_format,
|
|
47
|
+
force=True,
|
|
48
|
+
)
|
|
49
|
+
else:
|
|
50
|
+
FORMAT = "%(message)s"
|
|
51
|
+
logging.basicConfig(
|
|
52
|
+
level=LOG_LEVEL_MAP[env.log_level],
|
|
53
|
+
format=FORMAT,
|
|
54
|
+
datefmt="[%X]",
|
|
55
|
+
handlers=[RichHandler()],
|
|
56
|
+
force=True,
|
|
57
|
+
)
|
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
import dataclasses
|
|
2
|
-
import enum
|
|
3
|
-
import logging
|
|
4
|
-
|
|
5
|
-
import click
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
@enum.unique
|
|
9
|
-
class LogLevel(enum.Enum):
|
|
10
|
-
VERBOSE = "verbose"
|
|
11
|
-
DEBUG = "debug"
|
|
12
|
-
INFO = "info"
|
|
13
|
-
WARNING = "warning"
|
|
14
|
-
ERROR = "error"
|
|
15
|
-
FATAL = "fatal"
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
LOG_LEVEL_MAP = {
|
|
19
|
-
LogLevel.DEBUG: logging.DEBUG,
|
|
20
|
-
LogLevel.INFO: logging.INFO,
|
|
21
|
-
LogLevel.WARNING: logging.WARNING,
|
|
22
|
-
LogLevel.ERROR: logging.ERROR,
|
|
23
|
-
LogLevel.FATAL: logging.FATAL,
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
@dataclasses.dataclass
|
|
28
|
-
class Environment:
|
|
29
|
-
log_level: LogLevel = LogLevel.INFO
|
|
30
|
-
logger: logging.Logger = logging.getLogger("mr")
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
pass_env = click.make_pass_decorator(Environment, ensure=True)
|
|
1
|
+
import dataclasses
|
|
2
|
+
import enum
|
|
3
|
+
import logging
|
|
4
|
+
|
|
5
|
+
import click
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
@enum.unique
|
|
9
|
+
class LogLevel(enum.Enum):
|
|
10
|
+
VERBOSE = "verbose"
|
|
11
|
+
DEBUG = "debug"
|
|
12
|
+
INFO = "info"
|
|
13
|
+
WARNING = "warning"
|
|
14
|
+
ERROR = "error"
|
|
15
|
+
FATAL = "fatal"
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
LOG_LEVEL_MAP = {
|
|
19
|
+
LogLevel.DEBUG: logging.DEBUG,
|
|
20
|
+
LogLevel.INFO: logging.INFO,
|
|
21
|
+
LogLevel.WARNING: logging.WARNING,
|
|
22
|
+
LogLevel.ERROR: logging.ERROR,
|
|
23
|
+
LogLevel.FATAL: logging.FATAL,
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
@dataclasses.dataclass
|
|
28
|
+
class Environment:
|
|
29
|
+
log_level: LogLevel = LogLevel.INFO
|
|
30
|
+
logger: logging.Logger = logging.getLogger("mr")
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
pass_env = click.make_pass_decorator(Environment, ensure=True)
|
makerrepo_cli/cmds/main.py
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
from .artifacts import main # no qa
|
|
2
|
-
from .cli import cli
|
|
3
|
-
|
|
4
|
-
__ALL__ = [cli]
|
|
5
|
-
|
|
6
|
-
if __name__ == "__main__":
|
|
7
|
-
cli()
|
|
1
|
+
from .artifacts import main # no qa
|
|
2
|
+
from .cli import cli
|
|
3
|
+
|
|
4
|
+
__ALL__ = [cli]
|
|
5
|
+
|
|
6
|
+
if __name__ == "__main__":
|
|
7
|
+
cli()
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
makerrepo_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
2
|
makerrepo_cli/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
3
3
|
makerrepo_cli/cmds/aliase.py,sha256=OQ-E171TpBfRoX9D93DqBqXJkAWdtikprJsjK_UyXyA,863
|
|
4
|
-
makerrepo_cli/cmds/cli.py,sha256=
|
|
5
|
-
makerrepo_cli/cmds/environment.py,sha256=
|
|
6
|
-
makerrepo_cli/cmds/main.py,sha256=
|
|
4
|
+
makerrepo_cli/cmds/cli.py,sha256=Mr1zGsiX_wxJk9lmcUq7huA3uwsqW1CJPaUzQR3-DAQ,1400
|
|
5
|
+
makerrepo_cli/cmds/environment.py,sha256=ML8oJ1CUxKzg3YZlWf7AeIWfMTBHHoZ4lhLG1Eovjpo,629
|
|
6
|
+
makerrepo_cli/cmds/main.py,sha256=UanmIhumXs1JbrKj5Heu1eRHpZQmvY5K6R4TUSShUns,113
|
|
7
7
|
makerrepo_cli/cmds/artifacts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
8
8
|
makerrepo_cli/cmds/artifacts/capture_image.py,sha256=Ioww0R6hmXGxpFFuZbXT-wLEdXtlBnDKXOVDWlM28kU,7172
|
|
9
|
-
makerrepo_cli/cmds/artifacts/cli.py,sha256=
|
|
9
|
+
makerrepo_cli/cmds/artifacts/cli.py,sha256=zBohKuBgn3j6NkEkVAV8ahwHuqX7HnSEplEn_FpsoTo,191
|
|
10
10
|
makerrepo_cli/cmds/artifacts/main.py,sha256=rYO8M3ouhVC7n8RRYaC7CrZHQVsOGDUwMjzQK3AUQMo,5050
|
|
11
11
|
makerrepo_cli/cmds/artifacts/ocp_data_types.py,sha256=-YeAio5godIYcJPzoDIdu67MbqiJDMBkq8QcJJXQvMA,1175
|
|
12
12
|
makerrepo_cli/cmds/artifacts/utils.py,sha256=ZSLfm-S2uYk7Y7mq2fhK2Ki4OC2C6O0bNCZ5nDFLLEo,943
|
|
13
|
-
makerrepo_cli-0.1.
|
|
14
|
-
makerrepo_cli-0.1.
|
|
15
|
-
makerrepo_cli-0.1.
|
|
16
|
-
makerrepo_cli-0.1.
|
|
17
|
-
makerrepo_cli-0.1.
|
|
18
|
-
makerrepo_cli-0.1.
|
|
13
|
+
makerrepo_cli-0.1.1.dist-info/licenses/LICENSE,sha256=e1FWoucPP7MUG3AOBwb3R6PhN4N3KomjFLvu7CWar5Q,1072
|
|
14
|
+
makerrepo_cli-0.1.1.dist-info/METADATA,sha256=8ykA65mrNh-t3KLcyX1eHx9mi_Hg_lcmx0accy-YB28,405
|
|
15
|
+
makerrepo_cli-0.1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
|
|
16
|
+
makerrepo_cli-0.1.1.dist-info/entry_points.txt,sha256=Wcv5tkqI8NIiXZXJAZxTlVwy__9nT0ZfIktwNpPYjWE,95
|
|
17
|
+
makerrepo_cli-0.1.1.dist-info/top_level.txt,sha256=0sONY8MHgWTad63qvsjR1KXe7OOCwF66pDWm6iITrNM,14
|
|
18
|
+
makerrepo_cli-0.1.1.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|