lockss-turtles 0.5.0.dev4__tar.gz → 0.6.0.dev2__tar.gz

{lockss_turtles-0.5.0.dev4 → lockss_turtles-0.6.0.dev2}/CHANGELOG.rst

@@ -3,13 +3,49 @@ Release Notes
 =============
 
 -----
-0.5.0
+0.6.0
 -----
 
 Released: ?
 
 *  **Features**
 
+   *  Now using type hinting throughout.
+
+   *  Now using *lockss-pybasic* and *pydantic-argparse* internally.
+
+*  **Changes**
+
+   *  The configuration directory for Turtles in ``$XDG_CONFIG_HOME`` (by default ``$HOME/.config``), ``/usr/local/share``, and ``/etc`` is now called ``lockss-turtles`` instead of ``lockss.turtles``.
+
+   *  Some long options have been renamed (the short options remain unchanged):
+
+      ============ ================= =============
+      Short option Version 0.5.0     Version 0.6.0
+      ============ ================= =============
+      ``-i``       ``--identifier``  ``--plugin-identifier``
+      ``-I``       ``--identifiers`` ``--plugin-identifiers``
+      ``-j``       ``--jar``         ``--plugin-jar``
+      ``-J``       ``--jars``        ``--plugin-jars``
+      ``-l``       ``--layer``       ``--plugin-registry-layer``
+      ``-L``       ``--layers``      ``--plugin-registry-layers``
+      n/a          ``--password``    ``--plugin-signing-password``
+      ============ ================= =============
+
+   *  Bare arguments are no longer allowed and treated as plugin identifiers or plugin JARs; all plugin identifiers must be specified via ``--plugin-identifier/-i`` or ``--plugin-identifiers/-I`` options and all plugin JARS via ``--plugin-jar/-j`` or ``--plugin-jars/-J`` options.
+
+   *  The ``usage`` command has been removed.
+
+-----
+0.5.0
+-----
+
+Released: 2024-09-04
+
+*  **Features**
+
+   *  ``AntPluginSet``: also include plugin auxiliary packages (``plugin_aux_packages``).
+
 -----
 0.4.0
 -----

{lockss_turtles-0.5.0.dev4 → lockss_turtles-0.6.0.dev2}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

{lockss_turtles-0.5.0.dev4 → lockss_turtles-0.6.0.dev2}/PKG-INFO

@@ -1,39 +1,40 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: lockss-turtles
-Version: 0.5.0.dev4
-Summary: Tool to manage LOCKSS plugin sets and LOCKSS plugin registries
-Home-page: https://www.lockss.org/
+Version: 0.6.0.dev2
+Summary: Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin registries
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin
 Author-email: thib@cs.stanford.edu
-Requires-Python: >=3.8,<4.0
+Maintainer: Thib Guicherd-Callin
+Maintainer-email: thib@cs.stanford.edu
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
+Classifier: Framework :: Pydantic :: 2
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: System :: Archiving
 Classifier: Topic :: Utilities
-Requires-Dist: java-manifest (>=1.1.0,<2.0.0)
-Requires-Dist: jsonschema (>=4.23.0,<5.0.0)
-Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
-Requires-Dist: rich-argparse (>=1.5.2,<2.0.0)
-Requires-Dist: tabulate (>=0.9.0,<0.10.0)
-Requires-Dist: xdg (>=6.0.0,<7.0.0)
+Requires-Dist: java-manifest (>=1.1.0,<1.2.0)
+Requires-Dist: jsonschema (>=4.24.0,<4.25.0)
+Requires-Dist: lockss-pybasic (>=0.1.0,<0.2.0)
+Requires-Dist: pydantic (>=2.11.7,<3.0.0)
+Requires-Dist: pyyaml (>=6.0.0,<6.1.0)
+Requires-Dist: xdg (>=6.0.0,<6.1.0)
+Project-URL: Documentation, https://docs.lockss.org/en/latest/software/turtles
 Project-URL: Repository, https://github.com/lockss/lockss-turtles
+Project-URL: changelog, https://github.com/lockss/lockss-turtles/blob/main/CHANGELOG.rst
+Project-URL: issues, https://github.com/lockss/lockss-turtles/issues
 Description-Content-Type: text/x-rst
 
 =======
 Turtles
 =======
 
