Fixes #34, Fixes #35

Author: mkalioby

client/autodeploy_client/Client.py

@@ -59,6 +59,13 @@ def ListTags(self, workdir, owner=''):
             return newlist
         else:
             return []
+    def ListBranchs(self,workdir,owner=''):
+        global msg
+        if owner == '':
+            owner = Config.Owner
+        msg = Job.createGetBranchs(workdir=workdir, scm=self.scm, owner=owner)
+        result = self._send(msg)
+        return result.split("\n")
     def SwitchTag(self, workdir, tag, owner=''):
         global msg
         if owner == '':
@@ -78,10 +85,10 @@ def Deploy(self, workdir, configFile, owner=''):
     def CheckUp(self):
         return Connect.connect(self.server, self.port, 5)
 
-    def ListCommits(self, workdir, page=0, rpp=10, owner=''):
+    def ListCommits(self, workdir, page=0, rpp=10, owner='',options=None):
         if owner == '':
             owner = Config.Owner
-        msg = Job.createListCommitsMessage(workdir=workdir, scm=self.scm, owner=owner,key=self.sshkey)
+        msg = Job.createListCommitsMessage(workdir=workdir, scm=self.scm, owner=owner,key=self.sshkey,options=options)
         res = self._send(msg)
         result = []
         #HEAD = True

client/autodeploy_client/ClientJob.py

@@ -13,6 +13,20 @@ def importKey():
         return key
 
 
+def createGetBranchs(workdir, scm, owner,options=None):
+    sec = base64.encodestring(importKey().encrypt(owner + scm + "LIST-BRNACHS", "")[0])
+    f = '<job  owner="%s" type="%s" sec="%s" scm="%s">\n' % (owner, "LIST-BRNACHS", sec, scm)
+    f += '<workdir>%s</workdir>' % workdir
+
+    if options:
+        f += '<options>'
+        for option in options.keys():
+            f += "<option name='%s'>%s</option>" % (option, options[option])
+
+        f += "</options>"
+    f += '</job>'
+    return f
+
 
 # Provide id, owner and command as string
 # inputsFiles as List of file path

exampleConfig/autodeploy.yaml

@@ -11,7 +11,7 @@ permissions:
 
 events:
   beforeInstall:
-    - location: "/bin/rm -r /var/www/autodeploy"
+    - location: "/bin/rm -rf /var/www/autodeploy"
   afterInstall:
     - location: "/var/www/autodeploy/manage.py runserver 0.0.0.0:9002 &"
       interpreter: python

server/Request.py

@@ -67,6 +67,26 @@ def parseListTagsJob(message):
     return params
 
 
+def parseListBranchsJob(message):
+    params = {}
+    optionsDict = {}
+    doc = xml.dom.minidom.parseString(message)
+    Job = doc.getElementsByTagName('job')[0]
+    scm=Job.getAttribute("scm")
+    workdir= getValue(Job, 'workdir')
+
+    requestType = Job.getAttribute('type')
+    owner = Job.getAttribute('owner')
+    """options = (Job.getElementsByTagName('option'))
+    for option in options:
+        name = option.getAttribute("name")
+        optionsDict[name] = option.firstChild.nodeValue
+    """
+    print 'Recieved New Job from  ' + owner + '.....'
+    params = {"workdir": workdir,"owner": owner,  "requestType": requestType,"scm":scm,"options": optionsDict}
+    return params
+
+
 def parseSwitchTagJob(message):
     params = {}
     optionsDict = {}
@@ -122,8 +142,12 @@ def parseGetCommitsJob(message):
     requestType = Job.getAttribute('type')
     key= getValue(Job, 'sshkey')
     owner = Job.getAttribute('owner')
-    params = {"workdir": workdir,"owner": owner,  "requestType": requestType,"key":key,
-              "scm":scm,"options": optionsDict}
+    options = (Job.getElementsByTagName('option'))
+    for option in options:
+        name = option.getAttribute("name")
+        optionsDict[name] = option.firstChild.nodeValue
+    params = {"workdir": workdir, "owner": owner, "requestType": requestType, "key": key,
+              "scm": scm, "options": optionsDict}
     return params
 
 

server/autodeploy-server.py

@@ -102,13 +102,32 @@ def HandleClient(clientsock):
                                 pass
                         Response.sendData(clientsock,"\n".join(result))
                         return
-
+            elif req["requestType"] == "LIST-BRNACHS":
+                job = Request.parseListBranchsJob(msg)
+                if job["scm"] == "git":
+                    gclient = git.GIT(workdir=job["workdir"])
+                    cmd = gclient.get_list_branches()
+                    result = []
+                    res = Common.run(cmd)
+                    print res
+                    if "ERR:" in res:
+                        Response.sendData(clientsock, res)
+                    else:
+                        for line in res.split("\n"):
+                            try:
+                                if line!="":
+                                    result.append(line.replace("*","").strip())
+                            except:
+                                pass
+                        print result
+                        Response.sendData(clientsock, "\n".join(result))
+                        return
             elif req["requestType"]=="LIST-COMMITS":
                 job = Request.parseGetCommitsJob(msg)
                 if job["scm"]=="git":
                     gclient=git.GIT(workdir=job["workdir"])
                     gclient.setKey(job["key"])
