console command now accepts build number

Author: LD250

jenkins_cli/__init__.py

@@ -22,7 +22,7 @@ def main():
                                         formatter_class=argparse.RawTextHelpFormatter,
                                         description="Status description:\n\n" + "\n".join(get_jobs_legend()))
     jobs_parser.add_argument('-a', help='Show only active jobs', default=False, action='store_true')
-    jobs_parser.add_argument('-b', help='Show only jobs thats in build progress', default=False, action='store_true')
+    jobs_parser.add_argument('-p', help='Show only jobs thats in build progress', default=False, action='store_true')
 
     subparsers.add_parser('queue', help='Shows builds queue')
 
@@ -46,14 +46,15 @@ def main():
 
     console_parser = subparsers.add_parser('console', help='Show console for last build')
     console_parser.add_argument('job_name', help='Job to show console for')
+    console_parser.add_argument('-b', '--build', help='Job build number to show console for (if omitted, last build number used)', default='')
     console_parser.add_argument('-n', help='Show first n num of the lines only(if n is negative, shows last n lines)', type=int)
     console_parser.add_argument('-i', help='Interactive console', default=False, action='store_true')
 
     args = parser.parse_args()
     try:
         JenkinsCli(args).run_command(args)
     except JenkinsException as e:
-        print(e)
+        print("Jenkins server response: %s:" % e)
     except KeyboardInterrupt:
         print("Aborted")
     except CliException as e:

jenkins_cli/cli.py

@@ -26,8 +26,6 @@
                               'descr': 'Aborted'}
                   }
 
-# 'green': '\033[92m',
-
 
 ENDCOLLOR = '\033[0m'
 ANIME_SYMBOL = ['..', '>>']
@@ -127,7 +125,7 @@ def _get_jobs(self, args):
         jobs = self.jenkins.get_jobs()
         if args.a:
             jobs = [j for j in jobs if j.get('color') != 'disabled']
-        if hasattr(args, 'b') and args.b:
+        if hasattr(args, 'p') and args.p:
             jobs = [j for j in jobs if 'anime' in j.get('color')]
         return jobs
 
@@ -225,10 +223,6 @@ def builds(self, args):
                                                        '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)
@@ -240,11 +234,23 @@ def stop(self, args):
         else:
             print("%s job is not running" % job_name)
 
+    def _get_build_number(self, build_number):
+        parsed_build_number = None
+        if build_number:
+            if build_number[0] == "#":
+                build_number = build_number[1:]
+            if build_number.isdigit():
+                parsed_build_number = int(build_number)
+            else:
+                raise CliException('Build number must be in format 123')
+        return parsed_build_number
+
     def console(self, args):
         job_name = self._check_job(args.job_name)
         info = self.jenkins.get_job_info(job_name)
-        print(info['lastBuild'])
-        build_number = info['lastBuild'].get('number')
+        build_number = self._get_build_number(args.build)
+        if not build_number:
+            build_number = info['lastBuild'].get('number')
         console_out = self.jenkins.get_build_console_output(job_name, build_number)
         console_out = console_out.split('\n')
         last_line_num = len(console_out)