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, 03 Dec 2003 04:29:05 GMT
ajack       2003/12/02 20:29:05

  Modified:    python/gump engine.py
               python/gump/output rss.py
               python/gump/document forrest.py
  Log:
  1) RSS fixes
  2) One more attempt at getting Junitreport entries listed
  
  Revision  Changes    Path
  1.34      +1 -1      jakarta-gump/python/gump/engine.py
  
  Index: engine.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- engine.py	2 Dec 2003 23:58:46 -0000	1.33
  +++ engine.py	3 Dec 2003 04:29:05 -0000	1.34
  @@ -16,7 +16,7 @@
   from gump.utils.note import Annotatable
   from gump.utils.work import *
   
  -from gump.utils.tools import listDirectoryAsWork,syncDirectories
  +from gump.utils.tools import *
   
   from gump.model.workspace import Workspace
   from gump.model.module import Module
  
  
  
  1.10      +21 -16    jakarta-gump/python/gump/output/rss.py
  
  Index: rss.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/output/rss.py,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- rss.py	2 Dec 2003 22:36:46 -0000	1.9
  +++ rss.py	3 Dec 2003 04:29:05 -0000	1.10
  @@ -234,7 +234,9 @@
              
   class Syndicator:
       def __init__(self):
  -        pass
  +        self.gumpImage=Image('http://jakarta.apache.org/gump/images/bench.png',	\
  +                    'Jakarta Gump', \
  +                    'http://jakarta.apache.org/')
           
       def syndicate(self,run):
           
  @@ -245,12 +247,10 @@
                       self.workspace.logdir,'index.rss'))
       
           self.rss=RSS(self.rssFile,	\
  -            Channel(self.workspace.logurl,	\
  -                    'Jakarta Gump',		\
  +            Channel('Jakarta Gump',		\
  +                    self.workspace.logurl,	\
                       """Life is like a box of chocolates""", \
  -                Image('http://jakarta.apache.org/gump/images/bench.png',	\
  -                    'Jakarta Gump', \
  -                    'http://jakarta.apache.org/')))
  +                self.gumpImage))
           
           # build information 
           for module in self.workspace.getModules():
  @@ -264,9 +264,10 @@
           moduleURL=self.run.getOptions().getResolver().getUrl(module)
           
           moduleRSS=RSS(rssFile,	\
  -            Channel(moduleURL,\
  -                    'Jakarta Gump : Module ' + escape(module.getName()),	\
  -                    escape(module.getDescription())))
  +            Channel('Jakarta Gump : Module ' + escape(module.getName()),	\
  +                    moduleURL,	\
  +                    escape(module.getDescription()), \
  +                    self.gumpImage))
           
           for project in module.getProjects():  
               self.syndicateProject(project,moduleRSS,mainRSS)      
  @@ -279,9 +280,10 @@
           projectURL=self.run.getOptions().getResolver().getUrl(project)
           
           projectRSS=RSS(rssFile,	\
  -            Channel(projectURL,\
  -                    'Jakarta Gump : Project ' + escape(project.getName()),	\
  -                    escape(project.getDescription())))
  +            Channel('Jakarta Gump : Project ' + escape(project.getName()),	\
  +                    projectURL,	\
  +                    escape(project.getDescription()), \
  +                    self.gumpImage))
                       
           s=project.getStats()
           datestr=time.strftime('%Y-%m-%d')
  @@ -294,9 +296,10 @@
                                   + project.getReasonDescription() \
                                   + '\n\n'
                           
  -        content += 'Previous state: ' \
  -                                + stateName(s.previousState)  \
  -                                + '\n\n'
  +        if not s.previousState == STATE_NONE and not s.previousState == STATE_UNSET:
  +            content += 'Previous state: ' \
  +                                    + stateName(s.previousState)  \
  +                                    + '\n\n'
                        
           for note in project.annotations:
                   content += ("   - " + str(note) + "\n")
  @@ -307,13 +310,15 @@
                     project.getModule().getName() + ":" + project.getName(), \
                     ('%sT%s%s') % (datestr,timestr,TZ))
   
  -        if not s.currentState == STATE_NONE:
  +        if not s.currentState == STATE_NONE and	\
  +            not s.currentState == STATE_UNSET:           
               projectRSS.addItem(item)
               moduleRSS.addItem(item)  
   
           # State changes that are newsworthy...
           if 	s.sequenceInState == 1	\
               and not s.currentState == STATE_PREREQ_FAILED \
  +            and not s.currentState == STATE_UNSET \
               and not s.currentState == STATE_NONE \
               and not s.currentState == STATE_COMPLETE :       
               mainRSS.addItem(item)
  
  
  
  1.25      +1 -0      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- forrest.py	2 Dec 2003 20:19:54 -0000	1.24
  +++ forrest.py	3 Dec 2003 04:29:05 -0000	1.25
  @@ -1475,6 +1475,7 @@
                   for module in moduleList:        
                       if not gumpSet.inModules(module): continue                
                       self.insertLink(module, xref, moduleData)
  +                    moduleData.createText(' ')
             
           document.serialize()
    
  
  
  

Mime
View raw message