Merge 6b80ddd into 89e338f

lib/command/report.js

@@ -43,6 +43,7 @@ Command.mix(ReportCommand, {
                 formatOption('--config <path-to-config>', 'the configuration file to use, defaults to .istanbul.yml'),
                 formatOption('--root <input-directory>', 'The input root directory for finding coverage files'),
                 formatOption('--dir <report-directory>', 'The output directory where files will be written. This defaults to ./coverage/'),
+                formatOption('--nested', 'Nest the report by directories'),
                 formatOption('--include <glob>', 'The glob pattern to select one or more coverage files, defaults to **/coverage*.json'),
                 formatOption('--verbose, -v', 'verbose mode')
             ].join('\n\n'));
@@ -67,6 +68,7 @@ Command.mix(ReportCommand, {
                 config: path,
                 root: path,
                 dir: path,
+                nested: Boolean,
                 include: String,
                 verbose: Boolean
             },
@@ -76,6 +78,7 @@ Command.mix(ReportCommand, {
             collector = new Collector(),
             config = configuration.loadFile(opts.config, {
                 verbose: opts.verbose,
+                nested: opts.nested,
                 reporting: {
                     dir: opts.dir
                 }

lib/report/clover.js

@@ -203,7 +203,7 @@ Report.mix(CloverReport, {
         return { file: 'clover.xml' };
     },
     writeReport: function (collector, sync) {
-        var summarizer = new TreeSummarizer(),
+        var summarizer = new TreeSummarizer(this.opts.nested),
             outputFile = path.join(this.dir, this.file),
             writer = this.opts.writer || new FileWriter(sync),
             projectRoot = this.projectRoot,

lib/report/cobertura.js

@@ -197,7 +197,7 @@ Report.mix(CoberturaReport, {
         return { file: 'cobertura-coverage.xml' };
     },
     writeReport: function (collector, sync) {
-        var summarizer = new TreeSummarizer(),
+        var summarizer = new TreeSummarizer(this.opts.nested),
             outputFile = path.join(this.dir, this.file),
             writer = this.opts.writer || new FileWriter(sync),
             projectRoot = this.projectRoot,

lib/report/html.js

@@ -534,7 +534,7 @@ Report.mix(HtmlReport, {
     writeReport: function (collector, sync) {
         var opts = this.opts,
             dir = opts.dir,
-            summarizer = new TreeSummarizer(),
+            summarizer = new TreeSummarizer(opts.nested),
             writer = opts.writer || new FileWriter(sync),
             that = this,
             tree,

lib/report/text.js

@@ -42,6 +42,7 @@ function TextReport(opts) {
     this.file = opts.file;
     this.summary = opts.summary;
     this.maxCols = opts.maxCols || 0;
+    this.nested = !!opts.nested;
     this.watermarks = opts.watermarks || defaults.watermarks();
 }
 
@@ -196,7 +197,7 @@ Report.mix(TextReport, {
         return { file: null, maxCols: 0 };
     },
     writeReport: function (collector /*, sync */) {
-        var summarizer = new TreeSummarizer(),
+        var summarizer = new TreeSummarizer(this.nested),
             tree,
             root,
             nameWidth,

lib/reporter.js

@@ -51,6 +51,7 @@ Reporter.prototype = {
             rptConfig = config.reporting.reportConfig()[fmt] || {};
         rptConfig.verbose = config.verbose;
         rptConfig.dir = this.dir;
+        rptConfig.nested = config.nested;
         rptConfig.watermarks = config.reporting.watermarks();
         try {
             this.reports[fmt] = Report.create(fmt, rptConfig);

lib/util/tree-summarizer.js

@@ -69,16 +69,17 @@ Node.prototype = {
     }
 };
 
-function TreeSummary(summaryMap, commonPrefix) {
+function TreeSummary(summaryMap, commonPrefix, nest) {
     this.prefix = commonPrefix;
-    this.convertToTree(summaryMap, commonPrefix);
+    this.nest = !!nest;
+    this.convertToTree(summaryMap, commonPrefix, nest);
 }
 
 TreeSummary.prototype = {
     getNode: function (shortName) {
         return this.map[shortName];
     },
-    convertToTree: function (summaryMap, arrayPrefix) {
+    convertToTree: function (summaryMap, arrayPrefix, nest) {
         var nodes = [],
             rootPath = arrayPrefix.join(SEP) + SEP,
             root = new Node(rootPath, 'dir'),
@@ -91,8 +92,9 @@ TreeSummary.prototype = {
         Object.keys(summaryMap).forEach(function (key) {
             var metrics = summaryMap[key],
                 node,
-                parentPath,
-                parent;
+                parent,
+                parentPath;
+
             node = new Node(key, 'file', metrics);
             seen[key] = node;
             nodes.push(node);
@@ -101,7 +103,29 @@ TreeSummary.prototype = {
                 parentPath = SEP + '__root__' + SEP;
             }
             parent = seen[parentPath];
-            if (!parent) {
+
+            if (nest) {
+                var parentsPaths = parentPath.split(SEP),
+                    prevParent,
+                    lastParent = root,
+                    fullPath = '',
+                    lastParentPath;
+
+                while (!!(lastParentPath = parentsPaths.shift())) {
+                    lastParentPath = lastParentPath + SEP;
+                    fullPath += lastParentPath;
+                    prevParent = lastParent;
+                    lastParent = seen[fullPath];
+                    if (!lastParent) {
+                        lastParent = new Node(lastParentPath, 'dir');
+                        prevParent.addChild(lastParent);
+                        seen[fullPath] = prevParent = lastParent;
+                    }
+                }
+                node.name = node.name.replace(fullPath, '');
+
+                parent = lastParent;
+            } else if (!parent) {
                 parent = new Node(parentPath, 'dir');
                 root.addChild(parent);
                 seen[parentPath] = parent;
@@ -140,23 +164,28 @@ TreeSummary.prototype = {
         if (node.name.charAt(0) === SEP) {
             node.name = node.name.substring(1);
         }
-        if (parent) {
-            if (parent.name !== '__root__' + SEP) {
-                node.relativeName = node.name.substring(parent.name.length);
+        if (this.nest) {
+            node.relativeName = node.name;
+        } else {
+            if (parent) {
+                if (parent.name !== '__root__' + SEP) {
+                    node.relativeName = node.name.substring(parent.name.length);
+                } else {
+                    node.relativeName = node.name;
+                }
             } else {
-                node.relativeName = node.name;
+                node.relativeName = node.name.substring(prefix.length);
             }
-        } else {
-            node.relativeName = node.name.substring(prefix.length);
         }
+
         node.children.forEach(function (child) {
             that.fixupNodes(child, prefix, node);
         });
     },
     calculateMetrics: function (entry) {
         var that = this,
             fileChildren;
-        if (entry.kind !== 'dir') {return; }
+        if (entry.kind !== 'dir') { return; }
         entry.children.forEach(function (child) {
             that.calculateMetrics(child);
         });
@@ -196,8 +225,9 @@ TreeSummary.prototype = {
     }
 };
 
-function TreeSummarizer() {
+function TreeSummarizer(nest) {
     this.summaryMap = {};
+    this.nest = !!nest;
 }
 
 TreeSummarizer.prototype = {
@@ -206,7 +236,7 @@ TreeSummarizer.prototype = {
     },
     getTreeSummary: function () {
         var commonArrayPrefix = findCommonArrayPrefix(Object.keys(this.summaryMap));
-        return new TreeSummary(this.summaryMap, commonArrayPrefix);
+        return new TreeSummary(this.summaryMap, commonArrayPrefix, this.nest);
     }
 };