skilleter-thingy 0.1.6__tar.gz → 0.1.8__tar.gz

{skilleter_thingy-0.1.6 → skilleter_thingy-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.6
+Version: 0.1.8
 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
@@ -19,6 +19,7 @@ Requires-Dist: pygit2
 Requires-Dist: python-dateutil
 Requires-Dist: requests
 Requires-Dist: filetype
+Dynamic: license-file
 
 # Thingy
 
@@ -103,7 +104,7 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+init` - Create or update the configuration file
 
-`+dir` - Given the name of a working tree, output the location within the multigit tree of that working tree if the name matches uniquely, or the name of the directory where the multigit configuration file resides if no parameter is specified.
+`+dir NAME` - Given the name of a working tree, output relative path(s) to one or more matching working trees. If `NAME` does NOT contains wildcard characters (`*` or `?`) then matching takes place as if `*` were prefixed and appended to it, otherwise, the wildcards are used as specified. If `NAME` is not specified then the location of the directory where the multigit configuration file resides is output.
 
 `+config` - Print the name and location of the multigit configuration file.
 

{skilleter_thingy-0.1.6 → skilleter_thingy-0.1.8}/README.md

@@ -81,7 +81,7 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+init` - Create or update the configuration file
 
-`+dir` - Given the name of a working tree, output the location within the multigit tree of that working tree if the name matches uniquely, or the name of the directory where the multigit configuration file resides if no parameter is specified.
+`+dir NAME` - Given the name of a working tree, output relative path(s) to one or more matching working trees. If `NAME` does NOT contains wildcard characters (`*` or `?`) then matching takes place as if `*` were prefixed and appended to it, otherwise, the wildcards are used as specified. If `NAME` is not specified then the location of the directory where the multigit configuration file resides is output.
 
 `+config` - Print the name and location of the multigit configuration file.
 

{skilleter_thingy-0.1.6 → skilleter_thingy-0.1.8}/pyproject.toml

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

{skilleter_thingy-0.1.6 → skilleter_thingy-0.1.8}/skilleter_thingy/multigit.py

@@ -141,6 +141,14 @@ def error(msg, status=1):
 
 ################################################################################
 
+def verbose(args, msg):
+    """Output a message to stderr if running verbosely"""
+
+    if args.verbose:
+        colour.write(f'>>>{msg}', stream=sys.stderr)
+
+################################################################################
+
 def absolute_repo_path(args, relative_path=''):
     """Given a path relative to the multigit configuration file, return
        the absolute path thereto"""
@@ -149,6 +157,14 @@ def absolute_repo_path(args, relative_path=''):
 
 ################################################################################
 
+def relative_repo_path(args, relative_path=''):
+    """Given a path relative to the multigit configuration file, return
+       the relative path from the current directory"""
+
+    return os.path.relpath(absolute_repo_path(args, relative_path))
+
+################################################################################
+
 def find_configuration(default_config_file):
     """If the configuration file name has path elements, try and read it, otherwise
        search up the directory tree looking for the configuration file.
@@ -432,9 +448,13 @@ def mg_dir(args, config, console):
     _ = console
     _ = config
 
+    verbose(args, f'dir: Parameters: {", ".join(args.parameters)}')
+
     if len(args.parameters) > 1:
         error('The +dir command takes no more than one parameter - the name of the working tree to search for')
 
+    # TODO: mg_dir _should_ use these options
+
     if args.modified or args.branched or args.tag or args.subdirectories:
         error('The "--tag", "--modified" "--sub", and "--branched" options cannot be used with the "dir" subcommand')
 
@@ -443,29 +463,25 @@ def mg_dir(args, config, console):
 
     if args.parameters:
         location = []
-        wild_prefix_location = []
         wild_location = []
 
         search_name = args.parameters[0]
 
-        # Search for exact matches, matches if prefixed by '*' or prefixed and suffixed with '*'
-        # unless it already contains '*'
+        # Search for exact matches, or matches that contain the search term if it
+        # doesn't already contain a wildcard
 
         for repo in select_git_repos(args, config):
             if fnmatch.fnmatch(repo['repo name'], search_name):
                 location.append(repo.name)
 
             elif '*' not in search_name:
-                if fnmatch.fnmatch(repo['repo name'], f'*{search_name}'):
-                    wild_prefix_location.append(repo.name)
-
-                elif fnmatch.fnmatch(repo['repo name'], f'*{search_name}*'):
+                if fnmatch.fnmatch(repo['repo name'], f'*{search_name}*'):
                     wild_location.append(repo.name)
 
         # Look for a single exact match, a prefix with '*' match or prefix+suffix
 
         destination = None
-        for destinations in (location, wild_prefix_location, wild_location):
+        for destinations in (location, wild_location):
             if len(destinations) == 1:
                 destination = destinations
                 break
@@ -476,11 +492,7 @@ def mg_dir(args, config, console):
         if not destination:
             error(f'No matches with [BLUE:{search_name}]')
 
-        if len(destination) > 1:
-            dest_list = "\n\t".join([os.path.relpath(d) for d in destination])
-            error(f'Multiple matches with [BLUE:{search_name}]: \n\t{dest_list}')
-
-        colour.write(absolute_repo_path(args, destination[0]))
+        colour.write("\n".join([relative_repo_path(args, d) for d in destination]))
 
     else:
         colour.write(os.path.dirname(args.configuration_file))
@@ -578,82 +590,83 @@ def parse_command_line():
 
     args = Arguments()
 
-    # Expand arguments so that, for instance '-dv' is parsed as '-d -v'
-
-    argv = []
+    # Parse the command line, setting options in the args dataclass appropriately
 
-    for arg in sys.argv:
-        if arg[0] != '-' or arg.startswith('--'):
-            argv.append(arg)
-        else:
-            for c in arg[1:]:
-                argv.append('-' + c)
+    arg_list = sys.argv[1:]
 
-    # Parse the command line, setting options in the args dataclass appropriately
+    while arg_list and arg_list[0].startswith('-'):
+        # Split a parameter into a list, so --x becomes [x] but -xyz becomes [x, y, z]
 
-    i = 1
-    while i < len(argv):
-        param = argv[i]
+        arg_entry = arg_list.pop(0)
+        if arg_entry.startswith('--'):
+            params = [arg_entry[2:]]
+        else:
+            params = list(arg_entry[1:])
 
-        if param in ('--verbose', '-v'):
-            args.verbose = True
+        while params:
+            param = params.pop(0)
 
-        elif param in ('--quiet', '-q'):
-            args.quiet = True
+            if param in ('verbose', 'v'):
+                args.verbose = True
 
-        elif param in ('--config', '-c'):
-            try:
-                i += 1
-                args.default_configuration_file = argv[i]
-            except IndexError:
-                error('--config - missing configuration file parameter')
+            elif param in ('quiet', 'q'):
+                args.quiet = True
 
-        elif param in ('--repos', '-r'):
-            try:
-                i += 1
-                args.repos.append(argv[i])
-            except IndexError:
-                error('--repos - missing repo parameter')
+            elif param in ('config', 'c'):
+                if params:
+                    error('--config - missing configuration file parameter')
+                else:
+                    try:
+                        args.default_configuration_file = arg_list.pop(0)
+                    except IndexError:
+                        error('--config - missing configuration file parameter')
 
-        elif param in ('--tag', '-t'):
-            try:
-                i += 1
-                args.tag.append(argv[i])
-            except IndexError:
-                error('--tag - missing tag parameter')
+            elif param in ('repos', 'r'):
+                if params:
+                    error('--repos - missing repo parameter')
+                try:
+                    args.repos.append(arg_list.pop(0))
+                except IndexError:
+                    error('--repos - missing repo parameter')
 
-        elif param in ('--modified', '-m'):
-            args.modified = True
+            elif param in ('tag', 't'):
+                if params:
+                    error('--tag - missing tag parameter')
+                try:
+                    args.tag.append(arg_list.pop(0))
+                except IndexError:
+                    error('--tag - missing tag parameter')
 
-        elif param in ('--branched', '-b'):
-            args.branched = True
+            elif param in ('modified', 'm'):
+                args.modified = True
 
-        elif param in ('--sub', '-s'):
-            args.subdirectories = True
+            elif param in ('branched', 'b'):
+                args.branched = True
 
-        elif param in ('--continue', '-C'):
-            args.error_continue = True
+            elif param in ('sub', 's'):
+                args.subdirectories = True
 
-        elif param in ('--help', '-h'):
-            colour.write(HELP_INFO)
-            sys.exit(0)
+            elif param in ('continue', 'C'):
+                args.error_continue = True
 
-        elif param[0] == '-':
-            error(f'Invalid option: "{param}"')
-        else:
-            break
+            elif param in ('help', 'h'):
+                colour.write(HELP_INFO)
+                sys.exit(0)
 
-        i += 1
+            else:
+                error(f'Invalid option: "{param}"')
 
     # After the options, we either have a multigit command (prefixed with '+') or a git command
     # followed by parameter
 
     try:
-        if argv[i][0] == '+':
-            args.command = argv[i][1:]
+        command = arg_list.pop(0)
+
+        if command[0] == '+':
+            args.command = command[1:]
             args.internal_command = True
         else:
-            args.command = argv[i]
+            args.command = command
             args.internal_command = False
 
     except IndexError:
@@ -661,7 +674,7 @@ def parse_command_line():
 
     # Save the command parameters
 
-    args.parameters = argv[i+1:]
+    args.parameters = arg_list
 
     # Locate the configuration file
 

{skilleter_thingy-0.1.6 → skilleter_thingy-0.1.8}/skilleter_thingy/thingy/tidy.py

@@ -29,7 +29,8 @@ import re
 
 ANSI_REGEXES = [
     re.compile(r'\x1b\[([0-9][0-9;]*)*m'),
-    re.compile(r'\x1b\[m')
+    re.compile(r'\x1b\[m'),
+    re.compile(r'\x1b\[[0-9][A-Z]'),
 ]
 
 # Match and ANSI colour control sequence and capture the colour bit
@@ -58,7 +59,7 @@ RE_TIME = [
 
     {'regex': re.compile(r'[0-9]([.][0-9]*)*\s*(second[s]?)'), 'replace': '{ELAPSED}'},
 
-    {'find': '\{DATE\} \{TIME\}', 'replace': '{DATE+TIME}'},
+    {'find': '{DATE} {TIME}', 'replace': '{DATE+TIME}'},
     {'regex': re.compile(r'[0-9]+m *[0-9]+s'), 'replace': '{ELAPSED}'},
 ]
 

{skilleter_thingy-0.1.6 → skilleter_thingy-0.1.8}/skilleter_thingy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.6
+Version: 0.1.8
 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
@@ -19,6 +19,7 @@ Requires-Dist: pygit2
 Requires-Dist: python-dateutil
 Requires-Dist: requests
 Requires-Dist: filetype
+Dynamic: license-file
 
 # Thingy
 
@@ -103,7 +104,7 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+init` - Create or update the configuration file
 
-`+dir` - Given the name of a working tree, output the location within the multigit tree of that working tree if the name matches uniquely, or the name of the directory where the multigit configuration file resides if no parameter is specified.
+`+dir NAME` - Given the name of a working tree, output relative path(s) to one or more matching working trees. If `NAME` does NOT contains wildcard characters (`*` or `?`) then matching takes place as if `*` were prefixed and appended to it, otherwise, the wildcards are used as specified. If `NAME` is not specified then the location of the directory where the multigit configuration file resides is output.
 
 `+config` - Print the name and location of the multigit configuration file.