align try-summary and shell fallback (#210)

Resolves #201.

adds a `-q` flag for quieter output from `try-summary` (not something try will produce); aligns try-summary and the built-in shell fallback output

Author: mgree

test/summary.sh

@@ -32,12 +32,15 @@ echo 'fail' >file_2.txt
 touch target
 
 try_example_dir=$(mktemp -d)
-"$TRY" -D "$try_example_dir" "touch file_1.txt; echo test >file_2.txt; rm file.txt.gz; rm target; mkdir target; mkdir new_dir" || exit 1
+"$TRY" -D "$try_example_dir" "touch file_1.txt; echo test >file_2.txt; rm file.txt.gz; rm target; mkdir target; mkdir -p new_dir/nested" || exit 1
 "$TRY" summary "$try_example_dir" >summary.out || exit 2
 
+cat summary.out
+
 # Check that the summary correctly identifies every change
-grep -qx -e "$PWD/file_1.txt (added)"         summary.out || exit 3
-grep -qx -e "$PWD/file_2.txt (modified)"      summary.out || exit 4
-grep -qx -e "$PWD/file.txt.gz (deleted)"      summary.out || exit 5
-grep -qx -e "$PWD/target (replaced with dir)" summary.out || exit 6
-grep -qx -e "$PWD/new_dir (created dir)"      summary.out || exit 7
+grep -qx -e "$PWD/file_1.txt (added)"           summary.out || exit 3
+grep -qx -e "$PWD/file_2.txt (modified)"        summary.out || exit 4
+grep -qx -e "$PWD/file.txt.gz (deleted)"        summary.out || exit 5
+grep -qx -e "$PWD/target (replaced with dir)"   summary.out || exit 6
+grep -qx -e "$PWD/new_dir (created dir)"        summary.out || exit 7
+grep -qx -e "$PWD/new_dir/nested (created dir)" summary.out || exit 8

utils/try-summary.c

@@ -28,17 +28,21 @@ void show_change(char *local_file, char *msg) {
 }
 
 void usage(int status) {
-  fprintf(stderr, "Usage: try-summary [-i IGNORE_FILE] SANDBOX_DIR\n");
+  fprintf(stderr, "Usage: try-summary [-q] [-i IGNORE_FILE] SANDBOX_DIR\n");
   exit(status);
 }
 
 int main(int argc, char *argv[]) {
+  int skip_new_directories = 0;
   int opt;
-  while ((opt = getopt(argc, argv, "hvi:")) != -1) {
+  while ((opt = getopt(argc, argv, "hvqi:")) != -1) {
     switch (opt) {
     case 'i':
       load_ignores("try-summary", optarg);
       break;
+    case 'q':
+      skip_new_directories = 1;
+      break;
     case 'v':
       fprintf(stderr, "try-summary version " TRY_VERSION "\n");
       exit(0);
@@ -114,7 +118,11 @@ int main(int argc, char *argv[]) {
         show_change(local_file, "created dir");
 
         // don't traverse children, we copied the whole thing
-        fts_set(fts, ent, FTS_SKIP);
+        // only done when -q flag is supplied
+        // try will not supply this flag by default
+        if (skip_new_directories) {
+          fts_set(fts, ent, FTS_SKIP);
+        }
         break;
       }