crabatool 1.0.200 → 1.0.210

package/.eslintrc.json

@@ -77,6 +77,9 @@
         "crabaVersion": "readonly",
         "crabaDate": "readonly",
         "StringUtils": "readonly",
-        "convertGridData":"readonly"
+        "convertGridData": "readonly",
+        "__pathMapName": "readonly",
+        "CrabaLanguage": "readonly",
+        "NGPLanguage": "readonly"
     }
 }

package/index.js

@@ -28,6 +28,13 @@ function checkFast(args) {
     return true;
   }
 
+  // convert version
+  if (!config.version || config.version == 'NewCraba') {
+    config.version = 'master';
+  }
+  else if (config.version == 'NewCraba_temp') {
+    config.version = 'master_temp';
+  }
   if (process.env.REMOTE_BUILD == 'no') {
     config.version += '_temp';
   }

package/lib/utils.js

@@ -293,15 +293,18 @@ class Utils {
     }
 
     // 递归创建目录
-    mkdirsSync(dirname) {
-        var basename = path.basename(dirname);
-        if (basename.indexOf('.') > 0) {
-            dirname = path.dirname(dirname);
+    mkdirsSync(dirname, isFolder) {
+        this.debug(dirname);
+        if (!isFolder) {
+            var basename = path.basename(dirname);
+            if (basename.indexOf('.') > 0) {
+                dirname = path.dirname(dirname);
+            }
         }
         if (fs.existsSync(dirname)) {
             return true;
         }
-        if (utils.mkdirsSync(path.dirname(dirname))) {
+        if (utils.mkdirsSync(path.dirname(dirname), true)) {
             fs.mkdirSync(dirname);
             return true;
         }
@@ -431,7 +434,9 @@ class Utils {
             });
         }
 
-        if (!fileList) fileList = [];
+        if (!fileList) {
+            fileList = [];
+        }
 
         if (!fs.existsSync(source)) {
             return fileList;
@@ -440,7 +445,8 @@ class Utils {
         var files = fs.readdirSync(source);
         files.forEach(function(fileName) {
             var filePath = utils.join(source, fileName);
-            if (options.ignores && options.ignores.includes(filePath)) {
+            // 包含路径或文件名，都忽略掉
+            if (options.ignores && (options.ignores.includes(filePath) || options.ignores.includes(fileName))) {
                 return;
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.200",
+  "version": "1.0.210",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/checkjs.js

@@ -271,11 +271,11 @@ module.exports.start = async function() {
     detail.push(`${index + 1}. ${fileName}`);
 
     var infoList = errDatas[fileName];
-    detail.push("| 异常字符 | 行号 | 列号 | 说明 |");
+    detail.push("| 类型 | 行号 | 列号 | 说明 |");
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法异常', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
+      sonar.issues.push(getSonarEntity('语法异常', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
     });
   });
   //}
@@ -288,11 +288,11 @@ module.exports.start = async function() {
     detail.push(`${index + 1}. ${fileName}`);
 
     var infoList = warnDatas[fileName];
-    detail.push("| 警告字符 | 行号 | 列号 | 说明 |");
+    detail.push("| 类型 | 行号 | 列号 | 说明 |");
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法警告', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
+      sonar.issues.push(getSonarEntity('语法警告', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
     });
   });
   //}
@@ -306,11 +306,11 @@ module.exports.start = async function() {
     detail.push(`${index + 1}. ${fileName}`);
 
     var infoList = infoDatas[fileName];
-    detail.push("| 提示字符 | 行号 | 列号 | 说明 |");
+    detail.push("| 类型 | 行号 | 列号 | 说明 |");
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法提示', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
+      sonar.issues.push(getSonarEntity('语法提示', modName, item.char.trim(), item.msg, fileName, item.line, item.column, item.endLine));
     });
   });
   //}
@@ -321,7 +321,7 @@ module.exports.start = async function() {
     notUtf8List.forEach((s, index) => {
       detail.push(`${index + 1}. ${s}`);
 
-      sonar.issues.push(getSonarEntity('非utf8', modName, '', s, -1, -1));
+      sonar.issues.push(getSonarEntity('非utf8', modName, '', '', s, -1, -1, -1));
     });
   }
 
@@ -331,7 +331,7 @@ module.exports.start = async function() {
     bigList.forEach((s, index) => {
       detail.push(`${index + 1}. ${s}`);
       var arr = s.split(' ');
-      sonar.issues.push(getSonarEntity(`超${fileSize}kb文件`, modName, arr[1], arr[0], -1, -1));
+      sonar.issues.push(getSonarEntity(`超${fileSize}kb文件`, modName, arr[1], '', arr[0], -1, -1));
     });
   }
 
@@ -460,10 +460,10 @@ function getMathReuslts(content, nreg, filterFun) {
   return list;
 }
 
-function getSonarEntity(type, modName, message, filePath, line, column, endLine) {
+function getSonarEntity(type, modName, ruleId, message, filePath, line, column, endLine) {
   var entity = {
     "engineId": modName,
-    "ruleId": "no-undef",   // 规则名称，例如不使用const
+    "ruleId": ruleId,   // 规则名称，例如不使用const
     "primaryLocation": {
       "message": message,   // 提示信息
       "filePath": filePath, // 所在文件
@@ -480,7 +480,10 @@ function getSonarEntity(type, modName, message, filePath, line, column, endLine)
 }
 
 function getReportUrl(id, anchor) {
-  if (!config.reportHost) return '';
+  if (!config.reportHost) {
+    return '';
+  }
+
   var href = config.reportHost + "/index.html#%2FPages%2FReport%2FJsReport.gspx?id=" + id;
   if (anchor) {
     href += "&toc=anchor-" + anchor;
@@ -538,7 +541,10 @@ function postWebhooks(id, reportUrl, webhookList) {
     return;
   }
 
-  if (reportUrl) webhookList.push(`[报告详情](${reportUrl})`);
+  if (reportUrl) {
+    webhookList.push(`[报告详情](${reportUrl})`);
+    webhookList.push("[导出excel](" + config.reportHost + "/apis/downloadReport?id=" + id + ")");
+  }
   var content = webhookList.join('  \n');// 推送到钉钉只推送详情
 
   var data = {

package/tool/crabapublish.js

@@ -74,6 +74,7 @@ function doUploadCraba(version) {
     data: formData,
     headers: {
       ...headers,
+      craba: 1,
       version: version,
       token: 'wssf2021' // 临时授权码
     }
@@ -99,7 +100,14 @@ function doAutoTest() {
 
   utils.postWeebhooks(msg + '\r\n开始触发自动化测试');
 
-  var url = 'http://jci.ca.com/job/craba-uitest/buildWithParameters?token=remoteBuild&remoteBuild=yes&version';
+  var version = config.version;
+  if (version.indexOf('_temp')) {
+    version = version.replace('_temp', '');
+  }
+  if (version == 'master') {
+    version = 'NewCraba';
+  }
+  var url = 'http://jci.ca.com/job/craba-uitest/buildWithParameters?token=remoteBuild&remoteBuild=yes&version=' + version;
   axios({
     method: 'GET',
     url: url

package/tool/merge/mergeTool.js

@@ -239,7 +239,7 @@ function compressFile(filePath, options, filePath2) {
 function copyFileToCache1(filePath, stats) {
   var cachePath = getCachePath1(filePath);
   utils.debug("拷贝到缓存1:" + cachePath);
-  utils.mkdirsSync(cachePath)
+  utils.mkdirsSync(cachePath);
 
   fs.copyFileSync(filePath, cachePath);
   fs.utimesSync(cachePath, stats.atime, stats.mtime); // 必须同步文件时间