Fixed installation issues with npm

Author: wpgodone

.gitignore

@@ -2,4 +2,5 @@ node_modules/
 .idea/
 **/npm-debug.log
 **/node_modules/**
-/build
+/build
+**.*~

README.md

@@ -52,15 +52,15 @@ When you first run the dashboard, you should go to the "Settings" tab to configu
 # Using the"dxwcmdesigns"  command line utility
 Note that all the functionality for push/pull of WCM design files is available from the Dashboard user interface. For the command line support, use:
 ```
-$ dxdxwcmdesigns <command> [options]
+$ dxwcmdesigns <command> [options]
 ```
 
 The commands are described below.
 
 ## init
 Usage:
 ```
-$ dxdxwcmdesigns init [options]
+$ dxwcmdesigns init [options]
 ```
 Running this command will display a prompt to select a WCM library. A subdirectory
 will be created (in the current working directory) and the selected library will be
@@ -75,7 +75,7 @@ The available options are:
 Usage:
 ```
 $ cd <path to the wcm library>
-$ dxdxwcmdesigns push [options]
+$ dxwcmdesigns push [options]
 ```
 Running this command will push the source files to WCM and update the library on the server.
 
@@ -91,7 +91,7 @@ The available options are:
 Usage:
 ```
 $ cd <path to the wcm library>
-$ dxdxwcmdesigns pull [options]
+$ dxwcmdesigns pull [options]
 ```
 This command will download any remote changes to the WCM library. First run `wcm init`
 to initialize the WCM library before using `wcm pull`.

dashboard.tar.gz

@@ -25,6 +25,7 @@
     "async": "^1.3.0",
     "chokidar": "^1.0.3",
     "diff": "^1.4.0",
+    "dxsync": "https://github.com/digexp/dxsync/archive/1.0.2.tar.gz",
     "digexp-wcm-design": "file:../wcm-design.tar.gz",
     "findit": "",
     "map-stream": "0.0.6",
@@ -37,6 +38,10 @@
     "vinyl": "^0.5.0",
     "vinyl-fs": "^1.0.0"
   },
+  "config": {
+    "unsafe-perm": true,
+    "no-optional": true
+  },
   "scripts": {
     "preinstall": "node preinstall.js",
     "postinstall": "node postinstall.js"

digexp-dashboard/package.json

@@ -44,29 +44,72 @@ var rm_rf = function(path, cb) {
 
 console.log("Installing dxsync:");
 
-ch.exec("npm install https://github.com/digexp/dxsync/archive/1.0.2.tar.gz --no-optional",
-  function(err) {
+var cwd = process.cwd();
+
+var command = "npm install --no-optional --no-bin-links --prefix " + cwd + " https://github.com/digexp/dxsync/archive/1.0.2.tar.gz";
+
+if (process.platform == "win32") {
+  command = "npm install --no-optional https://github.com/digexp/dxsync/archive/1.0.2.tar.gz"
+}
+
+var cleanup = function() {
+  rm_rf("node_modules/dxsync/precompiled_modules/");
+  rm_rf("node_modules/dxsync/precompiled_modules.zip");
+}
+
+var cleanupWindows = function(cb) {
+  ch.exec("npm root -g", { }, function(err, root) {
+    root = root || process.env._;
+    if (root && fs.existsSync(root + "\\dxsync\\package.json")) {
+      ch.exec('xcopy "' + root + '\\dxsync" "' + process.cwd() + '\\node_modules\\dxsync" /e /y', function() {
+        cb && cb();
+      });
+    } else {
+      cb && cb();
+    }
+  });
+}
+
+var cleanupUnix = function(cb) {
+  if (fs.existsSync("lib/node_modules/dxsync/package.json")) {
+    ch.exec("cp -r lib/node_modules/dxsync/ node_modules/dxsync/", function() {
+      rm_rf("lib/node_modules/dxsync"); // ./lib/ shouldn't exist in this version of npm
+      cb && cb();
+    });
+  }
+}
+
+cleanup();
+/*ch.exec(command, { cwd: cwd },
+  function(err, stdout, stderr) {
+    if (stdout) {
+      console.log(stdout);
+    }
+    if (stderr) {
+      console.error(stderr);
+    }
     if (err) {
       console.error("Error installing dxsync: " + err.message);
+    } else if (process.platform == "win32") {
+      cleanupWindows(cleanup);
     } else {
-      rm_rf("node_modules/dxsync/precompiled_modules/");
-      rm_rf("node_modules/dxsync/precompiled_modules.zip");
-
-      setTimeout(function() {
-        console.log("Done!")
-      }, 300);
+      cleanupUnix(cleanup);
     }
-  });
+    setTimeout(function() {
+        console.log("Done!")
+      }, 500);
+  });*/
 
 // check if user-settings has been saved temporarily
 // (for saving settings when re-installing the dashboard globally)
