skilleter-thingy 0.0.97__tar.gz → 0.0.98__tar.gz

{skilleter_thingy-0.0.97/skilleter_thingy.egg-info → skilleter_thingy-0.0.98}/PKG-INFO

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

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

{skilleter_thingy-0.0.97 → skilleter_thingy-0.0.98}/skilleter_thingy/multigit.py

@@ -30,7 +30,6 @@ import thingy.colour as colour
 # TODO: -j option to run in parallel - yes, but it will only work with non-interactive Git commands
 # TODO: Command that takes partial working tree name and either returns full path or pops up window to autocomplete until single match found
 # TODO: Consistent colours in output
-# TODO: If run in a subdirectory, only process working trees in that tree (or have an option to do so)
 # TODO: Option to +dir to return all matches so that caller can select one they want
 # TODO: Verbose option
 # TODO: When filtering by tag, if tag starts with '!' only match if tag isn't present (and don't allow '!' at start of tag otherwise)
@@ -39,7 +38,8 @@ import thingy.colour as colour
 # TODO: +run command to do things other than git commands
 # TODO: init option '--update' to update the configuration file with new working trees and remove ones that are no longer there
 # TODO: init option '--set-default' to update the default branch to the current one for specified working trees
-# TODO: Integrat completion with fzf if installed?
+# TODO: Integrate completion with fzf if installed?
+# TODO: If run in a subdirectory, only process working trees in that tree (or have an option to do so, or an option _not_ to do so; --all)
 ################################################################################
 
 DEFAULT_CONFIG_FILE = 'multigit.toml'
@@ -153,14 +153,7 @@ def find_configuration(default_config_file):
 def show_progress(width, msg):
     """Show a single line progress message"""
 
-    name = msg[:width-1]
-
-    colour.write(f'{name}', newline=False)
-
-    if len(name) < width-1:
-        colour.write(' '*(width-len(name)), newline=False)
-
-    colour.write('\r', newline=False)
+    colour.write(msg[:width-1], newline=False, cleareol=True, cr=True)
 
 ################################################################################
 
@@ -298,9 +291,10 @@ def mg_init(args, config, console):
 
             colour.write(f'Added [BOLD:{repo}] with default branch [BLUE:{default_branch}]')
 
-    # Look for configuration entries that are no longer present and delete them
+    if not args.quiet:
+        colour.write(cleareol=True)
 
-    colour.write()
+    # Look for configuration entries that are no longer present and delete them
 
     removals = []
 
@@ -571,7 +565,7 @@ def main():
 
     if not args.configuration_file:
         if args.internal_command and args.command == 'init':
-            args.configuration_file = args.default_configuration_file
+            args.configuration_file = os.path.abspath(args.default_configuration_file)
         else:
             error('Cannot locate configuration file')
 

{skilleter_thingy-0.0.97 → skilleter_thingy-0.0.98}/skilleter_thingy/thingy/colour.py

@@ -42,6 +42,8 @@ _ANSI_BMAGENTA = '\x1b[45m'
 _ANSI_BCYAN = '\x1b[46m'
 _ANSI_BWHITE = '\x1b[47m'
 
+_ANSI_CLEAREOL = '\x1b[K'
+
 # Looking up tables for converting textual colour codes to ANSI codes
 
 ANSI_REGEXES = \
@@ -144,7 +146,7 @@ def format(txt):
 
 ################################################################################
 
-def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False):
+def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False, cleareol=False, cr=False):
     """ Write to the specified stream (defaulting to stdout), converting colour codes to ANSI
         txt can be None, a string or a list of strings."""
 
@@ -163,10 +165,22 @@ def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False):
 
             stream.write(line)
 
+            if cleareol:
+                stream.write(_ANSI_CLEAREOL)
+
             if newline or n < len(txt) - 1:
                 stream.write('\n')
-    elif newline:
-        stream.write('\n')
+            elif cr:
+                stream.write('\r')
+
+    else:
+        if cleareol:
+            stream.write(_ANSI_CLEAREOL)
+
+        if newline:
+            stream.write('\n')
+        elif cr:
+            stream.write('\r')
 
 ################################################################################
 

{skilleter_thingy-0.0.97 → skilleter_thingy-0.0.98/skilleter_thingy.egg-info}/PKG-INFO

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