Fix the update/delete CLI subcommands

Gauvain Pocentek · Gauvain Pocentek · commit 802c144cfd19 · 2015-07-11T08:57:44.000+02:00
Also update the testing tool to test these features. Closes python-gitlab#62
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -643,6 +643,11 @@ class GitlabObject(object):
     requiredCreateAttrs = []
     #: Attributes that are optional when creating a new object
     optionalCreateAttrs = []
+    #: Attributes that are required when updating an object
+    requiredUpdateAttrs = None
+    #: Attributes that are optional when updating an object
+    optionalUpdateAttrs = None
+
     idAttr = 'id'
     shortPrintAttr = None
 
@@ -1086,6 +1091,7 @@ class ProjectLabel(GitlabObject):
     idAttr = 'name'
     requiredDeleteAttrs = ['name']
     requiredCreateAttrs = ['name', 'color']
+    requiredUpdateAttrs = []
     # FIXME: new_name is only valid with update
     optionalCreateAttrs = ['new_name']
 
@@ -1157,6 +1163,7 @@ class Project(GitlabObject):
     _url = '/projects'
     _constructorTypes = {'owner': 'User', 'namespace': 'Group'}
     requiredCreateAttrs = ['name']
+    requiredUpdateAttrs = []
     optionalCreateAttrs = ['default_branch', 'issues_enabled', 'wall_enabled',
                            'merge_requests_enabled', 'wiki_enabled',
                            'snippets_enabled', 'public', 'visibility_level',
diff --git a/gitlab/cli.py b/gitlab/cli.py
@@ -103,12 +103,23 @@ def populate_sub_parser_by_class(cls, sub_parser):
              for x in cls.optionalCreateAttrs]
 
         elif action_name == UPDATE:
+            id_attr = cls.idAttr.replace('_', '-')
+            sub_parser_action.add_argument("--%s" % id_attr,
+                                           required=True)
+
+            attrs = (cls.requiredUpdateAttrs
+                     if cls.requiredUpdateAttrs is not None
+                     else cls.requiredCreateAttrs)
             [sub_parser_action.add_argument("--%s" % x.replace('_', '-'),
                                             required=True)
-             for x in cls.requiredCreateAttrs]
+             for x in attrs]
+
+            attrs = (cls.optionalUpdateAttrs
+                     if cls.optionalUpdateAttrs is not None
+                     else cls.optionalCreateAttrs)
             [sub_parser_action.add_argument("--%s" % x.replace('_', '-'),
                                             required=False)
-             for x in cls.optionalCreateAttrs]
+             for x in attrs]
 
     if cls in extra_actions:
         for action_name in sorted(extra_actions[cls]):
@@ -182,7 +193,7 @@ def do_delete(cls, gl, what, args):
     if not cls.canDelete:
         die("%s objects can't be deleted" % what)
 
-    o = do_get(cls, args, what, args)
+    o = do_get(cls, gl, what, args)
     try:
         o.delete()
     except Exception as e:
@@ -193,7 +204,7 @@ def do_update(cls, gl, what, args):
     if not cls.canUpdate:
         die("%s objects can't be updated" % what)
 
-    o = do_get(cls, args, what, args)
+    o = do_get(cls, gl, what, args)
     try:
         for k, v in args.items():
             o.__dict__[k] = v
diff --git a/tools/functional_tests.sh b/tools/functional_tests.sh
@@ -23,7 +23,7 @@ cleanup() {
 }
 trap cleanup EXIT
 
-docker run --name gitlab-test --detach --publish 8080:80 --publish 2222:22 sytse/gitlab-ce:7.10.1 >/dev/null 2>&1
+docker run --name gitlab-test --detach --publish 8080:80 --publish 2222:22 genezys/gitlab:latest >/dev/null 2>&1
 
 LOGIN='root'
 PASSWORD='5iveL!fe'
@@ -80,6 +80,14 @@ PROJECT_ID=$($GITLAB project create --name test-project1 | grep ^id: | cut -d' '
 $GITLAB project list | grep -q test-project1
 $OK
 
+echo -n "Testing project update... "
+$GITLAB project update --id $PROJECT_ID --description "My New Description"
+$OK
+
+echo -n "Testing project deletion... "
+$GITLAB project delete --id $PROJECT_ID
+$OK
+
 echo -n "Testing user creation... "
 USER_ID=$($GITLAB user create --email fake@email.com --username user1 --name "User One" --password fakepassword | grep ^id: | cut -d' ' -f2)
 $OK
