skilleter-thingy 0.0.89__py3-none-any.whl → 0.0.91__py3-none-any.whl

skilleter_thingy/multigit.py

@@ -68,7 +68,7 @@ Sub-commands:
   {+init,+dir,+config,GIT_COMMAND}
     +init                Build or update the configuration file using the current branch in each repo as the default branch
     +config              Return the name and location of the configuration file
-    +dir                 Return the location of a working tree, given the repo name
+    +dir                 Return the location of a working tree, given the repo name, or if no parameter specified, the root directory of the multigit tree
     GIT_COMMAND          Any git command, including options and parameters - this is then run in all specified working trees
 
 """
@@ -98,7 +98,7 @@ class Arguments():
 def error(msg, status=1):
     """Quit with an error"""
 
-    sys.stderr.write(f'{msg}\n')
+    colour.write(f'[RED:ERROR:] {msg}\n', stream=sys.stderr)
     sys.exit(status)
 
 ################################################################################
@@ -232,7 +232,7 @@ def mg_init(args, config, console):
         if not args.quiet:
             show_progress(console.columns, repo.name)
 
-        if not repo in config:
+        if repo not in config:
             config[repo] = {
                 'default branch': git.branch(path=repo)
             }
@@ -248,29 +248,33 @@ def mg_init(args, config, console):
 ################################################################################
 
 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"""
+    """Return the location of a working tree, given the name, or the root directory
+       of the tree if not
+       Returns an error unless there is a unique match"""
 
     # DONE: Should return location relative to the current directory or as absolute path
 
     _ = console
     _ = config
 
-    if len(args.parameters) != 1:
-        error('The +dir command takes one parameter - the name of the working tree to search for')
+    if len(args.parameters) > 1:
+        error('The +dir command takes no more than one parameter - the name of the working tree to search for')
+    elif args.parameters:
+        location = []
+        search_dir = args.parameters[0]
 
-    location = []
+        for repo in select_git_repos(args, config):
+            if fnmatch.fnmatch(repo['name'], search_dir):
+                location.append(repo.name)
 
-    for repo in select_git_repos(args, config):
-        if fnmatch.fnmatch(repo['name'], args.parameters[0]):
-            location.append(repo.name)
-
-    if len(location) == 0:
-        error(f'No matches with {search_dir}')
-    elif len(location) > 1:
-        error(f'Multiple matches with {search_dir}')
+        if len(location) == 0:
+            error(f'No matches with [BLUE:{search_dir}]')
+        elif len(location) > 1:
+            error(f'Multiple matches with [BLUE:{search_dir}] - {" ".join(location)}')
 
-    colour.write(os.path.join(os.path.dirname(args.configuration_file), location[0]))
+        colour.write(os.path.join(os.path.dirname(args.configuration_file), location[0]))
+    else:
+        colour.write(os.path.dirname(args.configuration_file))
 
 ################################################################################
 
@@ -418,7 +422,9 @@ def main():
     config = configparser.ConfigParser()
 
     if not (args.internal_command and args.command == 'init'):
-        if not os.path.isfile(args.configuration_file):
+        if not args.configuration_file:
+            error('Cannot locate configuration file')
+        elif not os.path.isfile(args.configuration_file):
             error(f'Cannot read configuration file {args.configuration_file}')
 
     if os.path.isfile(args.configuration_file):

{skilleter_thingy-0.0.89.dist-info → skilleter_thingy-0.0.91.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.89
+Version: 0.0.91
 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.89.dist-info → skilleter_thingy-0.0.91.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=hAMF5glefQ82_tMs-zGXj-5FGkXpytQZO5hjqjqA95M,16212
+skilleter_thingy/multigit.py,sha256=Ge5VpyqhFFF8TEN--M0oIN2g7A_Amht_F1KVhF1VhiU,16670
 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.89.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.89.dist-info/METADATA,sha256=m_ybn_cE_YK_cnxhqEmXKxyPm32Kx5cYWuRPwcqURUA,8236
-skilleter_thingy-0.0.89.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-skilleter_thingy-0.0.89.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
-skilleter_thingy-0.0.89.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.89.dist-info/RECORD,,
+skilleter_thingy-0.0.91.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.91.dist-info/METADATA,sha256=qWWQElEBKig5lAZ7X4oVuHqQCIQEXOwGPTXwsZNRYNE,8236
+skilleter_thingy-0.0.91.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+skilleter_thingy-0.0.91.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
+skilleter_thingy-0.0.91.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.91.dist-info/RECORD,,