diff options
| -rw-r--r-- | README.md | 13 | ||||
| -rwxr-xr-x | gitlab | 86 |
2 files changed, 28 insertions, 71 deletions
@@ -109,22 +109,21 @@ Some examples: gitlab Project list # get a specific project (id 2): -gitlab Project get 2 +gitlab Project get --id=2 # get a list of snippets for this project: -gitlab ProjectIssue list project_id=2 -# (you're right, this syntax sucks) +gitlab ProjectIssue list --project_id=2 # delete a Snippet (id 3): -gitlab ProjectSnippet delete 3 project_id=2 +gitlab ProjectSnippet delete --id=3 --project_id=2 # update a Snippet: -gitlab ProjectSnippet update 4 project_id=2 code="My New Code" +gitlab ProjectSnippet update --id=4 --project_id=2 --code="My New Code" # create a Snippet: -gitlab ProjectSnippet create project_id=2 +gitlab ProjectSnippet create --project_id=2 Impossible to create object (Missing attribute(s): title, file_name, code) # oops, let's add the attributes: -gitlab ProjectSnippet create project_id=2 title="the title" file_name="the name" code="the code" +gitlab ProjectSnippet create --project_id=2 --title="the title" --file_name="the name" --code="the code" ````` @@ -20,7 +20,6 @@ import os import sys from ConfigParser import ConfigParser -from optparse import OptionParser from inspect import getmro @@ -30,19 +29,28 @@ def die(msg): sys.stderr.write(msg + "\n") sys.exit(1) -# cmd line options -parser = OptionParser() -parser.add_option("-g", "--gitlab", dest="gitlab_id", - help="select the gitlab connection from the configuration file", - metavar="GITLAB") -(options, args) = parser.parse_args() +gitlab_id = None + +args = [] +d = {} +for arg in sys.argv[1:]: + if arg.startswith('--'): + k, v = arg.split('=', 2) + k = k[2:].strip() + v = v.strip() + + if k == 'gitlab': + gitlab_id = v + else: + d[k] = v + else: + args.append(arg) # read the config config = ConfigParser() config.read(['/etc/python-gitlab.cfg', os.path.expanduser('~/.python-gitlab.cfg')]) -gitlab_id = options.gitlab_id if gitlab_id is None: try: gitlab_id = config.get('global', 'default') @@ -79,16 +87,6 @@ if gitlab.GitlabObject not in getmro(cls): die("Unknown object: %s" % what) if action == "create": - d = {} - try: - for arg in args: - k, v = arg.split("=", 2) - k = k.strip() - v = v.strip() - d[k] = v - except: - die("Impossible to parse data: %s" % arg) - try: o = cls(gl, d) o.save() @@ -98,16 +96,6 @@ if action == "create": sys.exit(0) elif action == "list": - d = {} - try: - for arg in args: - k, v = arg.split("=", 2) - k = k.strip() - v = v.strip() - d[k] = v - except: - die("Impossible to parse data: %s" % arg) - try: l = cls.list(gl, **d) except Exception as e: @@ -121,19 +109,9 @@ elif action == "list": elif action == "get": try: - id = args.pop(0) + id = d.pop('id') except: - die("First arg must be the object id") - - d = {} - try: - for arg in args: - k, v = arg.split("=", 2) - k = k.strip() - v = v.strip() - d[k] = v - except: - die("Impossible to parse data: %s" % arg) + die("Missing --id argument") try: o = cls(gl, id, **d) @@ -146,19 +124,9 @@ elif action == "get": elif action == "delete": try: - id = args.pop(0) + id = d.pop('id') except: - die("First arg must be the object id") - - d = {} - try: - for arg in args: - k, v = arg.split("=", 2) - k = k.strip() - v = v.strip() - d[k] = v - except: - die("Impossible to parse data: %s" % arg) + die("Missing --id argument") try: o = cls(gl, id, **d) @@ -174,19 +142,9 @@ elif action == "delete": elif action == "update": try: - id = args.pop(0) - except: - die("First arg must be the object id") - - d = {} - try: - for arg in args: - k, v = arg.split("=", 2) - k = k.strip() - v = v.strip() - d[k] = v + id = d.pop('id') except: - die("Impossible to parse data: %s" % arg) + die("Missing --id argument") try: o = cls(gl, id, **d) |