skilleter-thingy 0.0.49__tar.gz → 0.0.51__tar.gz

{skilleter_thingy-0.0.49/skilleter_thingy.egg-info → skilleter_thingy-0.0.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.49
+Version: 0.0.51
 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

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.49"
+version = "0.0.51"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

skilleter_thingy-0.0.51/skilleter_thingy/box.py

@@ -0,0 +1,31 @@
+#! /usr/bin/env python3
+
+################################################################################
+""" Draw a box with text in
+"""
+################################################################################
+
+import sys
+import thingy.colour as colour
+
+################################################################################
+
+def main():
+    """The guts"""
+    return
+################################################################################
+
+def box():
+    """Entry point"""
+
+    try:
+        main()
+    except KeyboardInterrupt:
+        sys.exit(1)
+    except BrokenPipeError:
+        sys.exit(2)
+
+################################################################################
+
+if __name__ == '__main__':
+    box()

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/git_hold.py

@@ -54,7 +54,7 @@ def archive_branches(branches):
             colour.error(f'[RED:ERROR:] An archive tag already exists for branch {branch}')
 
         if branch == current_branch:
-            colour.error(f'[RED:ERROR:] Cannot archive the current branch')
+            colour.error('[RED:ERROR:] Cannot archive the current branch')
 
     for branch in branches:
         tag_name = archive_tag_name(branch)
@@ -95,7 +95,7 @@ def restore_archive_branches(branches):
     tags = archive_tags()
 
     for branch in branches:
-        if not archive_tag_name(branch) in tags:
+        if archive_tag_name(branch) not in tags:
             colour.error(f'[RED:ERROR:] Archive branch {branch} does not exist')
 
     archive_tag_names = []

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/git_review.py

@@ -1299,13 +1299,13 @@ def parse_command_line():
     # Make sure that we're actually in a git working tree
 
     if not git.working_tree():
-        colour.error(f'[RED:ERROR] Not a git repository')
+        colour.error('[RED:ERROR] Not a git repository')
 
     # -C/--change is shorthand for '--commit HEAD^'
 
     if args.change:
         if args.commits:
-            colour.error(f'[RED:ERROR] The -C/--change option does not take parameters')
+            colour.error('[RED:ERROR] The -C/--change option does not take parameters')
 
         args.commits = ['HEAD^']
 

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/git_update.py

@@ -195,7 +195,7 @@ def branch_pull(args, results, branch, fail=True):
                     fail = False
 
                 elif exc.msg.startswith('Your configuration specifies to merge with the ref'):
-                    colour.write(f'[RED:WARNING]: The upstream branch no longer exists', indent=4)
+                    colour.write('[RED:WARNING]: The upstream branch no longer exists', indent=4)
                     fail = False
 
                 elif 'no such ref was fetched' in exc.msg:

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/photodupe.py

@@ -3,7 +3,6 @@
 
 import sys
 import os
-import sys
 import pickle
 import argparse
 

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/py_audit.py

@@ -5,7 +5,6 @@
 
 ################################################################################
 
-import os
 import sys
 import requests
 import subprocess
@@ -64,7 +63,7 @@ def audit(package, version):
                 print()
                 print(v['details'])
     else:
-        print(f'No known vulnerabilities')
+        print('No known vulnerabilities')
 
 ################################################################################
 

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/readable.py

@@ -29,7 +29,7 @@ import thingy.files as files
 TF_OBJECTS_CHANGED_END = 'Terraform detected the following changes made outside of Terraform since the last "terraform apply":'
 TF_IGNORE_MSG = 'Unless you have made equivalent changes to your configuration, or ignored the relevant attributes using ignore_changes, the following plan may include actions to undo or respond to these changes.'
 
-TF_REFRESHING_AND_READING = re.compile(r'.*: (?:Refreshing state\.\.\.|Reading\.\.\.|Read complete after |Preparing import\.\.\.).*')
+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_HAS_CHANGED = re.compile(r'  # .* has changed')
@@ -62,6 +62,7 @@ def parse_command_line():
     parser.add_argument('-O', '--dir', action='store', default=None, help='Store output files in the specified directory (creating it if it doesn\'t exist)')
     parser.add_argument('-a', '--aws', action='store_true', help='Remove AWS resource IDs')
     parser.add_argument('-T', '--terraform', action='store_true', help='Clean Terraform plan/apply log files')
+    parser.add_argument('-R', '--replace', action='append', default=None, help='Additional regex replacements in the form "REGEX=REPLACEMENT"')
     parser.add_argument('files', nargs='*', default=None, help='The files to convert (use stdin/stout if no input files are specified)')
 
     args = parser.parse_args()
@@ -91,6 +92,18 @@ def parse_command_line():
     if args.dir and not os.path.isdir(args.dir):
         os.mkdir(args.dir)
 
+    # Handle additional regex replacements
+
+    if args.replace:
+        args.regex_replace = []
+        for entry in args.replace:
+            regex, replace = entry.split('=')
+            try:
+                args.regex_replace.append({'regex': re.compile(regex), 'replace':replace})
+            except re.error as exc:
+                print(f'ERROR in regular expression {regex}: {exc}')
+                sys.exit(1)
+
     return args
 
 ################################################################################
@@ -139,6 +152,7 @@ def cleanfile(args, infile, outfile):
             clean = tidy.remove_sha256(clean)
             clean = tidy.remove_sha1(clean)
             clean = tidy.remove_times(clean)
+            clean = tidy.remove_speeds(clean)
 
             if not args.light and not args.dark:
                 clean = tidy.remove_ansi(clean)
@@ -148,6 +162,12 @@ def cleanfile(args, infile, outfile):
         if args.aws:
             clean = tidy.remove_aws_ids(clean)
 
+        # Additional custom regex replacements
+
+        if args.replace:
+            for entry in args.regex_replace:
+                clean = entry['regex'].sub(entry['replace'], clean)
+
         # Do things with Terraform log data
 
         if args.terraform:

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/thingy/git.py

@@ -515,6 +515,13 @@ def difftool(commit_1=None, commit_2=None, files=None, tool=None):
 
 ################################################################################
 
+# Match 'git diff --numstat' output - first re splits into lines added, removed
+# and name. Second one is used if a file has been renamed, to get the old and
+# new name components.
+
+_DIFF_OUTPUT_RE = re.compile(r'(-|\d+)\s+(-|\d+)\s+(.*)')
+_DIFF_OUTPUT_RENAME_RE = re.compile('(.*)\{(.*) => (.*)\}(.*)')
+
 def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
     """ Return details of changes either in single commit (defaulting to the most
         recent one) or between two commits, optionally restricted a path or paths
@@ -523,22 +530,30 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
     """
 
     def parse_diff_output(result):
-        """Extract current filename and lines added/deleted from output from git diff --numstat"""
+        """Extract previous and current filename (which may be the same) and lines added/deleted
+           from output from git diff --numstat"""
+
+        p = _DIFF_OUTPUT_RE.fullmatch(result)
 
-        p = re.fullmatch(r'(-|\d+)\s+(-|\d+)\s+(.*)', result)
+        # Extract number of lines added/removed
 
         lines_ins = 0 if p.group(1) == '-' else int(p.group(1))
         lines_del = 0 if p.group(2) == '-' else int(p.group(2))
 
+        # Check for rename and get both old and new names
+
         if ' => ' in p.group(3):
-            filepath = p.group(3).split('{')[0]
-            filename = p.group(3).split(' => ')[1]
-            filename = filename.replace('}', '')
-            filename = os.path.join(filepath, filename)
+            q = _DIFF_OUTPUT_RENAME_RE.fullmatch(p.group(3))
+
+            if q:
+                old_filename = q.group(1) + q.group(2) + q.group(4)
+                new_filename = q.group(1) + q.group(3) + q.group(4)
+            else:
+                old_filename, new_filename = p.group(3).split(' => ')
         else:
-            filename = p.group(3)
+            old_filename = new_filename = p.group(3)
 
-        return filename, lines_ins, lines_del
+        return old_filename, new_filename, lines_ins, lines_del
 
     # Either get changes between the two commits, or changes in the specified commit
 
@@ -588,22 +603,23 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
         results = git(['diff', '--numstat'] + params)
 
         for result in results:
-            filename, lines_ins, lines_del = parse_diff_output(result)
+            old_filename, new_filename, lines_ins, lines_del = parse_diff_output(result)
 
-            info[filename]['deleted'] = lines_del
-            info[filename]['added'] = lines_ins
+            info[new_filename]['deleted'] = lines_del
+            info[new_filename]['added'] = lines_ins
 
         # Run git diff to get stats ignoring whitespace changes and add them
 
         results = git(['diff', '--numstat', '--ignore-all-space', '--ignore-blank-lines'] + params)
 
         for result in results:
-            filename, lines_ins, lines_del = parse_diff_output(result)
+            old_filename, new_filename, lines_ins, lines_del = parse_diff_output(result)
 
-            info[filename]['non-ws deleted'] = lines_del
-            info[filename]['non-ws added'] = lines_ins
+            info[new_filename]['non-ws deleted'] = lines_del
+            info[new_filename]['non-ws added'] = lines_ins
 
         # Fill in the blanks - files
+
         for filename in info:
             if 'deleted' not in info[filename]:
                 info[filename]['deleted'] = info[filename]['added'] = 0

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/thingy/git2.py

@@ -216,15 +216,6 @@ def merge(branch):
 
 ################################################################################
 
-def merging():
-    """ Return True if a merge is in progress, False otherwise """
-
-    merge_check = git_run_status(['rev-parse', '-q', '--verify', 'MERGE_HEAD'])
-
-    return merge_check[1] == 0
-
-################################################################################
-
 def abort_merge():
     """ Abort the current merge """
 

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/thingy/tidy.py

@@ -50,16 +50,16 @@ RE_TIME = [
     {'regex': re.compile(r'[1-9][0-9]{3}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}[.][0-9]+Z?'), 'replace': '{DATE+TIME}'},
     {'regex': re.compile(r'[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}(Z|,[0-9]+)'), 'replace': '{TIME}'},
     {'regex': re.compile(r'[0-9]{1,2}:[0-9]{2}:[0-9]{2}(\.[0-9]{1,6})?([+][0-9]{2}:[0-9]{2})?'), 'replace': '{TIME}'},
-    
-    
+
     {'regex': re.compile(r'[1-9][0-9]{3}/[0-9][0-9]?/[1-9][0-9]'), 'replace': '{DATE}'},
     {'regex': re.compile(r'[1-9][0-9]/[0-9][0-9]?/[1-9][0-9]{3}'), 'replace': '{DATE}'},
     {'regex': re.compile(r'[0-9]{4}-[0-9]{2}-[0-9]{2}'), 'replace': '{DATE}'},
     {'regex': re.compile(r'[0-9]{2}-[0-9]{2}-[0-9]{4}'), 'replace': '{DATE}'},
 
     {'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}'},
 ]
 
 # SHA values
@@ -85,6 +85,14 @@ RE_AWS = \
     {'regex': re.compile(r'request id: [0-0a-f]{8}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{12}'), 'replace': 'request id: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'},
 ]
 
+# Data transfer speeds
+
+RE_SPEED = \
+[
+    {'regex': re.compile(r'[0-9.]+ *MB/s'), 'replace': '{SPEED}'},
+    {'regex': re.compile(r'[0-9.]+ *MiB/s'), 'replace': '{SPEED}'},
+]
+
 ################################################################################
 
 def regex_replace(data, regexes):
@@ -150,6 +158,13 @@ def remove_aws_ids(data):
 
 ################################################################################
 
+def remove_speeds(data):
+    """ Attempt to remove data transfer speed references from a string """
+
+    return regex_replace(data, RE_SPEED)
+
+################################################################################
+
 def remove_ansi(text):
     """ Remove ANSI codes from a string """
 

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy/venv_create.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import sys
 import os
 import stat
 import argparse

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.49
+Version: 0.0.51
 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

{skilleter_thingy-0.0.49 → skilleter_thingy-0.0.51}/skilleter_thingy.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 skilleter_thingy/__init__.py
 skilleter_thingy/addpath.py
 skilleter_thingy/borger.py
+skilleter_thingy/box.py
 skilleter_thingy/console_colours.py
 skilleter_thingy/diskspacecheck.py
 skilleter_thingy/docker_purge.py