skilleter-thingy 0.2.4__tar.gz → 0.2.7__tar.gz

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.4
+Version: 0.2.7
 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.2.4 → skilleter_thingy-0.2.7}/pyproject.toml

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

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/ggit.py

@@ -7,7 +7,6 @@ import os
 import subprocess
 import argparse
 
-# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/ggrep.py

@@ -14,7 +14,6 @@ import sys
 import argparse
 
 import thingy.colour as colour
-# TODO: Update to git2
 import thingy.git as git
 
 ################################################################################

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_br.py

@@ -22,7 +22,6 @@ import datetime
 from dateutil.parser import parse
 from dateutil.relativedelta import relativedelta
 
-# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_ca.py

@@ -18,7 +18,6 @@ import sys
 import logging
 
 import thingy.colour as colour
-# TODO: Update to git2
 import thingy.git as git
 
 ################################################################################

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_cleanup.py

@@ -14,7 +14,6 @@ import sys
 import argparse
 import logging
 
-# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 
@@ -152,7 +151,7 @@ def main():
 
             # Has the branch got commits that haven't been merged to the master branch?
 
-            logging.info('Checking for umerged commits on %s (against %s)', branch, args.master)
+            logging.info('Checking for unmerged commits on %s (against %s)', branch, args.master)
 
             try:
                 unmerged = git.git(['log', '--no-merges', '--oneline', branch, '^%s' % args.master, '--'])

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_co.py

@@ -105,11 +105,11 @@ def checkout_matching_branch(args, branchname):
     if args.exact:
         commits = [branchname] if git.iscommit(branchname, remote=True) else []
 
-        logging.info(f'Exact match required: {commits}')
+        logging.info('Exact match required: %s', commits)
     elif git.iscommit(branchname, remote=True):
         commits = [branchname]
 
-        logging.info(f'Exact match found for {branchname}')
+        logging.info('Exact match found for %s', branchname)
     else:
         commits = git.matching_branch(branchname)
 
@@ -164,7 +164,7 @@ def checkout_matching_branch(args, branchname):
                             colour.write(f'ERROR: Most recent commit on {commit} is {author} - Use the --force option to force-update your own branch!')
                             sys.exit(1)
 
-                    colour.write('Removing existing [BLUE:%s] branch' % commit)
+                    colour.write('Removing existing [BLUE:{commit}] branch')
                     git.delete_branch(commit, force=True)
             else:
                 colour.write(f'No corresponding remote branch [BLUE:{remote_branch}] exists')
@@ -186,7 +186,7 @@ def checkout_matching_branch(args, branchname):
                 print(text)
 
     elif not commits:
-        colour.write('[BOLD]No branches or commits matching [NORMAL][BLUE]%s[NORMAL]' % branchname)
+        colour.write(f'[BOLD]No branches or commits matching [NORMAL][BLUE]{branchname}[NORMAL]')
     else:
         colour.write('[BOLD]Multiple matches for [NORMAL][BLUE]%s[NORMAL]: %s' % (branchname, ', '.join(commits)))
 
@@ -198,11 +198,10 @@ def main():
 
     args = parse_arguments()
 
-    try:
-        if args.branch:
-            git.checkout(args.branchname[0], create=True)
-        else:
-            checkout_matching_branch(args, args.branchname[0])
+    if args.branch:
+        git.checkout(args.branchname[0], create=True)
+    else:
+        checkout_matching_branch(args, args.branchname[0])
 
 ################################################################################
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_common.py

@@ -11,7 +11,6 @@ import sys
 import argparse
 
 import thingy.colour as colour
-# TODO: Update to git2
 import thingy.git as git
 
 ################################################################################

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_hold.py

@@ -8,7 +8,6 @@ import argparse
 import fnmatch
 
 import thingy.colour as colour
-# TODO: Update to git2
 import thingy.git as git
 
 ################################################################################
@@ -61,7 +60,7 @@ def archive_branches(branches):
     for branch in branches:
         tag_name = archive_tag_name(branch)
 
-        git.set_tag(tag_name, branch)
+        git.tag_apply(tag_name, branch)
         git.delete_branch(branch, force=True)
 
     for remote in git.remotes():
@@ -107,7 +106,7 @@ def restore_archive_branches(branches):
         archive_tag_names.append(archive_tag)
 
         git.checkout(branch, commit=archive_tag)
-        git.delete_tag(archive_tag)
+        git.tag_delete(archive_tag)
 
     for remote in git.remotes():
         git.push(repository=remote, delete=True, refspec=archive_tag_names)

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_mr.py

