skilleter-thingy 0.0.54__py3-none-any.whl → 0.0.56__py3-none-any.whl

skilleter_thingy/docker_purge.py

@@ -12,9 +12,9 @@
 import sys
 import re
 import argparse
+import logging
 
-import thingy.logger as logger
-import thingy.docker as docker
+from thingy import docker
 
 ################################################################################
 
@@ -35,11 +35,9 @@ def initialise():
 
     # Configure logging
 
-    log = logger.init('git-prompt')
-
     if args.debug:
-        log.setLevel(logger.DEBUG)
-        log.info('Debug logging enabled')
+        logging.basicConfig(level=logging.DEBUG)
+        logging.info('Debug logging enabled')
 
     # Default is to stop matching images
 
@@ -53,7 +51,7 @@ def initialise():
     else:
         args.images = '|'.join(args.images)
 
-    log.info('Arguments: %s', args)
+    logging.info('Arguments: %s', args)
     return args
 
 ################################################################################
@@ -66,7 +64,7 @@ def main(args):
             for instance in docker.instances():
                 if re.match(args.images, instance):
 
-                    print('Stopping instance: %s' % instance)
+                    print(f'Stopping instance: {instance}')
 
                     if not args.list:
                         docker.stop(instance, force=args.force)
@@ -75,7 +73,7 @@ def main(args):
             for instance in docker.instances(all=True):
                 if re.match(args.images, instance):
 
-                    print('Removing instance: %s' % instance)
+                    print(f'Removing instance: {instance}')
 
                     if not args.list:
                         docker.rm(instance)
@@ -84,7 +82,7 @@ def main(args):
             for image in docker.images():
                 if re.match(args.images, image):
 
-                    print('Removing image: %s' % image)
+                    print(f'Removing image: {image}')
 
                     if not args.list:
                         docker.rmi(image, force=args.force)

skilleter_thingy/ffind.py

@@ -27,16 +27,12 @@ import datetime
 import re
 import shlex
 import copy
+import logging
 
-import thingy.git as git
-import thingy.logger as logger
-import thingy.run as run
-import thingy.dircolors as dircolors
-import thingy.colour as colour
-
-################################################################################
-
-log = logger.init(__name__)
+from thingy import git
+from thingy import run
+from thingy import dircolors
+from thingy import colour
 
 ################################################################################
 
@@ -75,7 +71,7 @@ def report_file(args, filepath, filestat, dircolour):
         cmd = copy.copy(args.exec)
         cmd[cmd.index('^')] = filepath
 
-        log.debug('Running "%s"', ' '.join(cmd))
+        logging.debug('Running "%s"', ' '.join(cmd))
 
         # Attempt to run the command
 
@@ -212,9 +208,9 @@ def find_stuff(args, dircolour):
                                      onerror=None if args.quiet else report_exception,
                                      followlinks=args.follow):
 
-        log.debug('Root=%s', root)
-        log.debug('Dirs=%s', dirs)
-        log.debug('Files=%s', files)
+        logging.debug('Root=%s', root)
+        logging.debug('Dirs=%s', dirs)
+        logging.debug('Files=%s', files)
 
         if root[0:2] == './':
             root = root[2:]
@@ -284,8 +280,8 @@ def validate_arguments(args):
     # Enable logging
 
     if args.debug:
-        log.setLevel(logger.DEBUG)
-        log.debug('Debug logging enabled')
+        logging.basicConfig(level=logging.DEBUG)
+        logging.debug('Debug logging enabled')
 
     # Report conflicting options
 

skilleter_thingy/git_ca.py

@@ -15,10 +15,10 @@
 import os
 import argparse
 import sys
+import logging
 
 import thingy.colour as colour
 import thingy.git as git
-import thingy.logger as logger
 
 ################################################################################
 
@@ -50,11 +50,9 @@ def main():
 
     # Configure logger
 
-    log = logger.init(__name__)
-
     if args.verbose:
-        log.setLevel(logger.INFO)
-        log.info('Debug logging enabled')
+        logging.basicConfig(level=logging.INFO)
+        logging.info('Debug logging enabled')
 
     # 'Add' implies 'all'
 
@@ -85,11 +83,11 @@ def main():
     # Get the list of locally-modified and untracked files, including
     # files matching .gitignore, if necessary
 
-    log.info('Getting list of changed files')
+    logging.info('Getting list of changed files')
     local_changes = git.status_info(args.ignored)
 
     for change in local_changes:
-        log.info('Changed: %s (%s)', change, local_changes[change])
+        logging.info('Changed: %s (%s)', change, local_changes[change])
 
         if change in current_commit or (args.added and local_changes[change][0] == 'A'):
             # Locally changed and already in the commit or, optionally, added to it, so update it
