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

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

@@ -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 → skilleter_thingy-0.0.45}/pyproject.toml

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

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

@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+
+import os
+import stat
+import argparse
+
+import thingy.bash_venv as bash_venv
+import thingy.fish_venv as fish_venv
+
+################################################################################
+
+def main():
+    """Create the venv script and make it executable"""
+
+    parser = argparse.ArgumentParser(description='Create a script to run Python code in a virtual environment')
+    parser.add_argument('name', nargs=1, help='Name of the script to create')
+
+    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)
+
+    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():
+    """Entry point"""
+
+    try:
+        main()
+
+    except KeyboardInterrupt:
+        sys.exit(1)
+    except BrokenPipeError:
+        sys.exit(2)
+
+################################################################################
+
+if __name__ == '__main__':
+    venv_create()

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

@@ -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 → skilleter_thingy-0.0.45}/skilleter_thingy.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ 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
@@ -58,6 +59,7 @@ 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

skilleter_thingy-0.0.44/skilleter_thingy/venv_create.py

@@ -1,86 +0,0 @@
-#!/usr/bin/env python3
-
-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
-"""
-
-################################################################################
-
-def main():
-    """Create the venv script and make it executable"""
-
-    parser = argparse.ArgumentParser(description='Create a script to run Python code in a virtual environment')
-    parser.add_argument('name', nargs=1, help='Name of the script to create')
-
-    args = parser.parse_args()
-
-    with open(args.name[0], 'wt') as scriptfile:
-        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)
-
-################################################################################
-
-def venv_create():
-    """Entry point"""
-
-    try:
-        main()
-
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    venv_create()