ajack 2004/07/12 11:19:05 Modified: python/gump/runner runner.py python/gump/document/xdocs documenter.py Log: Some work on command line (human) running of Gump. Revision Changes Path 1.7 +4 -2 gump/python/gump/runner/runner.py Index: runner.py =================================================================== RCS file: /home/cvs/gump/python/gump/runner/runner.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- runner.py 8 Jul 2004 20:33:11 -0000 1.6 +++ runner.py 12 Jul 2004 18:19:05 -0000 1.7 @@ -112,7 +112,8 @@ self.run.registerActor(Statistician(self.run)) # Generate results - self.run.registerActor(Resulter(self.run)) + if self.run.getOptions().isResults(): + self.run.registerActor(Resulter(self.run)) # Document.. # Use XDOCS if not overridden... @@ -128,7 +129,8 @@ self.run.registerActor(documenter) # Syndicate once documented - self.run.registerActor(Syndicator(self.run)) + if self.run.getOptions().isSyndicate(): + self.run.registerActor(Syndicator(self.run)) # Notify last if self.run.getOptions().isNotify() and self.run.getWorkspace().isNotify(): 1.13 +30 -19 gump/python/gump/document/xdocs/documenter.py Index: documenter.py =================================================================== RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- documenter.py 8 Jul 2004 20:33:09 -0000 1.12 +++ documenter.py 12 Jul 2004 18:19:05 -0000 1.13 @@ -379,8 +379,7 @@ # Workspace Pieces # def documentRunDetails(self): - - + # # ---------------------------------------------------------------------- # @@ -396,21 +395,8 @@ definitionSection=document.createSection('Run Details') if not self.gumpSet.isFull(): - notice=definitionSection.createWarning() - - notice.createText("""This output does not represent the complete workspace, - but part of it. - Only projects, and their dependents, matching this regular expression """) - notice.createStrong(self.gumpSet.projectexpression) - notice.createBreak() - notice.createBreak() - notice.createStrong('Requested Projects: ') - notice.createBreak() - notice.createBreak() - for project in self.gumpSet.projects: - notice.createText(project.name) - notice.createText(' ') - + self.documentPartial(definitionSection) + definitionTable=definitionSection.createTable() definitionTable.createEntry('Gump Run GUID', self.run.getRunGuid()) definitionTable.createEntry('Gump Run (Hex) GUID', self.run.getRunHexGuid()) @@ -453,6 +439,22 @@ document.serialize() document=None + def documentPartial(self,node): + notice=node.createWarning() + + notice.createText("""This output does not represent the complete workspace, + but part of it. + Only projects, and their dependents, matching this regular expression """) + notice.createStrong(self.gumpSet.projectexpression) + notice.createBreak() + notice.createBreak() + notice.createStrong('Requested Projects: ') + notice.createBreak() + notice.createBreak() + for project in self.gumpSet.projects: + notice.createText(project.name) + notice.createText(' ') + def documentEverythingElse(self): self.documentRepositories() @@ -767,15 +769,24 @@ spec.getRootPath()) if realTime: + + # Work done... + modules = len(self.gumpSet.getCompletedModules()) + projects = len(self.gumpSet.getCompletedProjects()) + document.createWarning("""This Gump run is currently in progress. - It started at %s.""" - % self.workspace.getStartDateTime() ) + It started at %s. So far %s modules have been updated, and %s projects built.""" \ + % (self.workspace.getStartDateTime(), modules, projects )) + else: document.createNote("""This Gump run is complete. It started at %s and ended at %s.""" % ( self.workspace.getStartDateTime(), self.workspace.getEndDateTime())) + if not self.gumpSet.isFull(): + self.documentPartial(document) + if not realTime: self.documentSummary(document, self.workspace.getProjectSummary())
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]