Refactor the CLI

v3 and v4 CLI will be very different, so start moving things in their
own folders.

For now v4 isn't working at all.

1 files changed, 22 insertions, 15 deletions

diff --git a/gitlab/tests/test_cli.py b/gitlab/tests/test_cli.py
index 701655d..e6e290a 100644
--- a/gitlab/tests/test_cli.py
+++ b/gitlab/tests/test_cli.py
@@ -28,12 +28,13 @@ except ImportError:
     import unittest2 as unittest
 
 from gitlab import cli
+import gitlab.v3.cli
 
 
 class TestCLI(unittest.TestCase):
     def test_what_to_cls(self):
-        self.assertEqual("Foo", cli._what_to_cls("foo"))
-        self.assertEqual("FooBar", cli._what_to_cls("foo-bar"))
+        self.assertEqual("Foo", cli.what_to_cls("foo"))
+        self.assertEqual("FooBar", cli.what_to_cls("foo-bar"))
 
     def test_cls_to_what(self):
         class Class(object):
@@ -42,32 +43,33 @@ class TestCLI(unittest.TestCase):
         class TestClass(object):
             pass
 
-        self.assertEqual("test-class", cli._cls_to_what(TestClass))
-        self.assertEqual("class", cli._cls_to_what(Class))
+        self.assertEqual("test-class", cli.cls_to_what(TestClass))
+        self.assertEqual("class", cli.cls_to_what(Class))
 
     def test_die(self):
         with self.assertRaises(SystemExit) as test:
-            cli._die("foobar")
+            cli.die("foobar")
 
         self.assertEqual(test.exception.code, 1)
 
-    def test_extra_actions(self):
-        for cls, data in six.iteritems(cli.EXTRA_ACTIONS):
-            for key in data:
-                self.assertIsInstance(data[key], dict)
-
-    def test_parsing(self):
-        args = cli._parse_args(['-v', '-g', 'gl_id',
-                                '-c', 'foo.cfg', '-c', 'bar.cfg',
-                                'project', 'list'])
+    def test_base_parser(self):
+        parser = cli._get_base_parser()
+        args = parser.parse_args(['-v', '-g', 'gl_id',
+                                  '-c', 'foo.cfg', '-c', 'bar.cfg'])
         self.assertTrue(args.verbose)
         self.assertEqual(args.gitlab, 'gl_id')
         self.assertEqual(args.config_file, ['foo.cfg', 'bar.cfg'])
+
+
+class TestV3CLI(unittest.TestCase):
+    def test_parse_args(self):
+        parser = cli._get_parser(gitlab.v3.cli)
+        args = parser.parse_args(['project', 'list'])
         self.assertEqual(args.what, 'project')
         self.assertEqual(args.action, 'list')
 
     def test_parser(self):
-        parser = cli._build_parser()
+        parser = cli._get_parser(gitlab.v3.cli)
         subparsers = None
         for action in parser._actions:
             if type(action) == argparse._SubParsersAction:
@@ -93,3 +95,8 @@ class TestCLI(unittest.TestCase):
         actions = user_subparsers.choices['create']._option_string_actions
         self.assertFalse(actions['--twitter'].required)
         self.assertTrue(actions['--username'].required)
+
+    def test_extra_actions(self):
+        for cls, data in six.iteritems(gitlab.v3.cli.EXTRA_ACTIONS):
+            for key in data:
+                self.assertIsInstance(data[key], dict)