ansible-vars 1.0.15__py3-none-any.whl → 1.0.17__py3-none-any.whl

ansible_vars/cli.py

@@ -505,9 +505,12 @@ def print_yaml(code: str) -> None:
         return std_print(code)
     std_print(highlight(code, yaml_highlight_lexer, highlight_formatter).strip('\n'))
 
-def print_diff(diff: str) -> None:
+def print_diff(diff: str | None) -> None:
     '''Print a diff with highlighting if a `color_mode` is available.'''
     _color_map: dict = { '-': Color.TREE_REMOVED, '+': Color.TREE_ADDED, '@': Color.INFO, '*': Color.TREE_UNCHANGED }
+    if not diff:
+        print('Vaults are identical.', Color.TREE_UNCHANGED)
+        return
     for line in diff.split('\n'):
         color: Color = _color_map[line[0]] if (len(line) > 0 and line[0] in [ '-', '+', '@' ]) else _color_map['*']
         print(line, color)
@@ -707,7 +710,7 @@ if config.command in [ 'create', 'edit' ]:
                 new_editable: str = edit_file.read()
                 if editable != new_editable:
                     try:
-                        new_vault: VaultFile = VaultFile.from_editable(vault, new_editable)
+                        new_vault = VaultFile.from_editable(vault, new_editable)
                     except YAMLFormatError as e:
                         print('Invalid YAML format:', Color.BAD)
                         print(e.parent if e.parent else e, Color.BAD)

ansible_vars/util.py

@@ -3,7 +3,6 @@
 # Standard library imports
 import os, atexit
 from glob import glob
-from pathlib import Path
 from functools import wraps
 from datetime import datetime
 from typing import Callable
@@ -38,7 +37,7 @@ class DiffLogger():
         You can specify an optional comment string which will be included.
         '''
         # Check if any changes happened
-        diff: list[str] = curr_vault.diff(prev_vault, context_lines=0, show_filenames=True).split('\n')
+        diff: str | None = curr_vault.diff(prev_vault, context_lines=0, show_filenames=True)
         if not force and not diff:
             return None
         # Build entry
@@ -55,7 +54,7 @@ class DiffLogger():
         # Diff
         lines.append('DIFF')
         if diff:
-            lines += diff
+            lines += diff.split('\n')
         else:
             lines.append('No changes.')
         #lines.append(OUTER_SEP)

ansible_vars/vault.py

@@ -208,7 +208,7 @@ class Vault():
     def has(self, path: DictPath) -> bool:
         '''Checks if the given key path is present in the vault's data.'''
         try: self._traverse(path, decrypt=False)
-        except KeyError: return False
+        except ( KeyError, IndexError ): return False
         return True
 
     def get(
@@ -591,12 +591,13 @@ class Vault():
 
     # Comparing to older versions of this vault
 
-    def diff(self, prev_vault: 'Vault', context_lines: int = 3, show_filenames: bool = True) -> str:
+    def diff(self, prev_vault: 'Vault', context_lines: int = 3, show_filenames: bool = True) -> str | None:
         '''
         Generates a diff for the edit mode Jinja2 YAML vault code (from `Vault.as_editable`) of a previous vault to this one's.
         Set `context_lines` to specify how many lines of context are shown before and after the actual diff lines.
         If `show_filenames` is set to True and the vaults are `VaultFile` objects,
         the previous and current filenames will be shown in the diff header.
+        If there is no difference between the vaults, None is returned.
         '''
         # Generate filenames
         prev_filename: str = 'Previous vault'
@@ -615,7 +616,7 @@ class Vault():
                 n = context_lines,
                 lineterm = ''
             )
