Merge remote-tracking branch 'upstream/master'

Author: Gonchik Tsymzhitov

atlassian/VERSION

@@ -1 +1 @@
-1.9.5
+1.9.6

atlassian/confluence.py

@@ -485,6 +485,37 @@ def get_space(self, space_key, expand='description.plain,homepage'):
                                                                   expand=expand)
         return self.get(url)
 
+    def get_user_details_by_username(self, username, expand=None):
+        """
+        Get information about a user through username
+        :param username: The user name
+        :param expand: OPTIONAL expand for get status of user.
+                Possible param is "status". Results are "Active, Deactivated"
+        :return: Returns the user details
+        """
+        if expand:
+            url = 'rest/api/user?username={username}&expand={expand}'.format(username=username,
+                                                                             expand=expand)
+        else:
+            url = 'rest/api/user?username={username}'.format(username=username)
+
+        return self.get(url)
+
+    def get_user_details_by_userkey(self, userkey, expand=None):
+        """
+        Get information about a user through user key
+        :param userkey: The user key
+        :param expand: OPTIONAL expand for get status of user.
+                Possible param is "status". Results are "Active, Deactivated"
+        :return: Returns the user details
+        """
+        if expand:
+            url = 'rest/api/user?key={userkey}&expand={expand}'.format(userkey=userkey,
+                                                                       expand=expand)
+        else:
+            url = 'rest/api/user?key={userkey}'.format(userkey=userkey)
+        return self.get(url)
+
     def cql(self, cql, start=0, limit=None):
         """
         Get results from cql search result with all related fields

atlassian/jira.py

@@ -129,6 +129,43 @@ def get_project_components(self, key):
         """
         return self.get('rest/api/2/project/{0}/components'.format(key))
 
+    def get_project_versions(self, key, expand=None):
+        """
+        Contains a full representation of a the specified project's versions.
+        :param key:
+        :param expand: the parameters to expand
+        :return:
+        """
+        if expand is not None:
+            params["expand"] = expand
+        return self.get('rest/api/2/project/{}/versions'.format(key))
+
+    def get_project_versions_paginated(self, key, start=None, limit=None, order_by=None, expand=None):
+        """
+        Returns all versions for the specified project. Results are paginated.
+        Results can be ordered by the following fields:
+            sequence
+            name
+            startDate
+            releaseDate
+        :param key: the project key or id
+        :param start: the page offset, if not specified then defaults to 0
+        :param limit: how many results on the page should be included. Defaults to 50.
+        :param order_by: ordering of the results.
+        :param expand: the parameters to expand
+        :return:
+        """
+        params = {}
+        if start is not None:
+            params["startAt"] = int(start)
+        if limit is not None:
+            params["maxResults"] = int(limit)
+        if order_by is not None:
+            params["orderBy"] = order_by
+        if expand is not None:
+            params["expand"] = expand
+        return self.get('rest/api/2/project/{}/version'.format(key), params)
+
     def issue(self, key, fields='*all'):
         return self.get('rest/api/2/issue/{0}?fields={1}'.format(key, fields))
 

examples/confluence-get-user-details.py

@@ -0,0 +1,12 @@
+# coding: utf8
+from atlassian import Confluence
+
+""" This example related get user details and his status"""
+
+confluence = Confluence(
+    url='http://localhost:8090',
+    username='admin',
+    password='admin')
+
+result = confluence.get_user_details_by_username(username="gonchik.tsymzhitov", expand="status")
+print(result)