Merge pull request #7 from cknitt/feature/allow-files-and-directories

Allow multiple files and/or directories to be passed on the command line

Author: cknitt

bin/Extract.re

@@ -20,25 +20,26 @@ let iterator =
 
 let extractMessages = ast => iterator.structure(iterator, Obj.magic(ast));
 
-let processReasonFile = filename => {
-  let channel = open_in_bin(filename);
+let processReasonFile = path => {
+  let channel = open_in_bin(path);
   let lexbuf = Lexing.from_channel(channel);
   let ast = Reason_toolchain.RE.implementation(lexbuf);
   close_in(channel);
   extractMessages(ast);
 };
 
-let rec processDirectory = dir =>
-  Sys.readdir(dir)
-  |> Array.iter(filename => {
-       let path = Filename.concat(dir, filename);
-
-       if (Sys.is_directory(path)) {
-         processDirectory(path);
-       } else if (Filename.extension(filename) == ".re") {
-         processReasonFile(path);
-       };
-     });
+let rec processPath = path => {
+  if (! Sys.file_exists(path)) {
+    Printf.eprintf("Error: file or directory does not exist: %s\n", path);
+    exit(1);
+  };
+
+  if (Sys.is_directory(path)) {
+    Sys.readdir(path) |> Array.iter(filename => processPath(Filename.concat(path, filename)));
+  } else if (Filename.extension(path) == ".re") {
+    processReasonFile(path);
+  };
+};
 
 let outputJson = () => {
   let sortedJsonObjects =
@@ -63,13 +64,13 @@ let showVersion = () => {
 
 let args = [("-v", Arg.Unit(showVersion), "shows the program version")];
 
-let usage = "Usage: " ++ Sys.argv[0] ++ " directory ...";
+let usage = "Usage: " ++ Sys.argv[0] ++ " [path...]";
 
 Arg.parse(args, processInputFilename, usage);
 
 switch (inputFilenames^) {
 | [] => Arg.usage(args, usage)
-| filenames => filenames |> List.rev |> List.iter(processDirectory)
+| filenames =>
+  filenames |> List.rev |> List.iter(processPath);
+  outputJson();
 };
-
-outputJson();

tests/commandLineOptions.test.js

@@ -1,12 +1,19 @@
 const CliTest = require("command-line-test");
 
+let usage =
+  "Usage: ../_build/default/bin/Extract.exe [path...]\n  -v shows the program version\n  -help  Display this list of options\n  --help  Display this list of options";
+
 describe("test", function() {
+  it("shows usage when run without params", function*() {
+    const cliTest = new CliTest();
+    const res = yield cliTest.exec("../_build/default/bin/Extract.exe");
+    expect(res.stderr).toEqual(usage);
+  });
+
   it("shows help", function*() {
     const cliTest = new CliTest();
     const res = yield cliTest.exec("../_build/default/bin/Extract.exe -help");
-    expect(res.stdout).toEqual(
-      "Usage: ../_build/default/bin/Extract.exe directory ...\n  -v shows the program version\n  -help  Display this list of options\n  --help  Display this list of options"
-    );
+    expect(res.stdout).toEqual(usage);
   });
 
   it("shows version", function*() {

tests/extraction.test.js renamed to tests/extractionFull.test.js

@@ -0,0 +1,24 @@
+const CliTest = require("command-line-test");
+
+const expectedJson = [
+  { id: "test1.msg2.1", defaultMessage: "This is message 2.1" },
+  {
+    id: "test1.msg2.2",
+    defaultMessage: "This is message 2.2",
+    description: "Description for message 2.2"
+  },
+  {
+    id: "test2.msg1.1",
+    defaultMessage: "This is message 2.1.1"
+  }
+];
+
+describe("test", function() {
+  it("extracts messages", function*() {
+    const cliTest = new CliTest();
+    const res = yield cliTest.exec(
+      "../_build/default/bin/Extract.exe test1/subdir/Test_1_2.re test2"
+    );
+    expect(JSON.parse(res.stdout)).toEqual(expectedJson);
+  });
+});