Merge branch 'master' of github.com:AstroMatt/atlassian-python-api

Author: SLRover

atlassian/VERSION

@@ -1 +1 @@
-1.10.1
+1.10.2

atlassian/bitbucket.py

@@ -158,12 +158,63 @@ def get_tags(self, project, repository, filter='', limit=99999):
                 fixed system limits. Default by built-in method: 99999
         :return:
         """
-        url = '/rest/api/1.0/projects/{project}/repos/{repository}/tags'.format(project=project,
-                                                                                repository=repository)
+        url = 'rest/api/1.0/projects/{project}/repos/{repository}/tags'.format(project=project,
+                                                                               repository=repository)
         url += '?limit={limit}&filterText={filter}'.format(limit=limit,
                                                            filter=filter)
         return (self.get(url) or {}).get('values')
 
+    def get_project_tags(self, project, repository, tag_name):
+        """
+        Retrieve a tag in the specified repository.
+        The authenticated user must have REPO_READ permission for the context repository to call this resource.
+        Search uri is api/1.0/projects/{projectKey}/repos/{repositorySlug}/tags/{name:.*}
+        :param project:
+        :param repository:
+        :param tag_name: OPTIONAL:
+        :return:
+        """
+        url = 'rest/api/1.0/projects/{project}/repos/{repository}/tags/{tag}'.format(project=project,
+                                                                                     repository=repository,
+                                                                                     tag=tag_name)
+        return self.get(url, not_json_response=True)
+
+    def set_tag(self, project, repository, tag_name, commit_revision, description=None):
+        """
+        Creates a tag using the information provided in the {@link RestCreateTagRequest request}
+        The authenticated user must have REPO_WRITE permission for the context repository to call this resource.
+        :param project:
+        :param repository:
+        :param tag_name:
+        :param commit_revision: commit hash
+        :param description: OPTIONAL:
+        :return:
+        """
+        url = 'rest/api/1.0/projects/{project}/repos/{repository}/tags'.format(project=project,
+                                                                               repository=repository)
+        body = {}
+        if tag_name is not None:
+            body['name'] = tag_name
+        if tag_name is not None:
+            body['startPoint'] = commit_revision
+        if tag_name is not None:
+            body['message'] = description
+        return self.post(url, data=body)
+
+    def delete_tag(self, project, repository, tag_name):
+        """
+        Creates a tag using the information provided in the {@link RestCreateTagRequest request}
+        The authenticated user must have REPO_WRITE permission for the context repository to call this resource.
+        :param project:
+        :param repository:
+        :param tag_name:
+        :return:
+        """
+        url = 'rest/git/1.0/projects/{project}/repos/{repository}/tags/{tag}'.format(project=project,
+                                                                                     repository=repository,
+                                                                                     tag=tag_name)
+        return self.delete(url)
+
     def get_diff(self, project, repository, path, hash_oldest, hash_newest):
         url = 'rest/api/1.0/projects/{project}/repos/{repository}/compare/diff/{path}'.format(project=project,
                                                                                               repository=repository,

examples/bamboo_activity.py renamed to examples/bamboo-activity.py

@@ -1,18 +1,18 @@
-# coding: utf8
-from atlassian import Bamboo
-import os
-
-BAMBOO_URL = os.environ.get('BAMBOO_URL', 'http://localhost:8085')
-ATLASSIAN_USER = os.environ.get('ATLASSIAN_USER', 'admin')
-ATLASSIAN_PASSWORD = os.environ.get('ATLASSIAN_PASSWORD', 'admin')
-
-bamboo = Bamboo(
-    url=BAMBOO_URL,
-    username=ATLASSIAN_USER,
-    password=ATLASSIAN_PASSWORD)
-
-agent_status = bamboo.agent_status()
-print(agent_status)
-
-activity = bamboo.activity()
-print(activity)
+# coding: utf8
+from atlassian import Bamboo
+import os
+
+BAMBOO_URL = os.environ.get('BAMBOO_URL', 'http://localhost:8085')
+ATLASSIAN_USER = os.environ.get('ATLASSIAN_USER', 'admin')
+ATLASSIAN_PASSWORD = os.environ.get('ATLASSIAN_PASSWORD', 'admin')
+
+bamboo = Bamboo(
+    url=BAMBOO_URL,
+    username=ATLASSIAN_USER,
+    password=ATLASSIAN_PASSWORD)
+
+agent_status = bamboo.agent_status()
+print(agent_status)
+
+activity = bamboo.activity()
+print(activity)

examples/bitbucket-tag-manipulations.py

@@ -0,0 +1,23 @@
+from atlassian import Bitbucket
+
+"""This example shows how to create, get and delete tags"""
+
+bitbucket = Bitbucket(
+    url='http://localhost:7990',
+    username='admin',
+    password='admin')
+
+if __name__ == '__main__':
+    response = bitbucket.set_tag(project='gonchik.tsymzhitov',
+                                 repository='gonchik',
+                                 tag_name='test1',
+                                 commit_revision='ebcf5fdffa0',
+                                 description='Stable release')
+    print("Response after set_tag method")
+    print(response)
+
+    response = bitbucket.get_project_tags(project='INT', repository='jira-plugins', tag_name='test1')
+    print("Retrieve tag")
+    print(response)
+    print("Remove tag")
+    bitbucket.delete_tag(project='INT', repository='jira-plugins', tag_name='test1')