Fix: show error messages more systematically

1 files changed, 43 insertions, 4 deletions

diff --git a/icktool b/icktool
index c700a28..c848de7 100755
--- a/icktool
+++ b/icktool
@@ -88,11 +88,23 @@ class Icktool(cliapp.Application):
 
     def cmd_version(self, args):
         api = self._new_api()
-        self._prettyson(api.get('/version'))
+        code, text = api.get('/version')
+        if code != 200:
+            sys.stderr.write('HTTP status {}\n'.format(code))
+            sys.stderr.write(text)
+            sys.exit(1)
+        obj = json.loads(text)
+        self._prettyson(obj)
 
     def cmd_list_projects(self, args):
         api = self._new_api()
-        self._prettyson(api.get('/projects'))
+        code, text = api.get('/version')
+        if code != 200:
+            sys.stderr.write('HTTP status {}\n'.format(code))
+            sys.stderr.write(text)
+            sys.exit(1)
+        obj = json.loads(text)
+        self._prettyson(obj)
 
     def cmd_create_project(self, args):
         obj = self._read_object()
@@ -115,7 +127,22 @@ class Icktool(cliapp.Application):
     def cmd_show_project(self, args):
         name = args[0]
         api = self._new_api()
-        self._prettyson(api.get('/projects/{}'.format(name)))
+        code, text = api.get('/projects/{}'.format(name))
+        if code != 200:
+            sys.stderr.write('HTTP status {}\n'.format(code))
+            sys.stderr.write(text)
+            sys.exit(1)
+        obj = json.loads(text)
+        self._prettyson(obj)
+
+    def cmd_delete_project(self, args):
+        name = args[0]
+        api = self._new_api()
+        code, text = api.delete('/projects/{}'.format(name))
+        if code != 200:
+            sys.stderr.write('HTTP status {}\n'.format(code))
+            sys.stderr.write(text)
+            sys.exit(1)
 
     def _new_token(self):
         scopes = self.settings['scope']
@@ -169,7 +196,7 @@ class API:
             'Authorization': 'Bearer {}'.format(self._token),
         }
         r = requests.get(full_url, headers=headers, verify=self._verify)
-        return r.json()
+        return r.status_code, r.text
 
     def post(self, path, obj):
         assert self._url is not None
@@ -195,6 +222,18 @@ class API:
             full_url, json=obj, headers=headers, verify=self._verify)
         return r.status_code, r.text
 
+    def delete(self, path):
+        assert self._url is not None
+        assert self._token is not None
+
+        full_url = '{}{}'.format(self._url, path)
+        headers = {
+            'Authorization': 'Bearer {}'.format(self._token),
+        }
+        r = requests.delete(
+            full_url, headers=headers, verify=self._verify)
+        return r.status_code, r.text
+
 
 class TokenGenerator: