+ builds command output

Author: LD250

jenkins_cli/cli.py

@@ -6,45 +6,57 @@
 import socket
 from xml.etree import ElementTree
 
-STATUSES = {'blue': {'symbol': 'S',
-                     'color': '\033[94m',
-                     'descr': 'Stable'},
-            'red': {'symbol': 'F',
-                    'color': '\033[91m',
-                    'descr': 'Failed'},
-            'yellow': {'symbol': 'U',
-                       'color': '\033[93m',
-                       'descr': 'Unstable'},
-            'disabled': {'symbol': 'D',
-                         'color': '\033[97m',
-                         'descr': 'Disabled'},
-            'aborted': {'symbol': 'A',
-                        'color': '\033[97m',
-                        'descr': 'Aborted'}
-            }
+STATUSES_COLOR = {'blue': {'symbol': 'S',
+                           'color': '\033[94m',
+                           'descr': 'Stable'},
+                  'red': {'symbol': 'F',
+                          'color': '\033[91m',
+                          'descr': 'Failed'},
+                  'yellow': {'symbol': 'U',
+                             'color': '\033[93m',
+                             'descr': 'Unstable'},
+                  'disabled': {'symbol': 'D',
+                               'color': '\033[97m',
+                               'descr': 'Disabled'},
+                  'unknown': {'symbol': '.',
+                              'color': '\033[97m',
+                              'descr': 'Unknown'},
+                  'aborted': {'symbol': 'A',
+                              'color': '\033[97m',
+                              'descr': 'Aborted'}
+                  }
 
 # 'green': '\033[92m',
 
 
 ENDCOLLOR = '\033[0m'
 ANIME_SYMBOL = ['..', '>>']
 
+RESULT_TO_COLOR = {"FAILURE": 'red',
+                   "SUCCESS": 'blue',
+                   "UNSTABLE": 'yellow',
+                   "ABORTED": 'aborted',
+                   "DISABLED": 'aborted'
+                   }
 
-def get_formated_status(job_color, format_pattern="%(color)s%(symbol)s%(run_status)s%(endcollor)s"):
+
+def get_formated_status(job_color, format_pattern="%(color)s%(symbol)s%(run_status)s%(endcollor)s", extra_params={}):
     color_status = job_color.split('_')
     color = color_status[0]
     run_status = color_status[1] if len(color_status) == 2 else None
-    status = STATUSES[color]
-    return format_pattern % {'color': status['color'],
-                             'symbol': status['symbol'],
-                             'descr': status['descr'],
-                             'run_status': ANIME_SYMBOL[run_status == 'anime'],
-                             'endcollor': ENDCOLLOR}
+    status = STATUSES_COLOR[color]
+    params = {'color': status['color'],
+              'symbol': status['symbol'],
+              'descr': status['descr'],
+              'run_status': ANIME_SYMBOL[run_status == 'anime'],
+              'endcollor': ENDCOLLOR}
+    params.update(extra_params)
+    return format_pattern % params
 
 
 def get_jobs_legend():
     pattern = "%(color)s%(symbol)s..%(endcollor)s -> %(descr)s"
-    legend = [get_formated_status(job_color, pattern) for job_color in STATUSES.keys()]
+    legend = [get_formated_status(job_color, pattern) for job_color in STATUSES_COLOR.keys()]
     legend.append(".>> -> Build in progress")
     return legend
 
@@ -189,12 +201,34 @@ def start(self, args):
             start_status = self.jenkins.build_job(job_name)
             print("%s: %s" % (job_name, 'started' if not start_status else start_status))
 
+    def _get_build_changesets(self, build):
+        if 'changeSet' in build and 'items' in build['changeSet']:
+            return build['changeSet']['items']
+        else:
+            return []
+
+    def _get_build_duration(self, build):
+        return datetime.timedelta(milliseconds=build["duration"])
+
     def builds(self, args):
         job_name = self._check_job(args.job_name)
         job_info = self.jenkins.get_job_info(job_name, 1)