-.. |RELEASE| replace:: 0.5.0-dev1
+.. |RELEASE| replace:: 0.6.0-dev1
 .. |RELEASE_DATE| replace:: ?
 
 .. |HELP| replace:: ``--help/-h``

{lockss_turtles-0.5.0.dev4 → lockss_turtles-0.6.0.dev2}/README.rst

@@ -2,7 +2,7 @@
 Turtles
 =======
 
-.. |RELEASE| replace:: 0.5.0-dev1
+.. |RELEASE| replace:: 0.6.0-dev1
 .. |RELEASE_DATE| replace:: ?
 
 .. |HELP| replace:: ``--help/-h``

lockss_turtles-0.6.0.dev2/pyproject.toml

@@ -0,0 +1,85 @@
+# Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+[project]
+name = "lockss-turtles"
+version = "0.6.0-dev2" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+description = "Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin registries"
+license = { text = "BSD-3-Clause" }
+readme = "README.rst"
+requires-python = ">=3.9,<4.0"
+authors = [
+    { name = "Thib Guicherd-Callin",  email = "thib@cs.stanford.edu" },
+]
+maintainers = [
+    { name = "Thib Guicherd-Callin",  email = "thib@cs.stanford.edu" }
+]
+dependencies = [
+    "java-manifest (>=1.1.0,<1.2.0)",
+    "jsonschema (>=4.24.0,<4.25.0)",
+    "lockss-pybasic (>=0.1.0,<0.2.0)",
+    "pyyaml (>=6.0.0,<6.1.0)",
+    "xdg (>=6.0.0,<6.1.0)",
+    "pydantic (>=2.11.7,<3.0.0)",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Framework :: Pydantic :: 2",
+    "Intended Audience :: Developers",
+    "Intended Audience :: System Administrators",
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: System :: Archiving",
+    "Topic :: Utilities",
+]
+
+# See https://docs.pypi.org/project_metadata/
+[project.urls]
+changelog = "https://github.com/lockss/lockss-turtles/blob/main/CHANGELOG.rst"
+documentation = "https://docs.lockss.org/en/latest/software/turtles"
+issues = "https://github.com/lockss/lockss-turtles/issues"
+repository = "https://github.com/lockss/lockss-turtles"
+
+[tool.poetry]
+include = [
+    "CHANGELOG.rst",
+    "LICENSE",
+    "README.rst",
+]
+packages = [
+    { include = "lockss", from = "src" }
+]
+
+[tool.poetry.scripts]
+turtles = 'lockss.turtles.cli:main'
+
+[build-system]
+requires = ["poetry-core>=2.0.0,<3.0.0"]
+build-backend = "poetry.core.masonry.api"

lockss_turtles-0.6.0.dev2/src/lockss/turtles/__init__.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+"""
+Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin
+registries.
+"""
+
+__version__ = '0.6.0-dev2'
+
+__copyright__ = '''
+Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University
+'''.strip()
+
+__license__ = __copyright__ + '\n\n' + '''
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+'''.strip()

{lockss_turtles-0.5.0.dev4 → lockss_turtles-0.6.0.dev2}/src/lockss/turtles/__main__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,6 +28,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import lockss.turtles.cli
+from lockss.turtles.cli import main
 
-lockss.turtles.cli.main()
+main()

{lockss_turtles-0.5.0.dev4 → lockss_turtles-0.6.0.dev2}/src/lockss/turtles/app.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,103 +28,79 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import importlib.resources
+from collections.abc import Callable
+import importlib.resources as IR
 from pathlib import Path
+from typing import Dict, List, Optional, Tuple, Union
 
+from lockss.pybasic.fileutil import path
 import xdg
 
-from lockss.turtles.plugin import Plugin
-from lockss.turtles.plugin_registry import PluginRegistry, PluginRegistryCatalog
-from lockss.turtles.plugin_set import PluginSet, PluginSetCatalog
-import lockss.turtles.resources
-from lockss.turtles.util import _load_and_validate, _path
+from . import resources as __resources__
+from .plugin import Plugin
+from .plugin_registry import PluginRegistry, PluginRegistryCatalog
+from .plugin_set import PluginSet, PluginSetCatalog
+from .util import YamlT, load_and_validate
 
 
 class TurtlesApp(object):
 
