Cli commands rework/click

.gitignore

@@ -1,5 +1,10 @@
 
 
+
+# this file will be generated by `setuptools_scm`
+/nichtparasoup/VERSION
+
+
 # Distribution / packaging
 /nichtparasoup-*/
 

nichtparasoup/_internals/__init__.py

@@ -65,21 +65,5 @@ def _message_exception(exception: BaseException, file: Optional[TextIO] = None)
     _message('{}: {}'.format(exception_name, exception), file=file)
 
 
-def _confirm(prompt: str, default: bool = False) -> Optional[bool]:
-    return_values = {
-        'y': True,
-        'yes': True,
-        '': default,
-        'n': False,
-        'no': False,
-    }
-    options = 'Y/n' if default else 'y/N'
-    try:
-        value = input('{} [{}]: '.format(prompt, options)).strip().lower()
-        return return_values[value]
-    except (KeyboardInterrupt, EOFError, KeyError):
-        return None
-
-
 def _type_module_name_str(t: Type[Any]) -> str:
     return '{}:{}'.format(t.__module__, t.__name__)

nichtparasoup/cli/__init__.py

@@ -1,4 +1,63 @@
-"""Subpackage containing all of nichtparasoup's command line interface related code
-"""
+__all__ = ['main']
 
-# This file intentionally does not import submodules
+from os.path import dirname
+from sys import version_info
+
+from click import group, version_option
+
+import nichtparasoup
+# from nichtparasoup.cli.completion import main as completion # @FIXME removed until fixed -- see module itself
+from nichtparasoup.commands.imagecrawler_desc import main as imagecrawler_desc
+from nichtparasoup.commands.imagecrawler_list import main as imagecrawler_list
+from nichtparasoup.commands.server_config_check import main as server_config_check
+from nichtparasoup.commands.server_config_dump_defaults import main as server_config_dump_defaults
+from nichtparasoup.commands.server_run import main as server_run
+
+VERSION_STRING = '%(version)s from {location} (python {py_version})'.format(
+    location=dirname(nichtparasoup.__file__),
+    py_version='{}.{}'.format(version_info.major, version_info.minor)
+)
+
+
+@group(name='nichtparasoup')
+@version_option(version=nichtparasoup.__version__, message=VERSION_STRING)
+def main() -> None:  # pragma: no cover
+    """Nichtparasoup
+    """
+    pass
+
+
+# @FIXME removed until fixed -- see module itself
+# main.add_command(completion, name='completion')
+
+
+@main.group(name='server')
+def server() -> None:  # pragma: no cover
+    """Manage server.
+    """
+    pass
+
+
+server.add_command(server_run, name='run')
+
+
+@server.group(name='config')
+def server_config() -> None:  # pragma: no cover
+    """Manage server configs.
+    """
+    pass
+
+
+server_config.add_command(server_config_check, name='check')
+server_config.add_command(server_config_dump_defaults, name='dump-defaults')
+
+
+@main.group(name='imagecrawler')
+def imagecrawler() -> None:  # pragma: no cover
+    """Manage imagecrawlers.
+    """
+    pass
+
+
+imagecrawler.add_command(imagecrawler_list, name='list')
+imagecrawler.add_command(imagecrawler_desc, name='desc')

nichtparasoup/cli/__main__.py

@@ -0,0 +1,4 @@
+
+from . import main
+
+main()

nichtparasoup/cli/completion.py

@@ -0,0 +1,26 @@
+__all__ = ["main"]
+
+from typing import Optional
+
+from click import Choice, command, echo, option
+from click_completion import Shell, get_code, init  # type: ignore
+
+# click's builtin completion is insufficient and partially broken.
+# completes loaded sub commands as 'main' instead of the correct name
+init()
+# @FIXME unfortunately there is no proper completion for files
+# @FIXME and since there is no support for manual `autocomplete` callbacks, i cannot patch it in ...
+#   - see https://github.com/click-contrib/click-completion/pull/27
+
+ShellChoice = Choice(Shell.__members__.keys())
+
+
+@command(name='completion')
+@option('--shell', type=ShellChoice, default=None, metavar='SHELL',
+        help='Override auto-detection. Values: {}.'.format(', '.join(ShellChoice.choices)))
+def main(shell: Optional[Shell]) -> None:  # pragma: no cover
+    """Emit completion code for the shell.
+
+    Enables the shell to auto-complete nichtparasoup commands and options.
+    """
+    echo(get_code(shell=shell, prog_name='nichtparasoup'))