skilleter-thingy 0.2.9__py3-none-any.whl → 0.2.10__py3-none-any.whl

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(output, newline=False)
 
 ################################################################################
 

{skilleter_thingy-0.2.9.dist-info → skilleter_thingy-0.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.9
+Version: 0.2.10
 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.dist-info → skilleter_thingy-0.2.10.dist-info}/RECORD

@@ -18,7 +18,7 @@ skilleter_thingy/git_review.py,sha256=Z_e0wyQJ2AzOSy5cPI3jmAWystpJbHH4ygENjFagep
 skilleter_thingy/git_update.py,sha256=Z3p3E33ZJ2DVa107UzaFR9V8LXADRuHjJL8TX3IhEa4,14348
 skilleter_thingy/git_wt.py,sha256=tkGN_Bfz80icHNDVG8xuXVeUUR-xyZ3u8jopLRt1Ff4,2355
 skilleter_thingy/gitcmp_helper.py,sha256=MlRimPj-S-ov44ETUvocRvfygs3cArP6WdSJCIJWNCs,11347
-skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
+skilleter_thingy/gitprompt.py,sha256=Ci92A_uVc7gTcv1OwqerN91nBBY8SPvHpFJkYBICf08,8853
 skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/linecount.py,sha256=ehTN6VD76i4U5k6dXuYoiqSRHI67_BP-bziklNAJSKY,4309
 skilleter_thingy/multigit.py,sha256=kTxEYinHCH1CQE7hzJF58XH1m-n0NZz5IGOtIJ3nL4Q,33979
@@ -51,9 +51,9 @@ skilleter_thingy/thingy/run.py,sha256=mqafCzW9op_xKCt8OY3jJ6YltmoOJGh44vzl667mww
 skilleter_thingy/thingy/tfm_pane.py,sha256=XTTpSm71CyQyGmlVLuCthioOwech0jhUiFUXb-chS_Q,19792
 skilleter_thingy/thingy/tidy.py,sha256=AQ2RawsZJg6WHrgayi_ZptFL9occ7suSdCHbU3P-cys,5971
 skilleter_thingy/thingy/venv_template.py,sha256=ZfUvi8qFNGrk7J030Zy57xjwMtfIArJyqa-MqafyjVk,1016
-skilleter_thingy-0.2.9.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.2.9.dist-info/METADATA,sha256=Z3BmA1l9uxKUzFeEnrUWLi1QN5vL5Vqd8BUee6ln6Gg,28913
-skilleter_thingy-0.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.2.9.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
-skilleter_thingy-0.2.9.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.2.9.dist-info/RECORD,,
+skilleter_thingy-0.2.10.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.2.10.dist-info/METADATA,sha256=cDk-Jv1l9wV5uNDbd8GvHBIzLIJubSp_2NE5ZDaQtKs,28914
+skilleter_thingy-0.2.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.2.10.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
+skilleter_thingy-0.2.10.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.2.10.dist-info/RECORD,,