Change: sort output of icktool

1 files changed, 17 insertions, 15 deletions

diff --git a/icktool b/icktool
index 881cc68..5b57bee 100755
--- a/icktool
+++ b/icktool
@@ -40,9 +40,9 @@ def scopes(base):
     return [x.format(base) for x in patterns]
 
 
-def scopes_for_types(types):
+def scopes_for_types(typelist):
     result = []
-    for type_name in types:
+    for type_name in typelist:
         result.extend(scopes(type_name))
     return result
 
@@ -124,9 +124,11 @@ class Icktool(cliapp.Application):
     def cmd_status(self, args):
         rows = []
         projects = self._get_projects()
+        project_objs = sorted(
+            projects['projects'], key=lambda p: p.get('project'))
         builds = self._get_builds()['builds']
-        for project in projects['projects']:
-            pipelines = project['pipelines']
+        for project in project_objs:
+            pipelines = sorted(project['pipelines'])
             for pipeline in pipelines:
                 build = self._get_latest_build(
                     project['project'], pipeline, builds)
@@ -152,17 +154,17 @@ class Icktool(cliapp.Application):
 
     def _get_projects(self):
         rc = self._new_rc('/projects', 'project')
-        return rc.list()
+        projects = rc.list()
+        return projects
 
     def _get_builds(self):
         rc = self._new_rc('/builds', 'build')
         return rc.list()
 
-    def _get_latest_build(self, project_name, pipeline_name, builds):
+    def _get_latest_build(self, project, pipeline, builds):
         latest = None
         for build in builds:
-            if (build['project'] == project_name and
-                build['pipeline'] == pipeline_name):
+            if (build['project'], build['pipeline']) == (project, pipeline):
                 latest = build
         return latest
 
@@ -339,14 +341,14 @@ class Icktool(cliapp.Application):
             sys.exit(text)
 
     def _new_token(self):
-        scopes = self.settings['scope']
+        wanted_scopes = self.settings['scope']
         cmd = self.settings['token-private-key-cmd']
         if not cmd:
             raise cliapp.AppException('no --token-private-cmd specified')
 
         gen = TokenGenerator()
         gen.set_cmd(cmd)
-        gen.set_scopes(scopes)
+        gen.set_scopes(wanted_scopes)
         token = gen.new_token()
         self.settings['token'] = token
         return token
@@ -566,8 +568,8 @@ class TokenGenerator:
     def set_cmd(self, cmd):
         self._cmd = cmd
 
-    def set_scopes(self, scopes):
-        self._scopes = scopes
+    def set_scopes(self, wanted_scopes):
+        self._scopes = wanted_scopes
 
     def new_token(self):
         assert self._cmd is not None
@@ -581,15 +583,15 @@ class TokenGenerator:
 
         privkey = cliapp.runcmd(['sh', '-c', self._cmd])
         key = Crypto.PublicKey.RSA.importKey(privkey)
-        scopes = ' '.join(self._scopes)
+        wanted_scopes = ' '.join(self._scopes)
 
         now = time.time()
         claims = {
             'iss': iss,
             'sub': 'subject-uuid',
             'aud': aud,
-            'exp': now + 86400,  # FIXME: This is silly long
-            'scope': scopes,
+            'exp': now + 86400,
+            'scope': wanted_scopes,
         }
 
         token = apifw.create_token(claims, key)