-        )
+        ) or None # diff function returns empty list if there are no changes, even skipping the header
     
     def changes(self, prev_vault: 'Vault') -> tuple[ChangeList, ChangeList, ChangeList, ChangeList]:
         '''

ansible_vars/vault_crypt.py

@@ -206,8 +206,13 @@ class VaultKeyring():
         # XXX Hacky, but the right-hand path from loading a vault ID like 'vaultid@get-password.sh' will be resolved from CWD
         #     Could possibly be avoided by splitting the detected vault IDs and transforming any right-hand paths
         with chdir(pardir):
-            secrets: list[tuple[str | None, VaultSecret]] = \
-                CLI.setup_vault_secrets(DataLoader(), vault_ids, auto_prompt=False, initialize_context=False) # type: ignore
+            # Seems version-dependent if `initialize_context` is recognized and required
+            try:
+                secrets: list[tuple[str | None, VaultSecret]] = \
+                    CLI.setup_vault_secrets(DataLoader(), vault_ids, auto_prompt=False, initialize_context=False) # type: ignore
+            except TypeError:
+                secrets: list[tuple[str | None, VaultSecret]] = \
+                    CLI.setup_vault_secrets(DataLoader(), vault_ids, auto_prompt=False)
             return list(map(VaultKey.from_ansible_secret, secrets))
 
     def __repr__(self) -> str:

{ansible_vars-1.0.15.dist-info → ansible_vars-1.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansible-vars
-Version: 1.0.15
+Version: 1.0.17
 Summary: Manage vaults and variable files for Ansible
 Project-URL: Homepage, https://github.com/xorwow/ansible-vars
 Project-URL: Issues, https://github.com/xorwow/ansible-vars/issues

ansible_vars-1.0.17.dist-info/RECORD

@@ -0,0 +1,13 @@
+ansible_vars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ansible_vars/cli.py,sha256=cp891u9-kZoJireRIsTh-zy_9cTZPifLio2U7NqRoQM,66428
+ansible_vars/constants.py,sha256=VNr78qbzdJ0Vn0psbzjjQngNG3VbHhk6NXTz30VNUno,1622
+ansible_vars/errors.py,sha256=6dzyksPKWira9O2-Ir3MIOwr4XjN9MSBiRp5e6siY6Q,1256
+ansible_vars/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ansible_vars/util.py,sha256=NJ_qufelfe0m4i80sb81PYYbbkVhoHNcpkJdl8XYpTQ,21241
+ansible_vars/vault.py,sha256=pBZVz64qdj1vstC9rZBIJ3O9n-_AHhhbySN1Q7eMWho,47199
+ansible_vars/vault_crypt.py,sha256=ZXa6QywyWdRVhY3YkFuk-COYs50MG252uakqe3bUUog,12116
+ansible_vars-1.0.17.dist-info/METADATA,sha256=-OQpTFwCeOawRVBI1HV_oG2Jlxbmb52GKkQ2pskSCbk,21071
+ansible_vars-1.0.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ansible_vars-1.0.17.dist-info/entry_points.txt,sha256=RrhkEH0MbfRzflguVrfYfthsFC5V2fkFnizUG3uHMtQ,55
+ansible_vars-1.0.17.dist-info/licenses/LICENSE,sha256=ocyJHLG5wD12qB4uam2pqWTHIJmzloiyNyTex6Q2DKo,1062
+ansible_vars-1.0.17.dist-info/RECORD,,

ansible_vars-1.0.15.dist-info/RECORD

@@ -1,13 +0,0 @@
-ansible_vars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ansible_vars/cli.py,sha256=D2_gUY3u3EpeP4T76YTez9n9gUrBySPwFRyKcrW2auI,66339
-ansible_vars/constants.py,sha256=VNr78qbzdJ0Vn0psbzjjQngNG3VbHhk6NXTz30VNUno,1622
-ansible_vars/errors.py,sha256=6dzyksPKWira9O2-Ir3MIOwr4XjN9MSBiRp5e6siY6Q,1256
-ansible_vars/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ansible_vars/util.py,sha256=UwGPBT19pee7lBpWuBzLPAvcrHUBAn6i1MrJvzM9OQ4,21265
-ansible_vars/vault.py,sha256=F8Eyn8ebduC3Cmst07280Bt7Wmy293ZRt9QrwshVVCA,47011
-ansible_vars/vault_crypt.py,sha256=Hv_bBn6gazVAnfo-h2ufsg1qAdaPB_Lvpicjl-rR-r8,11818
-ansible_vars-1.0.15.dist-info/METADATA,sha256=LAixHYmmBpn82kfAGuBR16Xt3FbRG6plmEI1o1y1vlk,21071
-ansible_vars-1.0.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ansible_vars-1.0.15.dist-info/entry_points.txt,sha256=RrhkEH0MbfRzflguVrfYfthsFC5V2fkFnizUG3uHMtQ,55
-ansible_vars-1.0.15.dist-info/licenses/LICENSE,sha256=ocyJHLG5wD12qB4uam2pqWTHIJmzloiyNyTex6Q2DKo,1062
-ansible_vars-1.0.15.dist-info/RECORD,,