derivepassphrase.git

@@ -16,6 +16,7 @@ Warning:

 from __future__ import annotations

 import collections

+import importlib.metadata

 import inspect

 import logging

 import os

@@ -39,6 +40,7 @@ if TYPE_CHECKING:

 PROG_NAME = _internals.PROG_NAME

 VERSION = _internals.VERSION

+VERSION_OUTPUT_WRAPPING_WIDTH = 72

 # Error messages

 NOT_AN_INTEGER = 'not an integer'

@@ -957,14 +959,111 @@ def version_option_callback(

 ) -> None:

     del param

     if value and not ctx.resilient_parsing:

+        major_dependencies: list[str] = []

+        derivation_schemes = {'vault': True}

+        foreign_configuration_formats = {

+            'vault storeroom': False,

+            'vault v0.2': False,

+            'vault v0.3': False,

+        }

+        known_extras = {

+            'export': False,

+        }

+        try:

+            from derivepassphrase.exporter import storeroom, vault_native  # noqa: I001,PLC0415

+

+            foreign_configuration_formats[

+                'vault storeroom'

+            ] = not storeroom.STUBBED

+            foreign_configuration_formats[

+                'vault v0.2'

+            ] = not vault_native.STUBBED

+            foreign_configuration_formats[

+                'vault v0.3'

+            ] = not vault_native.STUBBED

+            known_extras['export'] = (

+                not storeroom.STUBBED and not vault_native.STUBBED

+            )

+        except ModuleNotFoundError:  # pragma: no cover

+            pass

+        try:

+            cryptography_version = importlib.metadata.version('cryptography')

+        except ModuleNotFoundError:

+            pass

+        else:

+            major_dependencies.append(f'cryptography {cryptography_version}')

+        major_dependencies.append(f'click {click.__version__}')

+

+        click.echo(

+            ' '.join([

+                click.style(PROG_NAME, bold=True),

+                VERSION,

+            ]),

+            color=ctx.color,

+        )

+        for dependency in major_dependencies:

             click.echo(

                 str(

                     _msg.TranslatedString(

-                    _msg.Label.VERSION_INFO_TEXT,

-                    PROG_NAME=PROG_NAME,

-                    VERSION=VERSION,

+                        _msg.Label.VERSION_INFO_MAJOR_LIBRARY_TEXT,

+                        dependency_name_and_version=dependency,

+                    )

+                ),

+                color=ctx.color,

             )

+        click.echo()

+        version_info_types = {

+            _msg.Label.SUPPORTED_DERIVATION_SCHEMES: [

+                k for k, v in derivation_schemes.items() if v

+            ],

+            _msg.Label.KNOWN_DERIVATION_SCHEMES: [

+                k for k, v in derivation_schemes.items() if not v

+            ],

+            _msg.Label.SUPPORTED_FOREIGN_CONFIGURATION_FORMATS: [

+                k for k, v in foreign_configuration_formats.items() if v

+            ],

+            _msg.Label.KNOWN_FOREIGN_CONFIGURATION_FORMATS: [

+                k for k, v in foreign_configuration_formats.items() if not v

+            ],

+            _msg.Label.ENABLED_PEP508_EXTRAS: [

+                k for k, v in known_extras.items() if v

+            ],

+        }

+        for message_label, item_list in version_info_types.items():

+            if item_list:

+                current_length = len(str(_msg.TranslatedString(message_label)))

+                formatted_item_list_pieces: list[str] = []

+                n = len(item_list)

+                for i, item in enumerate(item_list, start=1):

+                    space = ' '

+                    punctuation = '.' if i == n else ','

+                    if (

+                        current_length

+                        + len(space)

+                        + len(item)

+                        + len(punctuation)

+                        <= VERSION_OUTPUT_WRAPPING_WIDTH

+                    ):

+                        current_length += (

+                            len(space) + len(item) + len(punctuation)

+                        )

+                        piece = f'{space}{item}{punctuation}'

+                    else:

+                        space = '    '

+                        current_length = (

+                            len(space) + len(item) + len(punctuation)

+                        )

+                        piece = f'\n{space}{item}{punctuation}'

+                    formatted_item_list_pieces.append(piece)

+                click.echo(

+                    ''.join([

+                        click.style(

+                            str(_msg.TranslatedString(message_label)),

+                            bold=True,

                         ),

+                        ''.join(formatted_item_list_pieces),

+                    ]),

+                    color=ctx.color,

                 )

         ctx.exit()

@@ -1214,7 +1214,7 @@ class Label(enum.Enum):

         '',

     )(

         'Label :: Help text :: One-line description',

-        'Show applicable version information, then exit.',

+        'Show version and feature information, then exit.',

     )

     """"""

     COMMANDS_LABEL = commented(

@@ -1273,14 +1273,60 @@ class Label(enum.Enum):

         'Storage management',

     )

     """"""

-    VERSION_INFO_TEXT = commented(

-        '',

+    VERSION_INFO_MAJOR_LIBRARY_TEXT = commented(

+        'This message reports on the version of a major library '

+        'currently in use, such as "cryptography".',

     )(

         'Label :: Info Message',

-        '{PROG_NAME} {VERSION}',  # noqa: RUF027

+        'Using {dependency_name_and_version}',

         flags='python-brace-format',

     )

     """"""

+    ENABLED_PEP508_EXTRAS = commented(

+        'This is part of the version output, emitting lists of enabled '

+        'PEP 508 extras.  A comma-separated English list of items follows, '

+        'with standard English punctuation.',

+    )(

+        'Label :: Info Message:: Table row header',

+        'PEP 508 extras:',

+    )

+    """"""

+    KNOWN_DERIVATION_SCHEMES = commented(

+        'This is part of the version output, emitting lists of known '

+        'derivation schemes.  A comma-separated English list of items '

+        'follows, with standard English punctuation.',

+    )(

+        'Label :: Info Message:: Table row header',

+        'Known derivation schemes:',

+    )

+    """"""

+    KNOWN_FOREIGN_CONFIGURATION_FORMATS = commented(

+        'This is part of the version output, emitting lists of known '

+        'foreign configuration formats.  A comma-separated English list '

+        'of items follows, with standard English punctuation.',

+    )(

+        'Label :: Info Message:: Table row header',

+        'Known foreign configuration formats:',

+    )

+    """"""

+    SUPPORTED_DERIVATION_SCHEMES = commented(

+        'This is part of the version output, emitting lists of supported '

+        'derivation schemes.  A comma-separated English list of items '

+        'follows, with standard English punctuation.',

+    )(

+        'Label :: Info Message:: Table row header',

+        'Supported derivation schemes:',

+    )

+    """"""

+    SUPPORTED_FOREIGN_CONFIGURATION_FORMATS = commented(

+        'This is part of the version output, emitting lists of supported '

+        'foreign configuration formats.  A comma-separated English list '

+        'of items follows, with standard English punctuation.',

+    )(

+        'Label :: Info Message:: Table row header',

+        'Supported foreign configuration formats:',

+    )

+    """"""

     CONFIRM_THIS_CHOICE_PROMPT_TEXT = commented(

         'There is no support for "yes" or "no" in other languages '

         'than English, so it is advised that your translation makes it '

@@ -1778,11 +1778,6 @@ class TestAllCLI:

             'Expected no color, but found an ANSI control sequence'

         )

-    @pytest.mark.xfail(

-        reason='extras output not implemented yet',

-        raises=AssertionError,

-        strict=True,

-    )

     @Parametrize.COMMAND_NON_EAGER_ARGUMENTS

     def test_202_version_option_output(

         self,