moving to REST phase almost complete, build improvements, themes update

Author: nikitaeverywhere

export/exportTemplate.xml renamed to etc/exportTemplate.xml

@@ -12,10 +12,20 @@ var gulp = require("gulp"),
     source = "webSource",
     buildTo = "build2";
 
+var themes = fs.readdirSync("./" + buildTo + "/web/css/terminal-theme");
+
+var extra = {
+    themes:
+        themes.map(function (n) {
+            return ', "' + n.replace(/\..*$/, "") + '": "css/terminal-theme/' + n + '"';
+        }).join("")
+};
+
 var specialReplace = function () {
-    return replace(/[^\s]+\/\*build\.replace:(.*)\*\//g, function (part, match) {
+    return replace(/[^\s]*\/\*build\.replace:(.*)\*\//g, function (part, match) {
         var s = match.toString();
-        return s.replace(/pkg\.([a-zA-Z]+)/g, function (p,a) { return pkg[a]; });
+        return s.replace(/pkg\.([a-zA-Z]+)/g, function (p,a) { return pkg[a]; })
+            .replace(/extra\.([a-zA-Z]+)/g, function (p,a) { return extra[a]; });
     });
 };
 
@@ -52,20 +62,22 @@ gulp.task("copy-js", ["clean"], function () {
 
 gulp.task("copy-css-basic", ["clean"], function () {
     return gulp.src([
-        "./" + source + "/css/base.css",
-        "./" + source + "/css/terminal.css",
-        "./" + source + "/css/terminal-extra.css",
-        "./" + source + "/css/terminal-graphic.css"
+        "./" + source + "/css/*.css"
     ]).pipe(concat("terminal.css"))
         .pipe(minifyCSS({ keepSpecialComments: 0 }))
         .pipe(gulp.dest("./" + buildTo + "/web/css/"));
 });
 
 gulp.task("copy-css-themes", ["clean"], function () {
     return gulp.src([
-        "./" + source + "/css/terminal-theme-cache.css"
+        "./" + source + "/css/terminal-theme/*.css"
     ]).pipe(minifyCSS({ keepSpecialComments: 0 }))
-        .pipe(gulp.dest("./" + buildTo + "/web/css/"));
+        .pipe(gulp.dest("./" + buildTo + "/web/css/terminal-theme/"));
+});
+
+gulp.task("copy-export", ["clean"], function () {
+    return gulp.src(["./export/*.*", "!./export/template.xml"])
+        .pipe(gulp.dest("./" + buildTo + "/etc"));
 });
 
 gulp.task("export", ["copy-html", "copy-js", "copy-css-themes", "copy-css-basic" ], function () {
@@ -87,8 +99,21 @@ gulp.task("export", ["copy-html", "copy-js", "copy-css-themes", "copy-css-basic"
             /\{\{replace:html}}/,
             function () { return fs.readFileSync("./" + buildTo + "/web/index.html", "utf-8"); }
         ))
+        .pipe(replace(
+            /\{\{replace:themes}}([^]*)\{\{replace:end}}/g,
+            function (p, content) {
+                return themes.map(function (n) {
+                    return content.replace("{{replace:themeName}}", n.replace(/\..*$/, ""))
+                        .replace("{{replace:themeData}}", function () {
+                            return fs.readFileSync(
+                                "./" + buildTo + "/web/css/terminal-theme/" + n
+                            );
+                        });
+                }).join("\n\n");
+            }
+        ))
         .pipe(rename(function (path) { path.basename = "CacheWebTerminal-v" + pkg["version"]; }))
         .pipe(gulp.dest("./" + buildTo));
 });
 
-gulp.task("default", ["export"]);
+gulp.task("default", ["export", "copy-export"]);

programs/EscapeSequencesDemo.mac renamed to export/EscapeSequencesDemo.mac

@@ -3,12 +3,15 @@
   "title": "Cache WEB Terminal",
   "description": "Web-based terminal emulator for Caché administering.",
   "author": "ZitRo",
-  "version": "3.0.0-alpha.1",
-  "releaseNumber": "10",
+  "version": "3.0.0-alpha.2",
+  "releaseNumber": 11,
   "repository": {
     "type": "git",
     "url": "https://github.com/intersystems-ru/webterminal.git"
   },
+  "scripts": {
+    "test": "node localServer/run.js"
+  },
   "devDependencies": {
     "express": "^4.13.3",
     "gulp-concat": "^2.6.0",

export/template.xml

@@ -18,7 +18,7 @@ var CacheWebTerminalServer = function (CONTROLLER, WS_PROTOCOL, IP, PORT) {
     /**
      * @type {string}
      */
-    this.CACHE_CLASS_NAME = "WebTerminal.Engine.cls";
+    this.CACHE_CLASS_NAME = "%WebTerminal.Engine.cls";
 
     /**
      * @type {string}

gulpfile.js

@@ -71,8 +71,6 @@ window.createTerminal = function (authKey, namespace) {
 
     var term;
 
-    console.log(authKey, namespace);
-
     term = new Terminal({
         container: document.body,
         authKey: authKey || null,

package.json

@@ -48,12 +48,12 @@ var Terminal = function (setting) {
     /**
      * @type {string}
      */
-    this.VERSION = "".concat(/* @echo VERSION */) || "*-dev";
+    this.VERSION = "(dev)"/*build.replace:"pkg.version"*/;
 
     /**
      * @type {number}
      */
-    this.RELEASE_NUMBER = parseInt("".concat(/* @echo RELEASE_NUMBER */)) || 0;
+    this.RELEASE_NUMBER = 0/*build.replace:pkg.releaseNumber*/;
 
     /**
      * @type {Array} of { function: function () {}, this: Object, args: Array }

webSource/css/terminal-theme-cache.css renamed to webSource/css/terminal-theme/cache.css

@@ -293,11 +293,11 @@ var TerminalLocalization = function (TERMINAL) {
             en: "Caché WEB Terminal v" + terminal.VERSION + "\r\nAuthor:\x1B[20GZitRo " +
                 "(+NikitaSavchenko)\r\nProject:\x1B[20Ghttp://intersystems-ru.github.io/" +
                 "webterminal\r\nRepository:\x1B[20Ghttps://github.com/intersystems-ru/" +
-                "webterminal\r\n2013-2014 ©",
+                "webterminal\r\n2013-2016 ©",
             ru: "Caché WEB Terminal v" + terminal.VERSION + "\r\nАвтор:\x1B[20GZitRo " +
                 "(+NikitaSavchenko)\r\nПроект:\x1B[20Ghttp://intersystems-ru.github.io/" +
                 "webterminal\r\nРепозиторий:\x1B[20Ghttps://github.com/intersystems-ru/" +
-                "webterminal\r\n2013-2014 ©"
+                "webterminal\r\n2013-2016 ©"
         },
         44: {
             en: "Syntax highlighting enabled.",