Apply CustomParser to env arg parsing. Fixes #14.

cmdix/command/env.py

@@ -9,6 +9,7 @@
 
 
 def parseargs(p):
+    p.__class__ = CustomParser
     p.set_defaults(func=func)
     p.description = "Set each NAME to VALUE in the environment and run " + "COMMAND."
     p.usage = '%(prog)s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]'

tests/test_env.py

@@ -1,14 +1,28 @@
+import subprocess
+import sys
+
 import pytest
 
 from . import BaseTestCase
 
 
 class TestCase(BaseTestCase):
     @pytest.mark.xfail('platform.system() == "Windows"')
-    def test_env(self, capfd):
+    def test_env_dash_i(self, capfd):
         self.runcommandline('env -i FOO=bar env')
         assert capfd.readouterr().out == 'FOO=bar\n'
 
+    @pytest.mark.xfail('platform.system() == "Windows"')
+    def test_dash_as_dash_i(self, capfd):
+        self.runcommandline('env - FOO=bar env')
+        assert capfd.readouterr().out == 'FOO=bar\n'
+
     def test_env_simple(self, capfd):
         self.runcommandline('env')
         assert capfd.readouterr().out
+
+    def test_command_opts(self, capfd):
+        # invoke Python's help (not env's help)
+        cmd = ['env', sys.executable, '--help']
+        self.runcommandline(subprocess.list2cmdline(cmd))
+        assert "-m mod" in capfd.readouterr().out