@@ -117,7 +115,7 @@ def main():
     # Perform the commit running in the foreground in case the user is using a console
     # mode text editor for commit comments.
 
-    log.info('Files to commit: %s', files_to_commit)
+    logging.info('Files to commit: %s', files_to_commit)
 
     try:
         git.commit(files_to_commit, amend=True, foreground=True, patch=args.patch, dry_run=args.dry_run)

skilleter_thingy/git_co.py

@@ -24,8 +24,8 @@ import logging
 import sys
 import argparse
 
-import thingy.git as git
-import thingy.colour as colour
+from thingy import git
+from thingy import colour
 
 assert sys.version_info.major >= 3 and sys.version_info.minor >= 6
 

skilleter_thingy/git_parent.py

@@ -18,10 +18,12 @@ import thingy.colour as colour
 def main():
     """ Main function """
 
+    current_branch = git.branch()
+
     parser = argparse.ArgumentParser(description='Attempt to determine the parent branch for the specified branch (defaulting to the current one)')
     parser.add_argument('-a', '--all', action='store_true', help='Include feature branches as possible parents')
     parser.add_argument('-v', '--verbose', action='store_true', help='Report verbose results (includes number of commits between branch and parent)')
-    parser.add_argument('branch', action='store', nargs='?', type=str, default='HEAD', help='Branch, commit or commit')
+    parser.add_argument('branch', action='store', nargs='?', type=str, default=current_branch, help=f'Branch, commit or commit (defaults to current branch; {current_branch})')
 
     args = parser.parse_args()
 
@@ -53,7 +55,7 @@ def main():
             if len(parents) == 1:
                 colour.write(f'Parent branch [BLUE:{parents[0]}] is [BLUE:{distance}] commits away from [BLUE:{args.branch}]')
             else:
-                colour.write(f'Parent branches [BLUE:%s] are [BLUE:{distance}] commits away from [BLUE:{args.branch}[' % (', '.join(parents)))
+                colour.write(f'Parent branches [BLUE:%s] are [BLUE:{distance}] commits away from [BLUE:{args.branch}]' % (', '.join(parents)))
         else:
             print(', '.join(parents))
     else:

skilleter_thingy/git_update.py

@@ -78,16 +78,20 @@ def branch_rebase(args, results, branch):
             colour.error(exc.msg)
             sys.exit(1)
 
-        parents, _ = git.parents()
-
         # Ignore feature branches as potential alternative parents unless told otherwise
         # If they are the only possible parent(s) then we still consider them.
 
-        if not args.all_parents:
-            filtered_parents = [p for p in parents if not p.startswith('feature/')]
+        if args.all_parents:
+            parents, _ = git.parents()
+        else:
+            parents, _ = git.parents(ignore='feature/*' )
+
+            logging.debug('Probable parents of %s: %s', branch, parents)
+
+            if not parents:
+                parents, _ = git.parents()
 
-            if filtered_parents:
-                parents = filtered_parents
+                logging.debug('No non-feature-branch parents found for %s. Feature branch parents could be: %s', branch, parents)
 
         # Cheat - if we have multiple possible parents and one is 'develop', 'main' or 'master'
         # choose it.
@@ -184,10 +188,11 @@ def branch_pull(args, results, branch, fail=True):
                 output = git.pull()
 
                 colour.write(output, indent=4)
+
                 if output[0] == 'Already up-to-date.':
                     results['unchanged'].add(branch)
-                else:
-                    results['pulled'].add(branch)
+
+                results['pulled'].add(branch)
 
             except git.GitError as exc:
                 if exc.msg.startswith('There is no tracking information for the current branch.'):
@@ -345,6 +350,8 @@ def main():
     for entry in ('rebased', 'unchanged', 'pulled', 'failed', 'no-tracking'):
         results[entry] -= results['deleted']
 
+    results['pulled'] -= results['unchanged']
+
     if results['rebased']:
         report_branches('[BOLD:The following branches have been rebased:]', results['rebased'])
 

skilleter_thingy/gitcmp_helper.py

@@ -42,13 +42,13 @@ import os
 import argparse
 import filecmp
 import re
+import logging
 
-import thingy.logger as logger
-import thingy.colour as colour
-import thingy.run as run
-import thingy.files as files
-import thingy.git as git
-import thingy.dircolors as dircolors
+from thingy import colour
+from thingy import run
+from thingy import files
+from thingy import git
+from thingy import dircolors
 
 ################################################################################
 # Constants
@@ -88,10 +88,6 @@ def report_permissions(perm):
 def main():
     """ Main function - does everything """
 
-    # Set up logging
-
-    log = logger.init('gitcmp')
-
     # Allow the log level to be configured in git config, as well as via the
     # GITCMP_DEBUG
 
