pull on get, see: logsol#14

glaslos · glaslos · commit 5aeb334f2514 · 2015-11-20T12:39:01.000+01:00
diff --git a/README.md b/README.md
@@ -11,6 +11,7 @@ To set it up, do the following:
 * Enter the matching for your project(s) in the git_deploy.conf.json file
 * Start the server by typing "python git_deploy.py" 
 * To run it as a daemon add --daemon-mode
+* To trigger the pull and deploy via get add --get-to-pull
 * On the Github page go to a repository, then "Admin", "Service Hooks", "Post-Receive URLs" and add the url of your machine + port (e.g. http://example.com:8001).
 
 You can even test the whole thing here, by clicking on the "Test Hook" button, whohoo!
diff --git a/git_deploy.py b/git_deploy.py
@@ -14,6 +14,7 @@ class GitDeploy(BaseHTTPRequestHandler):
     quiet = False
     daemon = False
     branch = None
+    is_get_available = False
 
     @classmethod
     def get_config(cls):
@@ -33,6 +34,22 @@ def get_config(cls):
                         and not os.path.isdir(repository['path'] + '/objects'):
                     sys.exit('Directory ' + repository['path'] + ' is not a Git repository')
 
+    def do_GET(self):
+        if GitDeploy.is_get_available:
+            paths = [repository['path'] for repository in self.getConfig()['repositories']]
+            for path in paths:
+                self.pull(path)
+                self.deploy(path)
+            self.send_response(200)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+            self.wfile.write("<html>")
+            self.wfile.write("<head><title>Github Autodeploy</title></head>")
+            self.wfile.write("<body><p>Ok, updated.</p></body>")
+            self.wfile.write("</html>")
+        else:
+            self.send_response(500)
+
     def do_POST(self):
         event = self.headers.getheader('X-Github-Event')
         if event == 'ping':
@@ -109,6 +126,8 @@ def main():
                 GitDeploy.quiet = True
             if arg == '-q' or arg == '--quiet':
                 GitDeploy.quiet = True
+            if arg == '-g' or arg == '--get-to-pull':
+                GitDeploy.is_get_available = True
                 
         if GitDeploy.daemon:
             pid = os.fork()
