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 19:25:13 UTC
svn commit: r672558 - in
/incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan: connect.py
scanner.py tests.py
Author: rdonkin
Date: Sat Jun 28 10:25:12 2008
New Revision: 672558
URL: http://svn.apache.org/viewvc?rev=672558&view=rev
Log:
Updated to xhtml format
Modified:
incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/connect.py
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/connect.py
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/connect.py?rev=672558&r1=672557&r2=672558&view=diff
==============================================================================
--- incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/connect.py (original)
+++ incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/connect.py Sat Jun 28 10:25:12 2008
@@ -29,8 +29,11 @@
import sys
import os.path
-def addPreamble(xml):
- return """<?xml version='1.0'?>
+def toXhtmlDocument(xml):
+ today = datetime.datetime.utcnow().date().isoformat()
+ return """<!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">
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -44,7 +47,9 @@
See the License for the specific language governing permissions and
limitations under the License.
--->\n""" + xml
+-->
+<head><title>Audited On """ + today + """</title></head><body>
+<p>Audit ran on <span class='created'>""" + today + "</span></p>" + xml + "</body></html>"
def save(file, document):
@@ -91,11 +96,11 @@
print 'Ok'
xml = ''
-for document in stdout_value.split("<?xml version='1.0'?>"):
- if document.lstrip().startswith("<documents basedir='/www/www.apache.org/dist/incubator'"):
- xml = xml + document
- elif document.lstrip().startswith("<documents basedir='/www/archive.apache.org/dist/incubator'"):
- xml = xml + document
+for document in stdout_value.split("<div class='audit'>"):
+ if document.count("<span class='base-dir'>/www/www.apache.org/dist/incubator</span>") > 0:
+ xml = xml + "<div class='audit'>" + document
+ elif document.count("<span class='base-dir'>/www/archive.apache.org/dist/incubator</span>") > 0:
+ xml = xml + "<div class='audit'>" + document
else:
print "OUTPUT (probably nothing to worry about):"
print document
@@ -103,7 +108,7 @@
if xml == "":
print "No results returned"
else:
- xml = addPreamble("<audit on='" + datetime.datetime.utcnow().date().isoformat() + "'>" + xml + "</audit>")
+ xml = toXhtmlDocument(xml)
path = save(base_file, xml)
subprocess.Popen('gpg --armor --detach-sig ' + path, shell=True).wait()
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=672558&r1=672557&r2=672558&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 10:25:12 2008
@@ -84,21 +84,14 @@
self.at = at
def scan(self):
- 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:
created = datetime.datetime.utcnow().isoformat()
else:
created = self.at
- result = result + created + """/title></head>
-<body>
+ result = """<div class='audit'>
<p>
-Audit conducted on <span class='created'>"""
- result = result + created + """</span> scanned directories
-root at <span class='base-dir'>"""
+At <span class='at'>"""
+ result = result + created + """</span> started to scan root <span class='base-dir'>"""
result = result + self.basedir + """</span>
</p><p>
Artifacts by directory:
@@ -117,8 +110,7 @@
if '.svn' in dirs:
dirs.remove('.svn')
result = result + """</ul>
-</body>
-</html>"""
+</div>"""
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=672558&r1=672557&r2=672558&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 10:25:12 2008
@@ -18,7 +18,7 @@
import xml.parsers.expat
TEST_BASE_DIR="../../../../../test/org/apache/rat/scan/"
-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=\'resource\'>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=\'resource\'>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=\'resource\'>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
\'>307a14094c28da7a46f894ed10eb732fb4d0f199</dd></dl></li><li><a name=\'../../../../../test/org/apache/rat/scan/scanner/sub/deep/JuliusCaesar\' class=\'resource\'>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>"""
+SCANNER_OUT="""<div class='audit'>\n<p>\nAt <span class=\'at\'>NOW</span> started to scan root <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=\'resource\'>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=\'resource\'>RichardIII.txt</a><dl><dt>md5</dt><dd class=\'md5\'>911bade3f0bcdb652f1331fb19d7bf07</dd><dt>sha</dt><dd class=\'sha\'>3fd5d26bbbea1dfddeeab642bffd0d7fbdc6c4e
d0d06faae3283e1e7b220d943200048630663c6a33e7cbd26fceab585920cd77d3481ce4dfa209b5000ccd4de</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=\'resource\'>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\'>307a14094c28da7a46f894ed10eb732fb4d0f199</dd></dl></li><li><a name=\'../../../../../test/org/apache/rat/scan/scanner/sub/deep/JuliusCaesar\' class=\'resource\'>JuliusCaesar</a><dl><dt>md5</dt><dd class=\'md5\'>0ef9754818b94baecca3596b43eb
0753</dd><dt>sha</dt><dd class=\'sha\'>54184034009fc6b4e0dadfb0e14a1bad9c4c03791a982c4a7111dc7e4596164c1ca3dc49ec37c6081daf2bcd59d73a6c085beb1203b667066b77b58731f72460</dd><dt>ripe</dt><dd class=\'ripe\'>0aa5485c5b892be83910fae34c304c1ac41240ec</dd></dl></li></ul></ul>\n</div>"""
class ReadXmlTestCase(unittest.TestCase):
@@ -48,11 +48,8 @@
def testLoad(self):
documents = diff.Documents()
- documents.load("""<!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 2008-01-22</title></head>
-<body>
+ documents.load("""
+<div class='audit'>
<p>
Audit conducted on <span class='created'>2008-01-22</span> scanned directories
root at <span class='base-dir'>/www/whatever</span>
@@ -89,8 +86,7 @@
</ul>
</li>
</ul>
-</body>
-</html>
+</div>
""")
self.assert_(not documents.documents == None)