Changeset 1483

Timestamp:

07/10/08 18:14:45 (7 weeks ago)

Author:

rob

Message:

Added build, run, and stop project commands
* changed output log to search upwards in the history looking for working directories when double clicking on a grep-like line
* added i18n text for process start/finish messages

Location:

trunk/peppy

Files:

• lib/processmanager.py (modified) (2 diffs)
• plugins/error_log.py (modified) (3 diffs)
• plugins/project.py (modified) (6 diffs)

trunk/peppy/lib/processmanager.py

@@ -121 +121 @@
     # Use the unicode rightward double arrow as a delimiter
     arrow = u"\u21d2 "
+    started = _("Started %s on")
+    cwd = _("cwd = ")
+    exit = _("exit code = %s")
+    finished = _("Finished %s on")
     
     def __init__(self, cmd, working_dir, job_output):
@@ -133 +137 @@
         self.exit_code = 0
     
+    @classmethod
+    def matchCwd(cls, line):
+        """Evaluate if the line contains an embedded working directory specifier
+        
+        """
+        if line.startswith(cls.arrow):
+            start = len(cls.arrow)
+            #dprint(line[start:])
+            if line[start:].startswith(_(cls.cwd)):
+                cwd = line[start + len(cls.cwd):].strip()
+                return cwd
+        return ""
+    
     def getStartMessage(self):
-        return self.arrow + _("Started %s on %s") % (self.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+        return "%s%s %s\n%s%s%s\n" % (self.arrow, self.started % self.cmd, time.asctime(time.localtime(time.time())), self.arrow, self.cwd, self.working_dir)
 
     def getFinishMessage(self):
-        return self.arrow + _("exit code = %s") % self.exit_code + "\n" + self.arrow + _("Finished %s on %s") % (self.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+        return "%s%s\n%s%s %s" % (self.arrow, self.exit % self.exit_code, self.arrow, self.finished % self.cmd, time.asctime(time.localtime(time.time())))
 
     def run(self, text=""):

trunk/peppy/plugins/error_log.py

@@ -16 +16 @@
 from peppy.sidebar import *
 from peppy.minor import *
+from peppy.lib.processmanager import Job
 
 class LoggingSTC(PeppySTC, ClassPrefs, debugmixin):
@@ -88 +89 @@
             #sys.stdout.write("match ends at %d" % i)
             self.last_matched_filename = pos + i
+    
+    def findAbsolutePath(self, line):
+        """If the filename specified on the line is a relative path, search
+        upwards in the stc to locate a cwd specifier.
+        
+        """
+        while line > 0:
+            line -= 1
+            text = self.GetLine(line)
+            if text.startswith(Job.arrow):
+                #dprint("Found a candidate at %d: %s" % (line, text))
+                cwd = Job.matchCwd(text)
+                if cwd is None:
+                    return ""
+                elif cwd:
+                    return cwd
+        return ""
 
     def OnDoubleClick(self, evt):
@@ -100 +118 @@
             if match:
                 filename = match.group(1)
+                if not filename.startswith("/"):
+                    path = self.findAbsolutePath(line)
+                    filename = os.path.join(path, filename)
                 line = match.group(2)
                 self.open("%s#%s" % (filename, line))

trunk/peppy/plugins/project.py

@@ -160 +160 @@
         StrParam('build_command', '', 'shell command to build project, relative to working directory', fullwidth=True),
         DirParam('run_dir', '', 'working directory in which to execute the project', fullwidth=True),
-        StrParam('run_command', '', 'shell command to executee project, relative to working directory', fullwidth=True),
+        StrParam('run_command', '', 'shell command to execute project, absolute path needed or will search current PATH environment variable', fullwidth=True),
         )
     
@@ -169 +169 @@
         self.loadPrefs()
         self.loadTags()
+        self.process = None
     
     def __str__(self):
@@ -200 +201 @@
             dprint("Failed writing project config file")
     
-    def build(self):
+    def registerProcess(self, job):
+        self.process = job
+    
+    def deregisterProcess(self, job):
+        self.process = None
+    
+    def isRunning(self):
+        return bool(self.process)
+    
+    def build(self, frame):
         dprint("Compiling %s in %s" % (self.build_command, self.build_dir))
-    
-    def run(self):
+        output = JobOutputSidebarController(frame, self.registerProcess, self.deregisterProcess)
+        ProcessManager().run(self.build_command, self.build_dir, output)
+    
+    def run(self, frame):
         dprint("Running %s in %s" % (self.run_command, self.run_dir))
+        output = JobOutputSidebarController(frame, self.registerProcess, self.deregisterProcess)
+        ProcessManager().run(self.run_command, self.run_dir, output)
+    
+    def stop(self):
+        if self.process:
+            self.process.kill()
 
 
@@ -327 +345 @@
 
     def isEnabled(self):
-        return bool(self.mode.project_info and self.mode.project_info.build_command)
-
-    def action(self, index=-1, multiplier=1):
-        self.mode.project_info.build()
+        return bool(self.mode.project_info and self.mode.project_info.build_command and not self.mode.project_info.isRunning())
+
+    def action(self, index=-1, multiplier=1):
+        self.mode.project_info.build(self.frame)
 
 
@@ -337 +355 @@
     name = "Run..."
     icon = 'icons/application.png'
-    default_menu = ("Project", 100)
+    default_menu = ("Project", 101)
 
     def isEnabled(self):
-        return bool(self.mode.project_info and self.mode.project_info.run_command)
-
-    def action(self, index=-1, multiplier=1):
-        self.mode.project_info.run()
+        return bool(self.mode.project_info and self.mode.project_info.run_command and not self.mode.project_info.isRunning())
+
+    def action(self, index=-1, multiplier=1):
+        self.mode.project_info.run(self.frame)
+
+
+class StopProject(SelectAction):
+    """Stop the build or run of the project"""
+    name = "Stop"
+    icon = 'icons/stop.png'
+    default_menu = ("Project", 109)
+
+    def isEnabled(self):
+        return bool(self.mode.project_info and self.mode.project_info.run_command and self.mode.project_info.isRunning())
+
+    def action(self, index=-1, multiplier=1):
+        self.mode.project_info.stop()
 
 
@@ -622 +653 @@
             actions.append(SaveGlobalTemplate)
         if mode.buffer.url in self.known_project_dirs:
-            actions.extend([SaveProjectTemplate, BuildProject, RunProject,
+            actions.extend([SaveProjectTemplate,
+                            
+                            BuildProject, RunProject, StopProject,
                             
                             RebuildCtags, LookupCtag])