1 files changed, 3 insertions, 11 deletions
diff --git a/python/refcat/cli.py b/python/refcat/cli.py
index f47c63c..534eee6 100644
--- a/python/refcat/cli.py
+++ b/python/refcat/cli.py
@@ -22,7 +22,6 @@ import subprocess
 import sys
 import tempfile
 
-import gluish
 import luigi
 from luigi.cmdline_parser import CmdlineParser
 from luigi.parameter import MissingParameterException
@@ -35,17 +34,13 @@ from refcat.settings import LOGGING_CONF_FILE, settings
 from refcat.tasks import *
 from refcat.utils import columnize
 
-# XXX: get rid of gluish dep, include them in refcat
+# These are utility classes of luigi.
 suppress_task_names = [
     "Available",
     "BaseTask",
     "Config",
     "Executable",
     "ExternalTask",
-    "FillSolrIndex",
-    "GitCloneRepository",
-    "GitUpdateRepository",
-    "MockTask",
     "RangeBase",
     "RangeByMinutes",
     "RangeByMinutesBase",
@@ -237,7 +232,7 @@ def main():
             else:
                 print("not implemented: {}".format(sys.argv[1]))
         except KeyError:
-            print("sub-command not implemented: {}".format(sys.argv[1]), file=sys.stderr)
+            print("subcommand not implemented: {}".format(sys.argv[1]), file=sys.stderr)
         except (AttributeError, ValueError, RuntimeError) as exc:
             print(exc, file=sys.stderr)
             sys.exit(1)
@@ -252,10 +247,7 @@ def main():
         print("TMPDIR    {}".format(settings.TMPDIR))
         print("SHIV_ROOT {}".format(os.environ.get("SHIV_ROOT") or shiv_root_default))
         print()
-        names = [
-            name for name in sorted(Register.task_names()) if name not in suppress_task_names and not name.islower()
-        ]
-        print(columnize(names))
+        print(columnize(list(effective_task_names())))
         sys.exit(0)
 
     # If we found no subcommand, assume task name.