@@ -99,7 +95,7 @@ def main():
     env_debug = os.getenv('GITCMP_DEBUG', '0')
 
     if txt_debug.lower() in ('true', '1') or env_debug.lower() in ('true', '1'):
-        log.setLevel(logger.DEBUG)
+        logging.basicConfig(level=logging.INFO)
 
     # Parse the command line
 
@@ -129,17 +125,17 @@ def main():
 
     # Debug output
 
-    log.info('Parameters to gitcmp-helper:')
-    log.info('1: path:     %s', args.file_path)
-    log.info('2: old file: %s', args.old_file)
-    log.info('3: old sha1: %s', args.old_sha1)
-    log.info('4: old perm: %s', args.old_perm)
-    log.info('5: new file: %s', args.new_file)
-    log.info('6: new sha1: %s', args.new_sha1)
-    log.info('7: new perm: %s', args.new_perm)
-    log.info('8: new name: %s', args.new_name)
-    log.info('9: rename  : %s', args.rename)
-    log.info('path count:  %d/%d', path_count, path_total)
+    logging.info('Parameters to gitcmp-helper:')
+    logging.info('1: path:     %s', args.file_path)
+    logging.info('2: old file: %s', args.old_file)
+    logging.info('3: old sha1: %s', args.old_sha1)
+    logging.info('4: old perm: %s', args.old_perm)
+    logging.info('5: new file: %s', args.new_file)
+    logging.info('6: new sha1: %s', args.new_sha1)
+    logging.info('7: new perm: %s', args.new_perm)
+    logging.info('8: new name: %s', args.new_name)
+    logging.info('9: rename  : %s', args.rename)
+    logging.info('path count:  %d/%d', path_count, path_total)
 
     # Sanity checks
 
@@ -178,7 +174,7 @@ def main():
 
     current_file_path = os.path.relpath(args.file_path if args.new_name is None else args.new_name, current_path)
 
-    log.info('file path:   %s', current_file_path)
+    logging.info('file path:   %s', current_file_path)
 
     # Heading printed first
 

skilleter_thingy/readable.py

@@ -20,30 +20,37 @@ import os
 import re
 import filecmp
 import shutil
+import logging
 
-import thingy.tidy as tidy
-import thingy.files as files
+from thingy import tidy
+from thingy import 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\.\.\.|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')
-TF_READ_DURING_APPLY = re.compile(r' +# [-a-z_.0-9\[\]]+ will be read during apply')
 TF_UNCHANGED_TAG = re.compile(r' +".*" += +".*"')
-
-TF_OBJECTS_CHANGED = 'Note: Objects have changed outside of Terraform'
 TF_UNCHANGED_HIDDEN = re.compile(r' +# \(\d+ unchanged (?:attribute|block|element)s? hidden\)')
 
+TF_HAS_CHANGED = re.compile(r'  # .* has changed')
+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_MISC_REGEX = \
 [
     { 'regex': re.compile(r'(Read complete after) \d+s'), 'replace': r'\1 {SECONDS}'}
 ]
 
+TF_IGNORE_LIST = [
+    {'start': TF_HAS_CHANGED, 'end': TF_HAS_CHANGED_END},
+    {'start': TF_READ_DURING_APPLY, 'end': TF_READ_DURING_APPLY_END},
+]
+
 ################################################################################
 
 def parse_command_line():
@@ -63,10 +70,17 @@ def parse_command_line():
     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('-v', '--verbose', action='store_true', help='Output verbose status')
     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()
 
+    # Enable logging, if requested
+
+    if args.verbose:
+        logging.basicConfig(level=logging.INFO)
+        logging.info('Logging enabled')
+
     # Can't do more than one transformation
 
     if args.light + args.dark + args.none + args.debug > 1:
@@ -77,10 +91,11 @@ def parse_command_line():
         print('ERROR: The tidy and colour conversion options cannot be specified together')
         sys.exit(1)
 
-    # Default to doing cleanup - removing colour codes, times,
+    # Default to doing cleanup - removing colour codes, times & Terraform cleanup
 
     if not args.light and not args.dark and not args.tidy and not args.strip_blank and not args.terraform:
         args.strip_blank = args.none = args.tidy = args.terraform = True
+        logging.info('No options specified - defaulting to stripping blanks, removing colour codes, tidying and cleaning Terraform data')
 
     # Terraform option also removes ANSI, etc.
 
@@ -90,6 +105,8 @@ def parse_command_line():
     # Create the output directory, if required
 
     if args.dir and not os.path.isdir(args.dir):
+        logging.info('Creating output directory %s', args.dir)
+
         os.mkdir(args.dir)
 
     # Handle additional regex replacements
@@ -112,13 +129,16 @@ def cleanfile(args, infile, outfile):
     """ Clean infile, writing to outfile.
         Returns True if any changes were made. """
 
