fix(cli): fix parsing CLI objects to classnames

nejch · nejch · commit 0edbcaf37270 · 2021-02-10T00:32:48.000+01:00
diff --git a/gitlab/cli.py b/gitlab/cli.py
@@ -25,7 +25,10 @@
 
 import gitlab.config
 
-camel_re = re.compile("(.)([A-Z])")
+# Full credit for this regex goes to:
+# https://github.com/jpvanhal/inflection/blob/master/inflection/__init__.py
+camel_re = re.compile(r"([A-Z]+)([A-Z][a-z])")
+camel_re2 = re.compile(r"([a-z\d])([A-Z])")
 
 # custom_actions = {
 #    cls: {
@@ -75,7 +78,8 @@ def what_to_cls(what):
 
 
 def cls_to_what(cls):
-    return camel_re.sub(r"\1-\2", cls.__name__).lower()
+    what = camel_re.sub(r"\1-\2", cls.__name__)
+    return camel_re2.sub(r"\1-\2", what).lower()
 
 
 def _get_base_parser(add_help=True):
diff --git a/gitlab/tests/test_cli.py b/gitlab/tests/test_cli.py
@@ -26,6 +26,7 @@
 import pytest
 
 from gitlab import cli
+from gitlab.v4.objects import CurrentUserGPGKey
 import gitlab.v4.cli
 
 
@@ -34,15 +35,25 @@ def test_what_to_cls():
     assert "FooBar" == cli.what_to_cls("foo-bar")
 
 
+def test_what_to_cls_v4(gl):
+    what = "current-user-gpg-key"
+    g_cli = gitlab.v4.cli.GitlabCLI(gl, what, "list", [])
+    assert CurrentUserGPGKey == g_cli.what_to_cls(what)
+
+
 def test_cls_to_what():
     class Class(object):
         pass
 
     class TestClass(object):
         pass
 
+    class TestUPPERClass(object):
+        pass
+
     assert "test-class" == cli.cls_to_what(TestClass)
     assert "class" == cli.cls_to_what(Class)
+    assert "test-upper-class" == cli.cls_to_what(TestUPPERClass)
 
 
 def test_die():
diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
@@ -20,6 +20,8 @@
 import operator
 import sys
 
+from requests.structures import CaseInsensitiveDict
+
 import gitlab
 import gitlab.base
 from gitlab import cli
@@ -28,8 +30,9 @@
 
 class GitlabCLI(object):
     def __init__(self, gl, what, action, args):
-        self.cls_name = cli.what_to_cls(what)
-        self.cls = gitlab.v4.objects.__dict__[self.cls_name]
+        self.classes = gitlab.v4.objects.__dict__
+        self.cls = self.what_to_cls(what)
+        self.cls_name = self.cls.__name__
         self.what = what.replace("-", "_")
         self.action = action.lower()
         self.gl = gl
@@ -64,6 +67,12 @@ def __call__(self):
         # Finally try to find custom methods
         return self.do_custom()
 
+    def what_to_cls(self, what):
+        """Case-insensitive lookup of module class names from CLI args"""
+        classes = CaseInsensitiveDict(self.classes)
+        lowercase_class = what.replace("-", "")
+        return classes[lowercase_class]
+
     def do_custom(self):
         in_obj = cli.custom_actions[self.cls_name][self.action][2]
 
