candidate for second release

.gitignore

@@ -0,0 +1 @@
+*.pyc

gitlabreleaseuploader.py

@@ -4,15 +4,42 @@ import argparse
 import sys
 
 
-
 parser = argparse.ArgumentParser(description='Gitlab Release Uploader')
-parser.add_argument('--privateToken', '-p', help='Private token to access Gitlab', required=True)
+parser.add_argument('--privateToken', '-p',
-parser.add_argument('--projectId', '-i', help='ProjectID of the related project', required=True)
+                    help='Private token to access Gitlab', required=True)
-parser.add_argument('--projectUrl', '-u', help='URL of the related project at Gitlab', required=True)
+parser.add_argument('--projectId', '-i',
-parser.add_argument('--file', '-f', help='File to be released', required=True)
+                    help='ProjectID of the related project', required=True)
-parser.add_argument('--releaseName', '-n', help='Name of the release', required=True)
+parser.add_argument('--projectUrl', '-u',
-parser.add_argument('--releaseTag', '-t', help='Tag of the release in the repo, make sure it already exists', required=True)
+                    help='URL of the related project at Gitlab', required=True)
-parser.add_argument('--description', '-d', help='Description of the release', required=True)
+parser.add_argument('--file', '-f',
+                    help='File to be released', required=True)
+parser.add_argument('--releaseName', '-n',
+                    help='Name of the release', required=False,
+                    default='')
+parser.add_argument('--releaseTag', '-t',
+                    help='Tag of the release in the repo'
+                    required=False,
+                    default='')
+parser.add_argument('--releaseTagTarget', '-T',
+                    help='Commit or branch the tag should point to',
+                    required=False,
+                    default='')
+parser.add_argument('--createReleaseTag', '-c',
+                    help='Shall the release be created here',
+                    required=False,
+                    action='store_true',
+                    default=False)
+parser.add_argument('--description', '-d',
+                    help='Description of the release', required=False,
+                    default='')
+parser.add_argument('--releaseInfoFile', '-F',
+                    help='File containing JSON object with release info '
+                         '(release tag, create release tag, description',
+                    required=False,
+                    default='')
+parser.add_argument('--instanceUrl', '-I',
+                    help='URL of your gitlab instance', required=False,
+                    default='https://gitlab.com')
 args = parser.parse_args()
 print(args)
 
@@ -22,27 +49,81 @@ projectUrl = args.projectUrl
 fileToUpload = args.file
 releaseName = args.releaseName
 releaseTag = args.releaseTag
+releaseTagTarget = args.releaseTagTarget
 releaseDescription = args.description
+instanceUrl = args.instanceUrl
+createReleaseTag = args.createReleaseTag
+releaseInfoFilename = args.releaseInfoFile
+
+releaseInfo = {}
+
+if (releaseInfoFilename):
+    with open(releaseInfoFilename, 'r') as releaseInfoFile:
+        releaseInfo = releaseInfoFile.read()
+    releaseInfo = json.loads(releaseInfo)
+    if 'releaseName' in releaseInfo:
+        releaseName = releaseInfo['releaseName']
+    if 'releaseTag' in releaseInfo:
+        releaseTag = releaseInfo['releaseTag']
+    if 'releaseTagTarget' in releaseInfo:
+        releaseTagTarget = releaseInfo['releaseTagTarget']
+    if 'createReleaseTag' in releaseInfo:
+        createReleaseTag = (releaseInfo['createReleaseTag'] in ('true', 'True'))
+    if 'description' in releaseInfo:
+        releaseDescription = releaseInfo['description']
+
+if releaseName == '':
+    raise Exception('No release name given')
+if releaseTag == '':
+    raise Exception('No release tag given')
+if releaseTagTarget == '':
+    raise Exception('No release tag target given')
+if releaseDescription == '':
+    raise Exception('No release description given')
 
 
-
+# --- upload the file
-uploadUrl = "https://gitlab.com/api/v4/projects/%s/uploads" % projectId
+uploadUrl = "%s/api/v4/projects/%s/uploads" % (instanceUrl, projectId)
-createReleaseUrl = "https://gitlab.com/api/v4/projects/%s/releases" % projectId
+headers = {"PRIVATE-TOKEN": privateToken}
-
-
-headers = { "PRIVATE-TOKEN" : privateToken}
-
 files = {"file": open(fileToUpload, 'rb')}
 
 uploadResult = requests.post(uploadUrl, files=files, headers=headers)
 print(uploadResult)
 print(uploadResult.text)
 if uploadResult.status_code != 201:
-  raise Exception('Unable to upload file to Gitlab')
+    raise Exception('Unable to upload file to Gitlab')
-
 
 uploadResultJson = json.loads(uploadResult.text)
 
+# --- create release tag
+if createReleaseTag:
+    createReleaseTagUrl = "%s/api/v4//projects/%s/repository/tags" % (instanceUrl, projectId)
+    headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
+
+    # id (required) - The ID or URL-encoded path of the project owned by the authenticated user
+    # tag_name (required) - The name of a tag
+    # ref (required) - Create tag using commit SHA, another tag name, or branch name.
+    # message (optional) - Creates annotated tag.
+    # release_description (optional) - Add release notes to the git tag and store it in the GitLab database.
+
+    payloadCreateReleaseTag = {
+        "tag_name": releaseTag,
+        "id": projectId,
+        "ref": releaseTagTarget,
+        "message": "Tag for release %s" % releaseName
+    }
+
+    createReleaseTagResult = requests.post(createReleaseTagUrl, headers=headers,
+                                        data=json.dumps(payloadCreateReleaseTag))
+
+    print(createReleaseTagResult)
+    print(createReleaseTagResult.text)
+    if createReleaseTagResult.status_code != 201:
+        raise Exception('Unable to create release tag')
+
+# --- create release
+createReleaseUrl = "%s/api/v4/projects/%s/releases" % (instanceUrl, projectId)
+headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
 fullUrl = projectUrl + uploadResultJson['url']
 
 payloadCreateRelease = {
@@ -59,11 +140,10 @@ payloadCreateRelease = {
   }
 }
 
-headers = { "PRIVATE-TOKEN" : privateToken, "Content-Type": "application/json"}
+createReleaseResult = requests.post(createReleaseUrl, headers=headers,
+                                    data=json.dumps(payloadCreateRelease))
 
-createReleaseResult = requests.post(createReleaseUrl, headers=headers, data=json.dumps(payloadCreateRelease))
 print(createReleaseResult)
 print(createReleaseResult.text)
 if createReleaseResult.status_code != 201:
-  raise Exception('Unable to create release')
+    raise Exception('Unable to create release')
-

info.json

@@ -0,0 +1,7 @@
+{
+  "releaseTag": "v1.1",
+  "createReleaseTag": "true",
+  "releaseName": "Second release of the uploader",
+  "description": "Now includes the option to create the tag and to load infos from file"
+}
+