skilleter-thingy 0.0.45__tar.gz → 0.0.47__tar.gz

{skilleter_thingy-0.0.45/skilleter_thingy.egg-info → skilleter_thingy-0.0.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.45
+Version: 0.0.47
 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.45 → skilleter_thingy-0.0.47}/pyproject.toml

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

skilleter_thingy-0.0.47/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-0.0.45 → skilleter_thingy-0.0.47}/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-0.0.45 → skilleter_thingy-0.0.47}/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.45 → skilleter_thingy-0.0.47}/skilleter_thingy/venv_create.py

@@ -4,8 +4,7 @@ import os
 import stat
 import argparse
 
-import thingy.bash_venv as bash_venv
-import thingy.fish_venv as fish_venv
+import thingy.venv_template as venv_template
 
 ################################################################################
 
@@ -17,24 +16,16 @@ def main():
 
     args = parser.parse_args()
 
-    shell = os.getenv('SHELL').split('/')[-1]
+    script = args.name[0]
 
-    if shell == 'fish':
-        template = fish_venv.TEMPLATE
-    else:
-        if shell != 'bash':
-            print(f'Warning: Unknown shell: {shell} - using Bash template by default')
+    with open(script, 'wt') as scriptfile:
+        scriptfile.write(venv_template.TEMPLATE)
 
-        template = bash_venv.TEMPLATE
+    statinfo = os.stat(script)
 
-    with open(args.name[0], 'wt') as scriptfile:
-        scriptfile.write(template)
+    os.chmod(script, statinfo.st_mode|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
 
-    statinfo = os.stat(args.name[0])
-
-    os.chmod(args.name[0], statinfo.st_mode|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
-
-    print(f'Created virtual environment: {args.name[0]}')
+    print(f'Created virtual environment: {script}')
 
 ################################################################################
 

{skilleter_thingy-0.0.45 → skilleter_thingy-0.0.47/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.45
+Version: 0.0.47
 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.45 → skilleter_thingy-0.0.47}/skilleter_thingy.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 skilleter_thingy/__init__.py
 skilleter_thingy/addpath.py
 skilleter_thingy/borger.py
+skilleter_thingy/box.py
 skilleter_thingy/console_colours.py
 skilleter_thingy/diskspacecheck.py
 skilleter_thingy/docker_purge.py
@@ -51,7 +52,6 @@ skilleter_thingy.egg-info/entry_points.txt
 skilleter_thingy.egg-info/requires.txt
 skilleter_thingy.egg-info/top_level.txt
 skilleter_thingy/thingy/__init__.py
-skilleter_thingy/thingy/bash_venv.py
 skilleter_thingy/thingy/colour.py
 skilleter_thingy/thingy/dc_curses.py
 skilleter_thingy/thingy/dc_defaults.py
@@ -59,7 +59,6 @@ skilleter_thingy/thingy/dc_util.py
 skilleter_thingy/thingy/dircolors.py
 skilleter_thingy/thingy/docker.py
 skilleter_thingy/thingy/files.py
-skilleter_thingy/thingy/fish_venv.py
 skilleter_thingy/thingy/git.py
 skilleter_thingy/thingy/git2.py
 skilleter_thingy/thingy/gitlab.py
@@ -69,4 +68,5 @@ skilleter_thingy/thingy/popup.py
 skilleter_thingy/thingy/process.py
 skilleter_thingy/thingy/run.py
 skilleter_thingy/thingy/tfm_pane.py
-skilleter_thingy/thingy/tidy.py
+skilleter_thingy/thingy/tidy.py
+skilleter_thingy/thingy/venv_template.py

skilleter_thingy-0.0.45/skilleter_thingy/thingy/fish_venv.py

@@ -1,41 +0,0 @@
-TEMPLATE = \
-"""#!/usr/bin/env fish
-
-################################################################################
-
-set VENV_NAME $(basename "$0")
-set VENV_DIR __venv__
-
-set GREEN "\e[42m"
-set NORMAL "\e[0m"
-
-################################################################################
-
-function box
-   echo -e "$GREEN################################################################################$NORMAL"
-   echo -e "$GREEN# $argv$NORMAL"
-   echo -e "$GREEN################################################################################$NORMAL"
-end
-
-################################################################################
-
-box "Creating & activating $VENV_NAME virtual environment"
-
-python3 -m venv $VENV_DIR
-
-source $VENV_DIR/bin/activate.fish
-
-if test -f requirements.txt
-   box "Installing/Upgrading packages"
-
-   python3 -m pip install -r requirements.txt
-end
-
-if test -f $VENV_NAME.py
-    box "Running $VENV_NAME script"
-
-    python3 ./$VENV_NAME.py $argv
-
-    deactivate
-end
-"""