Merge pull request #114 from fa93hws/verbose-flag

Author: tinder-maxwellelliott

README.md

@@ -139,8 +139,7 @@ workspace.
   -V, --version           Print version information and exit.
   -w, --workspacePath=<workspacePath>
                           Path to Bazel workspace directory.
-  --displayElapsedTime    This flag controls whether to print out elapsed time
-                          for bazel query and content hashing
+  -v, --verbose           Display query string, missing files and elapsed time
 ```
 
 ## Installing

src/main/java/com/bazel_diff/BazelClient.java

@@ -28,7 +28,6 @@ class BazelClientImpl implements BazelClient {
     private Path bazelPath;
     private Boolean verbose;
     private Boolean keepGoing;
-    private Boolean displayElapsedTime;
     private List<String> startupOptions;
     private List<String> commandOptions;
 
@@ -38,24 +37,22 @@ class BazelClientImpl implements BazelClient {
             String startupOptions,
             String commandOptions,
             Boolean verbose,
-            Boolean keepGoing,
-            Boolean displayElapsedTime
+            Boolean keepGoing
     ) {
         this.workingDirectory = workingDirectory.normalize();
         this.bazelPath = bazelPath;
         this.startupOptions = startupOptions != null ? Arrays.asList(startupOptions.split(" ")): new ArrayList<String>();
         this.commandOptions = commandOptions != null ? Arrays.asList(commandOptions.split(" ")): new ArrayList<String>();
         this.verbose = verbose;
         this.keepGoing = keepGoing;
-        this.displayElapsedTime = displayElapsedTime;
     }
 
     @Override
     public List<BazelTarget> queryAllTargets() throws IOException {
         Instant queryStartTime = Instant.now();
         List<Build.Target> targets = performBazelQuery("'//external:all-targets' + '//...:all-targets'");
         Instant queryEndTime = Instant.now();
-        if (displayElapsedTime) {
+        if (verbose) {
             long querySeconds = Duration.between(queryStartTime, queryEndTime).getSeconds();
             System.out.printf("BazelDiff: All targets queried in %d seconds%n", querySeconds);
         }
@@ -69,7 +66,7 @@ public Map<String, BazelSourceFileTarget> queryAllSourcefileTargets() throws IOE
         Instant queryEndTime = Instant.now();
         Map<String, BazelSourceFileTarget> sourceFileTargets = processBazelSourcefileTargets(targets, true);
         Instant contentHashEndTime = Instant.now();
-        if (displayElapsedTime) {
+        if (verbose) {
             long querySeconds = Duration.between(queryStartTime, queryEndTime).getSeconds();
             long contentHashSeconds = Duration.between(queryEndTime, contentHashEndTime).getSeconds();
             System.out.printf("BazelDiff: All source files queried in %d seconds%n", querySeconds);

src/main/java/com/bazel_diff/VersionProvider.java

@@ -5,7 +5,7 @@
 class VersionProvider implements IVersionProvider {
     public String[] getVersion() throws Exception {
         return new String[] {
-            "3.2.2"
+            "3.4.0"
         };
     }
 }

src/main/java/com/bazel_diff/main.java

@@ -35,9 +35,6 @@ class GenerateHashes implements Callable<Integer> {
     @Option(names = {"-s", "--seed-filepaths"}, description = "A text file containing a newline separated list of filepaths, each of these filepaths will be read and used as a seed for all targets.")
     File seedFilepaths;
 
-    @Option(names = {"--displayElapsedTime"}, description = "This flag controls whether to print out elapsed time for bazel query and content hashing")
-    boolean displayElapsedTime;
-
     @Parameters(index = "0", description = "The filepath to write the resulting JSON of dictionary target => SHA-256 values")
     File outputPath;
 
@@ -48,9 +45,8 @@ public Integer call() {
                 parent.bazelPath,
                 parent.bazelStartupOptions,
                 parent.bazelCommandOptions,
-                BazelDiff.isVerbose(),
-                parent.keepGoing,
-                displayElapsedTime);
+                parent.isVerbose(),
+                parent.keepGoing);
         TargetHashingClient hashingClient = new TargetHashingClientImpl(bazelClient, new FilesClientImp());
         try {
             Instant generateHashStartTime = Instant.now();
@@ -68,7 +64,7 @@ public Integer call() {
             myWriter.write(gson.toJson(hashes));
             myWriter.close();
             Instant generateHashEndTime = Instant.now();
-            if (displayElapsedTime) {
+            if (parent.isVerbose()) {
                 long generateHashSeconds = Duration.between(generateHashStartTime, generateHashEndTime).getSeconds();
                 System.out.printf("BazelDiff: Generate-hashes command finishes in %d seconds%n", generateHashSeconds);
             }
@@ -113,6 +109,9 @@ class BazelDiff implements Callable<Integer> {
     @Option(names = {"-k", "--keep_going"}, negatable = true, description = "This flag controls if `bazel query` will be executed with the `--keep_going` flag or not. Disabling this flag allows you to catch configuration issues in your Bazel graph, but may not work for some Bazel setups. Defaults to `true`", scope = ScopeType.INHERIT)
     Boolean keepGoing = true;
 
+    @Option(names = {"-v", "--verbose"}, description = "Display query string, missing files and elapsed time", scope = ScopeType.INHERIT)
+    Boolean verbose = false;
+
     @Override
     public Integer call() throws IOException {
         if (startingHashesJSONPath == null || !startingHashesJSONPath.canRead()) {
@@ -132,9 +131,8 @@ public Integer call() throws IOException {
                 bazelPath,
                 bazelStartupOptions,
                 bazelCommandOptions,
-                BazelDiff.isVerbose(),
-                keepGoing,
-                false
+                isVerbose(),
+                keepGoing
         );
         TargetHashingClient hashingClient = new TargetHashingClientImpl(bazelClient, new FilesClientImp());
         Gson gson = new Gson();
@@ -167,9 +165,9 @@ public Integer call() throws IOException {
         return ExitCode.OK;
     }
 
-    static Boolean isVerbose() {
+    Boolean isVerbose() {
         String verboseFlag = System.getProperty("VERBOSE", "false");
-        return verboseFlag.equals("true");
+        return verboseFlag.equals("true") || verbose;
     }
 
     public static void main(String[] args) {