skilleter-thingy 0.0.46__py3-none-any.whl → 0.0.48__py3-none-any.whl

skilleter_thingy/box.py

@@ -0,0 +1,33 @@
+#! /usr/bin/env python3
+
+################################################################################
+""" Draw a box with text in
+"""
+################################################################################
+
+import os
+import sys
+import argparse
+import thingy.colour as colour
+
+################################################################################
+
+def main():
+    """The guts"""
+    return
+################################################################################
+
+def box():
+    """Entry point"""
+
+    try:
+        main()
+    except KeyboardInterrupt:
+        sys.exit(1)
+    except BrokenPipeError:
+        sys.exit(2)
+
+################################################################################
+
+if __name__ == '__main__':
+    box()

skilleter_thingy/git_review.py

@@ -16,6 +16,8 @@
         * info command
         * add command
         * commit command
+        * ability to embed colour changes in strings when writing with curses
+        * if no changes, screen should not flicker (it activates them immediately deactives curses)
         * Bottom line of the display should be menu that changes to a prompt if necc when running a command
         * Scroll, rather than jump, when moving down off the bottom of the screen - start scrolling when within 10% of top or bottom
         * Bottom line of display should show details of current file rather than help?
@@ -630,6 +632,9 @@ class GitReview():
         if self.repo_name:
             title_bar = '%s in %s' % (title_bar, self.repo_name)
 
+        if self.paths:
+            title_bar = '%s within path(s) %s' % (title_bar, ', '.join(self.paths))
+
         self.__centre_text(0, curses.color_pair(COLOUR_STATUS), title_bar)
 
     ################################################################################

skilleter_thingy/readable.py

@@ -39,6 +39,11 @@ TF_UNCHANGED_TAG = re.compile(r' +".*" += +".*"')
 TF_OBJECTS_CHANGED = 'Note: Objects have changed outside of Terraform'
 TF_UNCHANGED_HIDDEN = re.compile(r' +# \(\d+ unchanged (?:attribute|block|element)s? hidden\)')
 
+TF_MISC_REGEX = \
+[
+    { 'regex': re.compile(r'(Read complete after) \d+s'), 'replace': r'\1 {SECONDS}'}
+]
+
 ################################################################################
 
 def parse_command_line():
@@ -146,6 +151,8 @@ def cleanfile(args, infile, outfile):
         # Do things with Terraform log data
 
         if args.terraform:
+            clean = tidy.regex_replace(clean, TF_MISC_REGEX)
+
             if TF_HAS_CHANGED.fullmatch(clean):
                 ignore_until = '    }'
 

skilleter_thingy/thingy/tidy.py

@@ -59,30 +59,30 @@ RE_TIME = [
 
     {'regex': re.compile(r'[0-9]([.][0-9]*)*\s*(second[s]?)'), 'replace': '{ELAPSED}'},
     
-    {'find': '{DATE} {TIME}', 'replace': '{DATE+TIME}'},
+    {'find': r'{DATE} {TIME}', 'replace': '{DATE+TIME}'},
 ]
 
 # SHA values
 
 RE_SHA256 = [
-    {'regex': re.compile('[0-9a-f]{64}'), 'replace': '{SHA256}'},
+    {'regex': re.compile(r'[0-9a-f]{64}'), 'replace': '{SHA256}'},
 ]
 
 RE_SHA1 = [
-    {'regex': re.compile('[0-9a-f]{40}'), 'replace': '{SHA1}'},
+    {'regex': re.compile(r'[0-9a-f]{40}'), 'replace': '{SHA1}'},
 ]
 
 # AWS ids
 
 RE_AWS = \
 [
-    {'regex': re.compile('eni-0[0-9a-f]{16}'), 'replace': '{ENI-ID}'},
-    {'regex': re.compile('ami-0[0-9a-f]{16}'), 'replace': '{AMI-ID}'},
-    {'regex': re.compile('snap-0[0-9a-f]{16}'), 'replace': '{AMI-SNAP}'},
-    {'regex': re.compile('vol-0[0-9a-f]{16}'), 'replace': '{AMI-VOL}'},
-    {'regex': re.compile('sir-[0-9a-z]{8}'), 'replace': '{SPOT-INSTANCE}'},
-    {'regex': re.compile('i-0[0-9a-f]{16}'), 'replace': '{EC2-ID}'},
-    {'regex': re.compile('request id: [0-0a-f]{8}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{12}'), 'replace': 'request id: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'},
+    {'regex': re.compile(r'eni-0[0-9a-f]{16}'), 'replace': '{ENI-ID}'},
+    {'regex': re.compile(r'ami-0[0-9a-f]{16}'), 'replace': '{AMI-ID}'},
+    {'regex': re.compile(r'snap-0[0-9a-f]{16}'), 'replace': '{AMI-SNAP}'},
+    {'regex': re.compile(r'vol-0[0-9a-f]{16}'), 'replace': '{AMI-VOL}'},
+    {'regex': re.compile(r'sir-[0-9a-z]{8}'), 'replace': '{SPOT-INSTANCE}'},
+    {'regex': re.compile(r'i-0[0-9a-f]{16}'), 'replace': '{EC2-ID}'},
+    {'regex': re.compile(r'request id: [0-0a-f]{8}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{12}'), 'replace': 'request id: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'},
 ]
 
 ################################################################################

{skilleter_thingy-0.0.46.dist-info → skilleter_thingy-0.0.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.46
+Version: 0.0.48
 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.46.dist-info → skilleter_thingy-0.0.48.dist-info}/RECORD

