Merge branch 'list-ext' of https://github.com/trws/spack into trws-list-ext

2 files changed, 53 insertions, 14 deletions

diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst
index 50c48b802b..ec193e767d 100644
--- a/lib/spack/docs/basic_usage.rst
+++ b/lib/spack/docs/basic_usage.rst
@@ -24,12 +24,29 @@ Spack can install:
 
 .. command-output:: spack list
 
-The packages are listed by name in alphabetical order.  You can also
-do wildcats searches using ``*``:
+The packages are listed by name in alphabetical order.  If you specify a
+pattern to match, it will follow this set of rules.  A pattern with no
+wildcards, ``*`` or ``?``, will be treated as though it started and ended with
+``*``, so ``util`` is equivalent to ``*util*``.  A pattern with no capital
+letters will be treated as case-insensitive. You can also add the ``-i`` flag
+to specify a case insensitive search, or ``-d`` to search the description of
+the package in addition to the name.  Some examples:
 
-.. command-output:: spack list m*
+All packages whose names contain "sql" case insensitive:
 
-.. command-output:: spack list *util*
+.. command-output:: spack list sql
+
+All packages whose names start with a capital M:
+
+.. command-output:: spack list 'M*'
+
+All packages whose names or descriptions contain Documentation:
+
+.. command-output:: spack list -d Documentation
+
+All packages whose names contain documentation case insensitive:
+
+.. command-output:: spack list -d documentation
 
 .. _spack-info:
 
diff --git a/lib/spack/spack/cmd/list.py b/lib/spack/spack/cmd/list.py
index 1e3699cee0..974c4778ab 100644
--- a/lib/spack/spack/cmd/list.py
+++ b/lib/spack/spack/cmd/list.py
@@ -29,8 +29,10 @@ from llnl.util.tty.colify import colify
 
 import spack
 import fnmatch
+import re
+
+description = "List available spack packages"
 
-description ="List available spack packages"
 
 def setup_parser(subparser):
     subparser.add_argument(
@@ -39,26 +41,46 @@ def setup_parser(subparser):
     subparser.add_argument(
         '-i', '--insensitive', action='store_true', default=False,
         help='Filtering will be case insensitive.')
+    subparser.add_argument(
+        '-d', '--search-description', action='store_true', default=False,
+        help='Filtering will also search the description for a match.')
 
 
 def list(parser, args):
     # Start with all package names.
-    pkgs = spack.repo.all_package_names()
+    pkgs = set(spack.repo.all_package_names())
 
     # filter if a filter arg was provided
     if args.filter:
-        def match(p, f):
-            if args.insensitive:
-                p = p.lower()
-                f = f.lower()
-            return fnmatch.fnmatchcase(p, f)
-        pkgs = [p for p in pkgs if any(match(p, f) for f in args.filter)]
+        res = []
+        for f in args.filter:
+            if '*' not in f and '?' not in f:
+                r = fnmatch.translate('*' + f + '*')
+            else:
+                r = fnmatch.translate(f)
+            rc = re.compile(r, flags=re.I if args.insensitive or not any(
+                l.isupper() for l in f) else 0)
+            res.append(rc)
+
+        if args.search_description:
+            def match(p, f):
+                if f.match(p):
+                    return True
+
+                pkg = spack.repo.get(p)
+                if pkg.__doc__:
+                    return f.match(pkg.__doc__)
+                return False
+        else:
+            def match(p, f):
+                return f.match(p)
+        pkgs = [p for p in pkgs if any(match(p, f) for f in res)]
 
     # sort before displaying.
-    sorted_packages = sorted(pkgs, key=lambda s:s.lower())
+    sorted_packages = sorted(pkgs, key=lambda s: s.lower())
 
     # Print all the package names in columns
-    indent=0
+    indent = 0
     if sys.stdout.isatty():
         tty.msg("%d packages." % len(sorted_packages))
     colify(sorted_packages, indent=indent)