Merge pull request #444 from tombh/client-feedback-for-unresponsive-controller

Catch ConnectionError in client and return human friendly message.
Travis flaked out on this one and I can't get it to try again. LGTM, thanks Tom!

Author: mboersma

client/deis.py

@@ -2070,6 +2070,28 @@ def parse_args(cmd):
     return cmd, help_flag
 
 
+def _dispatch_cmd(method, args):
+    try:
+        method(args)
+    except requests.exceptions.ConnectionError as err:
+        print("Couldn't connect to the Deis Controller. Make sure that the Controller URI is \
+correct and the server is running.")
+        sys.exit(1)
+    except EnvironmentError as err:
+        raise DocoptExit(err.message)
+    except ResponseError as err:
+        resp = err.message
+        print('{} {}'.format(resp.status_code, resp.reason))
+        try:
+            msg = resp.json()
+            if 'detail' in msg:
+                msg = "Detail:\n{}".format(msg['detail'])
+        except:
+            msg = resp.text
+        print(msg)
+        sys.exit(1)
+
+
 def main():
     """
     Create a client, parse the arguments received on the command line, and
@@ -2097,21 +2119,7 @@ def main():
         if 'Usage: ' in docstring:
             args.update(docopt(docstring))
     # dispatch the CLI command
-    try:
-        method(args)
-    except EnvironmentError as err:
-        raise DocoptExit(err.message)
-    except ResponseError as err:
-        resp = err.message
-        print('{} {}'.format(resp.status_code, resp.reason))
-        try:
-            msg = resp.json()
-            if 'detail' in msg:
-                msg = "Detail:\n{}".format(msg['detail'])
-        except:
-            msg = resp.text
-        print(msg)
-        sys.exit(1)
+    _dispatch_cmd(method, args)
 
 
 if __name__ == '__main__':