Fixed a couple issues with a config file not existing

Author: Clark Perkins

setup.py

@@ -48,7 +48,7 @@ def test_python_version():
     'Jinja2==2.7.3',
     'PyYAML>=3.10',
     'click>=6.0,<7.0',
-    'click-shell==0.3',
+    'click-shell>=0.4',
     'colorama>=0.3,<0.4',
     'keyring==3.7',
     'requests>=2.4.0',

stackdio/client/__init__.py

@@ -44,31 +44,19 @@ class StackdioClient(BlueprintMixin, FormulaMixin, AccountMixin, ImageMixin,
     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
-        self.password = None
-        self.verify = None
-
-        if self.config.usable_config:
-            # Grab stuff from the config
-            self.url = self.config.get('url')
-            self.username = self.config.get('username')
-            self.password = self.config.get_password()
-            self.verify = self.config.get('verify', True)
+        self._password = self.config.get_password()
 
         if url is not None:
-            self.url = url
+            self.config['url'] = url
 
         if username is not None and password is not None:
-            self.username = username
-            self.password = password
+            self.config['username'] = username
+            self._password = password
 
         if verify is not None:
-            self.verify = verify
+            self.config['verify'] = verify
 
-        super(StackdioClient, self).__init__(url=self.url,
-                                             auth=(self.username, self.password),
-                                             verify=self.verify)
+        super(StackdioClient, self).__init__()
 
         if self.usable():
             try:
@@ -80,6 +68,22 @@ def __init__(self, url=None, username=None, password=None, verify=True, cfg_file
                 raise IncompatibleVersionException('Server version {0}.{1}.{2} not '
                                                    'supported.'.format(**self.version))
 
+    @property
+    def url(self):
+        return self.config.get('url')
+
+    @property
+    def username(self):
+        return self.config.get('username')
+
+    @property
+    def password(self):
+        return self._password or self.config.get_password()
+
+    @property
+    def verify(self):
+        return self.config.get('verify', True)
+
     def usable(self):
         return self.url and self.username and self.password
 

stackdio/client/config.py

@@ -16,6 +16,7 @@
 #
 
 import os
+import shutil
 
 import click
 import keyring
@@ -51,7 +52,7 @@ def __init__(self, config_file=None, section='stackdio'):
 
         self.section = section
 
-        self._cfg_file = config_file or CFG_FILE
+        self._cfg_file = os.path.abspath(config_file or CFG_FILE)
 
         self._config = ConfigParser()
 
@@ -67,6 +68,11 @@ def __init__(self, config_file=None, section='stackdio'):
             self._config.add_section(section)
 
     def save(self):
+        full_path = os.path.dirname(self._cfg_file)
+
+        if not os.path.isdir(full_path):
+            os.makedirs(full_path)
+
         with open(self._cfg_file, 'w') as f:
             self._config.write(f)
 

stackdio/client/http.py

@@ -44,17 +44,11 @@ class HttpMixin(object):
         'xml': {'content-type': 'application/xml'},
     }
 
-    def __init__(self, url, auth=None, verify=True):
+    def __init__(self):
         super(HttpMixin, self).__init__()
-
-        self.url = url
-        self.http_options = {
-            'auth': auth,
-            'verify': verify,
-        }
         self._http_log = logger
 
-        if not verify:
+        if not self.verify:
             if self._http_log.handlers:
                 self._http_log.warn(HTTP_INSECURE_MESSAGE)
             else:
@@ -63,6 +57,22 @@ def __init__(self, url, auth=None, verify=True):
             from requests.packages.urllib3 import disable_warnings
             disable_warnings()
 
+    @property
+    def url(self):
+        raise NotImplementedError()
+
+    @property
+    def username(self):
+        raise NotImplementedError()
+
+    @property
+    def password(self):
+        raise NotImplementedError()
+
+    @property
+    def verify(self):
+        raise NotImplementedError()
+
     def usable(self):
         raise NotImplementedError()
 
@@ -124,7 +134,7 @@ def __call__(self, *args, **kwargs):
             assert isinstance(self.obj, HttpMixin)
 
             if not self.obj.usable():
-                raise MissingUrlException('No url is set')
+                raise MissingUrlException('No url is set.  Please run `configure`.')
 
             none_on_404 = kwargs.pop('none_on_404', False)
             raise_for_status = kwargs.pop('raise_for_status', True)
@@ -149,10 +159,10 @@ def __call__(self, *args, **kwargs):
             result = requests.request(method,
                                       url,
                                       data=data,
-                                      auth=self.obj.http_options['auth'],
+                                      auth=(self.obj.username, self.obj.password),
                                       headers=self.headers,
                                       params=kwargs,
-                                      verify=self.obj.http_options['verify'])
+                                      verify=self.obj.verify)
 
             # Handle special conditions
             if none_on_404 and result.status_code == 404:
@@ -182,10 +192,10 @@ def __call__(self, *args, **kwargs):
                     next_page = requests.request(method,
                                                  next_url,
                                                  data=data,
-                                                 auth=self.obj.http_options['auth'],
+                                                 auth=(self.obj.username, self.obj.password),
                                                  headers=self.headers,
                                                  params=kwargs,
-                                                 verify=self.obj.http_options['verify']).json()
+                                                 verify=self.obj.verify).json()
                     res.extend(next_page['results'])
                     next_url = next_page.get('next')