apn-app-manager 2.1.1 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apn-app-manager",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },

package/src/actions/cloneAction.js

@@ -192,6 +192,7 @@ function executeClone() {
   // Prompts the user to tell us how to handle problem words
   addressProblemWords(function () {
     // These output files are helpful for debugging, and are used in tests
+    util.writeJson(path.resolve(cons.debugDir, `client-info.json`), util.clientInfo());
     util.writeJson(path.resolve(cons.debugDir, `objects.json`), objectMaps);
     util.writeJson(path.resolve(cons.debugDir, `not-cloned-uuids.json`), uuidCollector);
     util.writeJson(path.resolve(cons.debugDir, `namespaces.json`), context.namespaceMap);
@@ -365,11 +366,11 @@ function formatSelectedFilesLog() {
   for (const key of Object.keys(context)) {
     if (key.includes("Path") && !util.isBlank(context[key])) {
       if (!Array.isArray(context[key])) {
-        selectedFilesMap[key] = path.relative(cons.curDir, context[key]);
+        selectedFilesMap[key] = util.normalizeFilePath(path.relative(cons.curDir, context[key]));
       } else {
         let filePaths = [];
         context[key].forEach(filePath => {
-          filePaths.push(path.relative(cons.curDir, filePath));
+          filePaths.push(util.normalizeFilePath(path.relative(cons.curDir, filePath)));
         });
         selectedFilesMap[key] = lodash.sortBy(filePaths);
       }

package/src/handlers/fileSelectHandler.js

@@ -24,7 +24,7 @@ function selectFile(promptText, fileTypes, optional, multiple, ignoreFiles, leve
   let files = [];
   util.handleDirFiles(cons.curDir, fileTypes, levelsToParse, 1, function (filePath) {
     if (!lodash.includes(ignoreFiles, filePath)) {
-      files.push(path.relative(cons.curDir, filePath));
+      files.push(util.normalizeFilePath(path.relative(cons.curDir, filePath)));
     }
   });
   if (multiple) {

package/src/index.js

@@ -101,7 +101,7 @@ const options = {
 };
 
 // Check for a new version and displays it - skip if there are test overrides
-if (!testOverrides) {
+if (!util.isTestMode()) {
   displayNewVersion();
 }
 

package/src/util.js

@@ -14,7 +14,8 @@ const colorlog = require("node-color-log");
 const xmldom = require("@xmldom/xmldom").DOMParser;
 const xmlserializer = require("@xmldom/xmldom").XMLSerializer;
 const cons = require("./cons");
-const { matches } = require("lodash");
+const os = require("os");
+const pkg = require("../package.json");
 
 // Exports
 module.exports = {
@@ -375,6 +376,40 @@ module.exports = {
     const tLower = text.toLowerCase();
     return qWords.every(w => tLower.includes(w));
   },
+
+  // Returns a map of all client info (version, os, etc)
+  clientInfo: function () {
+    let testModeCheck = function (value) {
+      // If not test mode, return value as-is
+      if (!module.exports.isTestMode()) {
+        return value;
+      }
+      // If test mode and null, return "error"
+      if (isBlank(value)) {
+        return "ERROR - No value found";
+      }
+      // Otherwise return "" to ensure tests just check structure regardless of architecture running tests
+      return "";
+    };
+    return {
+      apn: testModeCheck(pkg.version),
+      npm: testModeCheck(outputCmd("npm --version")),
+      node: testModeCheck(process.versions.node),
+      os: {
+        platform: testModeCheck(os.platform()),
+        release: testModeCheck(os.release()),
+        arch: testModeCheck(os.arch()),
+      },
+    };
+  },
+
+  // Returns true if in test mode
+  isTestMode: isTestMode,
+
+  // Normalizes a file path to always use forward slashes
+  normalizeFilePath: function (filePath) {
+    return filePath.replace(/\\/g, "/");
+  },
 };
 
 // ---------------------------------------------------
@@ -417,7 +452,7 @@ function str(strings, ...keys) {
 
 // Loops through a directory with a callback function
 function handleDir(dirName, filesOnly, fileTypes, levelsToParse, startAtLevel, parseLevel, callback) {
-  const contents = fs.readdirSync(dirName, "utf8", true);
+  const contents = fs.readdirSync(dirName, "utf8", true).sort();
   contents.forEach(content => {
     const contentPath = path.resolve(dirName, content);
     const isFile = fs.statSync(contentPath).isFile();
@@ -563,6 +598,11 @@ function outputCmd(cmd, cwd, args) {
   }
 }
 
+// Returns true if in test mode (cli tests send env vars, menu tests override this method)
+function isTestMode() {
+  return !!process.env.TEST_OVERRIDES;
+}
+
 // Utility function to differenciate between debug logging and real logging
 function debug(input) {
   console.log(input);