Merge pull request #15 from purkhusid/bazel-options

Add bazel options

Author: tinder-maxwellelliott

src/main/java/com/bazel-diff/BazelClient.java

@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.Arrays;
 
 interface BazelClient {
     List<BazelTarget> queryAllTargets() throws IOException;
@@ -23,10 +24,14 @@ interface BazelClient {
 class BazelClientImpl implements BazelClient {
     private Path workingDirectory;
     private Path bazelPath;
+    private List<String> startupOptions;
+    private List<String> commandOptions;
 
-    BazelClientImpl(Path workingDirectory, Path bazelPath) {
+    BazelClientImpl(Path workingDirectory, Path bazelPath, String startupOptions, String commandOptions) {
         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>();
     }
 
     @Override
@@ -94,15 +99,20 @@ public Set<BazelSourceFileTarget> convertFilepathsToSourceTargets(Set<Path> file
     }
 
     private List<Build.Target> performBazelQuery(String query) throws IOException {
-        ProcessBuilder pb = new ProcessBuilder(bazelPath.toString(),
-                "query",
-                query,
-                "--output",
-                "streamed_proto",
-                "--order_output=no",
-                "--show_progress=false",
-                "--show_loading_progress=false"
-        ).directory(workingDirectory.toFile());
+        List<String> cmd = new ArrayList<String>();
+        
+        cmd.add((bazelPath.toString()));
+        cmd.addAll(this.startupOptions);
+        cmd.add("query");
+        cmd.add("--output");
+        cmd.add("streamed_proto");
+        cmd.add("--order_output=no");
+        cmd.add("--show_progress=false");
+        cmd.add("--show_loading_progress=false");
+        cmd.addAll(this.commandOptions);
+        cmd.add(query);
+
+        ProcessBuilder pb = new ProcessBuilder(cmd).directory(workingDirectory.toFile());
         Process process = pb.start();
         ArrayList<Build.Target> targets = new ArrayList<>();
         while (true) {

src/main/java/com/bazel-diff/main.java

@@ -86,7 +86,7 @@ class GenerateHashes implements Callable<Integer> {
     @Override
     public Integer call() {
         GitClient gitClient = new GitClientImpl(parent.workspacePath);
-        BazelClient bazelClient = new BazelClientImpl(parent.workspacePath, parent.bazelPath);
+        BazelClient bazelClient = new BazelClientImpl(parent.workspacePath, parent.bazelPath, parent.bazelStartupOptions, parent.bazelCommandOptions);
         TargetHashingClient hashingClient = new TargetHashingClientImpl(bazelClient);
         try {
             gitClient.ensureAllChangesAreCommitted();
@@ -142,6 +142,13 @@ class BazelDiff implements Callable<Integer> {
     @Option(names = {"-t", "--tests"}, scope = ScopeType.LOCAL, description = "Return only targets of kind 'test')")
     boolean testTargets;
 
+    @Option(names = {"-so", "--bazelStartupOptions"}, description = "Additional space separated Bazel client startup options used when invoking Bazel", scope = ScopeType.INHERIT)
+    String bazelStartupOptions;
+
+    @Option(names = {"-co", "--bazelCommandOptions"}, description = "Additional space separated Bazel command options used when invoking Bazel", scope = ScopeType.INHERIT)
+    String bazelCommandOptions;
+
+    @Override
     public Integer call() throws IOException {
         if (startingHashesJSONPath == null || !startingHashesJSONPath.canRead()) {
             System.out.println("startingHashesJSONPath does not exist! Exiting");
@@ -152,7 +159,7 @@ public Integer call() throws IOException {
             return ExitCode.USAGE;
         }
         GitClient gitClient = new GitClientImpl(workspacePath);
-        BazelClient bazelClient = new BazelClientImpl(workspacePath, bazelPath);
+        BazelClient bazelClient = new BazelClientImpl(workspacePath, bazelPath, bazelStartupOptions, bazelCommandOptions);
         TargetHashingClient hashingClient = new TargetHashingClientImpl(bazelClient);
         try {
             gitClient.ensureAllChangesAreCommitted();