-    # Set if we are ignoring a block of adata
-
-    ignore_until = False
+    # Keep the previous line so that we can skip multiple blank lines
 
     prev_line = None
 
+    # Set if we are ignoring a block - contains a regex for the end-of-ignore marker
+
     ignore_until = None
+
+    # Collects data that we are going to output in alphabetical order
+
     collection = []
 
     # Read, process and write stdin to stdout, converting appropriately
@@ -173,39 +193,41 @@ def cleanfile(args, infile, outfile):
         if args.terraform:
             clean = tidy.regex_replace(clean, TF_MISC_REGEX)
 
-            if TF_HAS_CHANGED.fullmatch(clean):
-                ignore_until = '    }'
-
-            elif TF_READ_DURING_APPLY.fullmatch(clean):
-                ignore_until = '    }'
+            for ignore in TF_IGNORE_LIST:
+                if ignore['start'].fullmatch(clean):
+                    ignore_until = ignore['end']
 
-            elif clean == TF_OBJECTS_CHANGED:
-                ignore_until = TF_OBJECTS_CHANGED_END
+                    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):
+                    clean = None
 
-            elif TF_UNCHANGED_HIDDEN.fullmatch(clean):
-                clean = None
+                elif clean == TF_IGNORE_MSG:
+                    clean = None
 
-            elif clean == TF_IGNORE_MSG:
-                clean = None
+                elif TF_UNCHANGED_TAG.fullmatch(clean):
+                    clean = None
 
-            elif TF_UNCHANGED_TAG.fullmatch(clean):
-                clean = None
+                elif TF_REFRESHING_AND_READING.match(clean) or TF_FINDING_AND_INSTALLING.fullmatch(clean):
+                    # Collect a block of non-deterministically-ordered data
 
-            elif TF_REFRESHING_AND_READING.match(clean) or TF_FINDING_AND_INSTALLING.fullmatch(clean):
-                # Collect a block of non-deterministically-ordered data
+                    logging.info('Adding "%s" to collection', clean)
+                    collection.append(clean)
+                    clean = None
 
-                collection.append(clean)
-                clean = None
+                elif collection:
+                    # If we collected a block, write it out in sorted order
 
-            elif collection:
-                # If we collected a block, write it out in sorted order
+                    logging.info('Outputting collection of %d lines of sorted text', len(collection))
 
-                collection.sort()
-                for entry in collection:
-                    outfile.write(entry)
-                    outfile.write('\n')
+                    collection.sort()
+                    for entry in collection:
+                        outfile.write(entry)
+                        outfile.write('\n')
 
-                collection = []
+                    collection = []
 
         # Write normal output, skipping >1 blank lines
 
@@ -218,8 +240,15 @@ def cleanfile(args, infile, outfile):
 
         # Clear the ignore flag if we've hid the end marker of the block
 
-        if ignore_until and clean == ignore_until:
+        if ignore_until and clean and ignore_until.fullmatch(clean):
             ignore_until = None
+            logging.info('Hit end of ignore section')
+
+    # If we've hit the end and are still ignoring stuff, something's up!
+
+    if ignore_until:
+        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)
 
 ################################################################################
 

skilleter_thingy/remdir.py

@@ -25,11 +25,9 @@ import os
 import argparse
 import fnmatch
 import shutil
+import logging
 
 import thingy.colour as colour
-import thingy.logger as logger
-
-log = logger.init('remdir')
 
 ################################################################################
 
@@ -48,7 +46,10 @@ def main():
     args = parser.parse_args()
 
     if args.debug:
-        log.setLevel(logger.DEBUG)
+        logging.basicConfig(level=logging.DEBUG)
+
+    if not args.keep:
+        args.keep = []
 
     # Go through each directory
 
@@ -60,15 +61,15 @@ def main():
         # Walk through the directory tree in bottom-up order
 
         for root, dirs, files in os.walk(directory, topdown=False):
-            log.debug('')
-            log.debug('Directory: %s', root)
-            log.debug('     Sub-directories : %s', dirs)
-            log.debug('     Files           : %s', files)
+            logging.debug('')
+            logging.debug('Directory: %s', root)
+            logging.debug('     Sub-directories : %s', dirs)
+            logging.debug('     Files           : %s', files)
 
             # Only consider directories with no subdirectories
 
             if dirs:
-                log.debug('Ignoring directory "%s" as it has %d subdirectories', root, len(dirs))
+                logging.debug('Ignoring directory "%s" as it has %d subdirectories', root, len(dirs))
             else:
                 # Count of files (if any) to preserve in the directory
 
@@ -95,7 +96,7 @@ def main():
                     if keep_dir:
                         colour.write(f'Keeping empty directory [BLUE:{root}]')
                     else:
