From ccf0c2fbf96477951f075e4578daae337e31feb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= Date: Wed, 3 Apr 2019 12:16:39 +0200 Subject: [PATCH] 7: Add --color option to CLI --- .../java/com/bartek/esa/cli/model/CliArgsOptions.java | 1 + .../java/com/bartek/esa/cli/parser/CliArgsParser.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/com/bartek/esa/cli/model/CliArgsOptions.java b/src/main/java/com/bartek/esa/cli/model/CliArgsOptions.java index ddcb5a9..1280bdb 100644 --- a/src/main/java/com/bartek/esa/cli/model/CliArgsOptions.java +++ b/src/main/java/com/bartek/esa/cli/model/CliArgsOptions.java @@ -14,6 +14,7 @@ public class CliArgsOptions { private String apkAuditFile; private Set excludes; private Set plugins; + private boolean color; public boolean isSourceAnalysis() { return sourceAnalysisDirectory != null; diff --git a/src/main/java/com/bartek/esa/cli/parser/CliArgsParser.java b/src/main/java/com/bartek/esa/cli/parser/CliArgsParser.java index dd23a4d..f98c873 100644 --- a/src/main/java/com/bartek/esa/cli/parser/CliArgsParser.java +++ b/src/main/java/com/bartek/esa/cli/parser/CliArgsParser.java @@ -15,6 +15,7 @@ public class CliArgsParser { private static final String EXCLUDE_OPT = "exclude"; private static final String HELP_OPT = "help"; private static final String PLUGINS_OPT = "plugins"; + private static final String COLOR_OPT = "color"; @Inject public CliArgsParser() {} @@ -47,6 +48,7 @@ public class CliArgsParser { .apkAuditFile(command.hasOption(APK_OPT) ? command.getOptionValue(APK_OPT) : null) .plugins(command.hasOption(PLUGINS_OPT) ? new HashSet<>(asList(command.getOptionValues(PLUGINS_OPT))) : emptySet()) .excludes(command.hasOption(EXCLUDE_OPT) ? new HashSet<>(asList(command.getOptionValues(EXCLUDE_OPT))) : emptySet()) + .color(command.hasOption(COLOR_OPT)) .build(); } @@ -62,6 +64,7 @@ public class CliArgsParser { options.addOption(exclude()); options.addOption(plugins()); options.addOption(help()); + options.addOption(color()); return options; } @@ -107,4 +110,11 @@ public class CliArgsParser { .desc("use only selected security checks for audit/analysis") .build(); } + + private Option color() { + return Option.builder() + .longOpt(COLOR_OPT) + .desc("enable colored output") + .build(); + } }