skilleter-thingy 0.0.61__tar.gz → 0.0.63__tar.gz

{skilleter_thingy-0.0.61/skilleter_thingy.egg-info → skilleter_thingy-0.0.63}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.61
+Version: 0.0.63
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: imagehash

{skilleter_thingy-0.0.61 → skilleter_thingy-0.0.63}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.61"
+version = "0.0.63"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -17,7 +17,7 @@ description = "A collection of useful utilities, mainly aimed at making Git more
 
 readme = "README.md"
 
-requires-python = ">=3.6"
+requires-python = ">=3.8"
 
 classifiers = [
     "Programming Language :: Python :: 3",

{skilleter_thingy-0.0.61 → skilleter_thingy-0.0.63}/skilleter_thingy/readable.py

@@ -31,6 +31,7 @@ TF_IGNORE_MSG = 'Unless you have made equivalent changes to your configuration,
 
 TF_REFRESHING_AND_READING = re.compile(r'.*: (?:Refreshing state\.\.\.|Reading\.\.\.|Still reading\.\.\.|Read complete after |Preparing import\.\.\.).*')
 TF_FINDING_AND_INSTALLING = re.compile(r'- (?:Finding .*[.]{3}|Installing .*[.]{3}|Installed .*)')
+TF_FETCHING_AND_INSTALLING = re.compile(r'(Fetching|Installing|Using) [-a-z0-9_]+ [0-9.]+')
 
 TF_UNCHANGED_HIDDEN = re.compile(r' +# \(\d+ unchanged (?:attribute|block|element)s? hidden\)')
 
@@ -40,16 +41,23 @@ TF_HAS_CHANGED_END = re.compile(r'    [}]')
 TF_READ_DURING_APPLY = re.compile(r' +# [-a-z_.0-9\[\]]+ will be read during apply')
 TF_READ_DURING_APPLY_END = re.compile(r'    [}]')
 
+TF_TAG_CHANGE_BLOCK_START = re.compile(r'^ +~ +tags(_all)? += +\{$')
+TF_TAG_ENTRY_IGNORE = re.compile(r'^ +".*" += +".*"')
+TF_TAG_CHANGE_BLOCK_END = re.compile(r'^ +}$')
+
 TF_MISC_REGEX = \
 [
-    { 'regex': re.compile(r'(Read complete after) \d+s'), 'replace': r'\1 {SECONDS}'},
+    { 'regex': re.compile(r'(Read complete after) (\d+s|\d+m\d+s)'), 'replace': r'\1 {ELAPSED}'},
     { 'regex': re.compile(r'"(.*:.*)"( = ".*")'), 'replace': r'\1\2'},
     { 'regex': re.compile(r'"(.*:.*)"( = \[$)'), 'replace': r'\1\2'},
+    { 'regex': re.compile(r'^last "terraform apply":$'), 'replace':r'last "terraform apply" which may have affected this plan:'},
 ]
 
 TF_IGNORE_LIST = [
     {'start': TF_HAS_CHANGED, 'end': TF_HAS_CHANGED_END},
     {'start': TF_READ_DURING_APPLY, 'end': TF_READ_DURING_APPLY_END},
+    {'start': re.compile(r'(Releasing|Acquiring) state lock. This may take a few moments\.+')},
+    {'start': re.compile(r'.*: Still reading\.{3} \[.* elapsed\]')},
 ]
 
 ################################################################################
@@ -142,6 +150,10 @@ def cleanfile(args, infile, outfile):
 
     collection = []
 
+    # True if we are processing a tag block
+
+    in_tag_block = False
+
     # Read, process and write stdin to stdout, converting appropriately
 
     for data in infile:
@@ -196,22 +208,31 @@ def cleanfile(args, infile, outfile):
 
             for ignore in TF_IGNORE_LIST:
                 if ignore['start'].fullmatch(clean):
-                    ignore_until = ignore['end']
+                    if 'end' in ignore:
+                        ignore_until = ignore['end']
+
+                        logging.info('Found ignore start marker: "%s"', clean)
+                        logging.info('Skipping until end marker: "%s"', ignore_until.pattern)
+                    else:
+                        clean = None
 
-                    logging.info('Found ignore start marker: "%s"', clean)
-                    logging.info('Skipping until end marker: "%s"', ignore_until.pattern)
                     break
             else:
-                if TF_UNCHANGED_HIDDEN.fullmatch(clean):
+                if TF_TAG_CHANGE_BLOCK_START.fullmatch(clean):
+                    in_tag_block = True
+
+                elif TF_TAG_CHANGE_BLOCK_END.fullmatch(clean):
+                    in_tag_block = False
+
+                elif TF_UNCHANGED_HIDDEN.fullmatch(clean):
                     clean = None
 
                 elif clean == TF_IGNORE_MSG:
                     clean = None
 
-                elif TF_REFRESHING_AND_READING.match(clean) or TF_FINDING_AND_INSTALLING.fullmatch(clean):
+                elif TF_REFRESHING_AND_READING.match(clean) or TF_FINDING_AND_INSTALLING.fullmatch(clean) or TF_FETCHING_AND_INSTALLING.fullmatch(clean):
                     # Collect a block of non-deterministically-ordered data
 
-                    logging.info('Adding "%s" to collection', clean)
                     collection.append(clean)
                     clean = None
 
@@ -227,6 +248,9 @@ def cleanfile(args, infile, outfile):
 
                     collection = []
 
+            if in_tag_block and clean and TF_TAG_ENTRY_IGNORE.fullmatch(clean):
+                clean = None
+
         # Write normal output, skipping >1 blank lines
 
         if clean is not None and not ignore_until:
@@ -248,6 +272,10 @@ def cleanfile(args, infile, outfile):
         print(f'INTERNAL ERROR: Code never found end of ignore-block marker "{ignore_until.pattern}" - either the Terraform output format has changed, or the log file is incomplete!')
         sys.exit(2)
 
+    if in_tag_block:
+        print('INTERNAL ERROR: Code never found end of tag block marker - either the Terraform output format has changed, or the log file is incomplete!')
+        sys.exit(2)
+
 ################################################################################
 
 def main():

{skilleter_thingy-0.0.61 → skilleter_thingy-0.0.63}/skilleter_thingy/thingy/tidy.py

@@ -58,8 +58,8 @@ RE_TIME = [
 
     {'regex': re.compile(r'[0-9]([.][0-9]*)*\s*(second[s]?)'), 'replace': '{ELAPSED}'},
 
-    {'find': r'{DATE} {TIME}', 'replace': '{DATE+TIME}'},
-    {'find': r'\d{2}m \d{2}s', 'replace': '{TIME}'},
+    {'find': '\{DATE\} \{TIME\}', 'replace': '{DATE+TIME}'},
+    {'regex': re.compile(r'[0-9]+m *[0-9]+s'), 'replace': '{ELAPSED}'},
 ]
 
 # SHA values

{skilleter_thingy-0.0.61 → skilleter_thingy-0.0.63/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.61
+Version: 0.0.63
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: imagehash