Merge pull request #219 from bryan-m-hughes/timob-14132-1_0_X

[TIMOB-14132] Fleshed out some report wording/formatting
appcelerator-archive · Jun 6, 2013 · 47ff17f · 47ff17f
2 parents fb8244c + 6e4ccf8
commit 47ff17f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/commands/analyze.js b/commands/analyze.js
@@ -308,16 +308,16 @@ function runFromCLIParameters(logger, config, cli) {
 
 	// Parse the config options
 	options = {};
-	options.invokeMethods = !argv['no-method-invokation'];
-	options.evaluateLoops = !argv['no-loop-evaluation'];
+	options.invokeMethods = argv['method-invokation'] !== false;
+	options.evaluateLoops = argv['loop-evaluation'] !== false;
 	options.maxLoopIterations = parseInt(argv['max-loop-iterations'], 10);
 	options.maxRecursionLimit = parseInt(argv['max-recursion-limit'], 10);
 	options.cycleDetectionStackSize = parseInt(argv['cycle-detection-stack-size'], 10);
 	options.maxCycles = parseInt(argv['max-cycles'], 10);
-	options.logConsoleCalls = !argv['no-console-passthrough'];
+	options.logConsoleCalls = argv['console-passthrough'] !== false;
 	options.executionTimeLimit = parseInt(argv['execution-time-limit'], 10);
 	options.exactMode = argv['exact-mode'];
-	options.nativeExceptionRecovery = !argv['no-native-exception-recovery'];
+	options.nativeExceptionRecovery = argv['native-exception-recovery'] !== false;
 	options.processUnvisitedCode = argv['process-unvisited-code'];
 	options.resultsPath = argv['results-dir'];
 

diff --git a/lib/CodeProcessor.js b/lib/CodeProcessor.js
@@ -1011,7 +1011,7 @@ function generateResultsPages(outputFormat, resultsDirectory, theme, callback) {
 	numErrors = results.errors.length;
 	numWarnings = results.warnings.length;
 	if (numErrors || numWarnings) {
-		errorsAndWarnings = '';
+		errorsAndWarnings = '\n';
 		if (numErrors) {
 			errorsAndWarnings += pluralize('%s error ', '%s errors ', numErrors);
 			if (numWarnings) {
@@ -1064,7 +1064,7 @@ function generateResultsPages(outputFormat, resultsDirectory, theme, callback) {
 			'******************************************\n\n';
 
 		resultsToLog += 'Analysis completed in ' + data.elapsedTime + ' seconds at ' + data.time + ' on ' + data.date +
-			(data.errorsAndWarnings ? '\n' + data.errorsAndWarnings : '') + '\n';
+			(data.errorsAndWarnings ? data.errorsAndWarnings : '') + '\n';
 		if (elevatedPluginList && elevatedPluginList.length) {
 			for (i = 0, len = elevatedPluginList.length; i < len; i++) {
 				resultsToLog += elevatedPluginList[i].name + ': ' + elevatedPluginList[i].overview + '\n';

diff --git a/templates/summary.html b/templates/summary.html
@@ -18,8 +18,7 @@
 </div>
 <div class="container-fluid">
 	<h3>Overview</h3>
-	<pre>Analysis completed in {{elapsedTime}} seconds at {{time}} on {{date}}
-{{errorsAndWarnings}}{{#elevatedPlugins}}
+	<pre>Analysis completed in {{elapsedTime}} seconds at {{time}} on {{date}}{{errorsAndWarnings}}{{#elevatedPlugins}}
 {{name}}: {{overview}}{{/elevatedPlugins}}</pre>
 <h3>Options</h3>
 	<table class="table table-striped table-bordered">