From a727e85df9d54aefe3d08152d39d3f2cbe293a81 Mon Sep 17 00:00:00 2001
From: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Date: Wed, 3 Mar 2021 19:14:26 -0800
Subject: [PATCH] Maestro 0.8.0

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
---
 docs/usage.rst      | 28 +++++++++++++++++-----------
 maestro/__main__.py |  6 +++---
 maestro/version.py  |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/docs/usage.rst b/docs/usage.rst
index 1d72f29..9cdac23 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -12,27 +12,27 @@ contains the path to your ``maestro-ng`` repository clone and using
 .. code::
 
   $ maestro -h
-  usage: maestro [-h] [-f FILE] [-v]
-                 {status,pull,start,stop,restart,logs,deptree} ...
+  usage: maestro-ng [-h] [-f FILE] [-v]
+                    {status,start,stop,restart,pull,clean,logs,deptree} ...
 
-  Maestro, Docker container orchestrator.
+  Maestro-Ng v0.8.0, Docker container orchestrator.
 
   positional arguments:
-    {status,pull,start,stop,restart,logs,deptree}
+    {status,start,stop,restart,pull,clean,logs,deptree}
       status              display container status
-      pull                pull images from repository
+      pull                pull container images from registry
       start               start services and containers
       stop                stop services and containers
       kill                kill services and containers
       restart             restart services and containers
+      clean               remove stopped containers
       logs                show logs from a container
       deptree             show the dependency tree
       complete            shell auto-completion helper
 
   optional arguments:
     -h, --help            show this help message and exit
-    -f FILE, --file FILE  read environment description from FILE (use - for
-                          stdin, defaults to ./maestro.yaml)
+    -f FILE, --file FILE  read environment description from FILE (use - for stdin, defaults to ./maestro.yaml)
     -v, --version         show program version and exit
 
 You can then get help on each individual command with:
@@ -40,23 +40,29 @@ You can then get help on each individual command with:
 .. code::
 
   $ maestro start -h
-  usage: maestro start [-h] [-c LIMIT] [-d] [-i] [-r] [thing [thing ...]]
+  usage: maestro-ng start [-h] [-c LIMIT] [-d] [-i] [-r | --reuse]
+                          [-C CONTAINER_FILTER] [-S SHIP_FILTER]
+                          [thing ...]
 
   Start services and containers
 
   positional arguments:
-    thing                 container(s) or service(s) to display
+    thing                 container(s) or service(s) to act on
 
   optional arguments:
     -h, --help            show this help message and exit
     -c LIMIT, --concurrency LIMIT
-                          limit how many containers can be acted on at the same
-                          time to LIMIT
+                          limit how many containers can be acted on at the same time
     -d, --with-dependencies
                           include dependencies
     -i, --ignore-dependencies
                           ignore dependency order
     -r, --refresh-images  force refresh of container images from registry
+    --reuse               reuse existing container if it exists
+    -C CONTAINER_FILTER, --container-filter CONTAINER_FILTER
+                          filter for container names (fnmatch semantics)
+    -S SHIP_FILTER, --ship-filter SHIP_FILTER
+                          filter for container names by ship name (fnmatch semantics)
 
 By default, Maestro will read the environment description configuration
 from the ``maestro.yaml`` file in the current directory. You can
diff --git a/maestro/__main__.py b/maestro/__main__.py
index dbd974c..4a2d7d6 100644
--- a/maestro/__main__.py
+++ b/maestro/__main__.py
@@ -50,10 +50,10 @@ def create_parser():
     filterable = argparse.ArgumentParser(add_help=False)
     filterable.add_argument(
         '-C', '--container-filter',
-        help='filter for container names. Uses fnmatch semantics')
+        help='filter for container names (fnmatch semantics)')
     filterable.add_argument(
         '-S', '--ship-filter',
-        help='filter for container names by ship name. Uses fnmatch semantics')
+        help='filter for container names by ship name (fnmatch semantics)')
 
     expandable = argparse.ArgumentParser(add_help=False)
     expandable.add_argument(
@@ -123,7 +123,7 @@ def create_parser():
         parents=[common, concurrent, expandable, filterable],
         name='kill',
         description='Kill services and containers',
-        help='kills the services and containers')
+        help='kill services and containers')
 
     # restart
     subparser = subparsers.add_parser(
diff --git a/maestro/version.py b/maestro/version.py
index d42044c..1c2af6d 100644
--- a/maestro/version.py
+++ b/maestro/version.py
@@ -2,4 +2,4 @@
 # Copyright (C) 2015-2018 SignalFx, Inc.
 
 name = 'maestro-ng'
-version = '0.7.5'
+version = '0.8.0'