From c4e6bf35f1bf1899df8cb9dcd49937b12a6c46d1 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Mon, 31 May 2010 22:07:52 -0400
Subject: Make include and omit work properly in the plugin.

---
 coverage/cmdline.py            | 10 ++++------
 coverage/runners/noseplugin.py |  2 +-
 coverage/runners/plugin.py     |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'coverage')

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index c96bba9..d8738db 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -440,12 +440,8 @@ class CoverageScript(object):
             return ERR
 
         # Listify the list options.
-        omit = None
-        if options.omit:
-            omit = pattern_list(options.omit)
-        include = None
-        if options.include:
-            include = pattern_list(options.include)
+        omit = pattern_list(options.omit)
+        include = pattern_list(options.include)
 
         # Do something.
         self.coverage = self.covpkg.coverage(
@@ -534,6 +530,8 @@ class CoverageScript(object):
 
 def pattern_list(s):
     """Turn an argument into a list of patterns."""
+    if not s:
+        return None
     if sys.platform == 'win32':
         # When running coverage as coverage.exe, some of the behavior
         # of the shell is emulated: wildcards are expanded into a list of
diff --git a/coverage/runners/noseplugin.py b/coverage/runners/noseplugin.py
index 79c4a46..930ef14 100644
--- a/coverage/runners/noseplugin.py
+++ b/coverage/runners/noseplugin.py
@@ -52,5 +52,5 @@ class Coverage(Plugin):
         """Output code coverage report."""
 
         log.debug("Coverage report")
-        stream.write("Processing Coverage...")
+        stream.write("Processing Coverage...\n")
         self.coverage.finish(stream)
diff --git a/coverage/runners/plugin.py b/coverage/runners/plugin.py
index e0591bd..26bc9e7 100644
--- a/coverage/runners/plugin.py
+++ b/coverage/runners/plugin.py
@@ -87,11 +87,11 @@ class CoverageTestWrapper(object):
 
 
 options = [
-    optparse.Option('--cover-rcfile', action='store', metavar="RC",
+    optparse.Option('--cover-rcfile', action='store', metavar="RCFILE",
                     help="Specify configuration file.  ['.coveragerc']",
                     default=True),
 
-    optparse.Option('--cover-report', action='append', default=['report'],
+    optparse.Option('--cover-report', action='append', default=[],
                     dest='cover_reports', type="choice",
                     choices=['annotate', 'html', 'report', 'xml'],
                     help=("Choose what coverage report(s) to create: "
-- 
cgit v1.2.1