gulp build task improved

Author: nikitaeverywhere

example/index.html

@@ -127,8 +127,6 @@
         mdxTo.innerHTML = "<b>Basic MDX:</b> <i>" + (typeof req === "object" ? req.basicMDX : req)
             + "</i>";
 
-        console.log(setup);
-
         var lp = new LightPivotTable(setup); // create widget
 
     </script>

gulpfile.js

@@ -8,7 +8,9 @@ var gulp = require("gulp"),
     htmlReplace = require("gulp-html-replace"),
     header = require("gulp-header"),
     replace = require("gulp-replace"),
-    pkg = require("./package.json");
+    pkg = require("./package.json"),
+    zip = require("gulp-zip"),
+    rename = require("gulp-rename");
 
 var banner = [
     "/** <%= pkg.name %>",
@@ -37,43 +39,58 @@ gulp.task("gatherScripts", ["clean"], function () {
             }
         }))
         .pipe(header(banner, { pkg: pkg }))
-        .pipe(gulp.dest("build/js/"));
+        .pipe(gulp.dest("build/WEBModule/js/"));
 });
 
 gulp.task("gatherCSS", ["clean"], function () {
     return gulp.src("source/css/*.css")
         .pipe(concat("lightPivotTable.css"))
         .pipe(minifyCSS())
-        .pipe(gulp.dest("build/css/"));
+        .pipe(gulp.dest("build/WEBModule/css/"));
 });
 
 gulp.task("addExample", ["clean"], function () {
-    gulp.src("example/index.html")
+    return gulp.src("example/index.html")
         .pipe(htmlReplace({
-            "css": "../css/lightPivotTable.css",
-            "js": "../js/lightPivotTable.js"
+            "css": "css/lightPivotTable.css",
+            "js": "js/lightPivotTable.js"
         }))
-        .pipe(gulp.dest("build/example/"));
-});
-
-gulp.task("exportCacheXML", ["clean", "gatherScripts", "gatherCSS"], function () {
-    gulp.src("export/LightPivotTable.xml")
-        .pipe(replace(/\{\{replace:css}}/, fs.readFileSync("build/css/lightPivotTable.css")))
-        .pipe(replace(/\{\{replace:js}}/, fs.readFileSync("build/js/lightPivotTable.js")))
-        .pipe(gulp.dest("build/"));
+        .pipe(gulp.dest("build/WEBModule/"));
 });
 
 gulp.task("copyLICENSE", ["clean"], function (){
-    gulp.src("LICENSE")
+    return gulp.src("LICENSE")
         .pipe(gulp.dest("build/"));
 });
 
 gulp.task("copyREADME", ["clean"], function (){
-    gulp.src("readme.md")
+    return gulp.src("readme.md")
         .pipe(gulp.dest("build/"));
 });
 
+gulp.task("exportCacheXML", [
+        "clean", "addExample", "gatherScripts", "gatherCSS", "copyLICENSE", "copyREADME"
+    ], function () {
+        return gulp.src("export/LightPivotTable.xml")
+            .pipe(
+                replace(/\{\{replace:css}}/,
+                fs.readFileSync("build/WEBModule/css/lightPivotTable.css"))
+            )
+            .pipe(
+                replace(/\{\{replace:js}}/,
+                fs.readFileSync("build/WEBModule/js/lightPivotTable.js"))
+            )
+            .pipe(rename(function (path) { path.basename += "-v" + pkg["version"]; }))
+            .pipe(gulp.dest("build/Caché"));
+});
+
+gulp.task("zipRelease", ["exportCacheXML"], function () {
+    return gulp.src("build/**/*")
+        .pipe(zip("LightPivotTable-v" + pkg["version"] + ".zip"))
+        .pipe(gulp.dest("build"));
+});
+
 gulp.task("default", [
     "clean", "gatherScripts", "gatherCSS", "addExample", "copyLICENSE", "copyREADME",
-    "exportCacheXML"
+    "exportCacheXML", "zipRelease"
 ]);

package.json

@@ -4,16 +4,22 @@
   "version": "1.0.0-beta",
   "description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
   "main": "test/testServer.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ZitRos/LightPivotTable"
+  },
   "devDependencies": {
     "express": "^5.0.0-alpha.1",
     "gulp": "^3.8.10",
     "gulp-clean": "^0.3.1",
     "gulp-concat": "^2.4.1",
     "gulp-html-replace": "^1.4.1",
     "gulp-minify-css": "^0.3.11",
+    "gulp-rename": "^1.2.0",
+    "gulp-replace": "^0.5.0",
     "gulp-uglify": "^1.0.1",
     "gulp-wrap": "^0.5.0",
-    "gulp-replace": "^0.5.0"
+    "gulp-zip": "^2.0.2"
   },
   "scripts": {
     "test": "node test/testServer.js"

source/js/DataSource.js

@@ -162,7 +162,7 @@ DataSource.prototype.getCurrentData = function (callback) {
 
         var data = ready.data;
 
-        console.log("Retrieved data:", ready);
+        //console.log("Retrieved data:", ready);
 
         (data.Info || {}).action = _.ACTION;
         if (_.ACTION === "MDXDrillthrough") {
@@ -220,7 +220,7 @@ DataSource.prototype.getCurrentData = function (callback) {
             mdx = mdxParser.applyFilter(mdx, filters[i]);
         }
 
-        console.log("Requesting MDX: " + mdx);
+        console.log("LPT MDX request:", mdx);
 
         _._post(_.SOURCE_URL + "/" + _.ACTION + (_.NAMESPACE ? "?Namespace=" + _.NAMESPACE : ""), {
             MDX: mdx

source/js/PivotView.js

@@ -489,7 +489,7 @@ PivotView.prototype.renderRawData = function (data) {
         }
     };
 
-    console.log("Data to render: ", data);
+    //console.log("Data to render: ", data);
 
     // fill header
     header.textContent = info.leftHeaderColumnsNumber ? rawData[0][0].value : "";