lockss-turtles 0.3.0.dev3__tar.gz → 0.3.0.dev5__tar.gz

{lockss_turtles-0.3.0.dev3 → lockss_turtles-0.3.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lockss-turtles
-Version: 0.3.0.dev3
+Version: 0.3.0.dev5
 Summary: Tool to manage LOCKSS plugin sets and LOCKSS plugin repositories
 Home-page: https://www.lockss.org/
 License: BSD-3-Clause
@@ -47,9 +47,7 @@ Turtles
 
 Turtles is a tool to manage LOCKSS plugin sets and LOCKSS plugin registries.
 
-.. COMMENT FIXME
-
-**Latest release:** 0.3.0-dev3 (2023-03-06)
+**Latest release:** 0.3.0-dev5 (2023-03-06)
 
 -------------
 Prerequisites
@@ -75,20 +73,6 @@ You can install it with ``pip``, in your native environment or in a virtual envi
 
 The installation process adds a ``turtles`` executable to the ``PATH``; you can check that the installation is functional by running ``turtles version`` or ``turtles --help``.
 
--------------------
-Configuration Files
--------------------
-
-All Turtles configuration files are YAML files and have a top-level ``kind`` key that declares what kind of configuration file it is.
-
-Some Turtles commands require a `Plugin Set Catalog`_, `Plugin Registry Catalog`_, or `Plugin Signing Credentials`_. You can specify the configuration file to use via the appropriate command line option (for example |PLUGIN_SET_CATALOG|). Otherwise, Turtles will look for then appropriate configuration file (for example ``plugin-set-catalog.yaml``) in several standard directories, in this order:
-
-*  ``$XDG_CONFIG_HOME/lockss.turtles`` (by default ``$HOME/.config/lockss.turtles``)
-
-*  ``/usr/local/share/lockss.turtles``
-
-*  ``/etc/lockss.turtles``
-
 ----------
 Invocation
 ----------
@@ -105,6 +89,20 @@ Help messages and this document use ``turtles`` throughout, but the two invocati
 
 Turtles uses `Commands`_, in the style of programs like ``git``, ``dnf``/``yum``, ``apt``/``apt-get``, and the like. You can see the list of available `Commands`_ by invoking ``turtles --help``.
 
+-------------------
+Configuration Files
+-------------------
+
+All Turtles configuration files are YAML files and have a top-level ``kind`` key that declares what kind of configuration file it is.
+
+Some Turtles commands require a `Plugin Set Catalog`_, `Plugin Registry Catalog`_, or `Plugin Signing Credentials`_. You can specify the configuration file to use via the appropriate command line option (for example |PLUGIN_SET_CATALOG|). Otherwise, Turtles will look for then appropriate configuration file (for example ``plugin-set-catalog.yaml``) in several standard directories, in this order:
+
+*  ``$XDG_CONFIG_HOME/lockss.turtles`` (by default ``$HOME/.config/lockss.turtles``)
+
+*  ``/usr/local/share/lockss.turtles``
+
+*  ``/etc/lockss.turtles``
+
 ----------------
 Building Plugins
 ----------------

{lockss_turtles-0.3.0.dev3 → lockss_turtles-0.3.0.dev5}/README.rst

@@ -17,9 +17,7 @@ Turtles
 
 Turtles is a tool to manage LOCKSS plugin sets and LOCKSS plugin registries.
 
-.. COMMENT FIXME
-
-**Latest release:** 0.3.0-dev3 (2023-03-06)
+**Latest release:** 0.3.0-dev5 (2023-03-06)
 
 -------------
 Prerequisites
@@ -45,20 +43,6 @@ You can install it with ``pip``, in your native environment or in a virtual envi
 
 The installation process adds a ``turtles`` executable to the ``PATH``; you can check that the installation is functional by running ``turtles version`` or ``turtles --help``.
 
--------------------
-Configuration Files
--------------------
-
-All Turtles configuration files are YAML files and have a top-level ``kind`` key that declares what kind of configuration file it is.
-
-Some Turtles commands require a `Plugin Set Catalog`_, `Plugin Registry Catalog`_, or `Plugin Signing Credentials`_. You can specify the configuration file to use via the appropriate command line option (for example |PLUGIN_SET_CATALOG|). Otherwise, Turtles will look for then appropriate configuration file (for example ``plugin-set-catalog.yaml``) in several standard directories, in this order:
-
-*  ``$XDG_CONFIG_HOME/lockss.turtles`` (by default ``$HOME/.config/lockss.turtles``)
-
-*  ``/usr/local/share/lockss.turtles``
-
-*  ``/etc/lockss.turtles``
-
 ----------
 Invocation
 ----------
@@ -75,6 +59,20 @@ Help messages and this document use ``turtles`` throughout, but the two invocati
 
 Turtles uses `Commands`_, in the style of programs like ``git``, ``dnf``/``yum``, ``apt``/``apt-get``, and the like. You can see the list of available `Commands`_ by invoking ``turtles --help``.
 
+-------------------
+Configuration Files
+-------------------
+
+All Turtles configuration files are YAML files and have a top-level ``kind`` key that declares what kind of configuration file it is.
+
+Some Turtles commands require a `Plugin Set Catalog`_, `Plugin Registry Catalog`_, or `Plugin Signing Credentials`_. You can specify the configuration file to use via the appropriate command line option (for example |PLUGIN_SET_CATALOG|). Otherwise, Turtles will look for then appropriate configuration file (for example ``plugin-set-catalog.yaml``) in several standard directories, in this order:
+
+*  ``$XDG_CONFIG_HOME/lockss.turtles`` (by default ``$HOME/.config/lockss.turtles``)
+
+*  ``/usr/local/share/lockss.turtles``
+
+*  ``/etc/lockss.turtles``
+
 ----------------
 Building Plugins
 ----------------

{lockss_turtles-0.3.0.dev3 → lockss_turtles-0.3.0.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lockss-turtles"
-version = "0.3.0-dev3"
+version = "0.3.0-dev5"
 description = "Tool to manage LOCKSS plugin sets and LOCKSS plugin repositories"
 license = "BSD-3-Clause"
 authors = [

{lockss_turtles-0.3.0.dev3 → lockss_turtles-0.3.0.dev5}/src/lockss/turtles/__init__.py

@@ -28,7 +28,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = '0.3.0-dev3'
+__version__ = '0.3.0-dev5'
 
 __copyright__ = '''\
 Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University

{lockss_turtles-0.3.0.dev3 → lockss_turtles-0.3.0.dev5}/src/lockss/turtles/app.py

@@ -120,7 +120,7 @@ class TurtlesApp(object):
     def load_plugin_signing_credentials(self, plugin_signing_credentials_path=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)
-            plugin_signing_credentials_schema_path = importlib.resources.path(lockss.turtles.resources, TurtlesApp.PLUGIN_SIGNING_SCHEMA)
+            plugin_signing_credentials_schema_path = importlib.resources.path(lockss.turtles.resources, TurtlesApp.PLUGIN_SIGNING_CREDENTIALS_SCHEMA)
             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)

{lockss_turtles-0.3.0.dev3 → lockss_turtles-0.3.0.dev5}/src/lockss/turtles/cli.py

@@ -132,7 +132,7 @@ class TurtlesCli(object):
     def _build_plugin(self):
         # Prerequisites
         self._app.load_plugin_sets(self._args.plugin_set_catalog)
-        self._app.load_plugin_signing_credentials(self._args.plugin_signing)
+        self._app.load_plugin_signing_credentials(self._args.plugin_signing_credentials)
         self._obtain_password()
         # Action
         # ... plugin_id -> (set_id, jar_path, plugin)
@@ -228,7 +228,7 @@ class TurtlesCli(object):
                                type=Path,
                                help=f'load plugin set catalog from %(metavar)s (default: {" or ".join(map(str, self._app.default_plugin_set_catalogs()))})')
 
-    def _make_option_plugin_signing(self, container):
+    def _make_option_plugin_signing_credentials(self, container):
         container.add_argument('--plugin-signing-credentials', '-c',
                                metavar='FILE',
                                type=Path,
@@ -330,7 +330,7 @@ class TurtlesCli(object):
         self._make_options_identifiers(parser)
         self._make_option_password(parser)
         self._make_option_plugin_set_catalog(parser)
-        self._make_option_plugin_signing(parser)
+        self._make_option_plugin_signing_credentials(parser)
 
     def _make_parser_copyright(self, container):
         parser = container.add_parser('copyright',
@@ -365,7 +365,7 @@ class TurtlesCli(object):
         self._make_option_password(parser)
         self._make_option_plugin_registry_catalog(parser)
         self._make_option_plugin_set_catalog(parser)
-        self._make_option_plugin_signing(parser)
+        self._make_option_plugin_signing_credentials(parser)
         self._make_option_production(parser)
         self._make_option_testing(parser)
 
@@ -394,7 +394,7 @@ class TurtlesCli(object):
         # Prerequisites
         self._app.load_plugin_sets(self._args.plugin_set_catalog)
         self._app.load_plugin_registries(self._args.plugin_registries)
-        self._app.load_plugin_signing_credentials(self._args.plugin_signing)
+        self._app.load_plugin_signing_credentials(self._args.plugin_signing_credentials)
         self._obtain_password()
         # Action
         # ... plugin_id -> list of (registry_id, layer_id, dst_path, plugin)