You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2008/06/28 18:05:37 UTC
svn commit: r672538 - in
/incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan: scanner.py
tests.py
Author: rdonkin
Date: Sat Jun 28 09:05:36 2008
New Revision: 672538
URL: http://svn.apache.org/viewvc?rev=672538&view=rev
Log:
Switch to use xhtml
Modified:
incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py
incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py
Modified: incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py?rev=672538&r1=672537&r2=672538&view=diff
==============================================================================
--- incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py (original)
+++ incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py Sat Jun 28 09:05:36 2008
@@ -66,11 +66,11 @@
return self.__sha
def toXml(self):
- result = " <document dir='" + self.dir + "' name='" + self.name + "' >\n"
- result = result + " <md5>" + self.md5() + "</md5>\n"
- result = result + " <sha512>" + self.sha() + "</sha512>\n"
- result = result + " <ripemd160>" + self.ripe() + "</ripemd160>\n"
- result = result + " </document>\n"
+ result = "<li><a name='" + join(self.dir, self.name) + "' class='file'>" + self.name + "</a><dl>"
+ result = result + "<dt>md5</dt><dd class='md5'>" + self.md5() + "</dd>"
+ result = result + "<dt>sha</dt><dd class='sha'>" + self.sha() + "</dd>"
+ result = result + "<dt>ripe</dt><dd class='ripe'>" + self.ripe() + "</dd>"
+ result = result + "</dl></li>"
return result
class Scanner:
@@ -84,13 +84,28 @@
self.at = at
def scan(self):
- result = "<?xml version='1.0'?>\n<documents basedir='" + self.basedir + "' at='"
+ result = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head><title>Audited On """
+
if self.at == None:
- result = result + datetime.datetime.utcnow().isoformat()
+ created = datetime.datetime.utcnow().isoformat()
else:
- result = result + self.at
- result = result + "'>\n"
+ created = self.at
+ result = result + created + """/title></head>
+<body>
+<p>
+Audit conducted on <span class='created'>"""
+ result = result + created + """</span> scanned directories
+root at <span class='base-dir'>"""
+ result = result + self.basedir + """</span>
+</p><p>
+Artifacts by directory:
+</p>
+<ul>"""
for root, dirs, files in os.walk(self.basedir):
+ result = result + "<li><span class='dir'>" + root + "</span><ul>"
for name in files:
ext = splitext(name)[1]
if name == 'KEYS':
@@ -98,9 +113,12 @@
elif not (ext == '.sha1' or ext == '.md5' or ext=='.sha' or ext == '.asc'):
document = Document(root, name)
result = result + document.toXml();
+ result = result + "</ul>"
if '.svn' in dirs:
dirs.remove('.svn')
- result = result + "</documents>"
+ result = result + """</ul>
+</body>
+</html>"""
return result
def scanIncubatorReleases():
Modified: incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py?rev=672538&r1=672537&r2=672538&view=diff
==============================================================================
--- incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py (original)
+++ incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py Sat Jun 28 09:05:36 2008
@@ -18,8 +18,7 @@
import xml.parsers.expat
TEST_BASE_DIR="../../../../../test/org/apache/rat/scan/"
-SCANNER_OUT="""<?xml version='1.0'?>
-<documents basedir='../../../../../test/org/apache/rat/scan/scanner/' at='NOW'>\n <document dir='../../../../../test/org/apache/rat/scan/scanner/' name='HenryV.txt' >\n <md5>c81f4cd3b2203ae869b8c6acea6bf73c</md5>\n <sha512>2ae73f5cfe7943a7d51b46e653948af7f067a6b01e61c827201c8e17b9231956f48b3e8e0da64e822ca9fdeb7a62f5af623406e2dbb9b39a8dabf569d2046402</sha512>\n <ripemd160>4b0a5f9317e0d3165ea4982f90e7266a553d8353</ripemd160>\n </document>\n <document dir='../../../../../test/org/apache/rat/scan/scanner/' name='RichardIII.txt' >\n <md5>911bade3f0bcdb652f1331fb19d7bf07</md5>\n <sha512>3fd5d26bbbea1dfddeeab642bffd0d7fbdc6c4ed0d06faae3283e1e7b220d943200048630663c6a33e7cbd26fceab585920cd77d3481ce4dfa209b5000ccd4de</sha512>\n <ripemd160>30ddc78d8bf08ef52ec8a7a8f7553c27931a6d0d</ripemd160>\n </document>\n <document dir='../../../../../test/org/apache/rat/scan/scanner/sub/deep' name='Hamlet.txt' >\n <md5>1ccce242df4a39d25057aebed53be182</md5>\n <sha512>2b92d82dcd9db3a3142f1bd1
522d0a3818555edfb3fd579d80e3b7ebc67adb8fb73db0185ccdc72704294005fb3830529e8962715f2dbfa7da0bb0553abb573a</sha512>\n <ripemd160>307a14094c28da7a46f894ed10eb732fb4d0f199</ripemd160>\n </document>\n <document dir='../../../../../test/org/apache/rat/scan/scanner/sub/deep' name='JuliusCaesar' >\n <md5>0ef9754818b94baecca3596b43eb0753</md5>\n <sha512>54184034009fc6b4e0dadfb0e14a1bad9c4c03791a982c4a7111dc7e4596164c1ca3dc49ec37c6081daf2bcd59d73a6c085beb1203b667066b77b58731f72460</sha512>\n <ripemd160>0aa5485c5b892be83910fae34c304c1ac41240ec</ripemd160>\n </document>\n</documents>"""
+SCANNER_OUT="""<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head><title>Audited On NOW/title></head>\n<body>\n<p>\nAudit conducted on <span class=\'created\'>NOW</span> scanned directories\nroot at <span class=\'base-dir\'>../../../../../test/org/apache/rat/scan/scanner/</span>\n</p><p>\nArtifacts by directory:\n</p>\n<ul><li><span class=\'dir\'>../../../../../test/org/apache/rat/scan/scanner/</span><ul><li><a name=\'../../../../../test/org/apache/rat/scan/scanner/HenryV.txt\' class=\'file\'>HenryV.txt</a><dl><dt>md5</dt><dd class=\'md5\'>c81f4cd3b2203ae869b8c6acea6bf73c</dd><dt>sha</dt><dd class=\'sha\'>2ae73f5cfe7943a7d51b46e653948af7f067a6b01e61c827201c8e17b9231956f48b3e8e0da64e822ca9fdeb7a62f5af623406e2dbb9b39a8dabf569d2046402</dd><dt>ripe</dt><dd class=\'ripe\'>4b0a5f9317e0d3165ea4982f90e7266a553d8353</dd></dl></li><li><a name=\'../..
/../../../test/org/apache/rat/scan/scanner/RichardIII.txt\' class=\'file\'>RichardIII.txt</a><dl><dt>md5</dt><dd class=\'md5\'>911bade3f0bcdb652f1331fb19d7bf07</dd><dt>sha</dt><dd class=\'sha\'>3fd5d26bbbea1dfddeeab642bffd0d7fbdc6c4ed0d06faae3283e1e7b220d943200048630663c6a33e7cbd26fceab585920cd77d3481ce4dfa209b5000ccd4de</dd><dt>ripe</dt><dd class=\'ripe\'>30ddc78d8bf08ef52ec8a7a8f7553c27931a6d0d</dd></dl></li></ul><li><span class=\'dir\'>../../../../../test/org/apache/rat/scan/scanner/sub</span><ul></ul><li><span class=\'dir\'>../../../../../test/org/apache/rat/scan/scanner/sub/deep</span><ul><li><a name=\'../../../../../test/org/apache/rat/scan/scanner/sub/deep/Hamlet.txt\' class=\'file\'>Hamlet.txt</a><dl><dt>md5</dt><dd class=\'md5\'>1ccce242df4a39d25057aebed53be182</dd><dt>sha</dt><dd class=\'sha\'>2b92d82dcd9db3a3142f1bd1522d0a3818555edfb3fd579d80e3b7ebc67adb8fb73db0185ccdc72704294005fb3830529e8962715f2dbfa7da0bb0553abb573a</dd><dt>ripe</dt><dd class=\'ripe\'>307a14094
c28da7a46f894ed10eb732fb4d0f199</dd></dl></li><li><a name=\'../../../../../test/org/apache/rat/scan/scanner/sub/deep/JuliusCaesar\' class=\'file\'>JuliusCaesar</a><dl><dt>md5</dt><dd class=\'md5\'>0ef9754818b94baecca3596b43eb0753</dd><dt>sha</dt><dd class=\'sha\'>54184034009fc6b4e0dadfb0e14a1bad9c4c03791a982c4a7111dc7e4596164c1ca3dc49ec37c6081daf2bcd59d73a6c085beb1203b667066b77b58731f72460</dd><dt>ripe</dt><dd class=\'ripe\'>0aa5485c5b892be83910fae34c304c1ac41240ec</dd></dl></li></ul></ul>\n</body>\n</html>"""
class ReadXmlTestCase(unittest.TestCase):
@@ -159,8 +158,7 @@
self.assertEquals("2ae73f5cfe7943a7d51b46e653948af7f067a6b01e61c827201c8e17b9231956f48b3e8e0da64e822ca9fdeb7a62f5af623406e2dbb9b39a8dabf569d2046402", self.document.sha())
def testXml(self):
- self.assertEquals(" <document dir='../../../../../test/org/apache/rat/scan/' name='Sample.txt' >\n <md5>c81f4cd3b2203ae869b8c6acea6bf73c</md5>\n <sha512>2ae73f5cfe7943a7d51b46e653948af7f067a6b01e61c827201c8e17b9231956f48b3e8e0da64e822ca9fdeb7a62f5af623406e2dbb9b39a8dabf569d2046402</sha512>\n <ripemd160>4b0a5f9317e0d3165ea4982f90e7266a553d8353</ripemd160>\n </document>\n", self.document.toXml())
-
+ self.assertEquals("<li><a name='../../../../../test/org/apache/rat/scan/Sample.txt' class='file'>Sample.txt</a><dl><dt>md5</dt><dd class='md5'>c81f4cd3b2203ae869b8c6acea6bf73c</dd><dt>sha</dt><dd class='sha'>2ae73f5cfe7943a7d51b46e653948af7f067a6b01e61c827201c8e17b9231956f48b3e8e0da64e822ca9fdeb7a62f5af623406e2dbb9b39a8dabf569d2046402</dd><dt>ripe</dt><dd class='ripe'>4b0a5f9317e0d3165ea4982f90e7266a553d8353</dd></dl></li>", self.document.toXml())
class ScanScannerTest(unittest.TestCase):