-    XDG_CONFIG_DIR = xdg.xdg_config_home().joinpath(__package__)
+    CONFIG_DIR_NAME = 'lockss-turtles'
 
-    USR_CONFIG_DIR = Path('/usr/local/share', __package__)
+    XDG_CONFIG_DIR: Path = xdg.xdg_config_home().joinpath(CONFIG_DIR_NAME)
 
-    ETC_CONFIG_DIR = Path('/etc', __package__)
+    USR_CONFIG_DIR: Path = Path('/usr/local/share', CONFIG_DIR_NAME)
 
-    CONFIG_DIRS = [XDG_CONFIG_DIR, USR_CONFIG_DIR, ETC_CONFIG_DIR]
+    ETC_CONFIG_DIR: Path = Path('/etc', CONFIG_DIR_NAME)
 
-    PLUGIN_REGISTRY_CATALOG = 'plugin-registry-catalog.yaml'
+    CONFIG_DIRS: List[Path] = [XDG_CONFIG_DIR, USR_CONFIG_DIR, ETC_CONFIG_DIR]
 
-    PLUGIN_SET_CATALOG = 'plugin-set-catalog.yaml'
+    PLUGIN_REGISTRY_CATALOG: str = 'plugin-registry-catalog.yaml'
 
-    PLUGIN_SIGNING_CREDENTIALS = 'plugin-signing-credentials.yaml'
+    PLUGIN_SET_CATALOG: str = 'plugin-set-catalog.yaml'
 
-    PLUGIN_SIGNING_CREDENTIALS_SCHEMA = 'plugin-signing-credentials-schema.json'
+    PLUGIN_SIGNING_CREDENTIALS: str = 'plugin-signing-credentials.yaml'
 
-    @staticmethod
-    def _default_files(file_str):
-        return [dir_path.joinpath(file_str) for dir_path in TurtlesApp.CONFIG_DIRS]
-
-    @staticmethod
-    def _select_file(file_str, preselected=None):
-        if preselected:
-            preselected = _path(preselected)
-            if not preselected.is_file():
-                raise FileNotFoundError(str(preselected))
-            return preselected
-        choices = TurtlesApp._default_files(file_str)
-        ret = next(filter(Path.is_file, choices), None)
-        if ret is None:
-            raise FileNotFoundError(' or '.join(map(str, choices)))
-        return ret
+    PLUGIN_SIGNING_CREDENTIALS_SCHEMA: str = 'plugin-signing-credentials-schema.json'
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
-        self._password = None
-        self._plugin_registries = None
-        self._plugin_sets = None
-        self._plugin_signing_credentials = None
+        self._password: Optional[Callable[[], str]] = None
+        self._plugin_registries: Optional[List[PluginRegistry]] = None
+        self._plugin_sets: Optional[List[PluginSet]] = None
+        self._plugin_signing_credentials: YamlT = None
 
-    # Returns plugin_id -> (set_id, jar_path, plugin)
-    def build_plugin(self, plugin_ids):
+    def build_plugin(self, plugin_ids: List[str]) -> Dict[str, Tuple[str, Path, Plugin]]:
         return {plugin_id: self._build_one_plugin(plugin_id) for plugin_id in plugin_ids}
 
-    def default_plugin_registry_catalogs(self):
-        return TurtlesApp._default_files(TurtlesApp.PLUGIN_REGISTRY_CATALOG)
-
-    def default_plugin_set_catalogs(self):
-        return TurtlesApp._default_files(TurtlesApp.PLUGIN_SET_CATALOG)
-
-    def default_plugin_signing_credentials(self):
-        return TurtlesApp._default_files(TurtlesApp.PLUGIN_SIGNING_CREDENTIALS)
-
-    # Returns (src_path, plugin_id) -> list of (registry_id, layer_id, dst_path, plugin)
-    def deploy_plugin(self, src_paths, layer_ids, interactive=False):
+    def deploy_plugin(self, src_paths: List[Path], layer_ids: List[str], interactive: bool=False) -> Dict[Tuple[Path, str], List[Tuple[str, str, Optional[Path], Optional[Plugin]]]]:
         plugin_ids = [Plugin.id_from_jar(src_path) for src_path in src_paths]
         return {(src_path, plugin_id): self._deploy_one_plugin(src_path,
                                                                plugin_id,
                                                                layer_ids,
                                                                interactive=interactive) for src_path, plugin_id in zip(src_paths, plugin_ids)}
 
