Merge pull request #23 from xgeek-net/fix/gitdeploy

Fixed bugs

Author: xgeek-net

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pipeline",
   "description": "Be less busy, less mistake in Salesforce metadata deploy",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "private": false,
   "main": "src/main.js",
   "dependencies": {
@@ -16,7 +16,7 @@
     "github-api": "^3.2.0",
     "jsforce": "^1.9.1",
     "moment": "^2.24.0",
-    "nodegit": "^0.24.3",
+    "nodegit": "^0.25.0",
     "querystring": "^0.2.0",
     "raven": "^2.6.4",
     "request": "^2.88.0",

src/class/GitApi.js

@@ -288,7 +288,9 @@ class GitApi {
         let fileName = patchPath;
         if(rootDir) fileName = fileName.replace(path.join(rootDir, '/'), '');
         let filePath = metadata.makeDir(self.pipeline.id, fileName);
-        if(utils.isBlank(fileName) || !fileName.startsWith('src/') || self.cacheFiles.indexOf(fileName) >= 0) {
+        if(utils.isBlank(fileName) || 
+          (!fileName.startsWith('src/') && fileName != 'src/package.xml') || 
+          self.cacheFiles.indexOf(fileName) >= 0) {
           self.logger('        > ' + patchPath + ' (Ignored)');
           return callback(null);
         }

src/class/GithubApi.js

@@ -342,14 +342,17 @@ class GithubApi {
             fileNameOnly = utils.getFileName(fileNameOnly);
 
             // ignore blank file, file out of src folder, cached file
-            if(utils.isBlank(fileNameOnly) || utils.isBlank(filedir) || !filedir.startsWith('src/') || self.cacheFiles.indexOf(fileName) >= 0) {
+            if(utils.isBlank(fileNameOnly) || utils.isBlank(filedir) || 
+              (!filedir.startsWith('src/') && fileName != 'src/package.xml') || 
+              self.cacheFiles.indexOf(fileName) >= 0) {
               self.logger('        > ' + file.path + ' (Ignored)');
               return callback(null);
             }
             self.cacheFiles.push(fileName);
-
             const localPath = metadata.makeDir(self.pipeline.id, fileName)
-            const fileContentUri = path.join('repos', repos.__fullname, 'contents', file.path);
+            const filePath = file.path.replace(new RegExp(fileNameOnly,'g'), encodeURIComponent(fileNameOnly));
+            const fileContentUri = path.join('repos', repos.__fullname, 'contents', filePath);
+
             self.fileApiCall(fileContentUri, { ref : branchName })
             .then(function(response) {
               if(utils.isBlank(response.status) || response.status != 200) {
@@ -429,7 +432,9 @@ class GithubApi {
         let filedir = path.dirname(fileName);
         fileNameOnly = utils.getFileName(fileNameOnly);
         // ignore blank file, file out of src folder, cached file
-        if(utils.isBlank(fileNameOnly) || utils.isBlank(filedir) || !filedir.startsWith('src/') || self.cacheFiles.indexOf(fileName) >= 0) {
+        if(utils.isBlank(fileNameOnly) || utils.isBlank(filedir) || 
+          (!filedir.startsWith('src/') && fileName != 'src/package.xml') || 
+          self.cacheFiles.indexOf(fileName) >= 0) {
           self.logger('        > ' + file.filename + ' (Ignored)');
           return callback(null);
         }

src/class/Metadata.js

@@ -99,7 +99,7 @@ class Metadata {
   createPackageXml(targetPath, opts) {
     opts = opts || {};
     const metaPath = path.join(targetPath, 'metadata', 'src');
-    if(fse.pathExistsSync(metaPath + '/package.xml')) {
+    if(fse.pathExistsSync(path.join(metaPath, 'package.xml'))) {
       return true;
     }
     return sgp({

src/class/Pipeline.js

@@ -428,6 +428,7 @@ class Pipeline {
 
     const getStatus = function(cmp) {
       let status = 'No Change';
+      if(!cmp) return status;
       if(cmp.changed == 'true') status = 'Updated';
       if(cmp.created == 'true') status = 'Created';
       if(cmp.deleted == 'true') status = 'Deleted';
@@ -452,7 +453,7 @@ class Pipeline {
         if(utils.isBlank(componentType)) continue;
         if(!componentLables.hasOwnProperty(componentType)) continue;
         deployResult.details.componentFailures[i]['componentTypeLabel'] = componentLables[componentType];
-        deployResult.details.componentSuccesses[i]['status'] = getStatus(deployResult.details.componentSuccesses[i]);
+        deployResult.details.componentFailures[i]['status'] = getStatus(deployResult.details.componentFailures[i]);
       }
     }
     fs.writeFileSync(filePath, JSON.stringify(deployResult));

src/class/SfdcApi.js

@@ -403,6 +403,12 @@ class SfdcApi {
         case 'Role' :
           // Needs requestMetaLabel
           break;
+        case 'Profile' :
+          resetFunction = function(meta) {
+            meta['customName'] = decodeURIComponent(meta.fullName); 
+            return meta;
+          };
+          break;
         default : 
           break;
       }
@@ -536,6 +542,9 @@ class SfdcApi {
                 }
                 if(child.typeName == 'WorkflowAlert' && cMeta.description) cMeta['customName'] = cMeta.description;
                 if(child.typeName == 'WorkflowFieldUpdate' && cMeta.name) cMeta['customName'] = cMeta.name;
+                // URI Decode Japanese 
+                if(child.typeName == 'WorkflowRule' && !cMeta.customName) cMeta['customName'] = decodeURIComponent(cMeta.fullName);
+                if(child.typeName == 'BusinessProcess' && !cMeta.customName) cMeta['customName'] = decodeURIComponent(cMeta.fullName);
 
                 metadataMap[child.typeName].push(cMeta);
               }