Merge pull request #1 from askiiart/dev

Prepare for stable release

basic_management.py

@@ -1,13 +1,41 @@
-from docker_wrapper import Docker
+from docker_wrapper import Docker, NoContainersError
-from pprint import pprint
+from subprocess import getoutput
+
+
+def container_to_str(container):
+    """
+    Returns info about a Docker container as a string
+    :parameters:f
+    container: The name of the container (str)
+
+    :returns:
+    str: The container info as a string, formatted for printing
+    """
+    # Header: "CONTAINER ID    IMAGE    COMMAND    CREATED    STATUS    PORTS    NAMES" (with way more spaces)
+    info = Docker.container_info(container)
+    info_str = f'{container}\n'
+    info_str += f'  CONTAINER ID: {info["CONTAINER ID"]}\n'
+    info_str += f'  IMAGE: {info["IMAGE"]}\n'
+    info_str += f'  COMMAND: {info["COMMAND"]}\n'
+    info_str += f'  CREATED: {info["CREATED"]}\n'
+    info_str += f'  STATUS: {info["STATUS"]}\n'
+    info_str += f'  PORTS: {info["PORTS"]}\n'
+    info_str += f'  NAMES: {info["NAMES"]}'
+
+    return info_str
+
+try:
+    while True:
+        if not Docker.containers_exist():
+            raise(NoContainersError('No containers exist! Please create a container and try again.'))
 
-while True:
         # Main Menu
         print('Select the container to manage:')
+
         containers = Docker.containers()
         for i in range(len(containers)):
             print(f'  {i} - {containers[i]}')
-    print('  q - quit')
+        print('  q - Quit')
 
         container_i = input()
         print()
@@ -16,6 +44,8 @@ while True:
             exit(0)
 
         while True:
+            if not Docker.containers_exist():
+                raise(NoContainersError('No containers exist! Please create a container and try again.'))
             # Container Menu
             container = containers[int(container_i)]
             print()
@@ -33,31 +63,35 @@ while True:
                 break
 
             elif selection == 'view':
-            pprint(Docker.container_info(container))  # TODO: Make better, custom printer
+                print(container_to_str(container))
 
             elif selection == 'start':
                 print('Starting...')
-            status = Docker.start(container)
+                Docker.start(container)
 
             elif selection == 'stop':
                 print('Stopping...')
-            status = Docker.stop(container)
+                Docker.stop(container)
-            print('Done.')
+                print('Done')
 
             elif selection == 'rm':
                 break_later = False
                 while selection != 'y' and selection != 'n' and selection != 'Y' and selection != 'N':
                     print(f'WARNING! This will DELETE {container}!')
-                print(f'Are you absolutely sure you want to delete {container}? (y/N)')
+                    print(
+                        f'Are you absolutely sure you want to delete {container}? (y/N)')
                     selection = input()
                     if selection == 'y' or selection == 'Y':
+                        print('Stopping...')
+                        Docker.stop(container)
                         print('Deleting...')
-                    status = Docker.rm(container)
+                        Docker.rm(container)
                         print('Done')
                         break_later = True
                     elif selection == 'n' or selection == 'N':
                         print(f'Operation cancelled, returning to {container} menu...')
                 if break_later:
+                    print()
                     break
 
             elif selection == 'menu':
@@ -67,3 +101,7 @@ while True:
             else:
                 print('Selection invalid. Please try again.')
             print()
+except NoContainersError as e:
+    print('Error:', e)
+    print('No containers found. Exiting...')
+    exit()

composer.py

@@ -1,5 +1,4 @@
 import os
-from subprocess import getoutput
 from docker_wrapper import Docker
 
 # Read config file and make variables
@@ -32,6 +31,4 @@ for dir in compose_dirs:
 for i in range(len(compose_dirs)):
     dir = compose_dirs[i]
     container = containers[i]
-    status = Docker.stop(container)  # Assigned to vars so I can see 
+    Docker.compose(dir)
-    status = Docker.rm(container)
-    status = Docker.compose(dir)

docker_wrapper.py

@@ -2,9 +2,11 @@ from subprocess import getoutput, getstatusoutput
 import pprint
 import os
 
+
 class NoContainersError(Exception):
     pass
 
+
 class Docker:
     @staticmethod
     def running_containers_info():
@@ -14,7 +16,8 @@ class Docker:
         """
         raw_info = getoutput('docker ps')
         if '\n' not in raw_info:
-            raise(NoContainersError('A running Docker container is required to run this program. Please run a docker container and try again.'))
+            raise (NoContainersError(
+                'A running Docker container is required to run this program. Please run a docker container and try again.'))
         # Header: "CONTAINER ID    IMAGE    COMMAND    CREATED    STATUS    PORTS    NAMES" (with way more spaces)
         header = raw_info[:raw_info.find('\n')+1]
         header_indices = {'CONTAINER ID': header.find('CONTAINER ID'), 'IMAGE': header.find('IMAGE'),
@@ -45,7 +48,6 @@ class Docker:
 
         return info
 
-    
     @staticmethod
     def containers():
         """
@@ -54,7 +56,8 @@ class Docker:
         """
         raw_info = getoutput('docker container list')
         if '\n' not in raw_info:
-            raise(NoContainersError('A Docker container is required to run this program. Please create a docker container and try again.'))
+            raise (NoContainersError(
+                'A Docker container is required to run this program. Please create a docker container and try again.'))
         # Remove header
         raw_info = raw_info[raw_info.find('\n')+1:]
         info = {}
@@ -74,7 +77,8 @@ class Docker:
         """
         raw_info = getoutput('docker ps -a')
         if '\n' not in raw_info:
-            raise(NoContainersError('A Docker container is required to run this program. Please create a docker container and try again.'))
+            raise (NoContainersError(
+                'A Docker container is required to run this program. Please create a docker container and try again.'))
         # Header: "CONTAINER ID    IMAGE    COMMAND    CREATED    STATUS    PORTS    NAMES" (with way more spaces)
         header = raw_info[:raw_info.find('\n')+1]
         header_indices = {'CONTAINER ID': header.find('CONTAINER ID'), 'IMAGE': header.find('IMAGE'),
@@ -129,7 +133,7 @@ class Docker:
         """
         cwd = os.getcwd()
         os.chdir(dir)
-        status = getstatusoutput('docker compose up -d')
+        status = getstatusoutput('docker compose up --detach --build --remove-orphans')
         os.chdir(cwd)
         return status
 
@@ -169,6 +173,24 @@ class Docker:
         """
         return getstatusoutput(f'docker rm {container}')[0]
 
+    @staticmethod
+    def containers_exist():
+        """
+        Checks if any containers exist
+        :returns:
+        bool: True if containers exist, False otherwise
+        """
+        return True if '\n' in getoutput('docker ps -a') else False
+
+
+def aliens_exist():
+    """
+    Checks if aliens exist
+    :returns:
+    bool: Up all night long; And there's something very wrong
+    """
+    return True if 'blink-182' in 'your playlist' else False
+
 
 if __name__ == '__main__':
     try:

requirements.txt

@@ -0,0 +1,2 @@
+os
+subprocess