Allow reformatting of multiple files

When using -i or --test.

See google#210.

Author: sbarzowski

cmd/jsonnet.cpp

@@ -110,7 +110,7 @@ void usage(std::ostream &o)
     o << "  -h / --help             This message\n";
     o << "  -e / --exec             Treat filename as code\n";
     o << "  -o / --output-file <file> Write to the output file rather than stdout\n";
-    o << "  -i / --in-place         Update the Jsonnet file in place.  Same as -o <filename>\n";
+    o << "  -i / --in-place         Update the Jsonnet file(s) in place.  Same as -o <filename>\n";
     o << "  --test                  Exit with failure if reformatting changed the file.\n";
     o << "  -n / --indent <n>       Number of spaces to indent by (default 0, means no change)\n";
     o << "  --max-blank-lines <n>   Max vertical spacing, 0 means no change (default 2)\n";
@@ -121,6 +121,7 @@ void usage(std::ostream &o)
     o << "  --[no-]pad-objects      { x: 1, x: 2 } instead of {x: 1, y: 2} (on by default)\n";
     o << "  --debug-desugaring      Unparse the desugared AST without executing it\n";
     o << "  --version               Print version\n";
+    o << "Note: Multiple filenames can be provided at once when using -i or --test options.\n";
     o << "\n";
     o << "In all cases:\n";
     o << "<filename> can be - (stdin)\n";
@@ -153,6 +154,7 @@ enum Command {
 struct JsonnetConfig {
     Command cmd;
     std::string inputFile;
+    std::vector<std::string> inputFiles;
     std::string outputFile;
     bool filenameIsCode;
 
@@ -455,15 +457,19 @@ static bool process_args(int argc,
         return false;
     }
 
-    std::string filename = remaining_args[0];
-    if (remaining_args.size() > 1) {
-        std::cerr << "ERROR: Already specified " << want
-                  << " as \"" << filename << "\"\n"
-                  << std::endl;
-        usage(std::cerr);
-        return false;
+    if (config->cmd == FMT && (config->fmtTest || config->fmtInPlace)) {
+        config->inputFiles = remaining_args;
+    } else {
+        std::string filename = remaining_args[0];
+        if (remaining_args.size() > 1) {
+            std::cerr << "ERROR: Already specified " << want
+                    << " as \"" << filename << "\"\n"
+                    << std::endl;
+            usage(std::cerr);
+            return false;
+        }
+        config->inputFile = filename;
     }
-    config->inputFile = filename;
     return true;
 }
 
@@ -618,18 +624,18 @@ int main(int argc, const char **argv)
             return EXIT_FAILURE;
         }
 
-        // Read input files.
-        std::string input;
-        if (!read_input(&config, &input)) {
-            jsonnet_destroy(vm);
-            return EXIT_FAILURE;
-        }
-
         // Evaluate input Jsonnet and handle any errors from Jsonnet VM.
         int error;
         char *output;
         switch (config.cmd) {
             case EVAL: {
+                // Read input files.
+                std::string input;
+                if (!read_input(&config, &input)) {
+                    jsonnet_destroy(vm);
+                    return EXIT_FAILURE;
+                }
+
                 if (config.evalMulti) {
                     output = jsonnet_evaluate_snippet_multi(
                         vm, config.inputFile.c_str(), input.c_str(), &error);
@@ -684,27 +690,64 @@ int main(int argc, const char **argv)
                         jsonnet_destroy(vm);
                         return EXIT_FAILURE;
                     }
-                    output_file = config.inputFile;
                 }
 
-                output = jsonnet_fmt_snippet(vm, config.inputFile.c_str(), input.c_str(), &error);
+                if (config.fmtInPlace || config.fmtTest) {
+                    for (std::string inputFile: config.inputFiles) {
+                        if (config.fmtInPlace) {
+                            output_file = inputFile;
+                        }
+                        config.inputFile = inputFile;
+                        std::string input;
+                        if (!read_input(&config, &input)) {
+                            jsonnet_destroy(vm);
+                            return EXIT_FAILURE;
+                        }
+
+                        output = jsonnet_fmt_snippet(vm, config.inputFile.c_str(), input.c_str(), &error);
+
+                        if (error) {
+                            std::cerr << output;
+                            std::cerr.flush();
+                            jsonnet_realloc(vm, output, 0);
+                            jsonnet_destroy(vm);
+                            return EXIT_FAILURE;
+                        }
+
+                        if (config.fmtTest) {
+                            // Check the output matches the input.
+                            bool ok = output == input;
+                            jsonnet_realloc(vm, output, 0);
+                            jsonnet_destroy(vm);
+                            return ok ? EXIT_SUCCESS : 2;
+                        } else {
+                            // Write output Jsonnet.
+                            bool successful = write_output_file(output, output_file);
+                            jsonnet_realloc(vm, output, 0);
+                            if (!successful) {
+                                jsonnet_destroy(vm);
+                                return EXIT_FAILURE;
+                            }
+                        }
+                    }
+                } else {
+                    // Read input files.
+                    std::string input;
+                    if (!read_input(&config, &input)) {
+                        jsonnet_destroy(vm);
+                        return EXIT_FAILURE;
+                    }
 
-                if (error) {
-                    std::cerr << output;
-                    std::cerr.flush();
-                    jsonnet_realloc(vm, output, 0);
-                    jsonnet_destroy(vm);
-                    return EXIT_FAILURE;
-                }
+                    output = jsonnet_fmt_snippet(vm, config.inputFile.c_str(), input.c_str(), &error);
 
-                if (config.fmtTest) {
-                    // Check the output matches the input.
-                    bool ok = output == input;
-                    jsonnet_realloc(vm, output, 0);
-                    jsonnet_destroy(vm);
-                    return ok ? EXIT_SUCCESS : 2;
+                    if (error) {
+                        std::cerr << output;
+                        std::cerr.flush();
+                        jsonnet_realloc(vm, output, 0);
+                        jsonnet_destroy(vm);
+                        return EXIT_FAILURE;
+                    }
 
-                } else {
                     // Write output Jsonnet.
                     bool successful = write_output_file(output, output_file);
                     jsonnet_realloc(vm, output, 0);