-    def load_plugin_registries(self, plugin_registry_catalog_path=None):
+    def load_plugin_registries(self, plugin_registry_catalog_path: Optional[Union[Path, str]]=None) -> None:
         if self._plugin_registries is None:
             plugin_registry_catalog = PluginRegistryCatalog.from_path(self.select_plugin_registry_catalog(plugin_registry_catalog_path))
             self._plugin_registries = list()
             for plugin_registry_file in plugin_registry_catalog.get_plugin_registry_files():
                 self._plugin_registries.extend(PluginRegistry.from_path(plugin_registry_file))
 
-    def load_plugin_sets(self, plugin_set_catalog_path=None):
+    def load_plugin_sets(self, plugin_set_catalog_path: Optional[Union[Path, str]]=None) -> None:
         if self._plugin_sets is None:
             plugin_set_catalog = PluginSetCatalog.from_path(self.select_plugin_set_catalog(plugin_set_catalog_path))
             self._plugin_sets = list()
             for plugin_set_file in plugin_set_catalog.get_plugin_set_files():
                 self._plugin_sets.extend(PluginSet.from_path(plugin_set_file))
 
-    def load_plugin_signing_credentials(self, plugin_signing_credentials_path=None):
+    def load_plugin_signing_credentials(self, plugin_signing_credentials_path: Optional[Union[Path, str]]=None) -> None:
         if self._plugin_signing_credentials is None:
-            plugin_signing_credentials_path = _path(plugin_signing_credentials_path) if plugin_signing_credentials_path else self._select_file(TurtlesApp.PLUGIN_SIGNING_CREDENTIALS)
-            with importlib.resources.path(lockss.turtles.resources, TurtlesApp.PLUGIN_SIGNING_CREDENTIALS_SCHEMA) as plugin_signing_credentials_schema_path:
-                self._plugin_signing_credentials = _load_and_validate(plugin_signing_credentials_schema_path, plugin_signing_credentials_path)
+            plugin_signing_credentials_path = path(plugin_signing_credentials_path) if plugin_signing_credentials_path else self._select_file(TurtlesApp.PLUGIN_SIGNING_CREDENTIALS)
+            with IR.path(__resources__, TurtlesApp.PLUGIN_SIGNING_CREDENTIALS_SCHEMA) as plugin_signing_credentials_schema_path:
+                self._plugin_signing_credentials = load_and_validate(plugin_signing_credentials_schema_path, plugin_signing_credentials_path)
 
-    # Returns plugin_id -> list of (registry_id, layer_id, dst_path, plugin)
-    def release_plugin(self, plugin_ids, layer_ids, interactive=False):
+    def release_plugin(self, plugin_ids: List[str], layer_ids: List[str], interactive: bool=False) -> Dict[str, List[Tuple[str, str, Path, Plugin]]]:
         # ... plugin_id -> (set_id, jar_path, plugin)
         ret1 = self.build_plugin(plugin_ids)
         jar_paths = [jar_path for set_id, jar_path, plugin in ret1.values()]
@@ -134,54 +110,83 @@ class TurtlesApp(object):
                                   interactive=interactive)
         return {plugin_id: val for (jar_path, plugin_id), val in ret2.items()}
 
-    def select_plugin_registry_catalog(self, preselected=None):
+    def select_plugin_registry_catalog(self, preselected: Optional[Union[Path, str]]=None) -> Path:
         return TurtlesApp._select_file(TurtlesApp.PLUGIN_REGISTRY_CATALOG, preselected)
 
-    def select_plugin_set_catalog(self, preselected=None):
+    def select_plugin_set_catalog(self, preselected: Optional[Union[Path, str]]=None) -> Path:
         return TurtlesApp._select_file(TurtlesApp.PLUGIN_SET_CATALOG, preselected)
 
-    def select_plugin_signing_credentials(self, preselected=None):
+    def select_plugin_signing_credentials(self, preselected: Optional[Union[Path, str]]=None) -> Path:
         return TurtlesApp._select_file(TurtlesApp.PLUGIN_SIGNING_CREDENTIALS, preselected)
 
