gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: jakarta-gump/python/gump/document forrest.py
Date Wed, 21 Jan 2004 18:52:30 GMT
ajack       2004/01/21 10:52:30

  Modified:    python/gump/output statsdb.py
               template/forrest/src/documentation/content/xdocs site.xml
               python/gump/test/resources/full1 module5.xml module4.xml
                        svn_module1.xml download1.xml alias1.xml
                        module2.xml module1.xml broken1.xml maven1.xml
                        package1.xml module3.xml
               .        gumpy.bat
               python/gump/utils __init__.py
               python/gump/model stats.py
               python/gump/document forrest.py
  Log:
  1) Added 'module by last modified' and 'project by duration in state' to stats.
  2) Made gumpy.bat work a little better.
  3) Cosmetics to the full1 unit test workspace.
  
  Revision  Changes    Path
  1.13      +20 -5     jakarta-gump/python/gump/output/statsdb.py
  
  Index: statsdb.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/output/statsdb.py,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- statsdb.py	15 Jan 2004 19:42:24 -0000	1.12
  +++ statsdb.py	21 Jan 2004 18:52:30 -0000	1.13
  @@ -233,7 +233,14 @@
           return float(val)
           
       def getDate(self,key):
  -        return self.getFloat(key)
  +        dateF=self.getFloat(key)
  +        
  +        # Hack to patch values incorrectly set to 0
  +        # not -1 by default.
  +        if 0 == dateF:
  +            dateF == -1
  +            
  +        return dateF
           
       def put(self,key,val=''):
           self.db[key]=val
  @@ -241,7 +248,7 @@
       def putInt(self,key,val=0):
           self.db[key]=str(val)
           
  -    def putDate(self,key,val=0):
  +    def putDate(self,key,val=-1):
           self.putInt(key,val)
           
       def loadStatistics(self,workspace):
  @@ -461,6 +468,13 @@
       fog2=project2.getLastUpdated()
       c= int(round(fog2 - fog1,0))                  
       if not c: c=cmp(project1,project2)
  +    return c              
  +            
  +def compareProjectsBySequenceInState(project1,project2):
  +    seq1=project1.getStats().sequenceInState
  +    seq2=project2.getStats().sequenceInState
  +    c= int(round(seq2 - seq1,0))                  
  +    if not c: c=cmp(project1,project2)
       return c                         
               
   class StatisticsGuru:
  @@ -488,4 +502,5 @@
           self.projectsByTotalDependees=createOrderedList(workspace.getProjects(),compareProjectsByDependeeCount)
           self.projectsByFOGFactor=createOrderedList(workspace.getProjects(),compareProjectsByFOGFactor)
           self.projectsByLastUpdated=createOrderedList(workspace.getProjects(),compareProjectsByLastUpdated)
  +        self.projectsBySequenceInState=createOrderedList(workspace.getProjects(),compareProjectsBySequenceInState)
           
  
  
  
  1.15      +2 -0      jakarta-gump/template/forrest/src/documentation/content/xdocs/site.xml
  
  Index: site.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/template/forrest/src/documentation/content/xdocs/site.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- site.xml	14 Dec 2003 17:57:39 -0000	1.14
  +++ site.xml	21 Jan 2004 18:52:30 -0000	1.15
  @@ -37,6 +37,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"/>
     </stats>
    
     <stats label="Projects" tab="statistics">
  @@ -44,6 +45,7 @@
       <index label="by Elapsed" href="gump_stats/project_elapsed.html"/>
       <index label="by Depends #" href="gump_stats/project_dependencies.html"/>
       <index label="by Dependees #" href="gump_stats/project_dependees.html"/>
  +    <index label="by Duration" href="gump_stats/project_durstate.html"/>
     </stats>
   
     <stats label="XRef" tab="xref">
  
  
  
  1.3       +3 -3      jakarta-gump/python/gump/test/resources/full1/module5.xml
  
  Index: module5.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/module5.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- module5.xml	19 Jan 2004 23:42:40 -0000	1.2
  +++ module5.xml	21 Jan 2004 18:52:30 -0000	1.3
  @@ -1,6 +1,6 @@
   <module name="module5">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Module #5
     </description>
  @@ -19,8 +19,8 @@
   
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
   </module>
   
  
  
  
  1.4       +3 -3      jakarta-gump/python/gump/test/resources/full1/module4.xml
  
  Index: module4.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/module4.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- module4.xml	19 Jan 2004 23:42:40 -0000	1.3
  +++ module4.xml	21 Jan 2004 18:52:30 -0000	1.4
  @@ -1,6 +1,6 @@
   <module name="module4">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Module #4
     </description>
  @@ -24,8 +24,8 @@
   
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
   </module>
   
  
  
  
  1.3       +4 -4      jakarta-gump/python/gump/test/resources/full1/svn_module1.xml
  
  Index: svn_module1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/svn_module1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- svn_module1.xml	24 Nov 2003 23:05:37 -0000	1.2
  +++ svn_module1.xml	21 Jan 2004 18:52:30 -0000	1.3
  @@ -1,6 +1,6 @@
   <module name="svn_module1">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Java based build tool
     </description>
  @@ -8,7 +8,7 @@
     <svn repository="svn_repository1" dir='svndir'/>
   
     <project name="svn_project1">
  -    <package>org.apache.tools.ant</package>
  +    <package>org.apache.tools.svn_project1</package>
       <ant target="gump"/>
       <depend project="random"/>
       <option project="random"/>
  @@ -16,8 +16,8 @@
       <jar name="lib/outputSVN.jar" id="outputSVN"/>
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
   
   </module>
  
  
  
  1.4       +3 -3      jakarta-gump/python/gump/test/resources/full1/download1.xml
  
  Index: download1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/download1.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- download1.xml	19 Jan 2004 23:42:40 -0000	1.3
  +++ download1.xml	21 Jan 2004 18:52:30 -0000	1.4
  @@ -1,6 +1,6 @@
   <module name="download1">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Test of downloading a package
     </description>
  @@ -21,8 +21,8 @@
   
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
   
   </module>
  
  
  
  1.3       +1 -1      jakarta-gump/python/gump/test/resources/full1/alias1.xml
  
  Index: alias1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/alias1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- alias1.xml	19 Jan 2004 23:42:40 -0000	1.2
  +++ alias1.xml	21 Jan 2004 18:52:30 -0000	1.3
  @@ -1,6 +1,6 @@
   <module name="alias1">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Jakarta Gump Alias1 -- test of aliasing
       i.e. dependency w/ inherit='jars'.
  
  
  
  1.8       +3 -3      jakarta-gump/python/gump/test/resources/full1/module2.xml
  
  Index: module2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/module2.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- module2.xml	19 Jan 2004 23:42:40 -0000	1.7
  +++ module2.xml	21 Jan 2004 18:52:30 -0000	1.8
  @@ -1,6 +1,6 @@
   <module name="module2">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Module 2
     </description>
  @@ -27,8 +27,8 @@
   
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
   </module>
   
  
  
  
  1.4       +3 -3      jakarta-gump/python/gump/test/resources/full1/module1.xml
  
  Index: module1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/module1.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- module1.xml	19 Jan 2004 23:42:40 -0000	1.3
  +++ module1.xml	21 Jan 2004 18:52:30 -0000	1.4
  @@ -1,6 +1,6 @@
   <module name="module1">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Module 1
     </description>
  @@ -20,8 +20,8 @@
   
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
   </module>
   
  
  
  
  1.3       +1 -1      jakarta-gump/python/gump/test/resources/full1/broken1.xml
  
  Index: broken1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/broken1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- broken1.xml	19 Jan 2004 23:42:40 -0000	1.2
  +++ broken1.xml	21 Jan 2004 18:52:30 -0000	1.3
  @@ -1,6 +1,6 @@
   <module name="broken1">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Broken module: 
       1) Duplicate project definitions
  
  
  
  1.4       +3 -3      jakarta-gump/python/gump/test/resources/full1/maven1.xml
  
  Index: maven1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/maven1.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven1.xml	19 Jan 2004 23:42:40 -0000	1.3
  +++ maven1.xml	21 Jan 2004 18:52:30 -0000	1.4
  @@ -1,6 +1,6 @@
   <module name="maven1">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Test of Gump using Maven...
     </description>
  @@ -21,8 +21,8 @@
   
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
   </module>
   
  
  
  
  1.3       +4 -4      jakarta-gump/python/gump/test/resources/full1/package1.xml
  
  Index: package1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/package1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- package1.xml	19 Jan 2004 23:42:40 -0000	1.2
  +++ package1.xml	21 Jan 2004 18:52:30 -0000	1.3
  @@ -1,6 +1,6 @@
   <module name="package1">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Package #1
     </description>
  @@ -21,12 +21,12 @@
   
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
     
     <project name="honorary1">
  -    <package>org.apache.tools.ant</package>
  +    <package>org.apache.tools.honarary1</package>
       <depend project="random"/>
       <option project="random"/>
       <home nested="dist"/>
  
  
  
  1.6       +3 -3      jakarta-gump/python/gump/test/resources/full1/module3.xml
  
  Index: module3.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/module3.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- module3.xml	19 Jan 2004 23:42:40 -0000	1.5
  +++ module3.xml	21 Jan 2004 18:52:30 -0000	1.6
  @@ -1,6 +1,6 @@
   <module name="module3">
   
  -  <url  href="http://ant.apache.org/index.html"/>
  +  <url  href="http://jakarta.apache.org/gump/index.html"/>
     <description>
       Module #3
     </description>
  @@ -25,8 +25,8 @@
   
       <license name="LICENSE"/>
   
  -    <nag from="Gump Integration Build &lt;dev@ant.apache.org&gt;"
  -         to="dev@ant.apache.org"/>
  +    <nag from="Gump Integration Build &lt;gump@jakarta.apache.org&gt;"
  +         to="gump@jakarta.apache.org"/>
     </project>
   </module>
   
  
  
  
  1.2       +11 -11    jakarta-gump/gumpy.bat
  
  Index: gumpy.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/gumpy.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gumpy.bat	20 Jan 2004 21:55:23 -0000	1.1
  +++ gumpy.bat	21 Jan 2004 18:52:30 -0000	1.2
  @@ -1,4 +1,4 @@
  -REM @ECHO OFFF
  +@ECHO OFF
   REM
   REM _ J A K A R T A  G U M P _ J A K A R T A  G U M P _ J A K A R T A  G U M P _ 
   REM
  @@ -87,10 +87,10 @@
   	goto end
   :hasProfileLogDir
   
  -COPY %GUMP%\gumpy.sh %GUMP_PROFILE_LOG_DIR%
  -COPY %GUMP_HOST%.xml  %GUMP_PROFILE_LOG_DIR%
  -IF EXIST %LOCAL_ENV% COPY %LOCAL_ENV% %GUMP_PROFILE_LOG_DIR%
  -IF EXIST %HOST_LOCAL_ENV% COPY %HOST_LOCAL_ENV% %GUMP_PROFILE_LOG_DIR%
  +COPY /Y %GUMP%\gumpy.sh %GUMP_PROFILE_LOG_DIR%
  +COPY /Y %GUMP_HOST%.xml  %GUMP_PROFILE_LOG_DIR%
  +IF EXIST %LOCAL_ENV% COPY /Y %LOCAL_ENV% %GUMP_PROFILE_LOG_DIR%
  +IF EXIST %HOST_LOCAL_ENV% COPY /Y %HOST_LOCAL_ENV% %GUMP_PROFILE_LOG_DIR%
   
   REM  :TODO:  cp -R `grep profile %GUMP_HOST%.xml  | cut -d\" -f2` %GUMP_PROFILE_LOG_DIR%
   
  @@ -100,13 +100,13 @@
   REM
   
   REM Gump-level tmp
  -IF EXIST %GUMP_TMP% REMOVE %GUMP_TMP%\*.txt
  +IF EXIST %GUMP_TMP% DEL /Q %GUMP_TMP%\*.txt
   
   REM Gump work tmp
  -IF EXIST %GUMP_WS_TMP% REMOVE %GUMP_WS_TMP%\*.txt
  +IF EXIST %GUMP_WS_TMP% DEL /Q %GUMP_WS_TMP%\*.txt
   
   REM Clear the forrest build area...
  -IF EXIST %GUMP_WS%\forrest\build\ REMOVE %GUMP_WS%\forrest\build\
  +IF EXIST %GUMP_WS%\forrest\build\ DEL /Q %GUMP_WS%\forrest\build\
   
   REM
   REM Do a CVS update
  @@ -161,7 +161,7 @@
   ECHO %SEPARATOR% >> %GUMP_LOG%
   IF NOT EXIST check_forrest.txt GOTO noCheckForrest
   	TYPE check_forrest.txt >> %GUMP_LOG%
  -	COPY check_forrest.txt %GUMP_LOG_DIR%
  +	COPY /Y check_forrest.txt %GUMP_LOG_DIR%
   	GOTO checkedForrest
   :noCheckForrest:
   	ECHO "No Forrest Output file @ %GUMP_TMP%\check_forrest.txt" >> %GUMP_LOG%
  @@ -171,7 +171,7 @@
   
   IF NOT EXIST forrest.txt GOTO noForrestOutput
   	TYPE forrest.txt >> %GUMP_LOG%
  -	COPY forrest.txt %GUMP_LOG_DIR%
  +	COPY /Y forrest.txt %GUMP_LOG_DIR%
   	GOTO forrested
   :noForrestOutput
   	ECHO "No Forrest Output file @ %GUMP_TMP%\forrest.txt" >> %GUMP_LOG%
  @@ -183,7 +183,7 @@
   	ECHO %SEPARATOR% >> %GUMP_LOG%
   	TYPE %GUMP_WS%\forrest\build\tmp\brokenlinks.txt >> %GUMP_LOG%
   	ECHO %SEPARATOR% >> %GUMP_LOG%
  -	COPY %GUMP_WS%\forrest\build\tmp\brokenlinks.txt %GUMP_LOG_DIR%
  +	COPY /Y %GUMP_WS%\forrest\build\tmp\brokenlinks.txt %GUMP_LOG_DIR%
   :noBrokenLinks
   
   :end
  @@ -204,9 +204,10 @@
   REM _ J A K A R T A  G U M P _ J A K A R T A  G U M P _ J A K A R T A  G U M P _ 
   REM
   REM $Log$
  -REM Revision 1.1  2004/01/20 21:55:23  ajack
  -REM Running the (bat) gumpy.bat on M$. Finally I can (sorta) test locally!
  -REM Worked out some minor nits through above.
  +REM Revision 1.2  2004/01/21 18:52:30  ajack
  +REM 1) Added 'module by last modified' and 'project by duration in state' to stats.
  +REM 2) Made gumpy.bat work a little better.
  +REM 3) Cosmetics to the full1 unit test workspace.
   REM
   REM
   REM _ J A K A R T A  G U M P _ J A K A R T A  G U M P _ J A K A R T A  G U M P _ 
  
  
  
  1.16      +8 -3      jakarta-gump/python/gump/utils/__init__.py
  
  Index: __init__.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/utils/__init__.py,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- __init__.py	9 Jan 2004 19:57:19 -0000	1.15
  +++ __init__.py	21 Jan 2004 18:52:30 -0000	1.16
  @@ -235,13 +235,18 @@
       
       return elapsedString    
       
  +# Note: Should've defaulted values to -1, but (by accident)
  +# set some to 0, which then stuck in the DB. Leave this
  +# check in until fixed that (perhaps by looking for 0 in
  +# DB).
   def secsToDate(secs):
  -    if -1 == secs: return '-'    
  +    if -1 == secs or 0 == secs: return '-'    
       return time.strftime(setting.datetimeformat, \
                       time.localtime(secs))    
  -                     
  +    
  +# See note on secsToDate               
   def secsToTime(secs):
  -    if -1 == secs: return '-'
  +    if -1 == secs or 0 == secs: return '-'
       return time.strftime(setting.timeformat, \
                       time.localtime(secs))                    
                   
  
  
  
  1.9       +12 -6     jakarta-gump/python/gump/model/stats.py
  
  Index: stats.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model/stats.py,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- stats.py	13 Jan 2004 00:03:25 -0000	1.8
  +++ stats.py	21 Jan 2004 18:52:30 -0000	1.9
  @@ -72,6 +72,12 @@
   from gump.config import *
   from gump.model.state import *
   
  +#
  +# Durations (in 'runs')
  +#
  +
  +SIGNIFICANT_DURATION=30
  +
   class Statistics:
       """Statistics Holder"""
       def __init__(self,name):
  @@ -79,11 +85,11 @@
           self.successes=0
           self.failures=0
           self.prereqs=0
  -        self.first=0
  -        self.last=0
  +        self.first=-1
  +        self.last=-1
           self.currentState=STATE_UNSET
           self.previousState=STATE_UNSET
  -        self.startOfState=0        
  +        self.startOfState=-1        
           self.sequenceInState=0
                   
       def getFOGFactor(self):
  
  
  
  1.55      +49 -7     jakarta-gump/python/gump/document/forrest.py
  
  Index: forrest.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- forrest.py	19 Jan 2004 22:41:14 -0000	1.54
  +++ forrest.py	21 Jan 2004 18:52:30 -0000	1.55
  @@ -79,6 +79,7 @@
   from gump.utils import *
   from gump.utils.xmlutils import xmlize
   from gump.model import *
  +from gump.model.stats import *
   from gump.model.project import AnnotatedPath,  ProjectStatistics
   from gump.output.statsdb import StatisticsGuru
   from gump.output.xref import XRefGuru
  @@ -940,11 +941,22 @@
           stats=project.getStats()
           
           statsSection=document.createSection('Statistics')  
  +        
  +        #
  +        # Start annotating with issues...
  +        #
  +        if project.isNotOk() and stats.sequenceInState >= SIGNIFICANT_DURATION:
  +            statsSection.createWarning(	\
  +                'This project has existed in this failed state for a significant duration.')
  +        
           statsTable=statsSection.createTable()           
           statsTable.createEntry("FOG Factor: ", round(stats.getFOGFactor(),2))
           statsTable.createEntry("Successes: ", stats.successes)
           statsTable.createEntry("Failures: ", stats.failures)
           statsTable.createEntry("Prerequisite Failures: ", stats.prereqs)
  +        statsTable.createEntry("Current State: ", stateName(stats.currentState))
  +        statsTable.createEntry("Duration in state: ", stats.sequenceInState)
  +        statsTable.createEntry("Start of state: ", secsToDate(stats.startOfState))
           statsTable.createEntry("Previous State: ", stateName(stats.previousState))
           
           if stats.first:
  @@ -1095,7 +1107,8 @@
           annotationsSection=xdocNode.createSection('Annotations')
           
           if annotatable.containsNasties():
  -            annotationsSection.createWarning('Some warnings and/or errors are present within
these annotations.')
  +            annotationsSection.createWarning(	\
  +                'Some warnings and/or errors are present within these annotations.')
           
           annotationsTable=annotationsSection.createTable()
           for note in annotations:      
  @@ -1463,12 +1476,14 @@
           self.documentModulesByProjects(stats, run, workspace, gumpSet)
           self.documentModulesByDependencies(stats, run, workspace, gumpSet)
           self.documentModulesByDependees(stats, run, workspace, gumpSet)
  -        self.documentModulesByFOGFactor(stats, run, workspace, gumpSet)        
  +        self.documentModulesByFOGFactor(stats, run, workspace, gumpSet)       
  +        self.documentModulesByLastUpdated(stats, run, workspace, gumpSet)        
           # Individual Pages...
           self.documentProjectsByElapsed(stats, run, workspace, gumpSet)
           self.documentProjectsByDependencies(stats, run, workspace, gumpSet)
           self.documentProjectsByDependees(stats, run, workspace, gumpSet)
  -        self.documentProjectsByFOGFactor(stats, run, workspace, gumpSet)        
  +        self.documentProjectsByFOGFactor(stats, run, workspace, gumpSet)    
  +        self.documentProjectsBySequenceInState(stats, run, workspace, gumpSet)
       
       def documentModulesByElapsed(self,stats,run,workspace,gumpSet):
           document=XDocDocument('Modules By Elapsed Time',	\
  @@ -1557,6 +1572,18 @@
               
           document.serialize()
       
  +    def documentModulesByLastUpdated(self,stats,run,workspace,gumpSet):
  +        document=XDocDocument('Modules By Last Updated',	\
  +                    self.resolver.getFile(stats,'module_updated.xml'),)        
  +        updTable=document.createTable(['Module','Last Updated'])
  +        for module in stats.modulesByLastUpdated:        
  +            if not gumpSet.inModules(module): continue    
  +            updRow=updTable.createRow()            
  +            self.insertLink( module, stats, updRow.createData())                
  +            updRow.createData(secsToDate(module.getLastUpdated()))
  +            
  +        document.serialize()
  +    
       def documentProjectsByElapsed(self,stats,run,workspace,gumpSet):
           document=XDocDocument('Projects By Elapsed Time',	\
               self.resolver.getFile(stats,'project_elapsed.xml'))
  @@ -1627,8 +1654,23 @@
               fogRow.createData(pstats.prereqs)
               fogRow.createData(round(pstats.getFOGFactor(),2))
               
  +        document.serialize()   
  +        
  +    def documentProjectsBySequenceInState(self,stats,run,workspace,gumpSet):
  +        document=XDocDocument('Projects By Duration In State',	\
  +                    self.resolver.getFile(stats,'project_durstate.xml'),)        
  +        durTable=document.createTable(['Project','Duration\nIn State','State'])
  +        for project in stats.projectsBySequenceInState:        
  +            if not gumpSet.inSequence(project): continue    
  +            durRow=durTable.createRow()            
  +            self.insertLink( project, stats, durRow.createData())  
  +                 
  +            pstats=project.getStats()
  +            
  +            durRow.createData(pstats.sequenceInState)
  +            durRow.createData(stateName(pstats.currentState))
  +            
           document.serialize()
  -   
   
           
       #####################################################################           
  
  
  

Mime
View raw message