Create all component packages

Author: derekbekoe

MANIFEST.in

@@ -1,2 +1 @@
 include *.rst
-exclude src/azure/__init__.py

requirements.txt

@@ -1,6 +1,7 @@
 applicationinsights==0.10.0
 azure==2.0.0rc1
 jmespath
+pip
 mock==1.3.0
 pylint==1.5.4
 six==1.10.0

setup.py

@@ -19,7 +19,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.0.1'
+VERSION = '0.0.3.dev0'
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
@@ -56,10 +56,12 @@
 
 DEPENDENCIES = [
     'applicationinsights',
-    'azure==2.0.0rc1',
+    'msrest',
     'six',
     'jmespath',
-    'adal==0.2.0' #from internal index server.
+    'pip',
+    # 'azure-cli-components==0.0.3.dev0',
+    # 'azure-cli-login==0.0.3.dev0',
 ]
 
 with open('README.rst', 'r', encoding='utf-8') as f:
@@ -82,10 +84,17 @@
     ],
     package_dir = {'':'src'},
     packages=[
+        'azure',
         'azure.cli',
         'azure.cli.commands',
+        'azure.cli.command_modules',
         'azure.cli.extensions',
     ],
     package_data={'azure.cli': ['locale/**/*.txt']},
     install_requires=DEPENDENCIES,
+    extras_require={
+        ':python_version < "3.4"': [
+            'enum34',
+        ],
+    },
 )

src/azure/cli/__init__.py

@@ -1,8 +1,9 @@
+__import__('pkg_resources').declare_namespace(__name__)
 '''The Azure Command-line tool.
 
 This tools provides a command-line interface to Azure's management and storage
 APIs.
 '''
 
 __author__ = "Microsoft Corporation <[email protected]>"
-__version__ = "0.0.1"
+__version__ = "0.0.3.dev0"

src/azure/cli/command_modules/__init__.py

@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)

src/azure/cli/commands/__init__.py

@@ -1,16 +1,10 @@
-from .._argparse import IncorrectUsageError
+from pip import get_installed_distributions
+
+from .._argparse import IncorrectUsageError
 from .._logging import logger
 
-# TODO: Alternatively, simply scan the directory for all modules
-COMMAND_MODULES = [
-    'account',
-    'login',
-    'logout',
-    'network',
-    'resource',
-    'storage',
-    'vm',
-]
+# Find our command modules, they start with 'azure-cli-'
+INSTALLED_COMMAND_MODULES = [dist.key.replace('azure-cli-', '') for dist in get_installed_distributions(local_only=False) if dist.key.startswith('azure-cli-')]
 
 _COMMANDS = {}
 
@@ -48,15 +42,16 @@ def add_to_parser(parser, command_name=None):
     loaded = False
     if command_name:
         try:
-            __import__('azure.cli.commands.' + command_name)
+            # Try and load the installed command module
+            __import__('azure.cli.command_modules.'+command_name)
             loaded = True
         except ImportError:
-            # Unknown command - we'll load all below
+            # Unknown command - we'll load all installed modules below
             pass
 
     if not loaded:
-        for mod in COMMAND_MODULES:
-            __import__('azure.cli.commands.' + mod)
+        for installed_mods in INSTALLED_COMMAND_MODULES:
+            __import__('azure.cli.command_modules.'+installed_mods)
         loaded = True
 
     for handler, info in _COMMANDS.items():

src/command_modules/azure-cli-account/README.rst

@@ -0,0 +1,7 @@
+Microsoft Azure CLI 'account' Command Module
+==================================
+
+This package is for the 'account' module.
+i.e. 'az account'
+
+This package has [not] been tested [much] with Python 2.7, 3.4 and 3.5.

src/command_modules/azure-cli-account/azure/__init__.py

@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)

src/command_modules/azure-cli-account/azure/cli/__init__.py

@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)

src/command_modules/azure-cli-account/azure/cli/command_modules/__init__.py

@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)