Added test; improved name

pykern/pkcli/__init__.py

@@ -198,9 +198,6 @@ def _commands(cli):
         list: cmomands sorted alphabetically
     """
 
-    def _exclude():
-        return itertools.chain(*(dir(b) for b in cli.__class__.__bases__))
-
     def _functions():
         return _iter(
             lambda t: inspect.isfunction(t)
@@ -214,13 +211,16 @@ def _iter(predicate):
                 yield (t)
 
     def _methods():
-        x = frozenset(_exclude())
+        x = frozenset(_super_methods())
         return _iter(
             lambda t: inspect.ismethod(t)
             and t.__name__ not in x
             and t.__name__ in dir(cli)
         )
 
+    def _super_methods():
+        return itertools.chain(*(dir(b) for b in cli.__class__.__bases__))
+
     return sorted(
         _functions() if isinstance(cli, types.ModuleType) else _methods(),
         key=lambda f: f.__name__.lower(),

tests/pkcli_data/package1/pkcli/conf1.py

@@ -1,8 +1,5 @@
-from __future__ import absolute_import, division, print_function
-
 last_cmd = None
 
-from pykern.pkdebug import pkdp
 
 def cmd1(arg1):
     """Subject line for cmd1
@@ -14,6 +11,7 @@ def cmd1(arg1):
     last_cmd = cmd1
     return
 
+
 def cmd2():
     """Subject line for cmd2
 

tests/pkcli_data/package1/pkcli/conf2.py

@@ -1,7 +1,6 @@
-from __future__ import absolute_import, division, print_function
-
 last_cmd = None
 
+
 def cmd1(arg1):
     global last_cmd
     last_cmd = cmd1

tests/pkcli_data/package1/pkcli/conf3.py

@@ -1,11 +1,9 @@
-from __future__ import absolute_import, division, print_function
-
 last_cmd = None
 
 last_arg = None
 
+
 def default_command(arg1):
     global last_cmd, last_arg
     last_cmd = default_command
     last_arg = arg1
-    return

tests/pkcli_data/package1/pkcli/conf4.py

@@ -0,0 +1,22 @@
+last_self = None
+last_cmd = None
+last_arg = None
+
+
+def should_not_find():
+    pass
+
+
+class Commands:
+    def __init__(self):
+        global last_self
+
+        last_self = self
+
+    def default_command(self, arg1):
+        global last_cmd, last_arg
+        last_cmd = self.default_command
+        last_arg = arg1
+
+    def _should_not_find():
+        pass

tests/pkcli_data/package1/pkcli/conf5.py

@@ -0,0 +1,22 @@
+last_self = None
+last_cmd = None
+last_arg = None
+
+
+def should_not_find():
+    pass
+
+
+class Commands:
+    def __init__(self):
+        global last_self
+
+        last_self = self
+
+    def cmd1(self, arg1):
+        global last_cmd, last_arg
+        last_cmd = self.cmd1
+        last_arg = arg1
+
+    def _should_not_find():
+        pass

tests/pkcli_test.py

@@ -68,19 +68,23 @@ def test_main1():
     _conf(rp, ["conf1", "cmd2"], first_time=False)
     _conf(rp, ["conf2", "cmd1", "2"])
     _conf(rp, ["conf3", "3"], default_command=True)
+    _conf(rp, ["conf4", "99"], default_command=True)
+    first_self = _conf(rp, ["conf5", "cmd1", "10"])
+    _conf(rp, ["conf5", "cmd1", "3"], first_self=first_self)
 
 
 def test_main2(capsys):
     from pykern import pkconfig
     import six
 
-    all_modules = r":\nconf1\nconf2\nconf3\n$"
+    all_modules = r":\nconf1\nconf2\nconf3\nconf4\nconf5\n$"
     pkconfig.reset_state_for_testing()
     rp = "package1"
     _deviance(rp, [], None, all_modules, capsys)
     _deviance(rp, ["--help"], None, all_modules, capsys)
     _deviance(rp, ["conf1"], SystemExit, r"cmd1,cmd2.*too few", capsys)
     _deviance(rp, ["conf1", "-h"], SystemExit, r"\{cmd1,cmd2\}.*commands", capsys)
+    _deviance(rp, ["conf5", "-h"], SystemExit, r"\{cmd1\}.*commands", capsys)
     if six.PY2:
         _deviance(rp, ["not_found"], None, r"no module", capsys)
     else:
@@ -112,19 +116,28 @@ def test_command_info():
         )
 
 
-def _conf(root_pkg, argv, first_time=True, default_command=False):
+def _conf(root_pkg, argv, first_time=True, default_command=False, first_self=None):
+    from pykern.pkunit import pkeq, pkne, pkok
     import sys
 
+    rv = None
     full_name = ".".join([root_pkg, "pkcli", argv[0]])
     if not first_time:
-        assert not hasattr(sys.modules, full_name)
-    assert _main(root_pkg, argv) == 0, "Unexpected exit"
+        pkok(not hasattr(sys.modules, full_name), "module loaded before first call")
+    pkeq(0, _main(root_pkg, argv), "Unexpected exit")
     m = sys.modules[full_name]
     if default_command:
-        assert m.last_cmd.__name__ == "default_command"
-        assert m.last_arg == argv[1]
+        pkeq("default_command", m.last_cmd.__name__)
+        pkeq(argv[1], m.last_arg)
     else:
-        assert m.last_cmd.__name__ == argv[1]
+        pkeq(argv[1], m.last_cmd.__name__)
+    if hasattr(m, "last_self"):
+        if first_self:
+            pkne(first_self, m.last_self)
+        else:
+            pkok(m.last_self, "")
+        rv = m.last_self
+    return rv
 
 
 def _deviance(root_pkg, argv, exc, expect, capsys):