jenkins: refactor jobs list

This commit is contained in:
James Booth
2014-06-10 23:12:42 +01:00
parent ad90038c27
commit 6f09260c56

View File

@@ -235,10 +235,9 @@ def _handle_input(win, line):
elif len(words) == 2: elif len(words) == 2:
_cmd_jenkins(words[0], words[1]) _cmd_jenkins(words[0], words[1])
def _list_jobs(): def _list_jobs(jobs):
if job_list and job_list.get_jobs():
prof.win_show(win_tag, "Jobs:") prof.win_show(win_tag, "Jobs:")
for name, build_number, state in job_list.get_jobs(): for name, build_number, state in jobs:
if state == STATE_SUCCESS: if state == STATE_SUCCESS:
prof.win_show_green(win_tag, " " + name + " #" + str(build_number) + " " + STATE_SUCCESS) prof.win_show_green(win_tag, " " + name + " #" + str(build_number) + " " + STATE_SUCCESS)
elif state == STATE_UNSTABLE: elif state == STATE_UNSTABLE:
@@ -249,8 +248,6 @@ def _list_jobs():
prof.win_show(win_tag, " " + name + ", no builds") prof.win_show(win_tag, " " + name + ", no builds")
else: else:
prof.win_show_cyan(win_tag, " " + name + " " + state) prof.win_show_cyan(win_tag, " " + name + " " + state)
else:
prof.win_show(win_tag, "No job data yet.")
def _build_job(job): def _build_job(job):
try: try:
@@ -290,7 +287,10 @@ def _cmd_jenkins(cmd=None, arg=None):
prof.win_focus(win_tag) prof.win_focus(win_tag)
if cmd == "jobs": if cmd == "jobs":
_list_jobs() if job_list and job_list.get_jobs():
_list_jobs(job_list.get_jobs())
else:
prof.win_show(win_tag, "No job data yet.")
elif cmd == "build": elif cmd == "build":
if not arg: if not arg:
prof.win_show(win_tag, "You must supply a job argument.") prof.win_show(win_tag, "You must supply a job argument.")