fix timeComponents logic and add zip breakup

Author: Shashikant Kadam

bin/commands/runs.js

@@ -81,15 +81,17 @@ module.exports = function run(args) {
 
       markBlockEnd('preArchiveSteps');
       // Archive the spec files
-      markBlockStart('archive');
+      markBlockStart('zip');
+      markBlockStart('zip.archive');
       return archiver.archive(bsConfig.run_settings, config.fileName, args.exclude).then(function (data) {
 
-        markBlockEnd('archive');
+        markBlockEnd('zip.archive');
         // Uploaded zip file
-        markBlockStart('zipUpload');
+        markBlockStart('zip.zipUpload');
         return zipUploader.zipUpload(bsConfig, config.fileName).then(async function (zip) {
 
-          markBlockEnd('zipUpload');
+          markBlockEnd('zip.zipUpload');
+          markBlockEnd('zip');
           // Create build
 
           //setup Local Testing

bin/helpers/timeComponents.js

@@ -46,7 +46,11 @@ const convertDotToNestedObject = (dotNotationObject) => {
       }
       currentKey = currentKey[dotKeys[i]];
     }
-    currentKey[dotKeys[dotKeys.length - 1]] = dotNotationObject[key];
+    if (isUndefined(currentKey[dotKeys[dotKeys.length - 1]]) || Number.isInteger(currentKey[dotKeys[dotKeys.length - 1]])) {
+      currentKey[dotKeys[dotKeys.length - 1]] = dotNotationObject[key];
+    } else {
+      currentKey[dotKeys[dotKeys.length - 1]].total = dotNotationObject[key];
+    }
   });
 
   return nestedObject;

test/unit/bin/helpers/timeComponents.js

@@ -103,7 +103,8 @@ describe('timeComponents', () => {
       {'block1.block2.block3.block4.block5': 50},
       {block1:10,'block2.block3':20},
       {block1:10,'block2.block3':30,'block2.block4':40},
-      {'block1.block2':10,'block2':20,'block1.block2.block3':30,'block2.block3':30,block4:40}
+      {'block1.block2':10,'block2':20,'block1.block2.block3':30,'block2.block3':30,block4:40},
+      {'block1.block2':10, 'block1.block3':20, 'block1':20}
     ];
     let outputs = [
       {},
@@ -114,7 +115,8 @@ describe('timeComponents', () => {
       {block1:{block2:{block3:{block4:{block5:50}}}}},
       {block1:10,block2:{block3:20}},
       {block1:10, block2:{block3:30,block4:40}},
-      {block1:{block2:{total:10,block3:30}},block2:{total:20,block3:30},block4:40}
+      {block1:{block2:{total:10,block3:30}},block2:{total:20,block3:30},block4:40},
+      {block1:{block2:10,block3:20,total:20}}
     ];
 
     it('should convert dotted object to nested object', () => {