Moved blueprints stuff inside the cli package

Author: Clark Perkins

setup.py

@@ -84,7 +84,7 @@ def test_python_version():
         entry_points={
             'console_scripts': [
                 'stackdio-cli=stackdio.cli:main',
-                'blueprint-generator=stackdio.blueprints:main',
+                'blueprint-generator=stackdio.cli.blueprints:main',
             ],
         },
         classifiers=[

stackdio/cli/__init__.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-__version__ = '0.2.dev'
-
 import argparse
 import json
 import os

stackdio/blueprints/__init__.py stackdio/cli/blueprints/__init__.pystackdio/blueprints/__init__.py renamed to stackdio/cli/blueprints/__init__.py

@@ -7,7 +7,7 @@
 from cmd2 import Cmd
 
 from stackdio.client.exceptions import StackException
-from stackdio.blueprints.generator import BlueprintGenerator, BlueprintException
+from stackdio.cli.blueprints.generator import BlueprintGenerator, BlueprintException
 
 
 class BlueprintNotFound(Exception):

stackdio/blueprints/generator.py stackdio/cli/blueprints/generator.pystackdio/blueprints/generator.py renamed to stackdio/cli/blueprints/generator.py

@@ -20,6 +20,7 @@ class PublicKeyNotFound(Exception):
 class BootstrapMixin(Cmd):
 
     def __init__(self):
+        super(BootstrapMixin, self).__init__()
 
         # quieting down pylint
         self.has_public_key = None