Changeset 76339 in webkit

Timestamp:

Jan 21, 2011 3:23:39 AM (13 years ago)

Author:

eric@webkit.org

Message:

2011-01-21 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Split Host object off from WebKitPatch for easier re-use
​https://bugs.webkit.org/show_bug.cgi?id=52284

new-run-webkit-tests and other tools are eventually going to want one of these.
Basically you need to inherit from this class if you want to pretend to be a
self.tool object for Steps/Commands.

• Scripts/webkitpy/common/host.py: Added.
• Scripts/webkitpy/tool/main.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/host.py (added)
• Scripts/webkitpy/tool/main.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-21  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Split Host object off from WebKitPatch for easier re-use
+        https://bugs.webkit.org/show_bug.cgi?id=52284
+
+        new-run-webkit-tests and other tools are eventually going to want one of these.
+        Basically you need to inherit from this class if you want to pretend to be a
+        self.tool object for Steps/Commands.
+
+        * Scripts/webkitpy/common/host.py: Added.
+        * Scripts/webkitpy/tool/main.py:
+
 2011-01-20  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/tool/main.py

@@ -37 +37 @@
 from webkitpy.common.checkout.scm import default_scm
 from webkitpy.common.config.ports import WebKitPort
+from webkitpy.common.host import Host
 from webkitpy.common.net.bugzilla import Bugzilla
 from webkitpy.common.net.buildbot import BuildBot
@@ -47 +48 @@
 
 
-class WebKitPatch(MultiCommandTool):
+class WebKitPatch(MultiCommandTool, Host):
     global_options = [
         make_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable all logging"),
@@ -60 +61 @@
     def __init__(self, path):
         MultiCommandTool.__init__(self)
+        Host.__init__(self)
 
         self._path = path
         self.wakeup_event = threading.Event()
-        # FIXME: All of these shared objects should move off onto a
-        # separate "Tool" object.  WebKitPatch should inherit from
-        # "Tool" and all these objects should use getters/setters instead of
-        # manual getter functions (e.g. scm()).
-        self.bugs = Bugzilla()
-        self.buildbot = BuildBot()
-        self.executive = executive.Executive()
-        self._irc = None
-        self.filesystem = filesystem.FileSystem()
-        self.workspace = workspace.Workspace(self.filesystem, self.executive)
-        self._port = None
-        self.user = user.User()
-        self._scm = None
-        self._checkout = None
-        self.status_server = StatusServer()
-        self.port_factory = port.factory
-        self.platform = platforminfo.PlatformInfo()
-
-    def scm(self):
-        # Lazily initialize SCM to not error-out before command line parsing (or when running non-scm commands).
-        if not self._scm:
-            self._scm = default_scm(self._options.patch_directories)
-        return self._scm
-
-    def checkout(self):
-        if not self._checkout:
-            self._checkout = Checkout(self.scm())
-        return self._checkout
-
-    def port(self):
-        return self._port
-
-    def ensure_irc_connected(self, irc_delegate):
-        if not self._irc:
-            self._irc = IRCProxy(irc_delegate)
-
-    def irc(self):
-        # We don't automatically construct IRCProxy here because constructing
-        # IRCProxy actually connects to IRC.  We want clients to explicitly
-        # connect to IRC.
-        return self._irc
 
     def path(self):
         return self._path
-
-    def command_completed(self):
-        if self._irc:
-            self._irc.disconnect()
 
     def should_show_in_main_help(self, command):
@@ -121 +78 @@
     # FIXME: This may be unnecessary since we pass global options to all commands during execute() as well.
     def handle_global_options(self, options):
-        self._options = options
+        self._initialize_scm(options.patch_directories)
         if options.dry_run:
             self.scm().dryrun = True