Updates to setup.py and other stuff

MANIFEST.in

@@ -4,6 +4,5 @@ include LICENSE
 include NOTICE
 include infra.yaml
 include users.json
-include vsphere_testing.py
 recursive-include examples *
 recursive-include specifications *

adles/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "0.9.1"
+__version__ = "0.9.2"
 __author__ = "Christopher Goes"
 __email__ = "<[email protected]>"
 __license__ = "Apache 2.0"

adles/scripts/adles_main.py

@@ -19,6 +19,7 @@
 Uses formal YAML specifications to create virtual environments for educational purposes.
 
 Usage:
+    adles.py -l NAME
     adles.py [options] -c SPEC
     adles.py [options] (-m | -d) [-p] -s SPEC
     adles.py [options] (--cleanup-masters | --cleanup-enviro) [--network-cleanup] -s SPEC
@@ -37,6 +38,7 @@
     --cleanup-enviro            Cleanup environment created by a specification
     --network-cleanup           Cleanup networks created during either phase
     -i, --infra FILE            Specifies the infrastructure configuration file to use
+    -l, --list-spec NAME        Prints the named specification exercise, package, infrastructure
     -h, --help                  Shows this help
     --version                   Prints current version
 
@@ -116,6 +118,16 @@ def main():
     elif args["--check-syntax"]:
         if check_syntax(args["--check-syntax"]) is None:
             logging.error("Syntax check failed")
+    elif args["--list-spec"]:
+        # from pkg_resources import Requirement, resource_filename
+        # spec = args["--list-spec"]
+        # specs = ["exercise", "package", "infrastructure"]
+        # if spec in specs:
+        #    filename = resource_filename(Requirement.parse("ADLES"), spec + "-specification.yaml")
+        #    print(open(filename).read())
+        # else:
+        #     logging.error("Invalid specification: %s", spec)
+        print("Not yet implemented yet...sorry")
     else:
         logging.error("Invalid arguments. Argument dump:\n%s", str(args))
 

requirements.txt

@@ -2,4 +2,5 @@ pyyaml == 3.12
 pyvmomi >= 6.0
 docopt == 0.6.2
 netaddr == 0.7.19
-colorlog >= 2.10.0
+colorlog >= 2.10.0
+setuptools

setup.py

@@ -25,6 +25,7 @@
     version=__version__,
     packages=find_packages(),
     include_package_data=True,
+    zip_safe=False,
     install_requires=required,
     entry_points={
         'console_scripts': [
@@ -35,9 +36,6 @@
             'vsphere-info = adles.scripts.vsphere_info:main'
         ]
     },
-    scripts=['adles/scripts/adles_main.py', 'adles/scripts/clone_vms.py',
-             'adles/scripts/cleanup_vms.py', 'adles/scripts/vm_power.py',
-             'adles/scripts/vsphere_info.py'],
     author=__author__,
     author_email=__email__,
     description='Automated Deployment of Lab Environments System (ADLES)',
@@ -55,8 +53,8 @@
     classifiers=[
         'Development Status :: 3 - Alpha',
         'License :: OSI Approved :: Apache Software License',
-        'Intended Audience :: Developers',
         'Intended Audience :: Education',
+        'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
         'Intended Audience :: Information Technology',
         'Intended Audience :: Science/Research',
@@ -71,6 +69,9 @@
         'Topic :: Education',
         'Topic :: Education :: Testing',
         'Topic :: Security',
-        'Topic :: Software Development'
+        'Topic :: Software Development',
+        'Topic :: System :: Systems Administration',
+        'Topic :: Utilities',
+        'Natural Language :: English'
     ]
 )