skilleter-thingy 0.0.44__py3-none-any.whl → 0.0.45__py3-none-any.whl

skilleter_thingy/git_wt.py

@@ -24,22 +24,28 @@ def main():
     # Command line parameters
 
     parser = argparse.ArgumentParser(description='Report top-level directory of the current git working tree.')
-    parser.add_argument('-p', '--parent', action='store_true',
+    parser.add_argument('--parent', '-p', action='store_true',
                         help='If we are already at the top of the working tree, check if the parent directory is in a working tree and output the top-level directory of that tree.')
-    parser.add_argument('-r', '--repo', action='store_true',
+    parser.add_argument('--repo', '-r', action='store_true',
                         help='If we are already at the top of the working tree, look for a parent directory with a repo control file (.repo directory or .mrconfig file) and output that directory.')
+    parser.add_argument('--dir', '-d', action='store', default=os.getcwd(),
+                        help='Find the location of the top-level directory in the working tree starting at the specified directory')
     parser.add_argument('level', nargs='?', type=int, default=0, help='Number of levels below the top-level directory to report')
     args = parser.parse_args()
 
-    try:
-        start_dir = os.getcwd()
-    except FileNotFoundError:
-        print('Unable to locate current directory')
+    if not os.path.isdir(args.dir):
+        print(f'Unable to locate directory {args.dir}')
         sys.exit(1)
 
     # Try to get the current working tree
 
-    working_tree = pygit2.discovery_repository(start_dir)
+    git_dir = pygit2.discover_repository(args.dir)
+
+    if not git_dir:
+        print(f'Directory {args.dir} is not in a Git working tree')
+        sys.exit(2)
+
+    working_tree = os.path.abspath(os.path.join(git_dir, os.pardir))
 
     # If we are in a working tree and also looking for the parent working
     # tree, check if we are at the top of the current tree, and, if so,
@@ -51,7 +57,7 @@ def main():
         if os.path.samefile(working_tree, current_directory):
             os.chdir('..')
 
-            working_tree = pygit2.discovery_repository()
+            working_tree = pygit2.discover_repository()
 
     # If we are also looking for a multi-repo control file or directory, and haven't
     # found the git working tree root scan up the tree until we find one.
@@ -71,7 +77,7 @@ def main():
     # Output the result, if we have one
 
     if args.level:
-        start = start_dir.split('/')
+        start = args.dir.split('/')
         working = working_tree.split('/')
 
         working_tree = os.path.join(working_tree, '/'.join(start[len(working):len(working) + int(args.level)]))

skilleter_thingy/thingy/bash_venv.py

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

skilleter_thingy/thingy/fish_venv.py

@@ -0,0 +1,41 @@
+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
+"""

skilleter_thingy/venv_create.py

@@ -4,51 +4,8 @@ import os
 import stat
 import argparse
 
-################################################################################
-
-TEMPLATE = \
-"""#!/usr/bin/env bash
-
-set -e
-
-################################################################################
-
-VENV_NAME=$(basename "$0")
-VENV_DIR=__venv__
-
-GREEN="\e[42m"
-NORMAL="\e[0m"
-
-################################################################################
-
-function box()
-{
-   echo -e "${GREEN}################################################################################${NORMAL}"
-   echo -e "${GREEN}# $@${NORMAL}"
-   echo -e "${GREEN}################################################################################${NORMAL}"
-}
-
-################################################################################
-
-box "Creating & activating $VENV_NAME virtual environment"
-
-python3 -m venv $VENV_DIR
-
-source $VENV_DIR/bin/activate
-
-if [[ -f requirements.txt ]]
-then
-   box "Installing/Upgrading packages"
-
-   python3 -m pip install -r requirements.txt
-fi
-
-box "Running ${VENV_NAME} script"
-
-python3 ./${VENV_NAME}.py "$@"
-
-deactivate
-"""
+import thingy.bash_venv as bash_venv
+import thingy.fish_venv as fish_venv
 
 ################################################################################
 
@@ -60,13 +17,25 @@ def main():
 
     args = parser.parse_args()
 
+    shell = os.getenv('SHELL').split('/')[-1]
+
+    if shell == 'fish':
+        template = fish_venv.TEMPLATE
+    else:
+        if shell != 'bash':
+            print(f'Warning: Unknown shell: {shell} - using Bash template by default')
+
+        template = bash_venv.TEMPLATE
+
     with open(args.name[0], 'wt') as scriptfile:
-        scriptfile.write(TEMPLATE)
+        scriptfile.write(template)
 
     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]}')
+
 ################################################################################
 
 def venv_create():

{skilleter_thingy-0.0.44.dist-info → skilleter_thingy-0.0.45.dist-info}/METADATA

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

@@ -17,7 +17,7 @@ skilleter_thingy/git_mr.py,sha256=BCE68hhz2bV0zwHkEv5tyfRY0aXoUdb_aJ-yWYDu_Wo,30
 skilleter_thingy/git_parent.py,sha256=D47D01dPs6kActusA0ircJYTv8tBjDoe8MzMpJVWJpA,2683
 skilleter_thingy/git_review.py,sha256=1_vGcEgy6TvzoXIIDqsOeRZ4qeweDeNPuLwDQsEH08k,51769
 skilleter_thingy/git_update.py,sha256=2SAGeqL2LjdsXTYak3nvPtNfhSOWJdXZfAUx6bqC8Qw,13972
-skilleter_thingy/git_wt.py,sha256=T5_jTJjTWypiTq6zWCsonSGE6dl4iwpY9II6ScCbhVs,3139
+skilleter_thingy/git_wt.py,sha256=kMxA3f39-gMjXfhLH4DHw9klsgPbJzn1Ae4osehbtD8,3487
 skilleter_thingy/gitcmp_helper.py,sha256=_3ji-PyIF2oI6a4zyUPjLeCFgAtACykxPpOrbjD6-aw,11245
 skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
 skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
@@ -37,11 +37,12 @@ skilleter_thingy/sysmon.py,sha256=XRZG6EVSzoVYan_N16qVB1l1RaU51uvLWlRA0CDjC54,11
 skilleter_thingy/tfm.py,sha256=3ejKNI2P65lGz-50mxRMxW_o5NmoeMDcmhji_0uALhI,33703
 skilleter_thingy/tfparse.py,sha256=u1IZH2J_WH1aORyMozKSI2JKok7_S1MMJhiobzmhlUI,2988
 skilleter_thingy/trimpath.py,sha256=IJU3zl4Hg08g0eU24LZyDlGfNa-5k-TZM5s9zR4OIdA,2385
-skilleter_thingy/venv_create.py,sha256=QOoAfZblufVUCxZc66t39b_A5D0-hPGragkP1teB7mo,2072
+skilleter_thingy/venv_create.py,sha256=JZzOGbGJehNIGuumeZG0jrtU2M0ijvLE67NqjLXfxyg,1428
 skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63sqJK8,3128
 skilleter_thingy/xchmod.py,sha256=F9_lxKuLqVlHHr3oBI3dkMoFOuwRzYDlpQMTmDcjpBI,4590
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
 skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
+skilleter_thingy/thingy/bash_venv.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
 skilleter_thingy/thingy/colour.py,sha256=D-RTYsND6Xm6m3xl0mOe9QSrTNYsyY0K_a8x3id2gvg,7031
 skilleter_thingy/thingy/dc_curses.py,sha256=fuuQPR11zV_akAhygL_cAhVLC5YAgKgowzlITVbETE8,8539
 skilleter_thingy/thingy/dc_defaults.py,sha256=ahcteQvoWZrO5iTU68zkIY1Zex6iX5uR5ubwI4CCYBk,6170
@@ -49,6 +50,7 @@ skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUs
 skilleter_thingy/thingy/dircolors.py,sha256=5NbXMsGWdABLvvZfB70VPmN6N5HyyihfpgoQq1NRJbg,12264
 skilleter_thingy/thingy/docker.py,sha256=9EFatudoVPfB1UbDEtzdJDB3o6ToHiNHv8-oLsUeqiQ,2449
 skilleter_thingy/thingy/files.py,sha256=8wXUHEGALhHvYtJewjSNwHFw-hGHFYbWH9_40lJj5ZY,4257
+skilleter_thingy/thingy/fish_venv.py,sha256=NKL9I5DKNyT7R6UpKRIiYmxg4kxzmywuuYO07uCBCrQ,1004
 skilleter_thingy/thingy/git.py,sha256=9y58KhFx6t9nNyqMbixM5cl8LBcD2sdCh9UgyVPv4bo,38043
 skilleter_thingy/thingy/git2.py,sha256=xfQrOpOk4SLdE6T-pr0FTuYGn0gSY92VMDpmqvX3gDM,35751
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
@@ -59,9 +61,9 @@ skilleter_thingy/thingy/process.py,sha256=88pKHQZXBP1m3Ja7t3DtKJ4Njn7HS2OtcI0Z0i
 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-0.0.44.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.44.dist-info/METADATA,sha256=LJ50JU50_euiz0igXs6KsMtUSVHcEXIqSHoo62qbV48,5313
-skilleter_thingy-0.0.44.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-skilleter_thingy-0.0.44.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
-skilleter_thingy-0.0.44.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.44.dist-info/RECORD,,
+skilleter_thingy-0.0.45.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.45.dist-info/METADATA,sha256=00YYxQOpeYPEng-K6B4hx-1WxPGu_pbnA55MVZ65wYs,5313
+skilleter_thingy-0.0.45.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+skilleter_thingy-0.0.45.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
+skilleter_thingy-0.0.45.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.45.dist-info/RECORD,,