-        print(job_info)
-        # start_status = self.jenkins.build_job(job_name)
-        # print("%s: %s" % (job_name, 'started' if not start_status else start_status))
+        for build in job_info['builds'][:10]:
+            color = RESULT_TO_COLOR.get(build['result'], 'unknown')
+            if build['building']:
+                color = color + "_anime"
+            pattern = "%(color)s%(symbol)s%(run_status)s #%(number)s%(endcollor)s %(duration)s (%(changeset_count)s commits)"
+            changeset_count = len(self._get_build_changesets(build))
+            status = get_formated_status(color,
+                                         format_pattern=pattern,
+                                         extra_params={'number': build['number'],
+                                                       'duration': str(self._get_build_duration(build)).split('.')[0],
+                                                       'changeset_count': changeset_count})
+            print(status)
+#        "actions": [
+#{
+#"causes": [
+#    "number": 17191,
 
     def stop(self, args):
         job_name = self._check_job(args.job_name)

tests/test_cli.py

@@ -11,7 +11,7 @@
 
 import jenkins
 
-from jenkins_cli.cli import JenkinsCli, CliException, STATUSES, ENDCOLLOR
+from jenkins_cli.cli import JenkinsCli, CliException, STATUSES_COLOR, ENDCOLLOR
 
 GIT_SCM_XML = """<?xml version=\'1.0\' encoding=\'UTF-8\'?>\n<project>\n  <actions/>\n  <description></description>\n  <keepDependencies>false</keepDependencies>\n  <properties/>\n  <scm class="hudson.plugins.git.GitSCM" plugin="git@2.4.2">\n    <configVersion>2</configVersion>\n    <userRemoteConfigs>\n      <hudson.plugins.git.UserRemoteConfig>\n        <url>https://github.com/LD250/jenkins-cli-python/</url>\n      </hudson.plugins.git.UserRemoteConfig>\n    </userRemoteConfigs>\n    <branches>\n      <hudson.plugins.git.BranchSpec>\n        <name>cli-tests</name>\n      </hudson.plugins.git.BranchSpec>\n    </branches>\n    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>\n    <submoduleCfg class="list"/>\n    <extensions/>\n  </scm>\n  <canRoam>true</canRoam>\n  <disabled>false</disabled>\n  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>\n  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>\n  <triggers/>\n  <concurrentBuild>false</concurrentBuild>\n  <builders>\n    <hudson.tasks.Shell>\n      <command></command>\n    </hudson.tasks.Shell>\n    <jenkins.plugins.shiningpanda.builders.VirtualenvBuilder plugin="shiningpanda@0.22">\n      <pythonName>System-CPython-2.7</pythonName>\n      <home></home>\n      <clear>true</clear>\n      <systemSitePackages>false</systemSitePackages>\n      <nature>shell</nature>\n      <command>pip install -U pip\npip install -U setuptools\npip install -U wheel\npip install -r requirements.txt\npip list -o\n\nflake8 jenkins_cli\npython setup.py test</command>\n      <ignoreExitCode>false</ignoreExitCode>\n    </jenkins.plugins.shiningpanda.builders.VirtualenvBuilder>\n  </builders>\n  <publishers/>\n  <buildWrappers/>\n</project>
 """
@@ -135,8 +135,8 @@ def test_jobs(self, patched_get_jobs):
         patched_get_jobs.return_value = jobs
         self.args.a = False
         JenkinsCli(self.args).jobs(self.args)
-        arg1 = "%sS..%s Job1" % (STATUSES[jobs[0]['color']]['color'], ENDCOLLOR)
-        arg2 = "%sD..%s Job2" % (STATUSES[jobs[1]['color']]['color'], ENDCOLLOR)
+        arg1 = "%sS..%s Job1" % (STATUSES_COLOR[jobs[0]['color']]['color'], ENDCOLLOR)
+        arg2 = "%sD..%s Job2" % (STATUSES_COLOR[jobs[1]['color']]['color'], ENDCOLLOR)
         self.patched_print.assert_has_calls([mock.call(arg1)], [mock.call(arg2)])
         self.patched_print.reset_mock()
         self.args.a = True