skilleter-thingy 0.0.81__py3-none-any.whl → 0.0.83__py3-none-any.whl

skilleter_thingy/multigit.py

@@ -8,7 +8,6 @@ import argparse
 import fnmatch
 import configparser
 import shlex
-import pathlib
 from collections import defaultdict
 
 import thingy.git2 as git
@@ -102,13 +101,23 @@ def select_git_repos(args, config):
        or, return them all if no relevant options specified"""
 
     for repo in config.sections():
-        # If wildcards are specified, then only match wildcards
+        # If repos are specified, then only match according to wildcards, full
+        # path or just basename.
 
         if args.repos:
-            for card in args.repos:
-                if fnmatch.fnmatch(repo, card):
+            for entry in args.repos:
+                if '?' in entry or '*' in entry:
+                    if fnmatch.fnmatch(repo, entry):
+                        matching = True
+                        break
+                elif '/' in entry:
+                    if repo == entry:
+                        matching = True
+                        break
+                elif os.path.basename(repo) == entry:
                     matching = True
                     break
+
             else:
                 matching = False
         else:
@@ -139,6 +148,7 @@ def branch_name(name, default_branch):
 ################################################################################
 
 def run_git_status(cmd, path, cont=False, redirect=True):
+    """Run a git command and exit if it fails"""
 
     output, status = git.git_run_status(cmd, path=path, redirect=redirect)
 
@@ -351,7 +361,7 @@ def mg_checkout(args, config, console):
         if not args.quiet:
             show_progress(console.columns, repo.name)
 
-        branch = branch_name(args.branch or repo.name['default branch'])
+        branch = branch_name(args.branch, repo['default branch'])
 
         if git.branch(path=repo.name) != branch:
             colour.write(f'Checking out [BLUE:{branch}] in [BOLD:{repo.name}]')
@@ -407,7 +417,7 @@ def mg_update(args, config, console):
             git.checkout(default_branch, path=repo.name)
 
         if not args.quiet:
-            colour.write(f'Pulling updates from remote', indent=4)
+            colour.write('Pulling updates from remote', indent=4)
 
         git.pull(path=repo.name)
 
@@ -457,6 +467,8 @@ def mg_dir(args, config, console):
     """Return the location of a working tree, given the name. Returns an
        error unless there is a unique match"""
 
+    # DONE: Should return location relative to the current directory or as absolute path
+
     _ = console
     _ = config
 
@@ -472,7 +484,17 @@ def mg_dir(args, config, console):
     elif len(location) > 1:
         error(f'Multiple matches with {dir}')
 
-    colour.write(location[0])
+    colour.write(os.path.join(os.path.dirname(args.config)), location[0]))
+
+################################################################################
+
+def mg_config(args, config, console):
+    """Output the path to the configuration file"""
+
+    _ = config
+    _ = console
+
+    colour.write(args.config)
 
 ################################################################################
 
@@ -510,10 +532,10 @@ def mg_review(args, config, console):
 
 ################################################################################
 
-def read_configuration(args):
+def find_configuration(args):
     """If the configuration file name has path elements, try and read it, otherwise
        search up the directory tree looking for the configuration file.
-       Returns the configuration data, or None if the configuration file
+       Returns configuration file path or None if the configuration file
        could not be found."""
 
     if '/' in args.config:
@@ -526,13 +548,7 @@ def read_configuration(args):
             config_path = os.path.dirname(config_path)
             config_file = os.path.join(config_path, args.config)
 
-    config = configparser.ConfigParser()
-
-    if os.path.isfile(config_file):
-        config.read(config_file)
-        return config
-
-    return None
+    return config_file if os.path.isfile(config_file) else None
 
 ################################################################################
 
@@ -550,6 +566,7 @@ def main():
        'update': mg_update,
        'clean': mg_clean,
        'dir': mg_dir,
+       'config': mg_config,
        'run': mg_run,
        'review': mg_review,
     }
@@ -604,6 +621,8 @@ def main():
     parser_dir = subparsers.add_parser('dir', help='Return the location of a working tree, given the repo name')
     parser_dir.add_argument('dir', nargs=1, action='store', help='The name of the working tree')
 
+    parser_config = subparsers.add_parser('config', help='Return the name and location of the configuration file')
+
     parser_run = subparsers.add_parser('run', help='Run any git command in each of the working trees')
     parser_run.add_argument('--cont', '-c', action='store_true', help='Continue if the command returns an error in any of the working trees')
     parser_run.add_argument('cmd', nargs=1, action='store', help='The command to run (should be quoted)')
@@ -625,7 +644,12 @@ def main():
 
     # If the configuration file exists, read it
 
-    config = read_configuration(args)
+    config = configparser.ConfigParser()
+
+    args.config = find_configuration(args)
+
+    if args.config:
+        config.read(args.config)
 
     # Command-specific validation
 

{skilleter_thingy-0.0.81.dist-info → skilleter_thingy-0.0.83.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.81
+Version: 0.0.83
 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.81.dist-info → skilleter_thingy-0.0.83.dist-info}/RECORD

@@ -25,7 +25,7 @@ skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/gphotosync.py,sha256=Vb2zYTEFp26BYdkG810SRg9afyfDqvq4CLHTk-MFf60,22388
 skilleter_thingy/linecount.py,sha256=5voQtjJjDCVx4zjPwVRy620NpuLiwwFitzxjIsRGtxQ,4310
 skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980k,4470
-skilleter_thingy/multigit.py,sha256=LPZjl2-VzTtAQRVozxgu7QAaVqiIylcKlYstnJcf9Dw,26021
+skilleter_thingy/multigit.py,sha256=9-IFOlHH7Xcxqr91OVu0F78NX5DaaFwCtwqjP5pgIBc,26948
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
@@ -61,9 +61,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.81.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.81.dist-info/METADATA,sha256=Jvbejh1CK4TUDqNgFuJ2VrFASRHf-d5n2u0O6uWbg_8,6113
-skilleter_thingy-0.0.81.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-skilleter_thingy-0.0.81.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
-skilleter_thingy-0.0.81.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.81.dist-info/RECORD,,
+skilleter_thingy-0.0.83.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.83.dist-info/METADATA,sha256=6_ACyV5SAnSA9JafWITy8ypToClvbS9KfNp3HfXcetY,6113
+skilleter_thingy-0.0.83.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+skilleter_thingy-0.0.83.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
+skilleter_thingy-0.0.83.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.83.dist-info/RECORD,,