-                    cmd=gclient.get_history_cmd()
+                    cmd=gclient.get_history_cmd(job["options"])
             elif req["requestType"]=="SWITCH-TAG":
                 job = Request.parseSwitchTagJob(msg)
                 if job["scm"]=="git":

server/scm/BaseSCM.py

@@ -10,7 +10,7 @@ def get_list_tags_cmd(self):
         pass
     def get_switch_to_tag_cmd(self):
         pass
-    def get_history_cmd(self,page=0,rpp=10):
+    def get_history_cmd(self,page=0,rpp=10,options={}):
         pass
     def switch_to_histroy_cmd(self,commit):
         pass

server/scm/Git.py

@@ -22,10 +22,21 @@ def get_pull_cmd(self):
         return "cd %s; git pull"%self.workdir
     def get_list_tags_cmd(self):
         return "cd %s;git tag -l"%self.workdir
+
+    def get_list_branches(self):
+        return "cd %s;git branch -a" % self.workdir
+
     def get_switch_to_tag_cmd(self,tag):
         return "cd %s; git checkout tags/%s"%(self.workdir,tag)
-    def get_history_cmd(self):
-        return 'cd ' + self.workdir +'; git log --all --pretty=format:"%H,,%h,,%an,,%ar,,%s,,%cd"  | cat -'
+    def get_history_cmd(self,options={}):
+        branch=options.get("branch","")
+        cmd =  'cd ' + self.workdir +'; git log '
+        if branch!="":
+            cmd += branch
+        else:
+            cmd+= ' --all '
+        cmd += ' --pretty=format:"%H,,%h,,%an,,%ar,,%s,,%cd"  | cat -'
+        return cmd
     def switch_to_histroy_cmd(self,commit):
         return 'cd %s; git reset --hard %s'%(self.workdir,commit)
     def commit_diff_cmd(self,commit):

webapp/autoDeploy/autodeploy/migrations/0014_auto_20160514_1317.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import datetime
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('autodeploy', '0013_auto_20150817_1250'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='lastCommit',
+            field=models.CharField(max_length=50, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='lastUpdate',
+            field=models.DateTimeField(default=datetime.datetime(2016, 5, 14, 13, 17, 34, 809478), blank=True),
+        ),
+    ]

webapp/autoDeploy/autodeploy/models.py

@@ -30,7 +30,7 @@ class Project(models.Model):
     repo = models.CharField(max_length=255, blank=True)
     default_server=models.ForeignKey(Server,blank=True)
     update_style=models.CharField(max_length=10,blank=True)
-    lastCommit = models.CharField(max_length=32,blank=True)
+    lastCommit = models.CharField(max_length=50,blank=True)
     lastTag=models.CharField(max_length=255,blank=True)
     lastCommitDate = models.DateTimeField(blank=True,default="1970-01-01")
     working_dir=models.FileField(blank=True)

webapp/autoDeploy/autodeploy/views.py

@@ -147,7 +147,8 @@ def deploy2(request):
     if project.update_style=="tag":
         return listTags(request, server)
     else:
-        return listCommits(request)
+        filter=request.GET.get("filter",None)
+        return listCommits(request,filter)
 
 @login_required(redirect_field_name="redirect")
 def listTags(request, server):
@@ -273,29 +274,43 @@ def checkServersStatus(request):
     return render_to_response("base.html", {"title":"Servers Health","function":"checkServers","dataType":"JSON","data":"","ajax": True}, context_instance=RequestContext(request))
 
 @login_required(redirect_field_name="redirect")
-def listCommits(request):
+def listCommits(request,filter=None):
     #if request.method == "GET":
     res = None
+    branches=[]
+    c=None
+    server=None
+    project=None
     print request.GET.get("refresh","False")
     if request.GET.get("refresh","False")=="True":
         if "commits" in request.session:
-            del request.session["commits"]
+            request.session.pop("commits","")
+            request.session.pop("branchs","")
             return redirect("./listCommits")
-    if not "commits" in request.session:
+    if filter or not "commits" in request.session:
         server = Server.objects.get(name=request.session["deploy_server"])
         project = Project.objects.get(name=request.session["deploy_project"])
         c = Client("git", server.ip, server.port,key=project.sshKey.key)
         c.Pull(project.repo,project.working_dir,project.sshKey.key)
-        res = c.ListCommits(project.working_dir)
-        print res
+        res = c.ListCommits(project.working_dir,options={"branch":filter})
         request.session["commits"] = res
     else:
         res = request.session["commits"]
+
+    if not "branchs" in request.session:
+        if not c:
+            server = Server.objects.get(name=request.session["deploy_server"])
+            project = Project.objects.get(name=request.session["deploy_project"])
+            c = Client("git", server.ip, server.port, key=project.sshKey.key)
+        branches=c.ListBranchs(project.working_dir)
+    else:
+        branches=request.session["branchs"]
+        request.session["branchs"]=branches
     table = CommitTable(res)
     table_to_report = RequestConfig(request, paginate={"per_page": 15}).configure(table)
     if table_to_report:
         return create_report_http_response(table_to_report, request)
-    return render_to_response("deploy2.html", {"mode":"commits","commits": table}, context_instance=RequestContext(request))
+    return render_to_response("deploy2.html", {"mode":"commits","commits": table,"branchs":branches,"current_branch":filter}, context_instance=RequestContext(request))
 
 
 @login_required(redirect_field_name="redirect")