skilleter-thingy 0.3.0__tar.gz → 0.3.1__tar.gz

{skilleter_thingy-0.3.0 → skilleter_thingy-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.3.0
+Version: 0.3.1
 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
@@ -407,24 +407,6 @@ Add or remove entries from a path list (e.g. as used by the PATH environment var
 
 Display all available colours in the console.
 
-## docker-purge
-
-Stop or kill docker instances and/or remove docker images.
-
-    docker-purge [-h] [--stop] [--kill] [--remove] [--list] [--force] [--debug] [images ...]
-
-    positional arguments:
-      images        List of Docker containers (regular expression)
-
-    options:
-      -h, --help    show this help message and exit
-      --stop, -s    Stop Docker instances
-      --kill, -k    Kill Docker instances
-      --remove, -r  Remove Docker images
-      --list, -l    List what would be done without doing it
-      --force, -f   Forcibly kill/remove instances
-      --debug       Enable debug output
-
 ## ffind
 
 Simple file find utility - replaces the `find` command with something that is more human-friendly.

{skilleter_thingy-0.3.0 → skilleter_thingy-0.3.1}/README.md

@@ -384,24 +384,6 @@ Add or remove entries from a path list (e.g. as used by the PATH environment var
 
 Display all available colours in the console.
 
-## docker-purge
-
-Stop or kill docker instances and/or remove docker images.
-
-    docker-purge [-h] [--stop] [--kill] [--remove] [--list] [--force] [--debug] [images ...]
-
-    positional arguments:
-      images        List of Docker containers (regular expression)
-
-    options:
-      -h, --help    show this help message and exit
-      --stop, -s    Stop Docker instances
-      --kill, -k    Kill Docker instances
-      --remove, -r  Remove Docker images
-      --list, -l    List what would be done without doing it
-      --force, -f   Forcibly kill/remove instances
-      --debug       Enable debug output
-
 ## ffind
 
 Simple file find utility - replaces the `find` command with something that is more human-friendly.

{skilleter_thingy-0.3.0 → skilleter_thingy-0.3.1}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.3.0"
+version = "0.3.1"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -43,7 +43,6 @@ Home = "https://skilleter.org.uk"
 [project.scripts]
 addpath         =  "skilleter_thingy:addpath.addpath"
 consolecolours  =  "skilleter_thingy:console_colours.console_colours"
-docker-purge    =  "skilleter_thingy:docker_purge.docker_purge"
 ffind           =  "skilleter_thingy:ffind.ffind"
 ggit            =  "skilleter_thingy:ggit.ggit"
 ggrep           =  "skilleter_thingy:ggrep.ggrep"

{skilleter_thingy-0.3.0 → skilleter_thingy-0.3.1}/skilleter_thingy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.3.0
+Version: 0.3.1
 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
@@ -407,24 +407,6 @@ Add or remove entries from a path list (e.g. as used by the PATH environment var
 
 Display all available colours in the console.
 
-## docker-purge
-
-Stop or kill docker instances and/or remove docker images.
-
-    docker-purge [-h] [--stop] [--kill] [--remove] [--list] [--force] [--debug] [images ...]
-
-    positional arguments:
-      images        List of Docker containers (regular expression)
-
-    options:
-      -h, --help    show this help message and exit
-      --stop, -s    Stop Docker instances
-      --kill, -k    Kill Docker instances
-      --remove, -r  Remove Docker images
-      --list, -l    List what would be done without doing it
-      --force, -f   Forcibly kill/remove instances
-      --debug       Enable debug output
-
 ## ffind
 
 Simple file find utility - replaces the `find` command with something that is more human-friendly.

{skilleter_thingy-0.3.0 → skilleter_thingy-0.3.1}/skilleter_thingy.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ pyproject.toml
 skilleter_thingy/__init__.py
 skilleter_thingy/addpath.py
 skilleter_thingy/console_colours.py
-skilleter_thingy/docker_purge.py
 skilleter_thingy/ffind.py
 skilleter_thingy/ggit.py
 skilleter_thingy/ggrep.py
@@ -46,7 +45,6 @@ skilleter_thingy/thingy/dc_curses.py
 skilleter_thingy/thingy/dc_defaults.py
 skilleter_thingy/thingy/dc_util.py
 skilleter_thingy/thingy/dircolors.py
-skilleter_thingy/thingy/docker.py
 skilleter_thingy/thingy/files.py
 skilleter_thingy/thingy/git.py
 skilleter_thingy/thingy/gitlab.py

{skilleter_thingy-0.3.0 → skilleter_thingy-0.3.1}/skilleter_thingy.egg-info/entry_points.txt

@@ -1,7 +1,6 @@
 [console_scripts]
 addpath = skilleter_thingy:addpath.addpath
 consolecolours = skilleter_thingy:console_colours.console_colours
-docker-purge = skilleter_thingy:docker_purge.docker_purge
 ffind = skilleter_thingy:ffind.ffind
 ggit = skilleter_thingy:ggit.ggit
 ggrep = skilleter_thingy:ggrep.ggrep

skilleter_thingy-0.3.0/skilleter_thingy/docker_purge.py

@@ -1,112 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Thingy docker-purge command
-
-    Copyright (C) 2017 John Skilleter
-
-    Initial version - contains only basic error checking and limited debug output.
-"""
-################################################################################
-
-import sys
-import re
-import argparse
-import logging
-
-from thingy import docker
-
-################################################################################
-
-def initialise():
-    """ Parse the command line """
-
-    breakpoint()
-    parser = argparse.ArgumentParser(description='Purge docker instances and images')
-
-    parser.add_argument('--stop', '-s', action='store_true', help='Stop Docker instances')
-    parser.add_argument('--kill', '-k', action='store_true', help='Kill Docker instances')
-    parser.add_argument('--remove', '-r', action='store_true', help='Remove Docker images')
-    parser.add_argument('--list', '-l', action='store_true', help='List what would be done without doing it')
-    parser.add_argument('--force', '-f', action='store_true', help='Forcibly kill/remove instances')
-    parser.add_argument('--debug', action='store_true', help='Enable debug output')
-    parser.add_argument('images', nargs='*', help='List of Docker containers (regular expression)')
-
-    args = parser.parse_args()
-
-    # Configure logging
-
-    if args.debug:
-        logging.basicConfig(level=logging.DEBUG)
-        logging.info('Debug logging enabled')
-
-    # Default is to stop matching images
-
-    if not args.stop and not args.kill and not args.remove:
-        args.stop = True
-
-    # Default is to match all containers
-
-    if not args.images:
-        args.images = '.*'
-    else:
-        args.images = '|'.join(args.images)
-
-    logging.info('Arguments: %s', args)
-    return args
-
-################################################################################
-
-def main(args):
-    """ Main code """
-
-    try:
-        if args.stop or args.kill:
-            for instance in docker.instances():
-                if re.match(args.images, instance):
-
-                    print(f'Stopping instance: {instance}')
-
-                    if not args.list:
-                        docker.stop(instance, force=args.force)
-
-        if args.kill:
-            for instance in docker.instances(all=True):
-                if re.match(args.images, instance):
-
-                    print(f'Removing instance: {instance}')
-
-                    if not args.list:
-                        docker.rm(instance)
-
-        if args.remove:
-            for image in docker.images():
-                if re.match(args.images, image):
-
-                    print(f'Removing image: {image}')
-
-                    if not args.list:
-                        docker.rmi(image, force=args.force)
-
-    except docker.DockerError as exc:
-        sys.stderr.write(f'{str(exc)}\n')
-        sys.exit(1)
-
-################################################################################
-
-def docker_purge():
-    """Entry point"""
-
-    try:
-        config = initialise()
-        main(config)
-
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    docker_purge()

skilleter_thingy-0.3.0/skilleter_thingy/thingy/docker.py

@@ -1,105 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Docker interface for Thingy
-
-    Copyright (C) 2017 John Skilleter
-
-    Note that this:
-        * Only implements functions required by docker-purge
-        * Only has basic error checking, in that it raises DockerError
-          for any error returned by the external docker command.
-"""
-################################################################################
-
-import subprocess
-
-################################################################################
-
-class DockerError(Exception):
-    """ Exception for dockery things """
-
-    pass
-
-################################################################################
-
-def instances(all=False):
-    """ Return a list of all current Docker instances """
-
-    cmd = ['docker', 'ps', '-q']
-
-    if all:
-        cmd.append('-a')
-
-    instances_list = []
-    try:
-        process = subprocess.run(cmd, capture_output=True, check=True, text=True)
-
-        for result in process.stdout:
-            instances_list.append(result)
-
-    except subprocess.CalledProcessError as exc:
-        raise DockerError(exc)
-
-    return instances_list
-
-################################################################################
-
-def stop(instance, force=False):
-    """ Stop the specified Docker instance """
-
-    # TODO: force option not implemented
-
-    try:
-        subprocess.run(['docker', 'stop', instance], check=True, capture_output=False)
-
-    except suprocess.CalledProcessError as exc:
-        raise DockerError(exc)
-
-################################################################################
-
-def rm(instance, force=False):
-    """ Remove the specified instance """
-
-    cmd = ['docker', 'rm']
-
-    if force:
-        cmd.append('--force')
-
-    cmd.append(instance)
-
-    try:
-        subprocess.run(cmd, check=True, capture_output=False)
-
-    except subprocess.CalledProcessError as exc:
-        raise DockerError(exc)
-
-################################################################################
-
-def images():
-    """ Return a list of all current Docker images """
-
-    try:
-        process = subprocess.run(['docker', 'images', '-q'], capture_output=True, check=True)
-
-        for result in process:
-            yield result
-
-    except subprocess.CalledProcessError as exc:
-        raise DockerError(exc)
-
-################################################################################
-
-def rmi(image, force=False):
-    """ Remove the specified image """
-
-    cmd = ['docker', 'rmi']
-    if force:
-        cmd.append('--force')
-
-    cmd.append(image)
-
-    try:
-        subprocess.run(cmd, capture_output=False, check=True)
-    except subprocess.CalledProcessError as exc:
-        raise DockerError(exc)