-                        log.debug('Deleting directory: %s', root)
+                        logging.debug('Deleting directory: %s', root)
                         colour.write(f'Deleting "[BLUE:{root}]"')
 
                         if not args.dry_run:
@@ -106,7 +107,7 @@ def main():
                             except OSError:
                                 colour.error('Unable to delete "[BLUE:{root}]"')
                 else:
-                    log.debug('Ignoring directory "%s" as it has %d non-ignorable files', root, filecount)
+                    logging.debug('Ignoring directory "%s" as it has %d non-ignorable files', root, filecount)
 
 ################################################################################
 

skilleter_thingy/thingy/path.py

@@ -10,8 +10,7 @@
 ################################################################################
 
 import os
-
-import thingy.logger as logger
+import logging
 
 ################################################################################
 
@@ -30,8 +29,8 @@ def is_subdirectory(root_path, sub_path):
     abs_sub_path = os.path.abspath(sub_path)
     abs_root_path = os.path.abspath(root_path)
 
-    log.debug('root path: %s', abs_root_path)
-    log.debug('sub path : %s', abs_sub_path)
+    logging.debug('root path: %s', abs_root_path)
+    logging.debug('sub path : %s', abs_sub_path)
 
     return abs_sub_path.startswith('%s/' % abs_root_path)
 
@@ -41,8 +40,8 @@ def trimpath(full_path, trim_width):
     """ Trim a path to a specified maximum width, but always leaving the
         lowest-level directory (even if it exceeds the trim width). """
 
-    log.debug('Path: "%s"', full_path)
-    log.debug('Required width: %d', trim_width)
+    logging.debug('Path: "%s"', full_path)
+    logging.debug('Required width: %d', trim_width)
 
     full_path = os.path.abspath(full_path)
 
@@ -58,12 +57,12 @@ def trimpath(full_path, trim_width):
 
     if full_path == home_dir:
         full_path = '~'
-        log.debug('Converted path to "~"')
+        logging.debug('Converted path to "~"')
 
     elif is_subdirectory(home_dir, full_path):
         full_path = "~/%s" % full_path[len(home_dir) + 1:]
 
-        log.debug('Converted path to "%s"', full_path)
+        logging.debug('Converted path to "%s"', full_path)
 
     # If the path is too long then slice it into directories and cut sub-directories
     # out of the middle until it is short enough. Always leave the last element
@@ -71,7 +70,7 @@ def trimpath(full_path, trim_width):
 
     path_len = len(full_path)
 
-    log.debug('Path length: %d', path_len)
+    logging.debug('Path length: %d', path_len)
 
     # Already within maximum width, so just return it
 
@@ -82,18 +81,18 @@ def trimpath(full_path, trim_width):
 
     directories = full_path.split('/')
 
-    log.debug('Path has %d elements: "%s"', len(directories), directories)
+    logging.debug('Path has %d elements: "%s"', len(directories), directories)
 
     if len(directories) == 1:
         # If there's only one element in the path, just give up
 
-        log.debug('Only 1 directory in the path, leaving it as-is')
+        logging.debug('Only 1 directory in the path, leaving it as-is')
 
     elif len(directories) == 2:
         # If there's only two elements in the path then replace the first
         # element with '...' and give up
 
-        log.debug('Only 2 directories in the path, so setting the first to "..."')
+        logging.debug('Only 2 directories in the path, so setting the first to "..."')
 
         directories[0] = '...'
 
@@ -126,20 +125,18 @@ def trimpath(full_path, trim_width):
 
                 left -= 1
 
-        log.debug('Removing entries %d..%d from the path', left, right)
+        logging.debug('Removing entries %d..%d from the path', left, right)
 
         directories = directories[0:left + 1] + ['...'] + directories[right:]
 
     full_path = '/'.join(directories)
 
-    log.debug('Calculated width is %d and actual width is %d', path_len, len(full_path))
+    logging.debug('Calculated width is %d and actual width is %d', path_len, len(full_path))
 
     return full_path
 
 ################################################################################
 
-log = logger.init('tgy_path')
-
 if __name__ == '__main__':
     PARENT = '/1/2/3/5'
     CHILD = '/1/2/3/5/6'

skilleter_thingy/thingy/process.py

@@ -11,8 +11,7 @@
 
 import subprocess
 import sys
-
-import thingy.logger as logger
+import logging
 
 ################################################################################
 
@@ -36,7 +35,7 @@ def run(command, foreground=False, shell=False):
 
     # TODO: for background use subprocess.Popen but use devnull = open('/dev/null', 'w') for stdio and return proc instead of communicating with it?
 
-    log.info('Running "%s"', ' '.join(command))
+    logging.info('Running "%s"', ' '.join(command))
 
     # If running in the foreground, run the command and either return an empty value
     # on success (output is to the console) or raise a RunError
