skilleter-thingy 0.0.82__tar.gz → 0.0.83__tar.gz

{skilleter_thingy-0.0.82/skilleter_thingy.egg-info → skilleter_thingy-0.0.83}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.82
+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.82 → skilleter_thingy-0.0.83}/pyproject.toml

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

{skilleter_thingy-0.0.82 → skilleter_thingy-0.0.83}/skilleter_thingy/multigit.py

@@ -467,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
 
@@ -482,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)
 
 ################################################################################
 
@@ -520,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:
@@ -536,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
 
 ################################################################################
 
@@ -560,6 +566,7 @@ def main():
        'update': mg_update,
        'clean': mg_clean,
        'dir': mg_dir,
+       'config': mg_config,
        'run': mg_run,
        'review': mg_review,
     }
@@ -614,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)')
@@ -635,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.82 → skilleter_thingy-0.0.83/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.82
+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