Added ability to specify a different config file

Author: Clark Perkins

stackdio/cli/__init__.py

@@ -6,9 +6,10 @@
 
 import click
 
-from stackdio.cli.mixins import blueprints, bootstrap, formulas, stacks
+from stackdio.cli.mixins import blueprints, formulas, stacks
 from stackdio.cli.utils import pass_client
 from stackdio.client import StackdioClient
+from stackdio.client.config import CFG_FILE
 from stackdio.client.version import __version__
 
 
@@ -19,10 +20,13 @@
 
 @click.group(context_settings=CONTEXT_SETTINGS)
 @click.version_option(__version__, '-v', '--version')
+@click.option('-c', '--config-file', help='The config file to use.',
+              type=click.Path(dir_okay=False, file_okay=True), default=CFG_FILE,
+              envvar='STACKDIO_CLI_CONFIG_FILE')
 @click.pass_context
-def stackdio(ctx):
+def stackdio(ctx, config_file):
     # Create a client instance
-    client = StackdioClient()
+    client = StackdioClient(cfg_file=config_file)
 
     # Throw an error if we're not configured already
     if ctx.invoked_subcommand not in ('configure', None) and not client.usable():

stackdio/client/__init__.py

@@ -41,8 +41,8 @@
 class StackdioClient(BlueprintMixin, FormulaMixin, AccountMixin, ImageMixin,
                      RegionMixin, StackMixin, SettingsMixin, HttpMixin):
 
-    def __init__(self, url=None, username=None, password=None, verify=True):
-        self.config = StackdioConfig()
+    def __init__(self, url=None, username=None, password=None, verify=True, cfg_file=None):
+        self.config = StackdioConfig(cfg_file)
 
         self.url = None
         self.username = None

stackdio/client/config.py

@@ -25,8 +25,7 @@
 from stackdio.client.compat import ConfigParser, NoOptionError
 
 
-CFG_DIR = os.path.join(os.path.expanduser('~'), '.stackdio')
-CFG_FILE = os.path.join(CFG_DIR, 'client.cfg')
+CFG_FILE = os.path.join(os.path.expanduser('~'), '.stackdio', 'client.cfg')
 
 
 class UserPath(click.Path):