@@ -62,8 +61,8 @@ def run(command, foreground=False, shell=False):
         except OSError as exc:
             raise RunError(exc)
 
-        log.info('Stdout: %s', proc.stdout)
-        log.info('Stderr: %s', proc.stderr)
+        logging.info('Stdout: %s', proc.stdout)
+        logging.info('Stderr: %s', proc.stderr)
 
         # If it returned an error raise a RunError exception with the stdout text as the
         # exception message
@@ -83,14 +82,14 @@ def run(command, foreground=False, shell=False):
         while output and output[-1] == '':
             output = output[:-1]
 
-        log.info('Output: %s', output)
+        logging.info('Output: %s', output)
         return output
 
 ################################################################################
 
-log = logger.init('tgy_process')
-
 if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+
     print('Run ls -l:')
 
     cmd_output = run(['ls', '-l'])

skilleter_thingy/trimpath.py

@@ -13,9 +13,9 @@ import sys
 import os
 import argparse
 import shutil
+import logging
 
-import thingy.path as path
-import thingy.logger as logger
+from thingy import path
 
 ################################################################################
 
@@ -32,11 +32,8 @@ def main():
 
     args = parser.parse_args()
 
-    log = logger.init('trimpath')
-
     if args.debug:
-        if log.getEffectiveLevel() < logger.DEBUG:
-            log.setLevel(logger.DEBUG)
+        logging.basicConfig(level=logging.DEBUG)
 
     # Set the width, defaulting to 25% of the console width
 
@@ -47,7 +44,7 @@ def main():
             trim_width = -1
 
         if trim_width <= 0:
-            log.critical('Invalid width: "%s"', args.width)
+            logging.critical('Invalid width: "%s"', args.width)
             sys.exit(1)
     else:
         console = shutil.get_terminal_size()

{skilleter_thingy-0.0.54.dist-info → skilleter_thingy-0.0.56.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.54
+Version: 0.0.56
 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.54.dist-info → skilleter_thingy-0.0.56.dist-info}/RECORD

@@ -4,22 +4,22 @@ skilleter_thingy/borger.py,sha256=AQX7OHeGXcUjkgyXEWE2h_oOey9eczZBbKjrreXvRAs,78
 skilleter_thingy/box.py,sha256=WJlviIvPtpdDUt4MfSMcnIo9OxV3j-ua_CAtR8CTYnc,745
 skilleter_thingy/console_colours.py,sha256=BOS9mo3jChx_FE8L1j488MDoVNgib11KjTRhrz_YRYE,1781
 skilleter_thingy/diskspacecheck.py,sha256=7xsj4egXXV6jPhXZTe2b5rS03XAmm5uLC5TeiO1NJoE,2072
-skilleter_thingy/docker_purge.py,sha256=2t6yjlxmHCHKMAejLViYyOQNzyqSXGiV59df4Wlojaw,3349
-skilleter_thingy/ffind.py,sha256=1MQGnzr-n3TUH2yFphfj4SjYNR3b-6LsdmLjhHJy2e0,19345
+skilleter_thingy/docker_purge.py,sha256=Qsykf_xR9ekn2u5n0ZNK84jMJbp08CilcCw1EAZKX2I,3307
+skilleter_thingy/ffind.py,sha256=XJwH27rTLI0-zGD-7s8viyg7_SZjJaq5Q7VBbJPSYSI,19235
 skilleter_thingy/ggit.py,sha256=AIhW3S7HC9smgBcHmDsbTLnO6j9VASkeLsBeA0hnCvM,2480
 skilleter_thingy/ggrep.py,sha256=Mxme8gliQms9-_uf7CLqD9Zd3ZAVFWjamsK6dWw58jg,5863
 skilleter_thingy/git_br.py,sha256=NUCqe85VCgouzEpbMVODaScPIsbCrC4pe7zDMDz02Ro,5799
-skilleter_thingy/git_ca.py,sha256=0SluqsJaNSaPdcS4c94648ELAm7aHB3aWgIdF1sngT8,4963
+skilleter_thingy/git_ca.py,sha256=wzYFaQmT1MyOF-Caz0daAUv7OUvrNKCyemIWMEBW-dA,4944
 skilleter_thingy/git_cleanup.py,sha256=TnUPYAUnByVyY_dwANzDg2BGGNh3jskNF1DgU3pc8Jk,10201
-skilleter_thingy/git_co.py,sha256=gBES0ltlomy7vXX8IHh0-Vt1af54t2Ie5UnRYYfP4tM,8212
+skilleter_thingy/git_co.py,sha256=VhgfUU-rNeEYh4ZQNlQRRusxDrnEOVmWCB1OQWj5WT4,8205
 skilleter_thingy/git_common.py,sha256=ZjNkvIBRDGNLFYwOu9FjeqdDKJdm0sndX5QATtmq290,1879
 skilleter_thingy/git_hold.py,sha256=Zk6YUhr08znUOdpVJkJAt0rOtrCXnKE0NHoZzoaEEGo,4616
 skilleter_thingy/git_mr.py,sha256=2vLzpd5waddNBRlOvQUxwqHVQaK9Rg6FYHb4VMEpS8c,3086
