ajack 2004/02/24 14:14:49
Modified: python/gump/test tools.py
python/gump engine.py
python/gump/utils tools.py file.py
. gumpy.py
python/gump/document forrest.py
Log:
1) Tidied up the files stuff, a little.
2) Added a lock file (to gumpy.py) -- for Leo -- still incomplete.
Revision Changes Path
1.5 +4 -4 jakarta-gump/python/gump/test/tools.py
Index: tools.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/tools.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tools.py 24 Feb 2004 19:32:28 -0000 1.4
+++ tools.py 24 Feb 2004 22:14:49 -0000 1.5
@@ -105,7 +105,7 @@
catFileToFileHolder(self.testfileholder,'./text.xml','test')
def testCatDirToFileHolder(self):
- catDirectoryContentsToFileHolder(self.testfileholder,'.','test')
+ catDirectoryContentsToFileHolder(self.testfileholder,'.')
def testFileClone(self):
self.testfileholder.getFileList().clone()
1.61 +3 -1 jakarta-gump/python/gump/engine.py
Index: engine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- engine.py 24 Feb 2004 19:32:28 -0000 1.60
+++ engine.py 24 Feb 2004 22:14:49 -0000 1.61
@@ -622,6 +622,7 @@
dircnt += 1
if os.path.exists(dir):
listDirectoryToFileHolder(project,dir,\
+ FILE_TYPE_OUTPUT,
'list_'+project.getName()+'_dir'+str(dircnt)+'_'+os.path.basename(dir))
dirs.append(dir)
listed += 1
@@ -641,7 +642,7 @@
for report in project.getReports():
reportDir=report.getResolvedPath()
project.addInfo('Reports in: ' + reportDir)
- catDirectoryContentsToFileHolder(project,reportDir)
+ catDirectoryContentsToFileHolder(project,reportDir,FILE_TYPE_OUTPUT)
# Maven generates a maven.log...
if project.hasMaven() and not project.isPackaged():
@@ -650,6 +651,7 @@
project.addDebug('Maven Log in: ' + logFile)
try:
catFileToFileHolder(project,logFile, \
+ FILE_TYPE_LOG,
project.getName() + ' ' + os.path.basename(logFile))
except:
log.error('Display Log [ ' + logFile + '] Failed', exc_info=1)
1.12 +7 -7 jakarta-gump/python/gump/utils/tools.py
Index: tools.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/utils/tools.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tools.py 24 Feb 2004 19:32:28 -0000 1.11
+++ tools.py 24 Feb 2004 22:14:49 -0000 1.12
@@ -141,7 +141,7 @@
#
return reference.exists() and reference.isDirectory()
-def catDirectoryContentsToFileHolder(holder,directory,name=None):
+def
catDirectoryContentsToFileHolder(holder,directory,type=FILE_TYPE_MISC,name=None):
try:
if os.path.exists(directory) and os.path.isdir(directory):
for fileName in os.listdir(directory):
@@ -152,7 +152,7 @@
workName=baseName+'_'+fileName
else:
workName=fileName
- catFileToFileHolder(holder, file, workName)
+ catFileToFileHolder(holder, file, type, workName)
except:
try:
holder.addWarning('No such directory [' + str(directory) + ']')
@@ -160,10 +160,10 @@
pass
-def catFileToFileHolder(holder,file,name=None):
+def catFileToFileHolder(holder,file,type=FILE_TYPE_MISC,name=None):
# Create a reference to the file
- reference=FileReference(file,type)
+ reference=FileReference(file,type,name)
#
# Update holder w/ reference to directory, 'cat'
1.3 +3 -1 jakarta-gump/python/gump/utils/file.py
Index: file.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/utils/file.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file.py 24 Feb 2004 20:18:30 -0000 1.2
+++ file.py 24 Feb 2004 22:14:49 -0000 1.3
@@ -73,10 +73,12 @@
FILE_TYPE_MISC=1
FILE_TYPE_CONFIG=2
FILE_TYPE_OUTPUT=3
+FILE_TYPE_LOG=4
fileTypeDescriptions = { FILE_TYPE_MISC : "Miscellaneous",
FILE_TYPE_CONFIG : "Config",
- FILE_TYPE_OUTPUT : "Output", }
+ FILE_TYPE_OUTPUT : "Output",
+ FILE_TYPE_LOG : "Log" }
def fileTypeDescription(type):
return fileTypeDescriptions.get(type,'Unknown File Type:' + str(type))
1.2 +16 -1 jakarta-gump/gumpy.py
Index: gumpy.py
===================================================================
RCS file: /home/cvs/jakarta-gump/gumpy.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gumpy.py 23 Feb 2004 15:43:06 -0000 1.1
+++ gumpy.py 24 Feb 2004 22:14:49 -0000 1.2
@@ -150,8 +150,20 @@
# Next...
line = input.readline()
+# Allow a lock
+lockFile=os.path.abspath('gumpy.lock')
+if os.path.exists(lockFile):
+ print """The lock file [%s] exists.
+Either Gump is still running, or it terminated very abnormally.
+Please resolve this (waiting or removing the lock file) before retrying.
+ """ % lockFile
+ sys.exit(1)
+lock=open(lockFile,'w')
+lock.write(`os.getpid()`)
+lock.close()
+
# Enable a log
-logFile='gumpy.log'
+logFile=os.path.abspath('gumpy.log')
log=open(logFile,'w')
result=0
@@ -239,9 +251,12 @@
# Close the log
log.close()
+ os.remove(lockFile)
+
if 1 or result:
# Cat log if failed...
catFile(sys.stdout, logFile, 'The Gump log...')
+
# bye!
sys.exit(result)
1.83 +18 -9 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.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- forrest.py 24 Feb 2004 20:25:21 -0000 1.82
+++ forrest.py 24 Feb 2004 22:14:49 -0000 1.83
@@ -1646,16 +1646,17 @@
fileSection=fdocument.createSection('Details')
fileList=fileSection.createList()
- fileList.createEntry("State: ", fileReference.getTypeDescription())
+ fileList.createEntry("Type: ", fileReference.getTypeDescription())
self.insertTypedLink(fileReference.getOwner(), \
fileReference, \
- fileList.createEntry("For: "))
+ fileList.createEntry("Owner (Referencer): "))
if fileReference.exists():
- if fileReference.isDirectory():
+ if fileReference.isDirectory():
+
listingSection=fdocument.createSection('Directory Contents')
- listingTable=listingSection.createTable(['Filename'])
+ listingTable=listingSection.createTable(['Filename','Type','Size'])
directory=fileReference.getPath()
@@ -1664,8 +1665,16 @@
files.sort()
for file in files:
listingRow=listingTable.createRow()
- listingRow.createData(file)
-
+
+ #
+ listingRow.createData(file)
+
+ if os.path.isdir(file):
+ listingRow.createData('Directory')
+ listingRow.createData('N/A')
+ else:
+ listingRow.createData('File')
+ listingRow.createData(str(os.path.getsize(file)))
else:
#
# Show the content...
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
