Update to 2.1

Author: lennartcl

.npmignore

@@ -3,7 +3,7 @@
 CMD_DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd "$CMD_DIR/.."
 
-make update
+make worker
 
 case `uname -a` in
 Linux*x86_64*)  echo "Linux 64 bit"

HELP.md

@@ -18,7 +18,7 @@
 		"msgpack-js": "empty:",
 		"v8debug": "empty:",
 		"apf/elements": "%d/lib.apf/www/apf/elements",
-		"ace/worker": "%a",
+		"ace": "%a",
 		"%m"
 	},
 

bin/cloud9.sh

@@ -17,12 +17,12 @@
     packages: [
         {
             "name": "engine.io",
-            "location": "node_modules/smith.io/node_modules/engine.io/node_modules/engine.io-client/dist",
-            "main": "engine.io-dev.js"
+            "location": "node_modules/engine.io-client",
+            "main": "engine.io.js"
         },
         {
             "name": "smith.io",
-            "location": "node_modules/smith.io/server-plugin/www",
+            "location": "plugins-server/c9.smith.io/www",
             "main": "client.js"
         },
         {
@@ -32,7 +32,7 @@
         },
         {
             "name": "msgpack-js",
-            "location": "node_modules/smith.io/node_modules/msgpack-js-browser",
+            "location": "node_modules/msgpack-js-browser",
             "main": "msgpack.js"
         }
     ],
@@ -66,9 +66,9 @@
         "core/document",
         "core/ext",
         "core/ide",
-        "core/settings", 
-        "core/util", 
-        "ext/main/main", 
+        "core/settings",
+        "core/util",
+        "ext/main/main",
         "treehugger/traverse",
         "treehugger/js/parse",
         "v8debug/util",

bin/run.js

@@ -0,0 +1,53 @@
+
+var fs = require('fs');
+
+var config = require("../configs/default.js");
+var extensions;
+
+for (var c in config) {
+    if (config[c].clientPlugins) {
+        extensions = config[c].clientPlugins;
+        break;
+    }
+}
+
+var clientPlugins = [ ];
+var clientMappings = [ ];
+
+var arguments = process.argv.splice(2);
+var isClean = parseInt(arguments[0]);
+
+//console.log(extensions);
+
+for (var e in extensions) {
+    var name = extensions[e].split("/")[1];
+
+    if (name === "log")
+        continue;
+    
+    var dir = "plugins-client/ext." + name;
+    var mapping = "ext/" + name;
+
+    clientMappings.push(mapping + "': '" + dir);
+    clientPlugins.push(mapping + "/" + name);
+}
+
+clientMappings.push("ext/uploadfiles': 'plugins-client/ext.uploadfiles"); // TODO: why is this not automatically added?
+clientPlugins = "'" + clientPlugins.join("',\n\t'") + "'";
+clientMappings = "'" + clientMappings.join("',\n\t'") + "'";
+
+var appTemplate = fs.readFileSync("./build/app.build.tmpl.js", "utf8");
+
+// transform all variable paths out
+var appFile = appTemplate.replace(/%b/g, "build").replace(/%d/g, "plugins-client").replace('"%a"', '"node_modules/ace/lib/ace"').replace('"%s"', clientPlugins).replace('"%m"', clientMappings).replace('"%o"', '"../plugins-client/lib.packed/www/c9os.min.js"');
+
+if (isClean)
+    appFile = appFile.replace(/\/\/\s*optimize/, 'optimize');
+
+fs.writeFile("./build/app.build.js", appFile, "utf8", function(err) {
+    if (err) {
+        console.error("Couldn't write app.build.js!")
+        console.error(err);
+        process.exit(1);
+    } 
+});

bin/runjs.sh

@@ -1,53 +1,152 @@
-
 var fs = require('fs');
+var path = require('path');
+
+var outDir = __dirname + "/src/";
+var arguments = process.argv.splice(2);
+var isClean = parseInt(arguments[0], 10);
 
-var config = require("../configs/default.js");
-var extensions;
+var templates = fs.readdirSync(path.resolve(__dirname + "/../configs/ide-templates"));
 
