Moved a couple things to click-shell

Author: Clark Perkins

setup.py

@@ -50,9 +50,8 @@ def test_python_version():
     'Jinja2==2.7.3',
     'PyYAML==3.11',
     'click>=6.0,<7.0',
-    'cmd2>=0.6,<0.7',
+    'click-shell==0.1',
     'keyring==3.7',
-    'readline',
     'requests>=2.4.0,<2.6.0',
     'simplejson==3.4.0',
 ]

stackdio/cli/__init__.py

@@ -8,11 +8,11 @@
 from cmd import Cmd
 
 import click
+import click_shell
 import keyring
 from requests import ConnectionError
 
 from stackdio.cli import mixins
-from stackdio.cli.shell import get_shell
 from stackdio.client import StackdIO
 from stackdio.client.config import StackdioConfig
 from stackdio.client.exceptions import MissingConfigException
@@ -21,6 +21,7 @@
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
+HIST_FILE = os.path.join(os.path.expanduser('~'), '.stackdio-cli', 'history')
 
 KEYRING_SERVICE = 'stackdio_cli'
 
@@ -53,20 +54,17 @@ class StackdioObj(object):
     def __init__(self, ctx, fail_on_misconfigure):
         super(StackdioObj, self).__init__()
         self.config = load_config(fail_on_misconfigure)
-        self.shell = get_shell(ctx)
         if self.config:
             self.client = get_client(self.config)
 
 
-@click.group(context_settings=CONTEXT_SETTINGS, invoke_without_command=True)
+@click_shell.shell(prompt='stackdio > ', intro='stackdio shell v{0}'.format(__version__),
+                   hist_file=HIST_FILE, context_settings=CONTEXT_SETTINGS)
 @click.version_option(__version__, '-v', '--version')
 @click.pass_context
 def stackdio(ctx):
     ctx.obj = StackdioObj(ctx, ctx.invoked_subcommand != 'configure')
 
-    if ctx.invoked_subcommand is None:
-        ctx.obj.shell.cmdloop()
-
 
 @stackdio.group()
 def stacks():
@@ -75,12 +73,17 @@ def stacks():
 
 @stackdio.group()
 def blueprints():
-    """
-    Foo bar
-    """
     pass
 
 
+@blueprints.command()
+@click.option('--template', '-t')
+@click.option('--var-file', '-v', multiple=True)
+def create(template, var_file):
+    click.echo(template)
+    click.echo(var_file)
+
+
 @stackdio.group()
 def formulas():
     pass
@@ -96,8 +99,9 @@ def configure():
 
 
 @stackdio.command('server-version')
-def server_version():
-    client = get_client()
+@click.pass_obj
+def server_version(obj):
+    client = obj.client
     click.echo('stackdio-server, version {0}'.format(client.get_version()))
 
 

stackdio/cli/shell.py

@@ -31,9 +31,16 @@
 
 class StackdioConfig(object):
 
+    BOOL_MAP = {
+        str(True): True,
+        str(False): False,
+    }
+
     def __init__(self, section='stackdio', config_file=CFG_FILE, create=False):
         super(StackdioConfig, self).__init__()
 
+        self.section = section
+
         self._cfg_file = config_file
 
         if not create and not os.path.isfile(config_file):
@@ -47,22 +54,28 @@ def __init__(self, section='stackdio', config_file=CFG_FILE, create=False):
             self._config.read(config_file)
 
             # Make the blueprint dir usable
-            new_blueprint_dir = os.path.expanduser(self.get('blueprint_dir'))
-            self._config.set(section, 'blueprint_dir', new_blueprint_dir)
-
-        self.section = section
+            blueprint_dir = self.get('blueprint_dir')
+            if blueprint_dir:
+                new_blueprint_dir = os.path.expanduser(blueprint_dir)
+                self._config.set(section, 'blueprint_dir', new_blueprint_dir)
 
     def save(self):
         with open(self._cfg_file, 'w') as f:
             self._config.write(f)
 
     def __getitem__(self, item):
         try:
-            return self._config.get(self.section, item)
+            ret = self._config.get(self.section, item)
+            if ret in self.BOOL_MAP:
+                return self.BOOL_MAP[ret]
+            else:
+                return str(ret)
         except NoOptionError:
             raise KeyError(item)
 
     def __setitem__(self, key, value):
+        if isinstance(value, bool):
+            value = str(value)
         self._config.set(self.section, key, value)
 
     def get(self, item, default=None):
@@ -84,7 +97,7 @@ def _test_url(self, url):
         except ConnectionError:
             return False
         except MissingSchema:
-            print("You might have forgotten http:// or https://")
+            click.echo('You might have forgotten http:// or https://')
             return False
 
     def get_url(self):