Create Jenkins project interface outside watcher

Create a complete Jenkins project interface instance and pass it to the
watcher, instead of having the watcher create it. This prepares the
watcher to using abstract scheduler interface, instead of Jenkins
specifically.

Author: spbnick

sktm.py

@@ -19,6 +19,7 @@
 import logging
 import os
 import sktm
+import sktm.jenkins
 
 
 def setup_parser():
@@ -120,9 +121,10 @@ def load_config(args):
     setup_logging(args.verbose)
     cfg = load_config(args)
     logging.debug("cfg=%s", cfg)
+    jenkins_project = sktm.jenkins.Project(cfg.get("jjname"), cfg.get("jurl"),
+                                           cfg.get("jlogin"), cfg.get("jpass"))
 
-    sw = sktm.watcher(cfg.get("jurl"), cfg.get("jlogin"), cfg.get("jpass"),
-                      cfg.get("jjname"), cfg.get("db"), cfg.get("makeopts"))
+    sw = sktm.watcher(jenkins_project, cfg.get("db"), cfg.get("makeopts"))
 
     args.func(sw, cfg)
     try:

sktm/__init__.py

@@ -31,16 +31,13 @@ class jtype(enum.IntEnum):
 
 # TODO This is no longer just a watcher. Rename/refactor/describe accordingly.
 class watcher(object):
-    def __init__(self, jenkinsurl, jenkinslogin, jenkinspassword,
-                 jenkinsjobname, dbpath, makeopts=None):
+    def __init__(self, jenkins_project, dbpath, makeopts=None):
         """
         Initialize a "watcher".
 
         Args:
-            jenkinsurl:         Jenkins instance URL.
-            jenkinslogin:       Jenkins user name.
-            jenkinspassword:    Jenkins user password.
-            jenkinsjobname:     Name of the Jenkins job to trigger and watch.
+            jenkins_project:    Interface to the Jenkins project to trigger
+                                and watch (sktm.jenkins.Project).
             dbpath:             Path to the job status database file.
             makeopts:           Extra arguments to pass to "make" when
                                 building.
@@ -49,9 +46,7 @@ def __init__(self, jenkinsurl, jenkinslogin, jenkinspassword,
         # Database instance
         self.db = sktm.db.skt_db(os.path.expanduser(dbpath))
         # Jenkins project interface instance
-        self.jk = sktm.jenkins.Project(jenkinsjobname,
-                                       jenkinsurl, jenkinslogin,
-                                       jenkinspassword)
+        self.jk = jenkins_project
         # Extra arguments to pass to "make"
         self.makeopts = makeopts
         # List of pending Jenkins builds, each one represented by a 3-tuple