Skip to content

Commit dd5e59c

Browse files
robertpeteuilrobertpeteuil
committed
Merge branch 'develop'
2 parents cdeb551 + cd1c8a2 commit dd5e59c

9 files changed

Lines changed: 31 additions & 33 deletions

File tree

‎mcc/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
"""Unified CLI Utility for AWS, Azure and GCP Instance Control.
1+
"""Command-Line Instance Control for AWS, Azure and GCP.
22
33
License:
44
5-
MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
6-
Copyright (C) 2017 Robert Peteuil
5+
MCC - Command-Line Instance Control for AWS, Azure and GCP.
6+
Copyright (C) 2017-2018 Robert Peteuil
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU General Public License as published by

‎mcc/__main__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
"""Unified CLI Utility for AWS, Azure and GCP Instance Control.
1+
"""Command-Line Instance Control for AWS, Azure and GCP.
22
33
License:
44
5-
MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
6-
Copyright (C) 2017 Robert Peteuil
5+
MCC - Command-Line Instance Control for AWS, Azure and GCP.
6+
Copyright (C) 2017-2018 Robert Peteuil
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU General Public License as published by

‎mcc/cldcnct.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
"""Connect Authenticate and get node objects from AWS, Azure and GCP.
1+
"""Authenticate and get node objects from user-specified cloud providers.
22
33
License:
44
5-
MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
6-
Copyright (C) 2017 Robert Peteuil
5+
MCC - Command-Line Instance Control for AWS, Azure and GCP.
6+
Copyright (C) 2017-2018 Robert Peteuil
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ def get_conns(cred, providers):
6363

6464

6565
def get_data(conn_objs, providers):
66-
"""Refresh node data using previous connection-objects."""
66+
"""Refresh node data using existing connection-objects."""
6767
cld_svc_map = {"aws": nodes_aws,
6868
"azure": nodes_az,
6969
"gcp": nodes_gcp}
@@ -104,7 +104,7 @@ def busy_disp_on():
104104

105105

106106
def busy_disp_off(dobj):
107-
"""Turn OFF busy_display to show working statues."""
107+
"""Turn OFF busy_display to indicate completion."""
108108
dobj.kill(block=False)
109109
sys.stdout.write("\033[D \033[D")
110110
sys.stdout.flush()
@@ -155,7 +155,7 @@ def nodes_aws(c_obj):
155155

156156

157157
def adj_nodes_aws(aws_nodes):
158-
"""Retrieve details specific to AWS."""
158+
"""Adjust details specific to AWS."""
159159
for node in aws_nodes:
160160
node.cloud = "aws"
161161
node.cloud_disp = "AWS"
@@ -194,7 +194,7 @@ def nodes_az(c_obj):
194194

195195

196196
def adj_nodes_az(az_nodes):
197-
"""Retrieve details specific to Azure."""
197+
"""Adjust details specific to Azure."""
198198
for node in az_nodes:
199199
node.cloud = "azure"
200200
node.cloud_disp = "Azure"
@@ -248,7 +248,7 @@ def nodes_gcp(c_obj):
248248

249249

250250
def adj_nodes_gcp(gcp_nodes):
251-
"""Retrieve details specific to GCP."""
251+
"""Adjust details specific to GCP."""
252252
for node in gcp_nodes:
253253
node.cloud = "gcp"
254254
node.cloud_disp = "GCP"

‎mcc/colors.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
33
License:
44
5-
MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
6-
Copyright (C) 2017 Robert Peteuil
5+
MCC - Command-Line Instance Control for AWS, Azure and GCP.
6+
Copyright (C) 2017-2018 Robert Peteuil
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU General Public License as published by

‎mcc/confdir.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
"""Calculate the dir contianing configuation information.
22
3-
Unified CLI Utility for AWS, Azure and GCP Instance Control.
4-
53
License:
64
7-
MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
8-
Copyright (C) 2017 Robert Peteuil
5+
MCC - Command-Line Instance Control for AWS, Azure and GCP.
6+
Copyright (C) 2017-2018 Robert Peteuil
97
108
This program is free software: you can redistribute it and/or modify
119
it under the terms of the GNU General Public License as published by

‎mcc/core.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
"""Unified CLI Utility for AWS, Azure and GCP Instance Control.
1+
"""Command-Line Instance Control for AWS, Azure and GCP.
22
33
License:
44
5-
MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
6-
Copyright (C) 2017 Robert Peteuil
5+
MCC - Command-Line Instance Control for AWS, Azure and GCP.
6+
Copyright (C) 2017+2018 Robert Peteuil
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU General Public License as published by
@@ -32,11 +32,11 @@
3232
import os
3333
import sys
3434

35-
__version__ = "0.9.1"
35+
__version__ = "0.9.2"
3636

3737

3838
def main():
39-
"""Retrieve and display instance data then process commands."""
39+
"""Command-Mode: Retrieve and display data then process commands."""
4040
(cred, providers) = config_read()
4141
cmd_mode = True
4242
conn_objs = cld.get_conns(cred, providers)
@@ -49,7 +49,7 @@ def main():
4949

5050

5151
def list_only():
52-
"""Retrieve and display instance data then exit."""
52+
"""List-Mode: Retrieve and display data then exit."""
5353
(cred, providers) = config_read()
5454
conn_objs = cld.get_conns(cred, providers)
5555
nodes = cld.get_data(conn_objs, providers)

‎mcc/tables.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
33
License:
44
5-
MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
6-
Copyright (C) 2017 Robert Peteuil
5+
MCC - Command-Line Instance Control for AWS, Azure and GCP.
6+
Copyright (C) 2017-2018 Robert Peteuil
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU General Public License as published by

‎mcc/uimode.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
33
License:
44
5-
MCC - Unified CLI Utility for AWS, Azure and GCP Instance Control.
6-
Copyright (C) 2017 Robert Peteuil
5+
MCC - Command-Line Instance Control for AWS, Azure and GCP.
6+
Copyright (C) 2017-2018 Robert Peteuil
77
88
This program is free software: you can redistribute it and/or modify
99
it under the terms of the GNU General Public License as published by

‎setup.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@
6464
package_data={'mcc': ['config.ini']},
6565
entry_points={'console_scripts': ['mcc=mcc.core:main',
6666
'mccl=mcc.core:list_only']},
67-
version='0.9.1',
67+
version='0.9.2',
6868
author="Robert Peteuil",
6969
author_email="robert.s.peteuil@gmail.com",
7070
url='https://github.com/robertpeteuil/multi-cloud-control',
7171
download_url='https://pypi.python.org/pypi/mcc',
7272
license='GNU General Public License v3 (GPLv3)',
73-
description='Unified Instance Management Utility across AWS, Azure and GCP Platforms',
74-
keywords='aws-ec2 gcp-compute azure-vm utility control ssh start stop connect',
73+
description='Command-Line Instance Control for AWS, Azure and GCP',
74+
keywords='aws-ec2 gcp-compute azure-vm utility ssh start stop connect',
7575
install_requires=INSTALL_REQUIRES,
7676
extras_require=EXTRAS_REQUIRE,
7777
classifiers=[

0 commit comments

Comments
 (0)