Merge pull request #41 from Tinder/update_example

Fix example script

Author: tinder-maxwellelliott

bazel-diff-example.sh

@@ -15,7 +15,12 @@ final_hashes_json="/tmp/final_hashes.json"
 impacted_targets_path="/tmp/impacted_targets.txt"
 impacted_test_targets_path="/tmp/impacted_test_targets.txt"
 
-$bazel_path run :bazel-diff -- modified-filepaths $previous_revision $final_revision -w $workspace_path -b $bazel_path $modified_filepaths_output
+shared_flags=""
+
+# Uncomment the line below to see debug information
+# shared_flags="--config=verbose"
+
+$bazel_path run :bazel-diff $shared_flags -- modified-filepaths $previous_revision $final_revision -w $workspace_path -b $bazel_path $modified_filepaths_output
 
 IFS=$'\n' read -d '' -r -a modified_filepaths < $modified_filepaths_output
 formatted_filepaths=$(IFS=$'\n'; echo "${modified_filepaths[*]}")
@@ -26,18 +31,18 @@ echo ""
 git -C $workspace_path checkout $previous_revision --quiet
 
 echo "Generating Hashes for Revision '$previous_revision'"
-$bazel_path run :bazel-diff -- generate-hashes -w $workspace_path -b $bazel_path $starting_hashes_json
+$bazel_path run :bazel-diff $shared_flags -- generate-hashes -w $workspace_path -b $bazel_path $starting_hashes_json
 
 git -C $workspace_path checkout - --quiet
 
 echo "Generating Hashes for Revision '$final_revision'"
-$bazel_path run :bazel-diff -- generate-hashes -w $workspace_path -b $bazel_path -m $modified_filepaths_output $final_hashes_json
+$bazel_path run :bazel-diff $shared_flags -- generate-hashes -w $workspace_path -b $bazel_path -m $modified_filepaths_output $final_hashes_json
 
 echo "Determining Impacted Targets"
-$bazel_path run :bazel-diff -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_targets_path
+$bazel_path run :bazel-diff $shared_flags -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_targets_path
 
 echo "Determining Impacted Test Targets"
-$bazel_path run :bazel-diff -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_test_targets_path -t
+$bazel_path run :bazel-diff $shared_flags -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_test_targets_path --avoid-query "//... except tests(//...)"
 
 IFS=$'\n' read -d '' -r -a impacted_targets < $impacted_targets_path
 formatted_impacted_targets=$(IFS=$'\n'; echo "${impacted_targets[*]}")

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

@@ -47,19 +47,19 @@ public List<BazelTarget> queryAllTargets() throws IOException {
 
     @Override
     public Set<String> queryForImpactedTargets(Set<String> impactedTargets, String avoidQuery) throws IOException {
-        Set<String> impactedTestTargets = new HashSet<>();
+        Set<String> impactedTargetNames = new HashSet<>();
         String targetQuery = impactedTargets.stream().collect(Collectors.joining(" + "));
         String query = String.format("rdeps(//..., %s)", targetQuery);
         if (avoidQuery != null) {
-            query = String.format("(%s) except %s", query, avoidQuery);
+            query = String.format("(%s) except (%s)", query, avoidQuery);
         }
         List<Build.Target> targets = performBazelQuery(query);
         for (Build.Target target : targets) {
             if (target.hasRule()) {
-                impactedTestTargets.add(target.getRule().getName());
+                impactedTargetNames.add(target.getRule().getName());
             }
         }
-        return impactedTestTargets;
+        return impactedTargetNames;
     }
 
     @Override
@@ -70,7 +70,7 @@ public Set<BazelSourceFileTarget> convertFilepathsToSourceTargets(Set<Path> file
                     .stream()
                     .map(path -> path.toString())
                     .collect(Collectors.joining(" + "));
-            List<Build.Target> targets = performBazelQuery(String.format("'%s'", targetQuery));
+            List<Build.Target> targets = performBazelQuery(targetQuery);
             for (Build.Target target : targets) {
                 Build.SourceFile sourceFile = target.getSourceFile();
                 if (sourceFile != null) {

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

@@ -58,7 +58,7 @@ public Set<String> getImpactedTargets(
         String avoidQuery)
     throws IOException {
         Set<String> impactedTargets = new HashSet<>();
-        for ( Map.Entry<String,String> entry : endHashes.entrySet()) {
+        for (Map.Entry<String,String> entry : endHashes.entrySet()) {
             String startHashValue = startHashes.get(entry.getKey());
             if (startHashValue == null || !startHashValue.equals(entry.getValue())) {
                 impactedTargets.add(entry.getKey());