[Checkins] SVN: z3c.coverage/trunk/ Add a --help message for the coveragereport script.

Marius Gedminas cvs-admin at zope.org
Wed Sep 5 13:02:28 UTC 2012


Log message for revision 127717:
  Add a --help message for the coveragereport script.

Changed:
  U   z3c.coverage/trunk/CHANGES.txt
  U   z3c.coverage/trunk/buildout.cfg
  U   z3c.coverage/trunk/src/z3c/coverage/coveragediff.py
  U   z3c.coverage/trunk/src/z3c/coverage/coveragereport.py

-=-
Modified: z3c.coverage/trunk/CHANGES.txt
===================================================================
--- z3c.coverage/trunk/CHANGES.txt	2012-09-05 13:02:19 UTC (rev 127716)
+++ z3c.coverage/trunk/CHANGES.txt	2012-09-05 13:02:24 UTC (rev 127717)
@@ -5,7 +5,7 @@
 1.2.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- The ``coveragereport`` script now accepts ``--help``.
 
 
 1.2.0 (2010-02-11)

Modified: z3c.coverage/trunk/buildout.cfg
===================================================================
--- z3c.coverage/trunk/buildout.cfg	2012-09-05 13:02:19 UTC (rev 127716)
+++ z3c.coverage/trunk/buildout.cfg	2012-09-05 13:02:24 UTC (rev 127717)
@@ -1,6 +1,6 @@
 [buildout]
 develop = .
-parts = test coverage-test coverage-report
+parts = test coverage-test coverage-report coverage-diff
 
 [test]
 recipe = zc.recipe.testrunner
@@ -15,5 +15,10 @@
 [coverage-report]
 recipe = zc.recipe.egg
 eggs = z3c.coverage
-scripts = coveragereport
-arguments = ('${buildout:directory}/parts/coverage-test', '${buildout:directory}/parts/coverage-test/report')
+scripts = coveragereport=coverage-report
+arguments = ['${buildout:directory}/parts/coverage-test', '${buildout:directory}/parts/coverage-test/report'] + sys.argv[1:]
+
+[coverage-diff]
+recipe = zc.recipe.egg
+eggs = z3c.coverage
+scripts = coveragediff=coverage-diff

Modified: z3c.coverage/trunk/src/z3c/coverage/coveragediff.py
===================================================================
--- z3c.coverage/trunk/src/z3c/coverage/coveragediff.py	2012-09-05 13:02:19 UTC (rev 127716)
+++ z3c.coverage/trunk/src/z3c/coverage/coveragediff.py	2012-09-05 13:02:24 UTC (rev 127717)
@@ -25,7 +25,6 @@
 
 import os
 import re
-import sys
 import smtplib
 import optparse
 from email.MIMEText import MIMEText
@@ -295,9 +294,7 @@
 
 def main():
     """Parse command line arguments and do stuff."""
-    progname = os.path.basename(sys.argv[0])
-    parser = optparse.OptionParser("usage: %prog [options] olddir newdir",
-                                   prog=progname)
+    parser = optparse.OptionParser("usage: %prog [options] olddir newdir")
     parser.add_option('--include', metavar='REGEX',
                       help='only consider files matching REGEX',
                       action='append')

Modified: z3c.coverage/trunk/src/z3c/coverage/coveragereport.py
===================================================================
--- z3c.coverage/trunk/src/z3c/coverage/coveragereport.py	2012-09-05 13:02:19 UTC (rev 127716)
+++ z3c.coverage/trunk/src/z3c/coverage/coveragereport.py	2012-09-05 13:02:24 UTC (rev 127717)
@@ -14,7 +14,7 @@
 ##############################################################################
 """Coverage Report
 
-Convert unit test coverage reports to HTML.
+Convert trace.py coverage reports to HTML.
 
 Usage: coveragereport.py [report-directory [output-directory]]
 
@@ -30,7 +30,8 @@
   '>>>>>> ' if this line was never executed
 
 You can produce such files with the Zope test runner by specifying
-``--coverage`` on the command line.
+``--coverage`` on the command line, or, more generally, by using the
+``trace`` module in the standard library.
 
 $Id$
 """
@@ -41,6 +42,7 @@
 import datetime
 import cgi
 import subprocess
+import optparse
 
 
 HIGHLIGHT_COMMAND = ['enscript', '-q', '--footer', '--header', '-h',
@@ -432,8 +434,18 @@
 
 def main(args=None):
     """Process command line arguments and produce HTML coverage reports."""
+
+    parser = optparse.OptionParser(
+        "usage: %prog [options] [inputdir [outputdir]]",
+        description=
+            'Converts trace.py coverage reports to HTML.'
+            '  If the input directory is omitted, it defaults to ./coverage.'
+            '  If the output directory is omitted, it defaults to'
+            ' ./coverage/report.')
+
     if args is None:
         args = sys.argv[1:]
+    opts, args = parser.parse_args(list(args))
 
     if len(args) > 0:
         path = args[0]
@@ -445,6 +457,9 @@
     else:
         report_path = 'coverage/reports'
 
+    if len(args) > 2:
+        parser.error("too many arguments")
+
     make_coverage_reports(path, report_path)
 
 



More information about the checkins mailing list