skilleter-thingy 0.0.65__py3-none-any.whl → 0.0.67__py3-none-any.whl

skilleter_thingy/ggit.py

@@ -16,9 +16,7 @@ def run_git(args, directory, command):
     """ Run a git command in the specified directory """
 
     if not args.quiet:
-        print('-' * 80)
-        print('Running git %s in %s' % (' '.join(command), directory))
-        print('-' * 80)
+        colour.write('\n[BOLD][GREEN:Running git %s in %s][NORMAL]\n' % (' '.join(command), directory))
 
     sys.stdout.flush()
 

skilleter_thingy/readable.py

@@ -58,7 +58,7 @@ TF_IGNORE_LIST = [
     {'start': TF_READ_DURING_APPLY, 'end': TF_READ_DURING_APPLY_END},
     {'start': re.compile(r'(Releasing|Acquiring) state lock. This may take a few moments\.+')},
     {'start': re.compile(r'.*: Still reading\.{3} \[.* elapsed\]')},
-    {'start': re.compile(r' +# .* will be destroyed'), 'end': TF_HAS_CHANGED_END, 'skip': 2},
+    {'start': re.compile(r'  - resource ".*" ".*" [{]'), 'end': TF_HAS_CHANGED_END},
 ]
 
 ################################################################################
@@ -260,7 +260,7 @@ def cleanfile(args, infile, outfile):
 
             # If we are ignoring and not in the pre-ignore section and not matching the end then, then ignore
 
-            if ignore_until and not pre_ignore_count and not ignore_until.fullmatch(clean):
+            if ignore_until and not pre_ignore_count and clean and not ignore_until.fullmatch(clean):
                 clean = None
 
         # Write normal output, skipping >1 blank lines and skipping ignore blocks when the pre-ignore

{skilleter_thingy-0.0.65.dist-info → skilleter_thingy-0.0.67.dist-info}/METADATA

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

@@ -6,7 +6,7 @@ skilleter_thingy/console_colours.py,sha256=BOS9mo3jChx_FE8L1j488MDoVNgib11KjTRhr
 skilleter_thingy/diskspacecheck.py,sha256=7xsj4egXXV6jPhXZTe2b5rS03XAmm5uLC5TeiO1NJoE,2072
 skilleter_thingy/docker_purge.py,sha256=Qsykf_xR9ekn2u5n0ZNK84jMJbp08CilcCw1EAZKX2I,3307
 skilleter_thingy/ffind.py,sha256=XJwH27rTLI0-zGD-7s8viyg7_SZjJaq5Q7VBbJPSYSI,19235
-skilleter_thingy/ggit.py,sha256=AIhW3S7HC9smgBcHmDsbTLnO6j9VASkeLsBeA0hnCvM,2480
+skilleter_thingy/ggit.py,sha256=VW1SgNug0Gr_t_BhinHxJSN0hL7UT-5_lAKuImWrZJM,2465
 skilleter_thingy/ggrep.py,sha256=Mxme8gliQms9-_uf7CLqD9Zd3ZAVFWjamsK6dWw58jg,5863
 skilleter_thingy/git_br.py,sha256=NUCqe85VCgouzEpbMVODaScPIsbCrC4pe7zDMDz02Ro,5799
 skilleter_thingy/git_ca.py,sha256=wzYFaQmT1MyOF-Caz0daAUv7OUvrNKCyemIWMEBW-dA,4944
@@ -28,7 +28,7 @@ skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
-skilleter_thingy/readable.py,sha256=SsXKQgDin8u2onSHFs3vUB_BJc5Cv5jJEisBf0lT0Y8,13944
+skilleter_thingy/readable.py,sha256=G-t6tINmi8qxYoD4qPc7LZbD4EjEjGJmWe2quzqaGB4,13945
 skilleter_thingy/remdir.py,sha256=SkN9xEc1ckFGRP4zS2LUbx7Ihw697YMV0ybr_-afiyE,4653
 skilleter_thingy/rmdupe.py,sha256=tcX3w8XvliGwBMdSt9BUu07kuDtQEc0IiU8sCxmgzHA,17117
 skilleter_thingy/rpylint.py,sha256=TzZ5GvWrqgTKYKZwadTvzdbX-DJ8ll4WfVJqtN6IzO0,2635
@@ -60,9 +60,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.65.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.65.dist-info/METADATA,sha256=sYWFxv9e_Hphz9vmnkUDx82BOHOnKMahvmCf-4ipV_8,5313
-skilleter_thingy-0.0.65.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-skilleter_thingy-0.0.65.dist-info/entry_points.txt,sha256=LxYRrQHkCGK-zjLXHqRdsUSUOoBbh7e8YUN1IVs5vIs,2072
-skilleter_thingy-0.0.65.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.65.dist-info/RECORD,,
+skilleter_thingy-0.0.67.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.67.dist-info/METADATA,sha256=QyAVcQ0li8sze2R7YS4ktG3J85dSOEVtVJHqir8Vkec,5313
+skilleter_thingy-0.0.67.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+skilleter_thingy-0.0.67.dist-info/entry_points.txt,sha256=LxYRrQHkCGK-zjLXHqRdsUSUOoBbh7e8YUN1IVs5vIs,2072
+skilleter_thingy-0.0.67.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.67.dist-info/RECORD,,

{skilleter_thingy-0.0.65.dist-info → skilleter_thingy-0.0.67.dist-info}/WHEEL

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