Load and show previous revisions.

Author: plietar

coder-apps/common/coderlib/app/app.js

@@ -1,6 +1,8 @@
 var fs = require('fs');
 var util = require('util');
 var async = require('async');
+var pathutil = require('path');
+var ncp = require('ncp');
 
 var getDateString = function( d ) {
     var now = new Date();
@@ -52,13 +54,6 @@ App.prototype.exec = function (req, res, path) {
     res.locals["coder_color"] = coderlib.device.color;
 
 
-    //Redirect to sign-in for unauthenticated users
-    var user = coderlib.auth.isAuthenticated(req, res);
-    if ( !user && !this.metadata.public) {
-        util.log( "redirect: " + '/app/auth' );
-        res.redirect('/app/auth');
-        return;
-    }
 
     this.require(function(err, userapp) {
         if (err) {
@@ -73,8 +68,8 @@ App.prototype.exec = function (req, res, path) {
             routes = userapp.post_routes;
         }
 
+        var found = false;
         if ( routes ) {
-            var found = false;
             for ( var i in routes ) {
                 route = routes[i];
                 if ( route['path'] instanceof RegExp ) {
@@ -91,10 +86,10 @@ App.prototype.exec = function (req, res, path) {
                     break;
                 }
             }
+        }
 
-            if ( !found ) {
-                res.send(404);
-            }
+        if ( !found ) {
+            res.send(404);
         }
     });
 }
@@ -136,8 +131,7 @@ LocalApp.prototype.require = function(callback) {
 };
 
 LocalApp.prototype.view = function(name) {
-    if (!name)
-        name = "index";
+    name = name || "index";
     return this.viewpath + name;
 };
 
@@ -243,7 +237,7 @@ var createLinks = function(name, cb) {
 
 LocalApp.create = function(template, name, callback) {
     var appPath = process.cwd() + "/apps/" + name;
-    var templatePath = path.resolve("apps/", template);
+    var templatePath = pathutil.resolve("apps/", template);
 
     ncp(templatePath, appPath, function(err) {
         if (err) {

coder-apps/common/vcs/app/gitapp.js

@@ -1,7 +1,9 @@
 "use strict";
 var async = require("async");
 var util = require("util");
+var pathutil = require("path");
 var Git = require("./git");
+
 var App = coderlib.App;
 var LocalApp = coderlib.LocalApp;
 
@@ -13,6 +15,9 @@ var GitApp = module.exports = function(name, rev) {
     this.repo = null;
     this.tree = null;
     this.module = null;
+
+    this.staticURL = pathutil.resolve('/app/vcs/static/', this.name, this.revision);
+    this.appURL = pathutil.resolve('/app/vcs/app/', this.name, this.revision);
 };
 
 util.inherits(GitApp, App);
@@ -57,13 +62,18 @@ GitApp.prototype.require = function(callback) {
             var m = new Module();
             m.paths = module.paths;
             m._compile(src, "/app/index.js");
-            self.module = m;
+            self.module = m.exports;
 
-            callback(null, m);
+            callback(null, self.module);
         }
     ], callback);
 };
 
+GitApp.prototype.view = function(name) {
+    name = name || "index";
+    return "apps/" + this.name + "/" + name;
+}
+
 GitApp.find = function(name, rev, callback) {
     callback = callback || function() {};
 

coder-apps/common/vcs/app/index.js

@@ -12,7 +12,8 @@ var isVersionned = function(app, callback) {
 
 exports.get_routes = [
     { path:'/', handler:'index_handler' },
-    { path:/^\/view\/(\w+)\/([0-9a-f]+)\/static\/(.+)$/, handler: 'static_handler' },
+    { path:/^\/app\/(\w+)\/([0-9a-f]+)(\/.*)?$/, handler: 'app_handler' },
+    { path:/^\/static\/(\w+)\/([0-9a-f]+)\/(.+)$/, handler: 'static_handler' },
     { path:/^\/log\/(\w+)\/?$/, handler:'log_handler' }
 ];
 
@@ -45,7 +46,6 @@ exports.static_handler = function( app, req, res, match ) {
     ], function(err, data) {
         if (err)
         {
-            console.log(err);
             res.send(404);
         }
         else
@@ -56,12 +56,28 @@ exports.static_handler = function( app, req, res, match ) {
     });
 };
 
+exports.app_handler = function( app, req, res, match ) {
+    var appname = match[1];
+    var rev = match[2];
+    var path = match[3] || "/";
+
+    var repo;
+
+    GitApp.find(appname, rev, function(err, app) {
+        if (err) {
+            res.send(404);
+            return;
+        }
+
+        app.exec(req, res, path);
+    });
+}
+
 exports.log_handler = function( app, req, res, match ) {
     var appname = match[1];
 
     GitApp.history(appname, function(err, results) {
-        console.log(err);
-        res.render( app.view("log"), {commits: results} );
+        res.render( app.view("log"), {name: appname, commits: results} );
     });
 };
 

coder-apps/common/vcs/views/log.html

@@ -25,7 +25,7 @@
         <h1>Log</h1>
         <ul>
             {{#commits}}
-            <li>{{message}} - {{short}}</li>
+            <li><a href="/app/vcs/app/{{name}}/{{short}}">{{message}} - {{short}}</a></li>
             {{/commits}}
         </ul>
     </div>

coder-base/server.js

@@ -60,6 +60,14 @@ var apphandler = function( req, res, appdir ) {
             return;
         }
 
+        //Redirect to sign-in for unauthenticated users
+        var user = auth.isAuthenticated(req, res);
+        if ( !user && !app.metadata.public) {
+            util.log( "redirect: " + '/app/auth' );
+            res.redirect('/app/auth');
+            return;
+        }
+
         app.exec(req, res, apppath);
     });
 };