ajack 2004/05/17 14:41:22 Modified: python/gump/syndication Tag: MultiRunner rss.py atom.py python/gump Tag: MultiRunner update.py debug.py build.py integrate.py check.py python/gump/test Tag: MultiRunner __init__.py stats.py python/gump/test/resources/complete1 Tag: MultiRunner module1.xml python/gump/model Tag: MultiRunner module.py workspace.py stats.py project.py python/gump/build Tag: MultiRunner ant.py abstract.py python/gump/core Tag: MultiRunner demand.py tasks.py runner.py misc.py python/gump/document/forrest Tag: MultiRunner documenter.py python/gump/shared Tag: MultiRunner comparator.py python/gump/output Tag: MultiRunner statsdb.py python/gump/update Tag: MultiRunner updater.py template/forrest/content/xdocs Tag: MultiRunner site.xml Log: Closer to having two Runners (Sequential & OnDemand) Revision Changes Path No revision No revision 1.23.2.1 +5 -5 gump/python/gump/syndication/rss.py Index: rss.py =================================================================== RCS file: /home/cvs/gump/python/gump/syndication/rss.py,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -r1.23 -r1.23.2.1 --- rss.py 5 May 2004 23:15:32 -0000 1.23 +++ rss.py 17 May 2004 21:41:21 -0000 1.23.2.1 @@ -321,7 +321,7 @@ ('%sT%s%s') % (datestr,timestr,TZ)) # Generate changes, only if the module had changed - if module.isUpdated() and not module.getStatePair().isUnset(): + if module.isModified() and not module.getStatePair().isUnset(): log.debug("Add module to RSS Newsfeed for : " + module.getName()) moduleRSS.addItem(item) @@ -366,7 +366,7 @@ ('%sT%s%s') % (datestr,timestr,TZ)) # Generate changes, only if the module changed - if project.getModule().isUpdated() and not project.getStatePair().isUnset(): + if project.getModule().isModified() and not project.getStatePair().isUnset(): log.debug("Add project to RSS Newsfeed for : " + project.getName()) projectRSS.addItem(item) moduleRSS.addItem(item) 1.16.2.1 +5 -5 gump/python/gump/syndication/atom.py Index: atom.py =================================================================== RCS file: /home/cvs/gump/python/gump/syndication/atom.py,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -r1.16 -r1.16.2.1 --- atom.py 5 May 2004 23:15:32 -0000 1.16 +++ atom.py 17 May 2004 21:41:21 -0000 1.16.2.1 @@ -219,7 +219,7 @@ content) # Generate changes, only if the module had changed - if module.isUpdated() and not module.getStatePair().isUnset(): + if module.isModified() and not module.getStatePair().isUnset(): log.debug("Add module to Atom Newsfeed for : " + module.getName()) moduleFeed.addEntry(entry) @@ -261,7 +261,7 @@ content ) # Generate changes, only if the project changed - if project.getModule().isUpdated() and not project.getStatePair().isUnset(): + if project.getModule().isModified() and not project.getStatePair().isUnset(): log.debug("Add project to Atom Newsfeed for : " + project.getName()) projectFeed.addEntry(entry) moduleFeed.addEntry(entry) No revision No revision 1.28.2.2 +3 -3 gump/python/gump/update.py Index: update.py =================================================================== RCS file: /home/cvs/gump/python/gump/update.py,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -u -r1.28.2.1 -r1.28.2.2 --- update.py 17 May 2004 20:22:01 -0000 1.28.2.1 +++ update.py 17 May 2004 21:41:21 -0000 1.28.2.2 @@ -32,7 +32,7 @@ from gump import log from gump.core.gumpinit import gumpinit -from gump.core.tasks import SequentialTaskRunner +from gump.core.runner import getRunner from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet from gump.core.commandLine import handleArgv from gump.model.loader import WorkspaceLoader @@ -69,7 +69,7 @@ # # Perform this integration run... # - result = SequentialTaskRunner(run).performUpdate() + result = getRunner(run).performUpdate() # log.info('Gump Update complete. Exit code:' + str(result)) 1.5.2.2 +2 -2 gump/python/gump/debug.py Index: debug.py =================================================================== RCS file: /home/cvs/gump/python/gump/debug.py,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -r1.5.2.1 -r1.5.2.2 --- debug.py 17 May 2004 20:22:01 -0000 1.5.2.1 +++ debug.py 17 May 2004 21:41:21 -0000 1.5.2.2 @@ -28,7 +28,7 @@ from gump import log from gump.core.gumpinit import gumpinit -from gump.core.tasks import SequentialTaskRunner +from gump.core.runner import getRunner from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet from gump.core.commandLine import handleArgv from gump.model.loader import WorkspaceLoader @@ -64,7 +64,7 @@ # # Perform this integration run... # - result = SequentialTaskRunner(run).performDebug() + result = getRunner(run).performDebug() # log.info('Gump Debug complete. Exit code:' + str(result)) 1.47.2.2 +2 -2 gump/python/gump/build.py Index: build.py =================================================================== RCS file: /home/cvs/gump/python/gump/build.py,v retrieving revision 1.47.2.1 retrieving revision 1.47.2.2 diff -u -r1.47.2.1 -r1.47.2.2 --- build.py 17 May 2004 20:22:01 -0000 1.47.2.1 +++ build.py 17 May 2004 21:41:21 -0000 1.47.2.2 @@ -29,7 +29,7 @@ from gump import log from gump.core.gumpinit import gumpinit -from gump.core.tasks import SequentialTaskRunner +from gump.core.runner import getRunner from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet from gump.core.commandLine import handleArgv from gump.model.loader import WorkspaceLoader @@ -60,7 +60,7 @@ # # Perform this integration run... # - result = SequentialTaskRunner(run).performBuild() + result = getRunner(run).performBuild() # log.info('Gump Build complete. Exit code:' + str(result)) 1.27.2.2 +3 -3 gump/python/gump/integrate.py Index: integrate.py =================================================================== RCS file: /home/cvs/gump/python/gump/integrate.py,v retrieving revision 1.27.2.1 retrieving revision 1.27.2.2 diff -u -r1.27.2.1 -r1.27.2.2 --- integrate.py 17 May 2004 20:22:01 -0000 1.27.2.1 +++ integrate.py 17 May 2004 21:41:21 -0000 1.27.2.2 @@ -32,7 +32,7 @@ from gump import log from gump.core.gumpinit import gumpinit -from gump.core.tasks import SequentialTaskRunner +from gump.core.runner import getRunner from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet from gump.core.commandLine import handleArgv from gump.utils import logResourceUtilization @@ -76,7 +76,7 @@ # # Perform this integration run... # - result = SequentialTaskRunner(run).performIntegrate() + result = getRunner(run).performIntegrate() logResourceUtilization('Before exit') 1.43.2.2 +2 -2 gump/python/gump/check.py Index: check.py =================================================================== RCS file: /home/cvs/gump/python/gump/check.py,v retrieving revision 1.43.2.1 retrieving revision 1.43.2.2 diff -u -r1.43.2.1 -r1.43.2.2 --- check.py 17 May 2004 20:22:01 -0000 1.43.2.1 +++ check.py 17 May 2004 21:41:21 -0000 1.43.2.2 @@ -28,7 +28,7 @@ from gump import log from gump.core.gumpinit import gumpinit -from gump.core.tasks import SequentialTaskRunner +from gump.core.runner import getRunner from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet from gump.core.commandLine import handleArgv from gump.model.loader import WorkspaceLoader @@ -51,7 +51,7 @@ # # Perform this check run... # - result = SequentialTaskRunner(run).performCheck() + result = getRunner(run).performCheck() # log.info('Gump Check complete. Exit code:' + str(result)) No revision No revision 1.11.2.1 +1 -1 gump/python/gump/test/__init__.py Index: __init__.py =================================================================== RCS file: /home/cvs/gump/python/gump/test/__init__.py,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -r1.11 -r1.11.2.1 --- __init__.py 16 Apr 2004 17:28:35 -0000 1.11 +++ __init__.py 17 May 2004 21:41:21 -0000 1.11.2.1 @@ -74,7 +74,7 @@ module.changeState(STATE_FAILED) else: if m % 2 == 0: - module.setUpdated(1) + module.setModified(1) module.changeState(STATE_SUCCESS) p=0 for project in module.getProjects(): 1.10.2.1 +5 -5 gump/python/gump/test/stats.py Index: stats.py =================================================================== RCS file: /home/cvs/gump/python/gump/test/stats.py,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -r1.10 -r1.10.2.1 --- stats.py 16 Apr 2004 17:28:35 -0000 1.10 +++ stats.py 17 May 2004 21:41:21 -0000 1.10.2.1 @@ -101,17 +101,17 @@ def testLoadAndUpdateStats(self): self.statsDB.loadStatistics(self.workspace) - # Mark Updated (so we get an updated reading) - self.module1.setUpdated(1) + # Mark Modified (so we get an Modified reading) + self.module1.setModified(1) self.statsDB.updateStatistics(self.workspace) - lastUpdated=self.module1.getLastUpdated() + lastModified=self.module1.getLastModified() # Give some padding. - lastUpdated -= (60*60*7) + lastModified -= (60*60*7) - rough=getGeneralDifferenceDescription(default.time, lastUpdated) + rough=getGeneralDifferenceDescription(default.time, lastModified) self.assertNonZeroString('Date Diff String', rough) self.assertNotSubstring('Date Diff String', 'year', rough) No revision No revision 1.1.2.2 +1 -1 gump/python/gump/test/resources/complete1/Attic/module1.xml Index: module1.xml =================================================================== RCS file: /home/cvs/gump/python/gump/test/resources/complete1/Attic/module1.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- module1.xml 17 May 2004 20:22:01 -0000 1.1.2.1 +++ module1.xml 17 May 2004 21:41:21 -0000 1.1.2.2 @@ -6,7 +6,7 @@ </description> <cvs repository="repository1" - module="gump/resources/test/module1"/> + module="gump/resources/test/cvs-modules/module1"/> <nag from="Ms. Dev 1 <[EMAIL PROTECTED]>" to="[EMAIL PROTECTED]"/> No revision No revision 1.43.2.2 +21 -9 gump/python/gump/model/module.py Index: module.py =================================================================== RCS file: /home/cvs/gump/python/gump/model/module.py,v retrieving revision 1.43.2.1 retrieving revision 1.43.2.2 diff -u -r1.43.2.1 -r1.43.2.2 --- module.py 17 May 2004 20:22:02 -0000 1.43.2.1 +++ module.py 17 May 2004 21:41:21 -0000 1.43.2.2 @@ -178,6 +178,11 @@ self.repository=None self.packaged = 0 + + # Changes were found (when updating) + self.modified = 0 + + # The task of updating has occured.. self.updated = 0 self.affected = 0 @@ -435,8 +440,8 @@ return float(historicalOdds)/float(historicalOddses) - def getLastUpdated(self): - return self.getStats().getLastUpdated() + def getLastModified(self): + return self.getStats().getLastModified() # Get a summary of states for each project def getProjectSummary(self,summary=None): @@ -536,7 +541,14 @@ if hasattr(self,'jars') and self.jars: return 1 return 0 - # Where the contents (at the repository) updated? + # Where the contents (at the repository) Modified? + def isModified(self): + return self.modified + + def setModified(self,modified): + self.modified=modified + + # Where the contents (at the repository) Updated? def isUpdated(self): return self.updated @@ -562,15 +574,15 @@ """ def __init__(self,moduleName): Statistics.__init__(self,moduleName) - self.lastUpdated=-1 + self.lastModified=-1 - def getLastUpdated(self): - return (self.lastUpdated) + def getLastModified(self): + return (self.lastModified) def getKeyBase(self): return 'module:'+ self.name - def lastUpdatedKey(self): + def lastModifiedKey(self): return self.getKeyBase() + '-last-updated' def update(self,module): @@ -579,5 +591,5 @@ # # Track code updates/changes # - if module.isUpdated(): - self.lastUpdated=default.time \ No newline at end of file + if module.isModified(): + self.lastModified=default.time \ No newline at end of file 1.48.2.2 +6 -6 gump/python/gump/model/workspace.py Index: workspace.py =================================================================== RCS file: /home/cvs/gump/python/gump/model/workspace.py,v retrieving revision 1.48.2.1 retrieving revision 1.48.2.2 diff -u -r1.48.2.1 -r1.48.2.2 --- workspace.py 17 May 2004 20:22:02 -0000 1.48.2.1 +++ workspace.py 17 May 2004 21:41:21 -0000 1.48.2.2 @@ -617,15 +617,15 @@ """Statistics Holder""" def __init__(self): Statistics.__init__(self,'workspace') - self.lastUpdated=-1 + self.lastModified=-1 - def getLastUpdated(self): - return (self.lastUpdated) + def getLastModified(self): + return (self.lastModified) def getKeyBase(self): return self.name - def lastUpdatedKey(self): + def lastModifiedKey(self): return self.getKeyBase() + '-last-updated' def update(self,module): @@ -634,8 +634,8 @@ # # Track code updates/changes # - if module.isUpdated(): - self.lastUpdated=default.time + if module.isModified(): + self.lastModified=default.time class ModelEvent(Event): 1.19.2.1 +4 -4 gump/python/gump/model/stats.py Index: stats.py =================================================================== RCS file: /home/cvs/gump/python/gump/model/stats.py,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -r1.19 -r1.19.2.1 --- stats.py 16 Apr 2004 17:28:41 -0000 1.19 +++ stats.py 17 May 2004 21:41:21 -0000 1.19.2.1 @@ -47,7 +47,7 @@ self.previousState=STATE_UNSET self.startOfState=-1 self.sequenceInState=0 - self.lastUpdated=0 + self.lastModified=0 # # FOG is (at pressent) effectively the @@ -68,8 +68,8 @@ total=(good+bad) or 1 return float(good)/float(total) - def getLastUpdated(self): - return (self.lastUpdated) + def getLastModified(self): + return (self.lastModified) def nameKey(self): return self.getKeyBase() + '-name' @@ -89,7 +89,7 @@ def lastKey(self): return self.getKeyBase() + '-last' - def lastUpdatededKey(self): + def lastModifiededKey(self): return self.getKeyBase() + '-last-updated' def currentStateKey(self): 1.82.2.2 +3 -3 gump/python/gump/model/project.py Index: project.py =================================================================== RCS file: /home/cvs/gump/python/gump/model/project.py,v retrieving revision 1.82.2.1 retrieving revision 1.82.2.2 diff -u -r1.82.2.1 -r1.82.2.2 --- project.py 17 May 2004 20:22:02 -0000 1.82.2.1 +++ project.py 17 May 2004 21:41:22 -0000 1.82.2.2 @@ -281,9 +281,9 @@ def getHistoricalOddsOfSuccess(self): return self.getStats().getHistoricalOddsOfSuccess() - # Only modules get updated. - def getLastUpdated(self): - return self.getModule().getStats().getLastUpdated() + # Only modules get Modified. + def getLastModified(self): + return self.getModule().getStats().getLastModified() def determineAffected(self): if self.affectedProjects: return len(self.affectedProjects) No revision No revision 1.1.2.2 +15 -14 gump/python/gump/build/Attic/ant.py Index: ant.py =================================================================== RCS file: /home/cvs/gump/python/gump/build/Attic/ant.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- ant.py 17 May 2004 20:22:04 -0000 1.1.2.1 +++ ant.py 17 May 2004 21:41:22 -0000 1.1.2.2 @@ -57,13 +57,13 @@ workspace=self.run.getWorkspace() - log.info(' Project: #[' + `project.getPosition()` + '] of [' + `projectCount` + '] : ' + project.getName()) + log.info(' Project: #[' + `project.getPosition()` + '] : ' + project.getName()) # # Get the appropriate build command... # - cmd=self.getAntCommand(self.run.getEnvironment().getJavaCommand()) + cmd=self.getAntCommand(project, self.run.getEnvironment().getJavaCommand()) if cmd: # Execute the command .... @@ -95,8 +95,9 @@ # def getAntCommand(self,project,javaCommand='java'): - ant=self.ant - antxml=self.xml.ant + # The original model information... + ant=project.ant + antxml=project.xml.ant # The ant target (or none == ant default target) target= antxml.target or '' @@ -116,7 +117,7 @@ # # Build a classpath (based upon dependencies) # - (classpath,bootclasspath)=self.getClasspaths() + (classpath,bootclasspath)=project.getClasspaths() # # Get properties @@ -131,12 +132,12 @@ # # Get properties # - jvmargs=self.getJVMArgs(project) + jvmargs=self.getJVMArgs(antxml) # # Run java on apache Ant... # - cmd=Cmd(javaCommand,'build_'+self.getModule().getName()+'_'+self.getName(),\ + cmd=Cmd(javaCommand,'build_'+project.getModule().getName()+'_'+project.getName(),\ basedir,{'CLASSPATH':classpath}) # These are workspace + project system properties @@ -171,9 +172,9 @@ # # Allow ant-level debugging... # - if self.getWorkspace().isDebug() or self.isDebug() or debug: + if project.getWorkspace().isDebug() or project.isDebug() or debug: cmd.addParameter('-debug') - if self.getWorkspace().isVerbose() or self.isVerbose() or verbose: + if project.getWorkspace().isVerbose() or project.isVerbose() or verbose: cmd.addParameter('-verbose') # @@ -182,7 +183,7 @@ # :NOTE: Commented out since <property on workspace works. # cmd.addPrefixedParameter('-D','build.sysclasspath','only','=') - mergeFile=self.getWorkspace().getMergeFile() + mergeFile=project.getWorkspace().getMergeFile() if mergeFile: cmd.addPrefixedParameter('-D','gump.merge',str(mergeFile),'=') @@ -202,17 +203,17 @@ - def getAntProperties(self): + def getAntProperties(self,project): """Get properties for a project""" properties=Parameters() - for property in self.getWorkspace().getProperties()+self.getAnt().getProperties(): + for property in project.getWorkspace().getProperties()+project.getAnt().getProperties(): properties.addPrefixedNamedParameter('-D',property.name,property.value,'=') return properties - def getAntSysProperties(self): + def getAntSysProperties(self,project): """Get sysproperties for a project""" properties=Parameters() - for property in self.getWorkspace().getSysProperties()+self.getAnt().getSysProperties(): + for property in project.getWorkspace().getSysProperties()+project.getAnt().getSysProperties(): properties.addPrefixedNamedParameter('-D',property.name,property.value,'=') return properties 1.1.2.2 +2 -7 gump/python/gump/build/Attic/abstract.py Index: abstract.py =================================================================== RCS file: /home/cvs/gump/python/gump/build/Attic/abstract.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- abstract.py 17 May 2004 20:22:04 -0000 1.1.2.1 +++ abstract.py 17 May 2004 21:41:22 -0000 1.1.2.2 @@ -51,16 +51,11 @@ Runnable.__init__(self,run) - def getJVMArgs(self): + def getJVMArgs(self,xml): """Get JVM arguments for a project""" args=Parameters() - if self.hasAnt(): - jvmargs=self.getAnt().xml.jvmarg - elif self.hasMaven(): - jvmargs=self.getMaven().xml.jvmarg - - for jvmarg in jvmargs: + for jvmarg in xml.jvmarg: if jvmarg.value: args.addParameter(jvmarg.value) else: No revision No revision 1.1.2.2 +19 -37 gump/python/gump/core/Attic/demand.py Index: demand.py =================================================================== RCS file: /home/cvs/gump/python/gump/core/Attic/demand.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- demand.py 17 May 2004 20:22:03 -0000 1.1.2.1 +++ demand.py 17 May 2004 21:41:22 -0000 1.1.2.2 @@ -57,47 +57,29 @@ # Classes ############################################################################### -class OnDemandTaskRunner(GumpRunner): +class OnDemandRunner(GumpRunner): def __init__(self,run): - GumpRunner.__init__(self,eun) + GumpRunner.__init__(self,run) ########################################### - - def performUpdate(self): - return self.perform(run, GumpTaskList(['update','document']) ) - - def performBuild(self): - return self.perform(run, GumpTaskList(['build','document']) ) - - def performDebug(self): - return self.perform(run, GumpTaskList(['update','build','document']) ) - + def performIntegrate(self): - return self.perform(run, \ - GumpTaskList(['update','build','syndicate','generateResults','document','notify']) ) - - def performCheck(self): - return self.perform(run, GumpTaskList(['check','document']) ) - ########################################### - - def perform(self): - # In order... - for project in self.run.getBuildSequence(): + for project in self.run.getGumpSet().getProjectSequence(): + # Process the module, upon demand module=project.getModule() - - # Update on demand - if not module.hasBeenUpdated(): + if not module.isUpdated(): self.processModule(module) + module.setUpdated(1) #:TODO: Move this... # Process self.processProject(project) # Keep track of progress... - documentBuildList() + #documentBuildList() # The wrap up... documentWorkspace() @@ -105,18 +87,18 @@ def processModule(self,module): # Update Module - module.update() - module.updateStats() - module.document() - module.syndicate() - module.notify() + self.updater.updateModule(module) + #module.updateStats() + #module.document() + #module.syndicate() + #module.notify() def processProject(self,project): # Build project - project.build() - product.publishArtefacts() - project.updateStats() - project.document() - project.syndicate() - project.notify() \ No newline at end of file + self.builder.buildProject(project) + #product.publishArtefacts() + #project.updateStats() + #project.document() + #project.syndicate() + #project.notify() \ No newline at end of file 1.1.2.2 +18 -3 gump/python/gump/core/Attic/tasks.py Index: tasks.py =================================================================== RCS file: /home/cvs/gump/python/gump/core/Attic/tasks.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- tasks.py 17 May 2004 20:22:03 -0000 1.1.2.1 +++ tasks.py 17 May 2004 21:41:22 -0000 1.1.2.2 @@ -85,12 +85,27 @@ # A few proxies... + def preprocess(self): self.misc.preprocess() + + def loadStatistics(self): self.misc.loadStatistics() + def updateStatistics(self): self.misc.updateStatistics() + def build(self): self.builder.build() def update(self): self.updater.update() + + def prepareDocumentation(self): self.misc.prepareDocumentation() def document(self): self.misc.document() + + def generateResults(self): self.misc.generateResults() + def gatherResults(self): self.misc.gatherResults() + + def notify(self): self.misc.notify() + def syndicate(self): self.misc.syndicate() + def setEndTime(self): self.misc.setEndTime() + ########################################### def perform(self,taskList): @@ -103,7 +118,7 @@ # Return an exit code based off success # :TODO: Move onto run - if run.getWorkspace().isSuccess(): + if self.run.getWorkspace().isSuccess(): result = EXIT_CODE_SUCCESS else: result = EXIT_CODE_FAILED @@ -151,8 +166,8 @@ self.method=getattr(engine,self.name,None) # For debugging ... - #if not (isinstance(self.method,types.MethodType) and callable(self.method)): - # raise RuntimeError, 'Failed to bind task name [' + self.name + '] to engine [' + `engine` + ']' + if not (isinstance(self.method,types.MethodType) and callable(self.method)): + raise RuntimeError, 'Failed to bind task name [' + self.name + '] to engine [' + `engine` + ']' def invoke(self): if self.method: 1.1.2.2 +6 -0 gump/python/gump/core/Attic/runner.py Index: runner.py =================================================================== RCS file: /home/cvs/gump/python/gump/core/Attic/runner.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- runner.py 17 May 2004 20:22:03 -0000 1.1.2.1 +++ runner.py 17 May 2004 21:41:22 -0000 1.1.2.2 @@ -50,3 +50,9 @@ self.builder=GumpBuilder(run) +def getRunner(run): + from gump.core.tasks import SequentialTaskRunner + return SequentialTaskRunner(run) + + #from gump.core.demand import OnDemandRunner + #return OnDemandRunner(run) 1.1.2.2 +2 -2 gump/python/gump/core/Attic/misc.py Index: misc.py =================================================================== RCS file: /home/cvs/gump/python/gump/core/Attic/misc.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- misc.py 17 May 2004 20:22:03 -0000 1.1.2.1 +++ misc.py 17 May 2004 21:41:22 -0000 1.1.2.2 @@ -267,12 +267,12 @@ def loadStatistics(self): """ Load Statistics into the self.run (to get current values) """ logResourceUtilization('Before load statistics') - self.processStatistics(self.run,1) + self.processStatistics(1) def updateStatistics(self): """ Update Statistics into the self.run (to set current values) """ logResourceUtilization('Before update statistics') - self.processStatistics(self.run,0) + self.processStatistics(0) def processStatistics(self,load): No revision No revision 1.36.2.2 +12 -12 gump/python/gump/document/forrest/documenter.py Index: documenter.py =================================================================== RCS file: /home/cvs/gump/python/gump/document/forrest/documenter.py,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -u -r1.36.2.1 -r1.36.2.2 --- documenter.py 17 May 2004 20:22:03 -0000 1.36.2.1 +++ documenter.py 17 May 2004 21:41:22 -0000 1.36.2.2 @@ -683,7 +683,7 @@ moduleRow.createData(module.getStats().sequenceInState) moduleRow.createData( \ getGeneralSinceDescription( \ - module.getStats().getLastUpdated())) + module.getStats().getLastModified())) notes='' if module.isVerbose(): @@ -721,7 +721,7 @@ projectRow.createData(project.getStats().sequenceInState) projectRow.createData( \ getGeneralSinceDescription( \ - project.getModule().getStats().getLastUpdated())) + project.getModule().getStats().getLastModified())) notes='' if project.isVerbose(): @@ -2629,10 +2629,10 @@ mstatsRow.createData().createLink(mByFOG, 'Modules By FOG Factor') mstatsRow.createData('Friend of Gump (FOG) Factor. A measure of dependability (for other Gumpers).') - # Modules By Last Updated - mByLU=self.documentModulesByLastUpdated(stats, run, workspace, gumpSet) + # Modules By Last Modified + mByLU=self.documentModulesByLastModified(stats, run, workspace, gumpSet) mstatsRow=mstatsTable.createRow() - mstatsRow.createData().createLink(mByLU, 'Modules By Last Updated') + mstatsRow.createData().createLink(mByLU, 'Modules By Last Modified') mstatsRow.createData('Best guess at last code change (in source control).') pstatsSection=document.createSection('Project Statistics') @@ -2784,20 +2784,20 @@ return fileName + '.html' - def documentModulesByLastUpdated(self,stats,run,workspace,gumpSet): - fileName='module_updated' + def documentModulesByLastModified(self,stats,run,workspace,gumpSet): + fileName='module_modified' documentFile=self.resolver.getFile(stats,fileName) - document=XDocDocument('Modules By Last Updated', documentFile) - updTable=document.createTable(['Module','Last Updated Date','Last Updated']) + document=XDocDocument('Modules By Last Modified', documentFile) + updTable=document.createTable(['Module','Last Modified Date','Last Modified']) modules=0 - for module in stats.modulesByLastUpdated: + for module in stats.modulesByLastModified: if not gumpSet.inModuleSequence(module): continue if module.isPackaged(): continue updRow=updTable.createRow() self.insertLink( module, stats, updRow.createData()) - updRow.createData(secsToDate(module.getLastUpdated())) + updRow.createData(secsToDate(module.getLastModified())) updRow.createData( \ - getGeneralSinceDescription(module.getLastUpdated())) + getGeneralSinceDescription(module.getLastModified())) modules+=1 if not modules: updTable.createLine('None') No revision No revision 1.3.2.1 +7 -7 gump/python/gump/shared/comparator.py Index: comparator.py =================================================================== RCS file: /home/cvs/gump/python/gump/shared/comparator.py,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- comparator.py 22 Apr 2004 22:58:17 -0000 1.3 +++ comparator.py 17 May 2004 21:41:22 -0000 1.3.2.1 @@ -60,9 +60,9 @@ if not c: c=cmp(module1,module2) return c -def compareModulesByLastUpdated(module1,module2): - lu1=module1.getLastUpdated() - lu2=module2.getLastUpdated() +def compareModulesByLastModified(module1,module2): + lu1=module1.getLastModified() + lu2=module2.getLastModified() c= int(round(lu2 - lu1,0)) if not c: c=cmp(module1,module2) return c @@ -102,9 +102,9 @@ if not c: c=cmp(project1,project2) return c -def compareProjectsByLastUpdated(project1,project2): - lu1=project1.getLastUpdated() - lu2=project2.getLastUpdated() +def compareProjectsByLastModified(project1,project2): + lu1=project1.getLastModified() + lu2=project2.getLastModified() c= int(round(lu2 - lu1,0)) if not c: c=cmp(project1,project2) return c No revision No revision 1.25.2.1 +5 -5 gump/python/gump/output/statsdb.py Index: statsdb.py =================================================================== RCS file: /home/cvs/gump/python/gump/output/statsdb.py,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -u -r1.25 -r1.25.2.1 --- statsdb.py 24 Apr 2004 15:25:18 -0000 1.25 +++ statsdb.py 17 May 2004 21:41:22 -0000 1.25.2.1 @@ -94,17 +94,17 @@ def getModuleStats(self,moduleName): stats=ModuleStatistics(moduleName) self.getBaseStats(stats) - stats.lastUpdated=self.getDate(stats.lastUpdatedKey()) + stats.lastModified=self.getDate(stats.lastModifiedKey()) return stats def putModuleStats(self,stats): self.putBaseStats(stats) - self.putDate(stats.lastUpdatedKey(), stats.lastUpdated) + self.putDate(stats.lastModifiedKey(), stats.lastModified) def delModuleStats(self,stats): self.delBaseStats(stats) try: - del self.db[stats.lastUpdatedKey()] + del self.db[stats.lastModifiedKey()] except: """ Hopefully means it wasn't there... """ @@ -354,7 +354,7 @@ self.modulesByTotalDependencies=createOrderedList(workspace.getModules(),compareModulesByDependencyCount) self.modulesByTotalDependees=createOrderedList(workspace.getModules(),compareModulesByDependeeCount) self.modulesByFOGFactor=createOrderedList(workspace.getModules(),compareModulesByFOGFactor) - self.modulesByLastUpdated=createOrderedList(workspace.getModules(),compareModulesByLastUpdated) + self.modulesByLastModified=createOrderedList(workspace.getModules(),compareModulesByLastModified) # All Projects @@ -362,7 +362,7 @@ self.projectsByTotalDependencies=createOrderedList(workspace.getProjects(),compareProjectsByDependencyCount) self.projectsByTotalDependees=createOrderedList(workspace.getProjects(),compareProjectsByDependeeCount) self.projectsByFOGFactor=createOrderedList(workspace.getProjects(),compareProjectsByFOGFactor) - self.projectsByLastUpdated=createOrderedList(workspace.getProjects(),compareProjectsByLastUpdated) + self.projectsByLastModified=createOrderedList(workspace.getProjects(),compareProjectsByLastModified) self.projectsBySequenceInState=createOrderedList(workspace.getProjects(),compareProjectsBySequenceInState) self.projectsByDependencyDepth=createOrderedList(workspace.getProjects(),compareProjectsByDependencyDepth) self.projectsByTotalDependencyDepth=createOrderedList(workspace.getProjects(),compareProjectsByTotalDependencyDepth) No revision No revision 1.1.2.2 +3 -1 gump/python/gump/update/Attic/updater.py Index: updater.py =================================================================== RCS file: /home/cvs/gump/python/gump/update/Attic/updater.py,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- updater.py 17 May 2004 20:22:04 -0000 1.1.2.1 +++ updater.py 17 May 2004 21:41:22 -0000 1.1.2.2 @@ -153,6 +153,8 @@ Synchronize the storage area with the build area """ + workspace = module.getWorkspace() + sourcedir = os.path.abspath( \ os.path.join( workspace.getCvsDirectory(), \ module.name)) # todo allow override @@ -174,7 +176,7 @@ # Were the contents of the repository modified? if modified: - module.setUpdated(1) + module.setModified(1) log.info('Update(s) received via CVS/SVN/Jars on #[' \ + `module.getPosition()` + \ '] of [' + `moduleCount` + ']: ' + module.getName()) No revision No revision 1.3.2.2 +1 -1 gump/template/forrest/content/xdocs/site.xml Index: site.xml =================================================================== RCS file: /home/cvs/gump/template/forrest/content/xdocs/site.xml,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- site.xml 17 May 2004 20:22:04 -0000 1.3.2.1 +++ site.xml 17 May 2004 21:41:22 -0000 1.3.2.2 @@ -47,7 +47,7 @@ <index label="by Project #" href="gump_stats/module_projects.html"/> <index label="by Depends #" href="gump_stats/module_dependencies.html"/> <index label="by Dependees #" href="gump_stats/module_dependees.html"/> - <index label="by Updated" href="gump_stats/module_updated.html"/> + <index label="by Modified" href="gump_stats/module_modified.html"/> </stats> <stats label="Projects" tab="statistics">
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]