-for (var c in config) {
-    if (config[c].clientPlugins) {
-        extensions = config[c].clientPlugins;
-        break;
+// create a dummy object so require(tmplPath) doesn't complain
+var project = {
+    remote: {
+        metadata: {
+            connect: {
+                host: ""
+            },
+            system: {
+                home: ""
+            },
+            node: {}
+        }
     }
-}
 
-var clientPlugins = [ ];
-var clientMappings = [ ];
+};
 
-var arguments = process.argv.splice(2);
-var isClean = parseInt(arguments[0]);
+var options = {
+    collab : {
+        env : ""
+    },
+    static: {
+        staticUrlPrefix: ""
+    }
+};
+
+var pluginList = require(path.resolve(__dirname + "/../configs/client_plugins"));
+
+for (var f in templates) {
+    var tmplPath = path.resolve(__dirname + "/../configs/ide-templates/" + templates[f]);
+    console.log("Reading " + tmplPath);
+    var tmplFile = require(tmplPath)("blank", project, pluginList, options);
+
+    var idePlugin = tmplFile.plugins.filter(function(plugin) {
+        return plugin.packagePath && plugin.packagePath.indexOf("cloud9.core") !== -1;
+    })[0];
+    var scmPluginList = idePlugin.clientPlugins;
+
+    if (templates[f] === "openshift.js")
+        scmPluginList.push("ext/strongloop/strongloop");
 
-//console.log(extensions);
+    scmPluginList = scmPluginList.filter(function(p) {
+        if (p === "ext/log/log")
+            return false;
+        return true;
+    });
 
-for (var e in extensions) {
-    var name = extensions[e].split("/")[1];
+    rewriteMappings(templates[f], scmPluginList, function(err, plugins, mappings) {
+        if (err) {
+            console.error(err);
+            process.exit(1);
+        }
 
-    if (name === "log")
-        continue;
+        createBuildFile(templates[f], plugins, eliminateDuplicates(mappings));
+    });
+}
+
+function rewriteMappings(type, pluginList, callback) {
+    var pluginMappings = [ ];
+    pluginList = eliminateDuplicates(pluginList);
+
+    // rewrite mappings for build file
+    for (var l in pluginList) {
+        var name = pluginList[l].split("/")[1];
+        var dir = "";
+        var c9Prefix = "../plugins-client/ext.";
+        var infraPrefix = "../plugins-client/ext.";
+
+        if (!path.existsSync(path.normalize(__dirname + "/" + c9Prefix + name))) {
+            //console.warn("Couldn't find " + path.normalize(__dirname + "/" + c9Prefix + name) + "; looking elsewhere...");
+            if (!path.existsSync(path.normalize(__dirname + "/" + infraPrefix + name))) {
+                //console.warn("Couldn't find " + path.normalize(__dirname + "/" + infraPrefix + name) + "; looking elsewhere...");
+                
+                console.error("We have a problem. I have no idea where " + name + " is referenced.");
+                console.error("I'm in " + __dirname + "!");
+                console.error("I tried " + c9Prefix + name + "!");
+                console.error("I tried " + infraPrefix + name + "!");
+                process.exit(1);
+            }
+            else
+                dir = infraPrefix + name;
+        }
+        else
+            dir = c9Prefix + name;
+        
+        var mapping = "ext/" + name;
 
-    var dir = "plugins-client/ext." + name;
-    var mapping = "ext/" + name;
+        pluginMappings.push("'" + mapping + "': '" + dir + "'");
+    }
 
-    clientMappings.push(mapping + "': '" + dir);
-    clientPlugins.push(mapping + "/" + name);
+    if (type == "ftp.js") {
+        // otherwise, packager cries and breaks for missing dependencies
+        pluginMappings.push("'ext/gotofile': '" + c9Prefix + "gotofile'");
+        pluginMappings.push("'ext/searchinfiles': '" + c9Prefix + "searchinfiles'");
+        pluginMappings.push("'ext/noderunner': '" + c9Prefix + "noderunner'");
+        pluginMappings.push("'ext/language':  '" + c9Prefix + "language'");
+    }
+    
+    callback(null, "'" + pluginList.join("',\n\t'") + "'", pluginMappings);
 }
 
-clientMappings.push("ext/uploadfiles': 'plugins-client/ext.uploadfiles"); // TODO: why is this not automatically added?
-clientPlugins = "'" + clientPlugins.join("',\n\t'") + "'";
-clientMappings = "'" + clientMappings.join("',\n\t'") + "'";
+function createBuildFile(configName, plugins, mappings) {
+    fs.readFile("./build/app.build.tmpl.js", "utf8", function(err, template) {
+        if (err) {
+            console.error("Couldn't read app.build.tmpl.js!");
+            console.error(err);
+            process.exit(1);
+        }
+        var newBuildFile = template
+            .replace(/%b/g, "../build")
+            .replace('"%a"', '"../node_modules/ace/lib/ace"')
+            .replace(/%d/g, '../plugins-client')
+            .replace('"%s"', plugins)
+            .replace('"%m"', mappings.join(",\n\t"))
+            .replace('"%o"', '"../../plugins-client/lib.packed/www/' + configName.replace(".js", ".min.js") + '"');
 
-var appTemplate = fs.readFileSync("./build/app.build.tmpl.js", "utf8");
+        if (isClean)
+            newBuildFile = newBuildFile.replace(/\/\/\s*optimize/, 'optimize');
 
-// transform all variable paths out
-var appFile = appTemplate.replace(/%b/g, "build").replace(/%d/g, "plugins-client").replace('"%a"', '"node_modules/ace/lib/ace/worker"').replace('"%s"', clientPlugins).replace('"%m"', clientMappings).replace('"%o"', '"../plugins-client/lib.packed/www/c9os.min.js"');
+        fs.writeFile(outDir + "/app.build." + configName, newBuildFile, "utf8", function(err) {
+            if (err) {
+                console.error("Couldn't write app.build." + configName + ".js!");
+                console.error(err);
+                process.exit(1);
+            }
+        });
+    });
+}
 
-if (isClean)
-    appFile = appFile.replace(/\/\/\s*optimize/, 'optimize');
+// r.js hates duplicates
+function eliminateDuplicates(arr) {
+  var i,
+      len=arr.length,
+      out=[],
+      obj={};
 
-fs.writeFile("./build/app.build.js", appFile, "utf8", function(err) {
-    if (err) {
-        console.error("Couldn't write app.build.js!")
-        console.error(err);
-        process.exit(1);
-    } 
-});
+  for (i=0;i<len;i++) {
+    obj[arr[i]]=0;
+  }
+  for (i in obj) {
+    out.push(i);
+  }
+  return out;
+}