@@ -9,7 +9,6 @@ import logging
 import sys
 import argparse
 
-# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_parent.py

@@ -11,7 +11,6 @@ import os
 import argparse
 import sys
 
-# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_retag.py

@@ -13,7 +13,8 @@ import os
 import sys
 import argparse
 
-import thingy.git2 as git
+import thingy.git as git
+import thingy.colour as colour
 
 ################################################################################
 
@@ -44,7 +45,7 @@ def main():
 
     # Apply the tag
 
-    git.tag_apply(tag, push=args.push)
+    git.tag_apply(tag, 'HEAD', push=args.push)
 
 ################################################################################
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_review.py

@@ -54,7 +54,6 @@ import subprocess
 import time
 from enum import IntEnum
 
-# TODO: Update to git2
 import thingy.git as git
 import thingy.dc_curses as dc_curses
 import thingy.colour as colour

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_update.py

@@ -27,7 +27,6 @@ import argparse
 import fnmatch
 import logging
 
-# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/git_wt.py

@@ -14,7 +14,8 @@ import sys
 import argparse
 import os
 
-import thingy.git2 as git
+import thingy.git as git
+import thingy.colour as colour
 
 ################################################################################
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/gitcmp_helper.py

@@ -152,7 +152,7 @@ def main():
     # Make sure that we have all the expected parameters
 
     if args.new_perm is None:
-        sys.stderr.write('Either 1 or 7 parameters must be specifed\n')
+        sys.stderr.write('Either 1 or 7 parameters must be specified\n')
         sys.exit(1)
 
     # Make sure we can access the temporary files supplied

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/gitprompt.py

@@ -49,7 +49,6 @@ import os
 import sys
 import argparse
 
-# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/multigit.py

@@ -10,7 +10,7 @@ import subprocess
 
 from dataclasses import dataclass, field
 
-import thingy.git2 as git
+import thingy.git as git
 import thingy.colour as colour
 
 ################################################################################
@@ -367,14 +367,14 @@ def mg_clone(args, config, console):
         if os.path.isdir(directory):
             colour.error(f'The "[BLUE:{directory}]" directory already exists', prefix=True)
         else:
-            colour.error(f'[BLUE:{directory}]" already exists', prefix=True)
+            colour.error(f'"[BLUE:{directory}]" already exists', prefix=True)
 
     # Clone the repo and chdir into it
 
     if not args.quiet:
         colour.write(f'Cloning [BOLD:{args.parameters[0]}] into [BLUE:{directory}]')
 
-    git.clone(args.parameters[0], path=directory)
+    git.clone(args.parameters[0], working_tree=directory)
 
     os.chdir(directory)
 
@@ -406,7 +406,7 @@ def mg_clone(args, config, console):
             if not args.quiet:
                 colour.write(f'Cloning [BLUE:{repo["origin"]}] into [BLUE:{directory}]')
 
-            git.clone(repo['origin'], path=repo.name)
+            git.clone(repo['origin'], working_tree=repo.name)
 
             if not args.quiet:
                 colour.write(f'    Checking out [BLUE:{repo["default branch"]}]')
@@ -450,7 +450,7 @@ def mg_init(args, config, console):
 
     for entry in removals:
         del config[entry]
-        colour.write(f'Removed [BLUE:{repo}] as it no longer exists')
+        colour.write(f'Removed [BLUE:{entry}] as it no longer exists')
 
     # The configuration file needs to be updated
 
@@ -488,10 +488,10 @@ def mg_add(args, config, console):
             else:
                 colour.error(f'"[BLUE:{location}]" already exists and was not cloned from [BLUE:{repo}]', prefix=True)
         else:
-            colour.error(f'"[BLUE:{location}]" already exists and is not a Git working tree')
+            colour.error(f'"[BLUE:{location}]" already exists and is not a Git working tree', prefix=True)
 
     else:
-        git.clone(repo, path=location)
+        git.clone(repo, working_tree=location)
 
     # Add to the configuration
 
@@ -524,41 +524,32 @@ def mg_dir(args, config, console):
     # If a parameter is specified, look for matches, otherwise just return the location of the
     # configuration file
 
-    if args.parameters:
-        location = []
-        wild_location = []
+    if not args.parameters:
+        colour.write(os.path.dirname(args.configuration_file))
+        return
+
+    locations = []
 
-        search_name = args.parameters[0]
+    search_name = args.parameters[0]
 
