skilleter-thingy 0.2.9__tar.gz → 0.2.11__tar.gz

{skilleter_thingy-0.2.9 → skilleter_thingy-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.9
+Version: 0.2.11
 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.2.9 → skilleter_thingy-0.2.11}/pyproject.toml

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

{skilleter_thingy-0.2.9 → skilleter_thingy-0.2.11}/skilleter_thingy/gitprompt.py

@@ -74,33 +74,37 @@ MAX_BRANCH_NAME_LENGTH = int(os.environ.get('COLUMNS', 96)) / 3
 
 ################################################################################
 
-def write_colour_prompt(gitstate: dict):
-    """ Output the colour for the prompt, according to the current state of the
+def colour_prompt(gitstate: dict):
+    """ Return the colour for the prompt, according to the current state of the
         working tree. """
 
-    colour.write('[NORMAL]', newline=False)
+    output = []
+
+    output.append('[NORMAL]')
 
     if gitstate['modified'] or gitstate['deleted']:
-        colour.write('[REVERSE][RED]', newline=False)
+        output.append('[REVERSE][RED]')
 
     elif gitstate['added'] or gitstate['copied'] or gitstate['renamed']:
-        colour.write('[REVERSE][YELLOW]', newline=False)
+        output.append('[REVERSE][YELLOW]')
 
     elif gitstate['unmerged']:
-        colour.write('[REVERSE][MAGENTA]', newline=False)
+        output.append('[REVERSE][MAGENTA]')
 
     elif gitstate['untracked']:
-        colour.write('[REVERSE][CYAN]', newline=False)
+        output.append('[REVERSE][CYAN]')
 
     elif gitstate['merging'] or gitstate['bisecting'] or gitstate['rebasing']:
-        colour.write('[REVERSE][BLACK]', newline=False)
+        output.append('[REVERSE][BLACK]')
 
     else:
-        colour.write('[REVERSE][GREEN]', newline=False)
+        output.append('[REVERSE][GREEN]')
+
+    return output
 
 ################################################################################
 
-def write_prompt_prefix(gitstate: dict):
+def prompt_prefix(gitstate: dict):
     """ Build a prompt prefix containing the type and number
       of changes in the repo. """
 
@@ -172,15 +176,14 @@ def write_prompt_prefix(gitstate: dict):
     elif gitstate['merging']:
         prefix.append('(merging)')
 
-    if prefix:
-        sys.stdout.write(' {%s}' % ' '.join(prefix))
-
     project = git.project(short=True)
 
     if project:
-        sys.stdout.write(f' {project}: {branch} ')
-    else:
-        sys.stdout.write(f' {branch} ')
+        prefix.append(project)
+
+    prefix.append(branch)
+
+    return ' '.join(prefix)
 
 ################################################################################
 
@@ -188,17 +191,19 @@ def git_status(colour_output: str, prompt_output: str):
     """ Catalogue the current state of the working tree then call the function
         to either output a suitable colour or the prompt text or both """
 
+    output = []
+
     # Get the working tree, just return if there's an error
 
     try:
         working_tree = git.working_tree()
     except git.GitError:
-        return
+        return None
 
     # Return if we are not in a working tree
 
     if not working_tree:
-        return
+        return None
 
     # gitstate contains counters for numbers of modified (etc.) elements in the tree and flags to indicate
     # whether we're currently in a merge/rebase/bisect state.
@@ -212,16 +217,16 @@ def git_status(colour_output: str, prompt_output: str):
         gitstate['rebasing'] = git.rebasing()
         gitstate['bisecting'] = git.bisecting()
 
-        status = git.status()
+        status = git.status(untracked=True)
     except git.GitError as exc:
         # Major failure of gitness - report the error and quit
 
+        msg = exc.msg.split('\n')[0]
+
         if colour_output:
-            colour.write('[WHITE][BRED]', newline=False)
-        else:
-            colour.write(' ERROR: %s ' % exc.msg.split('\n')[0], newline=False)
+            return f'[WHITE][BRED] {msg}'
 
-        return
+        return f' ERROR: {msg} '
 
     # Count the number of files in each state
 
@@ -237,10 +242,12 @@ def git_status(colour_output: str, prompt_output: str):
     # Set the output colour or output the prompt prefix
 
     if colour_output:
-        write_colour_prompt(gitstate)
+        output += colour_prompt(gitstate)
 
     if prompt_output or not colour_output:
-        write_prompt_prefix(gitstate)
+        output.append(prompt_prefix(gitstate))
+
+    return ''.join(output)
 
 ################################################################################
 
@@ -253,7 +260,10 @@ def main():
 
     args = parser.parse_args()
 
-    git_status(args.colour, args.prompt)
+    output = git_status(args.colour, args.prompt)
+
+    if output:
+        colour.write(f' {output} ', newline=False)
 
 ################################################################################
 

{skilleter_thingy-0.2.9 → skilleter_thingy-0.2.11}/skilleter_thingy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.9
+Version: 0.2.11
 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