Merge branch 'develop'

robertpeteuil · Jan 7, 2018 · dd5e59c · dd5e59c
2 parents cdeb551 + cd1c8a2
commit dd5e59c
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 33 deletions.
diff --git a/mcc/__init__.py b/mcc/__init__.py
@@ -1,9 +1,9 @@
-"""Unified CLI Utility for AWS, Azure and GCP Instance Control.
+"""Command-Line Instance Control for AWS, Azure and GCP.
 
 License:
 
-    MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
-    Copyright (C) 2017  Robert Peteuil
+    MCC - Command-Line Instance Control for AWS, Azure and GCP.
+    Copyright (C) 2017-2018  Robert Peteuil
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/mcc/__main__.py b/mcc/__main__.py
@@ -1,9 +1,9 @@
-"""Unified CLI Utility for AWS, Azure and GCP Instance Control.
+"""Command-Line Instance Control for AWS, Azure and GCP.
 
 License:
 
-    MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
-    Copyright (C) 2017  Robert Peteuil
+    MCC - Command-Line Instance Control for AWS, Azure and GCP.
+    Copyright (C) 2017-2018  Robert Peteuil
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/mcc/cldcnct.py b/mcc/cldcnct.py
@@ -1,9 +1,9 @@
-"""Connect Authenticate and get node objects from AWS, Azure and GCP.
+"""Authenticate and get node objects from user-specified cloud providers.
 
 License:
 
-    MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
-    Copyright (C) 2017  Robert Peteuil
+    MCC - Command-Line Instance Control for AWS, Azure and GCP.
+    Copyright (C) 2017-2018  Robert Peteuil
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ def get_conns(cred, providers):
 
 
 def get_data(conn_objs, providers):
-    """Refresh node data using previous connection-objects."""
+    """Refresh node data using existing connection-objects."""
     cld_svc_map = {"aws": nodes_aws,
                    "azure": nodes_az,
                    "gcp": nodes_gcp}
@@ -104,7 +104,7 @@ def busy_disp_on():
 
 
 def busy_disp_off(dobj):
-    """Turn OFF busy_display to show working statues."""
+    """Turn OFF busy_display to indicate completion."""
     dobj.kill(block=False)
     sys.stdout.write("\033[D \033[D")
     sys.stdout.flush()
@@ -155,7 +155,7 @@ def nodes_aws(c_obj):
 
 
 def adj_nodes_aws(aws_nodes):
-    """Retrieve details specific to AWS."""
+    """Adjust details specific to AWS."""
     for node in aws_nodes:
         node.cloud = "aws"
         node.cloud_disp = "AWS"
@@ -194,7 +194,7 @@ def nodes_az(c_obj):
 
 
 def adj_nodes_az(az_nodes):
-    """Retrieve details specific to Azure."""
+    """Adjust details specific to Azure."""
     for node in az_nodes:
         node.cloud = "azure"
         node.cloud_disp = "Azure"
@@ -248,7 +248,7 @@ def nodes_gcp(c_obj):
 
 
 def adj_nodes_gcp(gcp_nodes):
-    """Retrieve details specific to GCP."""
+    """Adjust details specific to GCP."""
     for node in gcp_nodes:
         node.cloud = "gcp"
         node.cloud_disp = "GCP"

diff --git a/mcc/colors.py b/mcc/colors.py
@@ -2,8 +2,8 @@
 
 License:
 
-    MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
-    Copyright (C) 2017  Robert Peteuil
+    MCC - Command-Line Instance Control for AWS, Azure and GCP.
+    Copyright (C) 2017-2018  Robert Peteuil
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/mcc/confdir.py b/mcc/confdir.py
@@ -1,11 +1,9 @@
 """Calculate the dir contianing configuation information.
 
-Unified CLI Utility for AWS, Azure and GCP Instance Control.
-
 License:
 
-    MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
-    Copyright (C) 2017  Robert Peteuil
+    MCC - Command-Line Instance Control for AWS, Azure and GCP.
+    Copyright (C) 2017-2018  Robert Peteuil
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/mcc/core.py b/mcc/core.py
@@ -1,9 +1,9 @@
-"""Unified CLI Utility for AWS, Azure and GCP Instance Control.
+"""Command-Line Instance Control for AWS, Azure and GCP.
 
 License:
 
-    MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
-    Copyright (C) 2017  Robert Peteuil
+    MCC - Command-Line Instance Control for AWS, Azure and GCP.
+    Copyright (C) 2017+2018  Robert Peteuil
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,11 +32,11 @@
 import os
 import sys
 
-__version__ = "0.9.1"
+__version__ = "0.9.2"
 
 
 def main():
-    """Retrieve and display instance data then process commands."""
+    """Command-Mode: Retrieve and display data then process commands."""
     (cred, providers) = config_read()
     cmd_mode = True
     conn_objs = cld.get_conns(cred, providers)
@@ -49,7 +49,7 @@ def main():
 
 
 def list_only():
-    """Retrieve and display instance data then exit."""
+    """List-Mode: Retrieve and display data then exit."""
     (cred, providers) = config_read()
     conn_objs = cld.get_conns(cred, providers)
     nodes = cld.get_data(conn_objs, providers)

diff --git a/mcc/tables.py b/mcc/tables.py
@@ -2,8 +2,8 @@
 
 License:
 
-    MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
-    Copyright (C) 2017  Robert Peteuil
+    MCC - Command-Line Instance Control for AWS, Azure and GCP.
+    Copyright (C) 2017-2018  Robert Peteuil
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/mcc/uimode.py b/mcc/uimode.py
@@ -2,8 +2,8 @@
 
 License:
 
-    MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
-    Copyright (C) 2017  Robert Peteuil
+    MCC - Command-Line Instance Control for AWS, Azure and GCP.
+    Copyright (C) 2017-2018  Robert Peteuil
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/setup.py b/setup.py
@@ -64,14 +64,14 @@
     package_data={'mcc': ['config.ini']},
     entry_points={'console_scripts': ['mcc=mcc.core:main',
                                       'mccl=mcc.core:list_only']},
-    version='0.9.1',
+    version='0.9.2',
     author="Robert Peteuil",
     author_email="[email protected]",
     url='https://github.com/robertpeteuil/multi-cloud-control',
     download_url='https://pypi.python.org/pypi/mcc',
     license='GNU General Public License v3 (GPLv3)',
-    description='Unified Instance Management Utility across AWS, Azure and GCP Platforms',
-    keywords='aws-ec2 gcp-compute azure-vm utility control ssh start stop connect',
+    description='Command-Line Instance Control for AWS, Azure and GCP',
+    keywords='aws-ec2 gcp-compute azure-vm utility ssh start stop connect',
     install_requires=INSTALL_REQUIRES,
     extras_require=EXTRAS_REQUIRE,
     classifiers=[