1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

add cmd_runner_fmt.stack decorator (#8415)

* add cmd_runner_fmt.stack decorator

* fix sanity

* fix typo

* add changelog frag
This commit is contained in:
Alexei Znamensky 2024-06-02 08:44:50 +12:00 committed by GitHub
parent e690317e3a
commit 7d72300c36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 30 additions and 2 deletions

View file

@ -0,0 +1,2 @@
minor_changes:
- cmd_runner module utils - add decorator ``cmd_runner_fmt.stack`` (https://github.com/ansible-collections/community.general/pull/8415).

View file

@ -94,13 +94,23 @@ class _ArgFormat(object):
self.ignore_none = ignore_none self.ignore_none = ignore_none
self.ignore_missing_value = ignore_missing_value self.ignore_missing_value = ignore_missing_value
def __call__(self, value, ctx_ignore_none): def __call__(self, value, ctx_ignore_none=True):
ignore_none = self.ignore_none if self.ignore_none is not None else ctx_ignore_none ignore_none = self.ignore_none if self.ignore_none is not None else ctx_ignore_none
if value is None and ignore_none: if value is None and ignore_none:
return [] return []
f = self.func f = self.func
return [str(x) for x in f(value)] return [str(x) for x in f(value)]
def __str__(self):
return "<ArgFormat: func={0}, ignore_none={1}, ignore_missing_value={2}>".format(
self.func,
self.ignore_none,
self.ignore_missing_value,
)
def __repr__(self):
return str(self)
class _Format(object): class _Format(object):
@staticmethod @staticmethod
@ -184,6 +194,19 @@ class _Format(object):
return func(**v) return func(**v)
return wrapper return wrapper
@staticmethod
def stack(fmt):
@wraps(fmt)
def wrapper(*args, **kwargs):
new_func = fmt(ignore_none=True, *args, **kwargs)
def stacking(value):
stack = [new_func(v) for v in value if v]
stack = [x for args in stack for x in args]
return stack
return _ArgFormat(stacking, ignore_none=True)
return wrapper
class CmdRunner(object): class CmdRunner(object):
""" """

View file

@ -47,6 +47,9 @@ TC_FORMATS = dict(
simple_fixed_false=(partial(cmd_runner_fmt.as_fixed, ["--always-here", "--forever"]), False, ["--always-here", "--forever"], None), simple_fixed_false=(partial(cmd_runner_fmt.as_fixed, ["--always-here", "--forever"]), False, ["--always-here", "--forever"], None),
simple_fixed_none=(partial(cmd_runner_fmt.as_fixed, ["--always-here", "--forever"]), None, ["--always-here", "--forever"], None), simple_fixed_none=(partial(cmd_runner_fmt.as_fixed, ["--always-here", "--forever"]), None, ["--always-here", "--forever"], None),
simple_fixed_str=(partial(cmd_runner_fmt.as_fixed, ["--always-here", "--forever"]), "something", ["--always-here", "--forever"], None), simple_fixed_str=(partial(cmd_runner_fmt.as_fixed, ["--always-here", "--forever"]), "something", ["--always-here", "--forever"], None),
stack_optval__str=(partial(cmd_runner_fmt.stack(cmd_runner_fmt.as_optval), "-t"), ["potatoes", "bananas"], ["-tpotatoes", "-tbananas"], None),
stack_opt_val__str=(partial(cmd_runner_fmt.stack(cmd_runner_fmt.as_opt_val), "-t"), ["potatoes", "bananas"], ["-t", "potatoes", "-t", "bananas"], None),
stack_opt_eq_val__int=(partial(cmd_runner_fmt.stack(cmd_runner_fmt.as_opt_eq_val), "--answer"), [42, 17], ["--answer=42", "--answer=17"], None),
) )
if tuple(version_info) >= (3, 1): if tuple(version_info) >= (3, 1):
from collections import OrderedDict from collections import OrderedDict
@ -67,7 +70,7 @@ TC_FORMATS_IDS = sorted(TC_FORMATS.keys())
def test_arg_format(func, value, expected, exception): def test_arg_format(func, value, expected, exception):
fmt_func = func() fmt_func = func()
try: try:
actual = fmt_func(value, ctx_ignore_none=True) actual = fmt_func(value)
print("formatted string = {0}".format(actual)) print("formatted string = {0}".format(actual))
assert actual == expected, "actual = {0}".format(actual) assert actual == expected, "actual = {0}".format(actual)
except Exception as e: except Exception as e: