Clean up displaying errors when fetching build scans

Previously, if a build scan failed to fetch, then the error would be printed on
the same line as the "Fetching build scan data" line, which was messy and
harder to read. Now, error messages are gaurenteed to be on their own newline.

Before:

```
Fetching build scan dataERROR: Failed to authenticate while attempting to fetch build scan https://example.com/s/jfg3vjxcgr3t2.
ERROR: Failed to authenticate while attempting to fetch build scan https://example.com/s/wn43gciypu5j4.
, done.
```

After:

```
Fetching build scan data
ERROR: Failed to authenticate while attempting to fetch build scan https://example.com/s/sn6yisoolyoeu.
ERROR: Failed to authenticate while attempting to fetch build scan https://example.com/s/v4q6wqny4rvvm.
done.
```

Author: jthurne

components/fetch-build-scan-data-cmdline-tool/src/main/java/com/gradle/enterprise/cli/ConsoleLogger.java

@@ -9,6 +9,8 @@ public class ConsoleLogger {
     private final CommandLine.Help.ColorScheme colorScheme;
     private final boolean debugEnabled;
 
+    private boolean lastStatementIncludedNewline = true;
+
     public ConsoleLogger(PrintStream out, CommandLine.Help.ColorScheme colorScheme, boolean debugEnabled) {
         this.out = out;
         this.colorScheme = colorScheme;
@@ -17,14 +19,16 @@ public ConsoleLogger(PrintStream out, CommandLine.Help.ColorScheme colorScheme,
 
     public void info(String message) {
         out.println(message);
+        lastStatementIncludedNewline = true;
     }
 
     public void infoNoNewline(String message) {
         out.print(message);
+        lastStatementIncludedNewline = false;
     }
 
     public void info(String message, Object... args) {
-        out.printf(message, args);
+        info(String.format(message + "%n", args));
     }
 
     public void debug(String message, Object... args) {
@@ -34,6 +38,7 @@ public void debug(String message, Object... args) {
     public void debug(String message) {
         if (debugEnabled) {
             out.println(colorScheme.text("@|faint " + message + "|@"));
+            lastStatementIncludedNewline = true;
         }
     }
 
@@ -46,7 +51,11 @@ public void error(String message, Object... args) {
     }
 
     public void error(String message) {
+        if (!lastStatementIncludedNewline) {
+            out.println();
+        }
         out.println(colorScheme.errorText(message));
+        lastStatementIncludedNewline = true;
     }
 
     public void error(Throwable t) {

components/fetch-build-scan-data-cmdline-tool/src/main/java/com/gradle/enterprise/cli/FetchBuildValidationDataCommand.java

@@ -54,6 +54,8 @@ public static class ExitCode {
     @Option(names = {"--brief-logging"}, description = "Only log a short message about fetching build scan data and when it completes.")
     private boolean briefLogging;
 
+    private boolean someScansFailedToFetch = false;
+
     @Override
     public Integer call() throws Exception {
         // Use System.err for logging since we're going to write out the CSV to System.out
@@ -108,6 +110,7 @@ private BuildValidationData fetchBuildScanData(int index, URL buildScanUrl, Cust
     }
 
     private void printException(RuntimeException e) {
+        someScansFailedToFetch = true;
         if (logger.isDebugEnabled()) {
             logger.error(e);
             if (e instanceof FailedRequestException) {
@@ -174,7 +177,7 @@ private void logStartFetchingBuildScans() {
 
     private void logFinishedFetchingBuildScans() {
         if (briefLogging) {
-            if (logger.isDebugEnabled()) {
+            if (logger.isDebugEnabled() || someScansFailedToFetch) {
                 logger.info("done.");
             } else {
                 logger.info(", done.");
@@ -184,7 +187,7 @@ private void logFinishedFetchingBuildScans() {
 
     private void logFinishedFetchingBuildScan() {
         if (!briefLogging) {
-            if (logger.isDebugEnabled()) {
+            if (logger.isDebugEnabled() || someScansFailedToFetch) {
                 logger.info("done.");
             } else {
                 logger.info(", done.");
@@ -223,7 +226,7 @@ private void logFetchResults(List<BuildValidationData> buildValidationData, Cust
 
     private void logFetchResultFor(int index, String property, String customValueKey, boolean found) {
         String ordinal = buildScanIndexToOrdinal(index);
-        logger.info("Looking up %s from custom value with name '%s' from the %s build scan, %s.%n", property, customValueKey, ordinal, found ? "found": "not found");
+        logger.info("Looking up %s from custom value with name '%s' from the %s build scan, %s.", property, customValueKey, ordinal, found ? "found": "not found");
     }
 
     public void printHeader() {