-ch.exec("npm root -g", function(err, root) {
+ch.exec("npm root -g", { }, function(err, root) {
+  root = root || process.env._;
   if (root) {
     root = root.replace(/\n|\r/g, "");
     fs.readFile(path.resolve(root, ".digexp-dashboard-user-settings.json"),
       function(err, contents) {
         if (!err) {
-          fs.writeFile(path.resolve(root, "digexp-dashboard/user-settings.json"),
+          fs.writeFile(path.resolve(root,"digexp-dashboard/user-settings.json"),
             contents);
           fs.unlink(path.resolve(root, ".digexp-dashboard-user-settings.json"))
         }

digexp-dashboard/postinstall.js

@@ -12,6 +12,8 @@ var fs = require("fs");
 var ch = require("child_process");
 
 ch.exec("npm root -g", function(err, root) {
+  root = root || process.env._;
+  console.log(root);
   if (root) {
     root = root.replace(/\n|\r/g, "");
     fs.readFile(path.resolve(root, "digexp-dashboard/user-settings.json"),

digexp-dashboard/preinstall.js

@@ -21,7 +21,7 @@ const SP_SERVER = "./digexp-sp-server";
 var getFileList = function(folder) {
   // todo read gitignore, npmignore
   return [folder + "/**", "!" + folder + "/.git/**", "!" + folder + "/node_modules/**",
-          "!" + folder + "/node_modules/", "!" + folder + "/.idea/**", "!" + folder + "/user-settings.json"];
+          "!" + folder + "/node_modules/", "!" + folder + "/.idea/**", "!" + folder + "/user-settings.json", + "!" + folder + "/**.*~"];
 };
 
 var npm_pack = function(folder, dest) {
@@ -66,4 +66,4 @@ gulp.task("watch_sp-server", function() {
 
 gulp.task("watch", ['watch_wcm', 'watch_sp-server', 'watch_dashboard'])
 
-gulp.task('default', ['pack', 'watch']);
+gulp.task('default', ['pack', 'watch']);

gulpfile.js

@@ -1,3 +1,3 @@
 call npm install -g wcm-design.tar.gz
-call npm install -g dashboard.tar.gz
+call npm install -g --unsafe-perm --no-optional dashboard.tar.gz 
 call npm install -g nw

install.cmd

@@ -1,3 +1,3 @@
 npm install -g wcm-design.tar.gz
-npm install -g dashboard.tar.gz
+npm install -g --unsafe-perm --no-optional dashboard.tar.gz 
 npm install -g nw

install.sh

@@ -1,12 +1,12 @@
 {
-  "name": "diggexp-toolkit",
+  "name": "digexp-toolkit",
   "version": "0.1.0",
   "devDependencies": {
     "grunt": "latest",
     "grunt-contrib-compress": "latest",
-	"gulp": "latest",
-	"gulp-tar": "latest",
-	"gulp-gzip": "latest",
-	"map-stream": "latest"
+    "gulp": "^3.9.0",
+    "gulp-gzip": "^1.2.0",
+    "gulp-tar": "^1.4.0",
+    "map-stream": "0.0.6"
   }
 }