diff options
| -rw-r--r-- | coverage/annotate.py | 13 | ||||
| -rw-r--r-- | coverage/report.py | 30 | ||||
| -rw-r--r-- | coverage/summary.py | 29 |
3 files changed, 54 insertions, 18 deletions
diff --git a/coverage/annotate.py b/coverage/annotate.py index 2d7d04a..c4fe810 100644 --- a/coverage/annotate.py +++ b/coverage/annotate.py @@ -2,12 +2,11 @@ import os, re -from coverage.codeunit import code_unit_factory +from coverage.report import Reporter -class AnnotateReporter: +class AnnotateReporter(Reporter): def __init__(self, coverage, ignore_errors=False): - self.coverage = coverage - self.ignore_errors = ignore_errors + super(AnnotateReporter, self).__init__(coverage, ignore_errors) self.directory = None @@ -15,10 +14,10 @@ class AnnotateReporter: else_re = re.compile(r"\s*else\s*:\s*(#|$)") def report(self, morfs, directory=None, omit_prefixes=None): - morfs = morfs or self.coverage.data.executed_files() - code_units = code_unit_factory(morfs, self.coverage.file_locator, omit_prefixes) + self.find_code_units(morfs, omit_prefixes) + self.directory = directory - for cu in code_units: + for cu in self.code_units: try: filename, statements, excluded, missing, _ = self.coverage.analyze(cu) self.annotate_file(filename, statements, excluded, missing) diff --git a/coverage/report.py b/coverage/report.py new file mode 100644 index 0000000..f20b453 --- /dev/null +++ b/coverage/report.py @@ -0,0 +1,30 @@ +"""Reporter foundation for coverage.py""" + +from coverage.codeunit import code_unit_factory + +class Reporter(object): + """A base class for all reporters.""" + + def __init__(self, coverage, ignore_errors=False): + """Create a reporter. + + `coverage` is the coverage instance. `ignore_errors` controls how + skittish the reporter will be during file processing. + + """ + self.coverage = coverage + self.ignore_errors = ignore_errors + + # The code units to report on. Set by find_code_units. + self.code_units = [] + + def find_code_units(self, morfs, omit_prefixes): + """Find the code units we'll report on. + + `morfs` is a list of modules or filenames. `omit_prefixes` is a list + of prefixes to leave out of the list. + + """ + morfs = morfs or self.coverage.data.executed_files() + self.code_units = code_unit_factory(morfs, self.coverage.file_locator, omit_prefixes) + self.code_units.sort() diff --git a/coverage/summary.py b/coverage/summary.py index 979d377..779cdad 100644 --- a/coverage/summary.py +++ b/coverage/summary.py @@ -2,24 +2,23 @@ import sys -from coverage.codeunit import code_unit_factory +from coverage.report import Reporter -class SummaryReporter: + +class SummaryReporter(Reporter): """A reporter for writing the summary report.""" def __init__(self, coverage, show_missing=True, ignore_errors=False): - self.coverage = coverage + super(SummaryReporter, self).__init__(coverage, ignore_errors) self.show_missing = show_missing - self.ignore_errors = ignore_errors def report(self, morfs, omit_prefixes=None, outfile=None): """Writes a report summarizing coverage statistics per module.""" - morfs = morfs or self.coverage.data.executed_files() - code_units = code_unit_factory(morfs, self.coverage.file_locator, omit_prefixes) - code_units.sort() + self.find_code_units(morfs, omit_prefixes) - max_name = max(5, max(map(lambda cu: len(cu.name), code_units))) + # Prepare the formatting strings + max_name = max(5, max(map(lambda cu: len(cu.name), self.code_units))) fmt_name = "%%- %ds " % max_name fmt_err = fmt_name + "%s: %s\n" header = fmt_name % "Name" + " Stmts Exec Cover\n" @@ -27,14 +26,20 @@ class SummaryReporter: if self.show_missing: header = header.replace("\n", " Missing\n") fmt_coverage = fmt_coverage.replace("\n", " %s\n") + rule = "-" * (len(header)-1) + "\n" + if not outfile: outfile = sys.stdout - rule = "-" * (len(header)-1) + "\n" + + # Write the header outfile.write(header) outfile.write(rule) + total_statements = 0 total_executed = 0 - for cu in code_units: + total_units = 0 + + for cu in self.code_units: try: _, statements, _, missing, readable = self.coverage.analyze(cu) n = len(statements) @@ -47,6 +52,7 @@ class SummaryReporter: if self.show_missing: args = args + (readable,) outfile.write(fmt_coverage % args) + total_units += 1 total_statements = total_statements + n total_executed = total_executed + m except KeyboardInterrupt: #pragma: no cover @@ -55,7 +61,8 @@ class SummaryReporter: if not self.ignore_errors: typ, msg = sys.exc_info()[:2] outfile.write(fmt_err % (cu.name, typ, msg)) - if len(code_units) > 1: + + if total_units > 1: outfile.write(rule) if total_statements > 0: pc = 100.0 * total_executed / total_statements |