-        # Search for exact matches, or matches that contain the search term if it
-        # doesn't already contain a wildcard
+    # Search for wildcard matches, or matches that contain the search term if it
+    # doesn't already contain a wildcard
 
+    if '*' in search_name or '?' in search_name:
+        search_name = f'*{search_name}*'
         for repo in select_git_repos(args, config):
             if fnmatch.fnmatch(repo['repo name'], search_name):
-                location.append(repo.name)
-
-            elif '*' not in search_name:
-                if fnmatch.fnmatch(repo['repo name'], f'*{search_name}*'):
-                    wild_location.append(repo.name)
-
-        # Look for a single exact match, a prefix with '*' match or prefix+suffix
-
-        destination = None
-        for destinations in (location, wild_location):
-            if len(destinations) == 1:
-                destination = destinations
-                break
-
-            if len(destinations) > 1:
-                destination = destinations
+                locations.append(repo.name)
+    else:
+        for repo in select_git_repos(args, config):
+            if search_name in repo['repo name']:
+                locations.append(repo.name)
 
-        if not destination:
-            colour.error(f'No matches with [BLUE:{search_name}]', prefix=True)
+    if not locations:
+        colour.error(f'No matches with [BLUE:{search_name}]', prefix=True)
 
-        colour.write("\n".join([relative_repo_path(args, d) for d in destination]))
+    colour.write("\n".join([relative_repo_path(args, loc) for loc in locations]))
 
-    else:
-        colour.write(os.path.dirname(args.configuration_file))
 
 ################################################################################
 
@@ -637,7 +628,7 @@ def mg_run(args, config, console):
     _ = console
 
     if not args.parameters:
-        colour.error('[BOLD:+run] command - missing parameter(s)')
+        colour.error('[BOLD:+run] command - missing parameter(s)', prefix=True)
 
     # Run the command in each of the working trees
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/rpylint.py

@@ -11,7 +11,6 @@ import sys
 import argparse
 import glob
 
-# TODO: Convert to use thingy.proc
 import thingy.process as process
 
 ################################################################################
@@ -20,7 +19,7 @@ def main():
     """ Main code. Exits directly on failure to locate source files, or returns
         the status code from Pylint otherwise. """
 
-    # Parse the comand line
+    # Parse the command line
 
     parser = argparse.ArgumentParser(description='Run pylint in the current (or specified) directory/ies')
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/tfparse.py

@@ -37,7 +37,7 @@ def main():
 
     # Open the input file or use stdin and read the JSON
 
-    jsonfile = open(sys.argv[1], 'rt') if args.infile else sys.stdin
+    jsonfile = open(args.infile[0], 'rt') if args.infile else sys.stdin
 
     terraform = json.loads(jsonfile.read())
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/thingy/docker.py

@@ -12,7 +12,6 @@
 """
 ################################################################################
 
-# TODO: Convert to use thingy.proc
 import thingy.process as process
 
 ################################################################################
@@ -32,12 +31,15 @@ def instances(all=False):
     if all:
         cmd.append('-a')
 
+    instances_list = []
     try:
         for result in process.run(cmd):
-            yield result
+            instances_list.append(result)
     except process.RunError as exc:
         raise DockerError(exc)
 
+    return instances_list
+
 ################################################################################
 
 def stop(instance, force=False):
@@ -46,7 +48,7 @@ def stop(instance, force=False):
     # TODO: force option not implemented
 
     try:
-        process.run(['docker', 'stop', instance])
+        process.run(['docker', 'stop', instance], foreground=True)
     except process.RunError as exc:
         raise DockerError(exc)
 
@@ -63,7 +65,7 @@ def rm(instance, force=False):
     cmd.append(instance)
 
     try:
-        process.run(cmd)
+        process.run(cmd, foreground=True)
     except process.RunError as exc:
         raise DockerError(exc)
 
@@ -90,6 +92,6 @@ def rmi(image, force=False):
     cmd.append(image)
 
     try:
-        process.run(cmd)
+        process.run(cmd, foreground=True)
     except process.RunError as exc:
         raise DockerError(exc)

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.7}/skilleter_thingy/thingy/files.py

@@ -12,7 +12,6 @@
 import os
 import shutil
 
-# TODO: Convert to use thingy.proc
 import thingy.process as process
 
 ################################################################################
@@ -41,7 +40,8 @@ def file_type(filename, mime=False):
 
     cmd.append(filename)
 
-    return process.run(cmd)[0]
+    result = process.run(cmd)
+    return result[0] if result else ""
 
 ################################################################################