-    def set_password(self, pw):
-        self._password = pw if callable(pw) else lambda x: pw
+    def set_password(self, pw: Union[Callable[[], str], str]) -> None:
+        self._password = pw if callable(pw) else lambda: pw
 
-    # Returns (set_id, jar_path, plugin)
-    def _build_one_plugin(self, plugin_id):
+    def _build_one_plugin(self, plugin_id: str) -> Tuple[str, Optional[Path], Optional[Plugin]]:
         for plugin_set in self._plugin_sets:
             if plugin_set.has_plugin(plugin_id):
-                return (plugin_set.get_id(),
-                        *plugin_set.build_plugin(plugin_id,
-                                                 self._get_plugin_signing_keystore(),
-                                                 self._get_plugin_signing_alias(),
-                                                 self._get_plugin_signing_password()))
+                bp = plugin_set.build_plugin(plugin_id,
+                                             self._get_plugin_signing_keystore(),
+                                             self._get_plugin_signing_alias(),
+                                             self._get_plugin_signing_password())
+                return plugin_set.get_id(), bp[0] if bp else None, bp[1] if bp else None
         raise Exception(f'{plugin_id}: not found in any plugin set')
 
-    # Returns list of (registry_id, layer_id, dst_path, plugin)
-    def _deploy_one_plugin(self, src_jar, plugin_id, layer_ids, interactive=False):
+    def _deploy_one_plugin(self, src_jar: Path, plugin_id: str, layer_ids: List[str], interactive: bool=False) -> List[Tuple[str, str, Optional[Path], Optional[Plugin]]]:
         ret = list()
         for plugin_registry in self._plugin_registries:
             if plugin_registry.has_plugin(plugin_id):
                 for layer_id in layer_ids:
                     layer = plugin_registry.get_layer(layer_id)
                     if layer is not None:
+                        dp = layer.deploy_plugin(plugin_id,
+                                                 src_jar,
+                                                 interactive=interactive)
                         ret.append((plugin_registry.get_id(),
                                     layer.get_id(),
-                                    *layer.deploy_plugin(plugin_id,
-                                                         src_jar,
-                                                         interactive=interactive)))
+                                    dp[0] if dp else None,
+                                    dp[1] if dp else None))
         if len(ret) == 0:
             raise Exception(f'{src_jar}: {plugin_id} not declared in any plugin registry')
         return ret
 
-    def _get_password(self):
+    def _get_password(self) -> Optional[str]:
         return self._password() if self._password else None
 
-    def _get_plugin_signing_alias(self):
+    def _get_plugin_signing_alias(self) -> str:
         return self._plugin_signing_credentials['plugin-signing-alias']
 
-    def _get_plugin_signing_keystore(self):
+    def _get_plugin_signing_keystore(self) -> str:
         return self._plugin_signing_credentials['plugin-signing-keystore']
 
-    def _get_plugin_signing_password(self):
+    def _get_plugin_signing_password(self) -> str:
         return self._get_password()
+
+    @staticmethod
+    def default_plugin_registry_catalogs() -> List[Path]:
+        return TurtlesApp._default_files(TurtlesApp.PLUGIN_REGISTRY_CATALOG)
+
+    @staticmethod
+    def default_plugin_set_catalogs() -> List[Path]:
+        return TurtlesApp._default_files(TurtlesApp.PLUGIN_SET_CATALOG)
+
+    @staticmethod
+    def default_plugin_signing_credentials() -> List[Path]:
+        return TurtlesApp._default_files(TurtlesApp.PLUGIN_SIGNING_CREDENTIALS)
+
+    @staticmethod
+    def _default_files(file_str) -> List[Path]:
+        return [dir_path.joinpath(file_str) for dir_path in TurtlesApp.CONFIG_DIRS]
+
+    @staticmethod
+    def _select_file(file_str, preselected: Optional[Union[Path, str]]=None) -> Path:
+        if preselected:
+            preselected = path(preselected)
+            if not preselected.is_file():
+                raise FileNotFoundError(str(preselected))
+            return preselected
+        choices = TurtlesApp._default_files(file_str)
+        ret = next(filter(lambda f: f.is_file(), choices), None)
+        if ret is None:
+            raise FileNotFoundError(' or '.join(map(str, choices)))
+        return ret