@@ -30,13 +30,33 @@ class GitlabCreateError(Exception):
3030class GitlabUpdateError (Exception ):
3131pass
3232
33- class GitlabSessionError (Exception ):
33+ class GitlabAuthenticationError (Exception ):
3434pass
3535
3636class Gitlab (object ):
37- def __init__ (self ,url ,private_token ):
37+ def __init__ (self ,url ,private_token = None , email = None , password = None ):
3838self .url = '%s/api/v3' % url
3939self .private_token = private_token
40+ self .email = email
41+ self .password = password
42+
43+ if not self .private_token :
44+ self .authenticate
45+
46+ def authenticate (self ,email = None ,password = None ):
47+ self .email = self .email or email
48+ self .password = self .password or password
49+
50+ if not self .email or not self .password :
51+ raise GitlabAuthenticationError ("Missing email/password" )
52+
53+ r = self .rawPost ('/session' , {'email' :email ,'password' :password })
54+ if r .status_code == 201 :
55+ self .user = User (self ,r .json )
56+ else :
57+ raise GitlabAuthenticationError ()
58+
59+ self .private_token = self .user .private_token
4060
4161def setUrl (self ,url ):
4262self .url = '%s/api/v3' % url
@@ -234,13 +254,16 @@ def getObject(self, k, v):
234254
235255def __init__ (self ,gl ,data ):
236256self .gitlab = gl
257+
237258for k ,v in data .items ():
238259if isinstance (v ,list ):
239260self .__dict__ [k ]= []
240261for i in v :
241262self .__dict__ [k ].append (self .getObject (k ,i ))
242- else :
263+ elif v :
243264self .__dict__ [k ]= self .getObject (k ,v )
265+ else :# None object
266+ self .__dict__ [k ]= None
244267
245268def __str__ (self ):
246269return '%s => %s' % (type (self ),str (self .__dict__ ))
@@ -275,13 +298,6 @@ class Issue(GitlabObject):
275298canUpdate = False
276299canCreate = False
277300
278- def Session (gl ,email ,password ):
279- r = gl .rawPost ('/session' , {'email' :email ,'password' :password })
280- if r .status_code == 201 :
281- return User (gl ,r .json )
282- else :
283- raise GitlabSessionError ()
284-
285301class ProjectBranch (GitlabObject ):
286302url = '/projects/%(project_id)d/repository/branches'
287303canDelete = False
