From 831d85a5e09248e7371277aedb9ff1033ff7d5d2 Mon Sep 17 00:00:00 2001
From: Andre Miras <andre.miras@gmail.com>
Date: Tue, 12 Mar 2019 19:31:46 +0100
Subject: [PATCH] Handles unknown command/target error gracefully, closes #812

Running `buildozer unknown_command` should show a meaningful error and
exit. Fixes regression introduced in 4936d31 and adds unit tests.

Also updates other tests `assert` keyword rather than `self.assert*` in
order to keep style consistent.

Last, minor `Dockerfile` documentation update as per recent @tshirtman
feedback.
---
 Dockerfile              |  4 ++--
 buildozer/__init__.py   |  2 +-
 tests/test_buildozer.py | 21 +++++++++++++++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2e1a09cde..e529bae8f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,13 +8,13 @@
 # Run with (e.g. `buildozer --version`):
 # docker run \
 #   --volume "$HOME/.buildozer":/home/user/.buildozer \
-#   --volume "$(pwd)":/home/user/hostcwd \
+#   --volume "$PWD":/home/user/hostcwd \
 #   kivy/buildozer --version
 #
 # Or for interactive shell:
 # docker run --interactive --tty --rm \
 #   --volume "$HOME/.buildozer":/home/user/.buildozer \
-#   --volume "$(pwd)":/home/user/hostcwd \
+#   --volume "$PWD":/home/user/hostcwd \
 #   --entrypoint /bin/bash \
 #   kivy/buildozer
 #
diff --git a/buildozer/__init__.py b/buildozer/__init__.py
index 3b1f1ccee..c0aff3384 100644
--- a/buildozer/__init__.py
+++ b/buildozer/__init__.py
@@ -1056,7 +1056,7 @@ def run_command(self, args):
         # maybe it's a target?
         targets = [x[0] for x in self.targets()]
         if command not in targets:
-            print('Unknown command/target {}'.format(self.translate_target(command, inverse=True)))
+            print('Unknown command/target {}'.format(command))
             exit(1)
 
         self.set_target(command)
diff --git a/tests/test_buildozer.py b/tests/test_buildozer.py
index d6f0fef56..f5d24c795 100644
--- a/tests/test_buildozer.py
+++ b/tests/test_buildozer.py
@@ -59,16 +59,16 @@ def test_buildozer_base(self):
         Basic test making sure the Buildozer object can be instanciated.
         """
         buildozer = Buildozer()
-        self.assertEqual(buildozer.specfilename, 'buildozer.spec')
+        assert buildozer.specfilename == 'buildozer.spec'
         # spec file doesn't have to exist
-        self.assertFalse(os.path.exists(buildozer.specfilename))
+        assert os.path.exists(buildozer.specfilename) is False
 
     def test_buildozer_read_spec(self):
         """
         Initializes Buildozer object from existing spec file.
         """
         buildozer = Buildozer(filename=self.default_specfile_path())
-        self.assertTrue(os.path.exists(buildozer.specfilename))
+        assert os.path.exists(buildozer.specfilename) is True
 
     def test_buildozer_help(self):
         """
@@ -78,7 +78,7 @@ def test_buildozer_help(self):
         buildozer = Buildozer()
         with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
             buildozer.usage()
-        self.assertIn('Usage:', mock_stdout.getvalue())
+        assert 'Usage:' in mock_stdout.getvalue()
 
     def test_log_get_set(self):
         """
@@ -121,3 +121,16 @@ def test_log_print(self):
         assert 'debug message' in mock_stdout.getvalue()
         assert 'info message' in mock_stdout.getvalue()
         assert 'error message' in mock_stdout.getvalue()
+
+    def test_run_command_unknown(self):
+        """
+        Makes sure the unknown command/target is handled gracefully, refs:
+        https://github.com/kivy/buildozer/issues/812
+        """
+        buildozer = Buildozer()
+        command = 'foobar'
+        args = [command, 'debug']
+        with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
+            with self.assertRaises(SystemExit):
+                buildozer.run_command(args)
+        assert mock_stdout.getvalue() == 'Unknown command/target {}\n'.format(command)