-skilleter_thingy/git_parent.py,sha256=D47D01dPs6kActusA0ircJYTv8tBjDoe8MzMpJVWJpA,2683
+skilleter_thingy/git_parent.py,sha256=znw0ehKau-YocFJu2jLBsYSnLJfUvSNFKSDBdQ9_OTo,2774
 skilleter_thingy/git_review.py,sha256=WCBw49OP3WHiaxku8jUUk6I_NqtjScLGaQHvPxX6LnU,52053
-skilleter_thingy/git_update.py,sha256=uYd4ubnDbHzkwwrtzVatNIg-L15ap1X8UMO-2PafseY,13971
+skilleter_thingy/git_update.py,sha256=6mXHSF7fxhKzFxsG3-78JOHYKdmAEE68iq39-Ho5WQU,14181
 skilleter_thingy/git_wt.py,sha256=dnJSkZGGMaSGeHARQ1ZYwf9yeFLbag-c4w4HwpA2od0,3522
-skilleter_thingy/gitcmp_helper.py,sha256=_3ji-PyIF2oI6a4zyUPjLeCFgAtACykxPpOrbjD6-aw,11245
+skilleter_thingy/gitcmp_helper.py,sha256=wutDHpBPOX8ZsXbsC5ApHxMY5tOKgD3P0eyFVs_mSAI,11214
 skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
 skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/gphotosync.py,sha256=Vb2zYTEFp26BYdkG810SRg9afyfDqvq4CLHTk-MFf60,22388
@@ -28,8 +28,8 @@ skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
-skilleter_thingy/readable.py,sha256=pz6g0Rh91SnzzpzrPoYELkBGwljuPiwhb33yANIjAAw,10462
-skilleter_thingy/remdir.py,sha256=-C-LAOaphdKLbBwm--rEwrsDdyldXps-C4s8iDNOKw8,4610
+skilleter_thingy/readable.py,sha256=PPR3kBr36-ArFvKumdGB8T04RCvoN_lejabR9BBIFzs,11812
+skilleter_thingy/remdir.py,sha256=SkN9xEc1ckFGRP4zS2LUbx7Ihw697YMV0ybr_-afiyE,4653
 skilleter_thingy/rmdupe.py,sha256=tcX3w8XvliGwBMdSt9BUu07kuDtQEc0IiU8sCxmgzHA,17117
 skilleter_thingy/rpylint.py,sha256=TzZ5GvWrqgTKYKZwadTvzdbX-DJ8ll4WfVJqtN6IzO0,2635
 skilleter_thingy/splitpics.py,sha256=qRlJrqet7TEI6SodS4bkuKXQUpOdMaqmjE4c1CR7ouo,3266
@@ -37,7 +37,7 @@ skilleter_thingy/strreplace.py,sha256=xsIWw0hc452rYEBtNEQFKIzmV03xjm_Taz-eDTmFFK
 skilleter_thingy/sysmon.py,sha256=XRZG6EVSzoVYan_N16qVB1l1RaU51uvLWlRA0CDjC54,11348
 skilleter_thingy/tfm.py,sha256=3ejKNI2P65lGz-50mxRMxW_o5NmoeMDcmhji_0uALhI,33703
 skilleter_thingy/tfparse.py,sha256=u1IZH2J_WH1aORyMozKSI2JKok7_S1MMJhiobzmhlUI,2988
-skilleter_thingy/trimpath.py,sha256=IJU3zl4Hg08g0eU24LZyDlGfNa-5k-TZM5s9zR4OIdA,2385
+skilleter_thingy/trimpath.py,sha256=25On5OHTT1rXTzTuRWQeS3FWtTd0XZr5NFDDACR6AGM,2294
 skilleter_thingy/venv_create.py,sha256=lMcGvWNwP-ZlyPJ1eZU-PHNOnscZHjtjhoT6sLfhIU4,1153
 skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63sqJK8,3128
 skilleter_thingy/xchmod.py,sha256=F9_lxKuLqVlHHr3oBI3dkMoFOuwRzYDlpQMTmDcjpBI,4590
