gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: gump/python/gump/document/forrest documenter.py
Date Fri, 23 Apr 2004 18:09:24 GMT
ajack       2004/04/23 11:09:24

  Modified:    python/gump/model project.py
               project  depot.xml
               .        gumpy.py
               python/gump/core commandLine.py
               python   gmp.py
               python/gump/output nag.py
               python/gump/document/forrest documenter.py
  Removed:     python   core
  Log:
  1) Try to may -w optional on gmp
  2) Various minor.
  
  Revision  Changes    Path
  1.78      +5 -6      gump/python/gump/model/project.py
  
  Index: project.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/project.py,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- project.py	22 Apr 2004 14:50:47 -0000	1.77
  +++ project.py	23 Apr 2004 18:09:24 -0000	1.78
  @@ -297,13 +297,12 @@
       def gatherAffected(self):
           # Look through all dependees
           for project in self.getFullDependeeProjectList():
  +            # Something caused that some grief
  +            # The something was this project
               cause=project.getCause()
  -            # Something caused this some grief
  -            if cause:
  -                # The something was this project
  -                if cause == self:
  -                    if not project in self.affectedProjects:
  -                        self.affectedProjects.append(project)
  +            if cause and cause == self:
  +                if not project in self.affectedProjects:
  +                    self.affectedProjects.append(project)
           
       def propagateErrorStateChange(self,state,reason,cause,message):
           
  
  
  
  1.25      +2 -1      gump/project/depot.xml
  
  Index: depot.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/depot.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- depot.xml	22 Apr 2004 19:58:08 -0000	1.24
  +++ depot.xml	23 Apr 2004 18:09:24 -0000	1.25
  @@ -33,7 +33,8 @@
           <work nested="common/target/classes"/>
           <home nested="common/dist"/>
   
  -        <depend inherit="runtime" project="ant"/>
  +        <depend project="antworks-importer"/>
  +        <depend project="antworks-antlets"/>
   
           <jar name="depot-common-@@DATE@@.jar"/>
   
  
  
  
  1.24      +2 -2      gump/gumpy.py
  
  Index: gumpy.py
  ===================================================================
  RCS file: /home/cvs/gump/gumpy.py,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- gumpy.py	22 Apr 2004 22:58:15 -0000	1.23
  +++ gumpy.py	23 Apr 2004 18:09:24 -0000	1.24
  @@ -358,7 +358,7 @@
       
       releaseLock(lock,lockFile)
       
  -    if 1 or result:
  +    if result:
           logTitle='The Apache Gump log...'
           
           # :TODO: Need to check if stdout is a plain terminal? Not sure, see next.
  @@ -377,7 +377,7 @@
               except:
                   published=0
                   
  -        if 1 or not published:
  +        if not published:
               catFile(sys.stdout, logFile, logTitle)
           
           if mailserver and mailport and mailto and mailfrom and logurl:
  
  
  
  1.4       +5 -1      gump/python/gump/core/commandLine.py
  
  Index: commandLine.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/core/commandLine.py,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- commandLine.py	22 Apr 2004 20:46:57 -0000	1.3
  +++ commandLine.py	23 Apr 2004 18:09:24 -0000	1.4
  @@ -117,6 +117,7 @@
                   self.options.setTemplate(1)
                   log.info('Use template (not forrest).')
                   
  +        # Remove 
           for arg in removers:
               argv.remove(arg)
   
  @@ -146,8 +147,11 @@
                   print " Project wildcards are accepted, e.g. \"jakarta-*\"."
                   sys.exit(1)
       
  -        for arg in self.args:
  +        for arg in argv:
               log.warn("Unused command line argument : " + arg)
  +            
  +        for arg in self.args:
  +            log.warn("Argument : " + arg)
   
       def getArguments(self):
           return self.args
  
  
  
  1.6       +13 -7     gump/python/gmp.py
  
  Index: gmp.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gmp.py,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- gmp.py	16 Apr 2004 20:38:11 -0000	1.5
  +++ gmp.py	23 Apr 2004 18:09:24 -0000	1.6
  @@ -127,12 +127,18 @@
           # The path of this command
           gmpPath = os.path.abspath(args[0])
           del args[0]     
  -
  -        # Workspace is 'workspace.xml', unless overridden
  -        workspaceName = 'workspace.xml'
  -        if len(args)>1 and args[0] in ['-w','--workspace']:
  -            workspaceName=args[1]
  -            del args[0:2]
  +       
  +        # Workspace is the `hostname`.xml or workspace.xml, 
  +        # unless overridden
  +        workspaceName = hostname + '.xml'
  +        if not os.path.abspath(workspaceName):
  +            workspaceName='workspace.xml'
  +            
  +        if os.environ.has_key('GUMP_WORKSPACE'):        
  +            workspaceName = os.environ['GUMP_WORKSPACE'] + '.xml'   
  +        if len(args)>2 and args[1] in ['-w','--workspace']:
  +            workspaceName=args[2]
  +            del args[1:3]     
           workspacePath = os.path.abspath(workspaceName)
   
           # Nope, can't find the workspace...
  
  
  
  1.34      +9 -8      gump/python/gump/output/nag.py
  
  Index: nag.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/output/nag.py,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- nag.py	21 Apr 2004 19:01:52 -0000	1.33
  +++ nag.py	23 Apr 2004 18:09:24 -0000	1.34
  @@ -32,8 +32,8 @@
   from gump.net.mailer import *
   from gump.utils import *
   
  -LINE     ='-  -  -  -  - -- -- ------------------------------------ G U M P'
  -SEPARATOR='******************************************************** G U M P'
  +LINE     ='--   --   --   --   --   --   --   --   --   --   --   --   G U M P'
  +SEPARATOR='*********************************************************** G U M P'
   
   class AddressPair:
       def __init__(self,toAddr,fromAddr):
  @@ -356,12 +356,12 @@
           content += type + ' ' + name + ' has an issue affecting its community integration'
                   
           if affected:
  -            content += '. This issue affects ' + `affected` + ' projects'
  +            content += '.\nThis issue affects ' + `affected` + ' projects'
               
           if duration and duration > 1:
               content += ', and has been outstanding for ' + `duration` + ' runs'
           
  -        content += '. '
  +        content += '.\n'
           
           if isinstance(object,Project) and affected:
               affectedProjects=object.determineAffectedProjects()
  @@ -375,7 +375,7 @@
                       content += '    - ' + project.getName() 
                       
                       if project.hasDescription():
  -                        content += '  '
  +                        content += ' :  '
                           content += project.getLimitedDescription()
                           
                       content += '\n'
  @@ -407,9 +407,10 @@
           # Link them back here...
           #
           url=self.run.getOptions().getResolver().getUrl(object)
  -        content += "\nFull details are available at: " + url 
  -        
  -        
  +        content += "\nFull details are available at:\n    " 
  +        content += url 
  +        content += "\n"
  +                
           if object.annotations or object.worklist:
               content += ', however some snippets follow:\n'
               
  
  
  
  1.17      +1 -1      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- documenter.py	22 Apr 2004 22:58:16 -0000	1.16
  +++ documenter.py	23 Apr 2004 18:09:24 -0000	1.17
  @@ -1555,7 +1555,7 @@
           # Generate an SVG for FOG:
           (pngFile,pngTitle) = self.diagramFOG(project)
           if pngFile:
  -            statsTable.createEntry('FOG Factor').createData().createIcon(pngFile,pngTitle)
  +            statsTable.createEntry("FOG Factor: ").createData().createIcon(pngFile,pngTitle)
               
           statsTable.createEntry("FOG Factor: ", '%02.2f' % stats.getFOGFactor())
           statsTable.createEntry('Dependency Depth: ', project.getDependencyDepth())    
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Mime
View raw message