@@ -1,6 +1,7 @@
 skilleter_thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
 skilleter_thingy/addpath.py,sha256=4Yhhgjjz1XDI98j0dAiQpNA2ejLefeWUTeSg3nIXQq0,3842
 skilleter_thingy/borger.py,sha256=AQX7OHeGXcUjkgyXEWE2h_oOey9eczZBbKjrreXvRAs,7832
+skilleter_thingy/box.py,sha256=6ciOMyER62fNUIs5SwGS0g3VsnnHQN9SITJ_vBNFxAY,771
 skilleter_thingy/console_colours.py,sha256=BOS9mo3jChx_FE8L1j488MDoVNgib11KjTRhrz_YRYE,1781
 skilleter_thingy/diskspacecheck.py,sha256=7xsj4egXXV6jPhXZTe2b5rS03XAmm5uLC5TeiO1NJoE,2072
 skilleter_thingy/docker_purge.py,sha256=2t6yjlxmHCHKMAejLViYyOQNzyqSXGiV59df4Wlojaw,3349
@@ -15,7 +16,7 @@ skilleter_thingy/git_common.py,sha256=ZjNkvIBRDGNLFYwOu9FjeqdDKJdm0sndX5QATtmq29
 skilleter_thingy/git_hold.py,sha256=yXpbpwH0cKpRiSAwxsYZncF4XHkJREUiLEyxCWzN8Rg,4617
 skilleter_thingy/git_mr.py,sha256=BCE68hhz2bV0zwHkEv5tyfRY0aXoUdb_aJ-yWYDu_Wo,3087
 skilleter_thingy/git_parent.py,sha256=D47D01dPs6kActusA0ircJYTv8tBjDoe8MzMpJVWJpA,2683
-skilleter_thingy/git_review.py,sha256=1_vGcEgy6TvzoXIIDqsOeRZ4qeweDeNPuLwDQsEH08k,51769
+skilleter_thingy/git_review.py,sha256=23kxfq7A3Se_x3dMgT12rKp7Ixqd1jOaUHUIySfZnOc,52055
 skilleter_thingy/git_update.py,sha256=2SAGeqL2LjdsXTYak3nvPtNfhSOWJdXZfAUx6bqC8Qw,13972
 skilleter_thingy/git_wt.py,sha256=kMxA3f39-gMjXfhLH4DHw9klsgPbJzn1Ae4osehbtD8,3487
 skilleter_thingy/gitcmp_helper.py,sha256=_3ji-PyIF2oI6a4zyUPjLeCFgAtACykxPpOrbjD6-aw,11245
@@ -27,7 +28,7 @@ skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980
 skilleter_thingy/photodupe.py,sha256=FssLgbLnqHPuSvMGtRyOa7bRdowufJOQaJJ56f9ybxk,4195
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=ZyKN8O0fM4xnwVspk1qH_Dnv5ujM7lJfKxC87xWilr0,4395
-skilleter_thingy/readable.py,sha256=eZ6nI5TDMncwP74sdPMXrvGTNR7M51-NUGOxRwJpAvA,9474
+skilleter_thingy/readable.py,sha256=2KAhc45ZwjEHrvWrMZUTbpY7xPKFJiP5vxIsmLizHfc,9645
 skilleter_thingy/remdir.py,sha256=-C-LAOaphdKLbBwm--rEwrsDdyldXps-C4s8iDNOKw8,4610
 skilleter_thingy/rmdupe.py,sha256=tcX3w8XvliGwBMdSt9BUu07kuDtQEc0IiU8sCxmgzHA,17117
 skilleter_thingy/rpylint.py,sha256=TzZ5GvWrqgTKYKZwadTvzdbX-DJ8ll4WfVJqtN6IzO0,2635
@@ -58,11 +59,11 @@ skilleter_thingy/thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dO
 skilleter_thingy/thingy/process.py,sha256=88pKHQZXBP1m3Ja7t3DtKJ4Njn7HS2OtcI0Z0i1KwUs,3560
 skilleter_thingy/thingy/run.py,sha256=051lGahG4liYLckQFpmSaGuE9Chd-lFdmJO85LdmeXE,12607
 skilleter_thingy/thingy/tfm_pane.py,sha256=40DmQeLMEUPiKKIJkgN1MEpIen00V70I1HB7Q6git44,19814
-skilleter_thingy/thingy/tidy.py,sha256=wzkyxzCsHXyY46G3Rjqu4ZrqiL8QMbRXyJEeYOmpy-o,5402
+skilleter_thingy/thingy/tidy.py,sha256=adm-09WLOSj6_8UId23Hb7LgJowFgoEtDAvv00ni2mA,5412
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.46.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.46.dist-info/METADATA,sha256=RtT0thW60tu7gdRnk7xyNn6NlyblaIZbpF7D55atgDY,5313
-skilleter_thingy-0.0.46.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-skilleter_thingy-0.0.46.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
-skilleter_thingy-0.0.46.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.46.dist-info/RECORD,,
+skilleter_thingy-0.0.48.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.48.dist-info/METADATA,sha256=NHtEQ7p4XSYJHK5GSSWvYO4gHC8VHU5A6xZ9rlwlA6w,5313
+skilleter_thingy-0.0.48.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
+skilleter_thingy-0.0.48.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
+skilleter_thingy-0.0.48.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.48.dist-info/RECORD,,

{skilleter_thingy-0.0.46.dist-info → skilleter_thingy-0.0.48.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (71.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any