@@ -53,17 +53,16 @@ skilleter_thingy/thingy/files.py,sha256=oW6E6WWwVFSUPdrZnKMx7P_w_hh3etjoN7RrqvYH
 skilleter_thingy/thingy/git.py,sha256=qXWIduF4jbP5pKFYt_hW9Ex5iL9mSBBrcNKBkULhRTg,38834
 skilleter_thingy/thingy/git2.py,sha256=UgdAC1rZWf6Tdl9xB6PAIT6K_3OjD2juCOEQSHEEb90,35530
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
-skilleter_thingy/thingy/logger.py,sha256=xKgPAq8KGXmtaXIFjFs1AmZJXtYrXJn2sqL3oxHZjfQ,3107
-skilleter_thingy/thingy/path.py,sha256=me__Ukw-7NiD70Yd9tOWyj7QX79-deFvsQaQ9AGzWzU,4732
+skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dOeu8,2529
-skilleter_thingy/thingy/process.py,sha256=88pKHQZXBP1m3Ja7t3DtKJ4Njn7HS2OtcI0Z0i1KwUs,3560
+skilleter_thingy/thingy/process.py,sha256=WJLg3js1zdgI7Nlkt7e5ICltkjXcA9P1f-LWPSZCdWs,3570
 skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1Uo,12611
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=0EVUP2XyUTtoIpqaDwvrHL58YxM4Elvu5MO1nzhwLG4,5854
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.54.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.54.dist-info/METADATA,sha256=iR7kxxHCn2O7GdaQt8BTr1VINMx2RPDpRtp1byf7PlQ,5313
-skilleter_thingy-0.0.54.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-skilleter_thingy-0.0.54.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
-skilleter_thingy-0.0.54.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.54.dist-info/RECORD,,
+skilleter_thingy-0.0.56.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.56.dist-info/METADATA,sha256=z_KocDUM-WXKzF608kNO9FVKx_sqn2vDB8oyJTUAkXI,5313
+skilleter_thingy-0.0.56.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+skilleter_thingy-0.0.56.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
+skilleter_thingy-0.0.56.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.56.dist-info/RECORD,,

skilleter_thingy/thingy/logger.py

@@ -1,112 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Thingy logging functionality - wraps the Pythong logging module
-
-    Copyright (c) 2017 John Skilleter
-
-    Licence: GPL v3 or later
-"""
-################################################################################
-
-import os
-
-import logging
-
-################################################################################
-
-CRITICAL = logging.CRITICAL
-ERROR = logging.ERROR
-WARNING = logging.WARNING
-INFO = logging.INFO
-DEBUG = logging.DEBUG
-NOTSET = logging.NOTSET
-
-LOG_LEVELS = {
-    'CRITICAL': CRITICAL, 'ERROR': ERROR, 'WARNING': WARNING, 'INFO': INFO,
-    'DEBUG': DEBUG, 'NOTSET': NOTSET
-}
-
-__config_done__ = False
-
-################################################################################
-
-def set_logging(log, name):
-    """ If an environment variable called NAME_DEBUG is set and defines a
-        log level that is more verbose than the current level then set
-        that level (you can only increase verbosity via the variable, not
-        decrease it). """
-
-    # Check whether there is an environment variable setting the debug level
-
-    env_name = '%s_DEBUG' % name.upper()
-
-    value = os.getenv(env_name, None)
-
-    if value is not None:
-        value = value.upper()
-
-        current = log.getEffectiveLevel()
-
-        # Check for a textual level in the value and if no match, try
-        # for an integer level ignoring invalid values.
-
-        if value in LOG_LEVELS:
-            if current > LOG_LEVELS[value]:
-                log.setLevel(LOG_LEVELS[value])
-        else:
-            try:
-                intlevel = int(value)
-
-                if current > intlevel:
-                    log.setLevel(intlevel)
-
-            except ValueError:
-                pass
-
-    return log
-
-################################################################################
-
-def init(name):
-    """ Initilise logging and create a logger.
-        If the environment variable NAME_DEBUG is set to a value in LOG_LEVELS
-        then the log level is set to that level. If NAME_DEBUG is an integer
-        then the same applies, otherwise, by default, the log level is CRITICAL """
-
-    # Create the new logger
-
-    log = logging.getLogger(name)
-
-    # Default log level is CRITICAL
-
-    log.setLevel(CRITICAL)
-
-    # Set logging according to the value of THINGY_DEBUG (if set) then
-    # override with the logger-specific variable (again, if set)
-
-    set_logging(log, 'THINGY')
-    set_logging(log, name)
-
-    return log
-
-################################################################################
-# Entry point
-
-# Ensure that the logging module is initialise
-
-if not __config_done__:
-    logging.basicConfig()
-    __config_done__ = True
-
-if __name__ == '__main__':
-    demo = init('wombat')
-
-    demo.critical('Critical error')
-
-    # These messages should only appear if the WOMBAT_DEBUG environment variable
-    # is set to an appropriate value (ERROR, WARNING or INFO)
-
-    demo.error('Error message')
-    demo.warning('Warning message')
-    demo.info('Info message')