backlogops-cli 0.9__tar.gz → 1.1__tar.gz

{backlogops_cli-0.9 → backlogops_cli-1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: backlogops-cli
-Version: 0.9
+Version: 1.1
 Summary: Command line interface for backlog operations.
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
@@ -24,9 +24,9 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: argcomplete>=3.7.2
-Requires-Dist: backlogops>=0.9
+Requires-Dist: backlogops>=1.1
 Requires-Dist: wizard-ui-bridge[textual]>=1.3
-Requires-Dist: edit-cfg-json-textual==0.0.2
+Requires-Dist: edit-cfg-json-textual>=0.1.0
 Requires-Dist: versionreporter>=0.4
 Dynamic: author
 Dynamic: license-file
@@ -322,10 +322,10 @@ backlogops_cli serves 2 purposes:
 
 ## Test summary
 
-- Test result: 2232 passed, 1 deselected in 44s
+- Test result: 2298 passed, 1 deselected in 57s
 - No flake8 warnings.
 - No mypy errors found.
 - No pylint warnings.
 - No python layout warnings.
-- Built version(s): 0.9
+- Built version(s): 1.1
 - Build and test using Python 3.14.7

{backlogops_cli-0.9 → backlogops_cli-1.1}/README_pypi.md

@@ -287,10 +287,10 @@ backlogops_cli serves 2 purposes:
 
 ## Test summary
 
-- Test result: 2232 passed, 1 deselected in 44s
+- Test result: 2298 passed, 1 deselected in 57s
 - No flake8 warnings.
 - No mypy errors found.
 - No pylint warnings.
 - No python layout warnings.
-- Built version(s): 0.9
+- Built version(s): 1.1
 - Build and test using Python 3.14.7

{backlogops_cli-0.9 → backlogops_cli-1.1}/backlogops_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: backlogops-cli
-Version: 0.9
+Version: 1.1
 Summary: Command line interface for backlog operations.
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
@@ -24,9 +24,9 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: argcomplete>=3.7.2
-Requires-Dist: backlogops>=0.9
+Requires-Dist: backlogops>=1.1
 Requires-Dist: wizard-ui-bridge[textual]>=1.3
-Requires-Dist: edit-cfg-json-textual==0.0.2
+Requires-Dist: edit-cfg-json-textual>=0.1.0
 Requires-Dist: versionreporter>=0.4
 Dynamic: author
 Dynamic: license-file
@@ -322,10 +322,10 @@ backlogops_cli serves 2 purposes:
 
 ## Test summary
 
-- Test result: 2232 passed, 1 deselected in 44s
+- Test result: 2298 passed, 1 deselected in 57s
 - No flake8 warnings.
 - No mypy errors found.
 - No pylint warnings.
 - No python layout warnings.
-- Built version(s): 0.9
+- Built version(s): 1.1
 - Build and test using Python 3.14.7

{backlogops_cli-0.9 → backlogops_cli-1.1}/backlogops_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 argcomplete>=3.7.2
-backlogops>=0.9
+backlogops>=1.1
 wizard-ui-bridge[textual]>=1.3
-edit-cfg-json-textual==0.0.2
+edit-cfg-json-textual>=0.1.0
 versionreporter>=0.4

{backlogops_cli-0.9 → backlogops_cli-1.1}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
   name='backlogops-cli',
-  version='0.9',
+  version='1.1',
   description='Command line interface for backlog operations.',
   author='Tom Björkholm',
   author_email='klausuler_linnet0q@icloud.com',
@@ -15,9 +15,9 @@ setup(
   package_data={'backlogops_cli': ['src/py.typed']},
   install_requires=[
     'argcomplete >= 3.7.2',
-    'backlogops >= 0.9',
+    'backlogops >= 1.1',
     'wizard-ui-bridge[textual] >= 1.3',
-    'edit-cfg-json-textual == 0.0.2',
+    'edit-cfg-json-textual >= 0.1.0',
     'versionreporter >= 0.4'
   ]
 )

{backlogops_cli-0.9 → backlogops_cli-1.1}/src/backlogops_cli/config_edit.py

@@ -3,8 +3,13 @@
 
 The whole configuration is shown at once, folded where it is deep, so a
 single value can be changed without walking through every question the
-wizard asks. The editor is the one of ``edit-cfg-json-textual``, so it needs
-a terminal; where the input is redirected, the wizard command is the way in.
+wizard asks, and how many things a member holds is editable as well: a
+preset, a person, a team, a level and an entry of a map can each be added
+beside the ones that are there and taken out again. The editor is the one of
+``edit-cfg-json-textual``, so it needs a terminal; where the input is
+redirected, the wizard command is the way in.
+One call runs the whole session: ``edit`` reads the file, shows it until the
+user is done, and answers with the configuration that was saved.
 
 ``-i`` says which file to edit and ``-k``/``--kind`` what kind of file it
 is: the backlog-ops configuration, or a stand-alone input or output preset.
@@ -23,16 +28,16 @@ import argparse
 import sys
 from pathlib import Path
 from typing import Optional
+from config_as_json import Config
 from config_as_json.file_extension import fix_file_extension
-from edit_cfg_json import EditModel
-from edit_cfg_json_textual import TextualEditor
-from backlogops import (
-    CONFIG_EXTENSION, default_edit_config, edit_model_for)
+from edit_cfg_json import ConfigLoadError, default_config
+from edit_cfg_json_textual import edit
+from backlogops import CONFIG_EXTENSION, EDIT_SETTINGS, descriptions_for
 from backlogops_cli._command_io import add_kind_arg, kind_class, parsed_args
 
 DESCRIPTION = 'Edit a configuration file in a full-screen editor'
 
-EDIT_ERRORS = (ValueError, TypeError, KeyError, OSError)
+EDIT_ERRORS = (ConfigLoadError, ValueError, TypeError, KeyError, OSError)
 """Errors raised when the file to edit cannot be opened."""
 
 
@@ -64,36 +69,54 @@ def _input_file(parsed: argparse.Namespace) -> str:
     return path
 
 
-def _model_to_edit(parsed: argparse.Namespace) -> EditModel:
-    """Return the edit model for the file and kind that were asked for.
+def _out_file(output: Optional[str], in_file: str) -> str:
+    """Return the file a save writes, naming it as the editor will.
 
-    Raises:
-        ValueError: The file cannot be found or cannot be opened for
-            editing, or the class cannot be constructed.
+    Without ``-o`` that is the file that was read. A destination named on
+    the command line is one this run chose, so it is given the
+    configuration extension when it has none, which is what the editor
+    would do with it; naming it here as well is what lets this command say
+    afterwards which file was written.
+
+    Args:
+        output: The ``-o`` value, or None when there is none.
+        in_file: The file that is being edited.
+
+    Returns:
+        The file that a save of this session writes.
     """
-    return edit_model_for(default_edit_config(kind_class(parsed)),
-                          in_file=_input_file(parsed), out_file=parsed.output,
-                          stderr_file=sys.stderr)
+    if output is None:
+        return in_file
+    return output if Path(output).suffix else output + CONFIG_EXTENSION
 
 
-def _report(model: EditModel) -> int:
-    """Print what the session wrote, and answer with the exit code.
+def _edited(parsed: argparse.Namespace, in_file: str,
+            out_file: str) -> Optional[Config]:
+    """Run one editing session and return the configuration it saved.
 
-    Closing an editor is not a failure, so a session that saved nothing
-    still succeeds; it says so, because a user who meant to save would
-    otherwise be told nothing at all. What a save did is the editor's own
-    message, which names the file it wrote and where what it wrote over is.
+    Args:
+        parsed: The parsed command line, naming the kind of file to edit.
+        in_file: The configuration file the editor reads.
+        out_file: The configuration file a save writes.
+
+    Returns:
+        What the session saved, or None when it saved nothing.
+
+    Raises:
+        ConfigLoadError: The input file cannot be opened for editing.
     """
-    if model.saved_config is None:
-        print('Closed without saving.')
-        return 0
-    print(model.save_message)
-    return 0
+    config = default_config(kind_class(parsed))
+    return edit(config, descriptions=descriptions_for(config), in_file=in_file,
+                out_file=out_file, settings=EDIT_SETTINGS)
 
 
 def main(args: Optional[list[str]] = None) -> int:
     """Open the configuration file in the editor and report what was saved.
 
+    Closing an editor is not a failure, so a session that saved nothing
+    still succeeds; it says so, because a user who meant to save would
+    otherwise be told nothing at all.
+
     Args:
         args: Optional replacement for ``sys.argv[1:]``, mainly for tests.
 
@@ -103,12 +126,15 @@ def main(args: Optional[list[str]] = None) -> int:
     """
     parsed = parsed_args(build_parser(), args)
     try:
-        model = _model_to_edit(parsed)
+        in_file = _input_file(parsed)
+        out_file = _out_file(parsed.output, in_file)
+        saved = _edited(parsed, in_file, out_file)
     except EDIT_ERRORS as error:
         print(f'Could not open the configuration: {error}', file=sys.stderr)
         return 1
-    TextualEditor().run_editor(model)
-    return _report(model)
+    print('Closed without saving.' if saved is None
+          else f'Saved to {out_file}')
+    return 0
 
 
 if __name__ == '__main__':  # pragma: no cover