[#58] Ensure ANSI colors when running ami in Windows Command Prompt

petermr · Aug 1, 2020 · 188effc · 188effc
1 parent 11b702b
commit 188effc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/RELEASE-NOTES-NEXT.md b/RELEASE-NOTES-NEXT.md
@@ -3,5 +3,5 @@
 This is a template and should be replaced by actual release notes...
 
 ## Changes in this Release
-- First Change
+- [#58] Ensure ANSI colors when running `ami` in Windows Command Prompt.
 - Second Change
diff --git a/pom.xml b/pom.xml
@@ -81,7 +81,8 @@
         <log4j.version>2.13.3</log4j.version>
         <pdfbox2.version>2.0.19</pdfbox2.version>
         <pdfbox-tools.version>2.0.19</pdfbox-tools.version>
-        <picocli.version>4.4.0</picocli.version>
+        <picocli.version>4.5.0</picocli.version>
+        <picocli.jansi.graalvm.version>1.2.0</picocli.jansi.graalvm.version>
         <resteasy.client>4.5.3.Final</resteasy.client>
         <Saxon-HE.version>10.0</Saxon-HE.version>
         <selenium-java.version>4.0.0-alpha-5</selenium-java.version>
@@ -375,6 +376,11 @@
             <artifactId>picocli</artifactId>
             <version>${picocli.version}</version>
         </dependency>
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli-jansi-graalvm</artifactId>
+            <version>${picocli.jansi.graalvm.version}</version>
+        </dependency>
         <!--
         <dependency>
           <groupId>javax.media</groupId>

diff --git a/src/main/java/org/contentmine/ami/tools/AMI.java b/src/main/java/org/contentmine/ami/tools/AMI.java
@@ -23,6 +23,7 @@
 import picocli.CommandLine.ParameterException;
 import picocli.CommandLine.ParseResult;
 import picocli.CommandLine.Spec;
+import picocli.jansi.graalvm.AnsiConsole;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -119,7 +120,10 @@ public static void main(String args) {
 	}
 
 	public static void main(String... args) {
-		int exitCode = createCommandLine().execute(logArgs(args));
+		int exitCode;
+		try (AnsiConsole ansi = AnsiConsole.windowsInstall()) { // enable colors on Windows
+			exitCode = createCommandLine().execute(logArgs(args));
+		}
 		if (System.getProperty("ami.no.exit") == null) {
 			System.exit(exitCode);
 		}

diff --git a/src/main/java/org/contentmine/ami/tools/AMIDict.java b/src/main/java/org/contentmine/ami/tools/AMIDict.java
@@ -34,6 +34,7 @@
 import picocli.CommandLine.Option;
 import picocli.CommandLine.ParameterException;
 import picocli.CommandLine.Spec;
+import picocli.jansi.graalvm.AnsiConsole;
 
 @Command(name = "amidict",
 		description = {
@@ -81,7 +82,10 @@ public void run() {
 	}
 
 	public static void main(String... args) {
-		int exitCode = createCommandLine().execute(logArgs(args));
+		int exitCode;
+		try (AnsiConsole ansi = AnsiConsole.windowsInstall()) { // enable colors on Windows
+			exitCode = createCommandLine().execute(logArgs(args));
+		}
 		if (System.getProperty("ami.no.exit") == null) {
 			System.exit(exitCode);
 		}