Correctly output usage errors as click does

Fixes #4

Author: GaretJax

djclick/adapter.py

@@ -50,7 +50,13 @@ def run_from_argv(self, argv):
         """
         Called when run from the command line.
         """
-        return self.main(args=argv[2:], standalone_mode=False)
+        try:
+            return self.main(args=argv[2:], standalone_mode=False)
+        except click.ClickException as e:
+            if getattr(e.ctx, 'traceback', False):
+                raise
+            e.show()
+            sys.exit(e.exit_code)
 
     def create_parser(self, progname, subcommand):
         """
@@ -69,6 +75,10 @@ def map_names(self):
             for opt in param.opts:
                 yield opt.lstrip('--').replace('-', '_'), param.name
 
+    def collect_usage_pieces(self, ctx):
+        pieces = super(DjangoCommandMixin, self).collect_usage_pieces(ctx)
+        return [self.name] + pieces
+
     def execute(self, *args, **kwargs):
         """
         Called when run through `call_command`. `args` are passed through,

djclick/test/conftest.py

@@ -8,12 +8,19 @@
 
 @pytest.fixture(scope='session')
 def manage():
-    def call(*args):
+    def call(*args, **kwargs):
+        ignore_errors = kwargs.pop('ignore_errors', False)
+        assert not kwargs
         cmd = [
             sys.executable,
             os.path.join(os.path.dirname(__file__), 'testprj', 'manage.py'),
         ] + list(args)
-        return subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+        try:
+            return subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError as e:
+            if not ignore_errors:
+                raise
+            return e.output
 
     return call
 

djclick/test/test_adapter.py

@@ -60,6 +60,21 @@ def test_call_command_args():
         call_command('testcmd', '--raise')
 
 
+def test_call_command_required_args():
+    call_command('requiredargcmd', 'arg1')
+    with pytest.raises(click.MissingParameter):
+        call_command('requiredargcmd')
+
+
+def test_call_command_required_args_cli(manage):
+    out = manage('requiredargcmd', ignore_errors=True)
+    assert out == (
+        b'Usage: manage.py requiredargcmd [OPTIONS] ARG\n'
+        b'\n'
+        b'Error: Missing argument "arg".\n'
+    )
+
+
 def test_call_command_kwargs():
     call_command('testcmd', raise_when_called=False)
     with pytest.raises(RuntimeError):
@@ -84,7 +99,7 @@ def test_call_directly():
         command(**{'raise': True})
 
 
-def test_django_verbosity(capsys):
+def test_django_verbosity(capsys, manage):
     # Make sure any command can be called, even if it does not explictly
     # accept the --verbosity option
     with pytest.raises(RuntimeError):
@@ -104,9 +119,13 @@ def test_django_verbosity(capsys):
     assert out == '2'
 
     # Invalid
-    with pytest.raises(click.BadParameter):
-        execute_from_command_line([
-            './manage.py', 'ctxverbositycmd', '--verbosity', '4'])
+    out = manage('ctxverbositycmd', '--verbosity', '4', ignore_errors=True)
+    assert out == (
+        b'Usage: manage.py ctxverbositycmd [OPTIONS]\n'
+        b'\n'
+        b'Error: Invalid value for "-v" / "--verbosity": 4 is not in the '
+        b'valid range of 0 to 3.\n'
+    )
 
     # Default (option)
     execute_from_command_line([

djclick/test/testprj/testapp/management/commands/requiredargcmd.py

@@ -0,0 +1,7 @@
+import djclick as click
+
+
+@click.command()
+@click.argument('arg')
+def command(arg):
+    click.echo(arg)