Fix #1 - print usage

symmetryinvestments · Nov 12, 2018 · e2be450 · e2be450
1 parent 5bee2c8
commit e2be450
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/source/jupyter/wire/kernel.d b/source/jupyter/wire/kernel.d
@@ -8,11 +8,7 @@ mixin template Main(Backend) {
     int main(string[] args) {
         import std.experimental.logger: error;
         try {
-            import jupyter.wire.kernel: Kernel;
-            const connectionFileName = args[1];
-            auto backend = Backend();
-            auto k = kernel(backend, connectionFileName);
-            k.run;
+            run!Backend(args);
             return 0;
         } catch(Exception e) {
             error("Error: ", e.msg);
@@ -24,6 +20,19 @@ mixin template Main(Backend) {
     }
 }
 
+void run(Backend)(in string[] args) {
+    import jupyter.wire.kernel: Kernel;
+    import std.exception: enforce;
+
+    const exeName = args.length > 0 ? args[0] : "<exeName>";
+    enforce(args.length == 2, "Usage: " ~ exeName ~ " <connectionFileName>");
+
+    const connectionFileName = args[1];
+    auto backend = Backend();
+    auto k = kernel(backend, connectionFileName);
+    k.run;
+}
+
 
 struct LanguageInfo {
     string name;

diff --git a/tests/ut/kernel.d b/tests/ut/kernel.d
@@ -2,7 +2,17 @@ module ut.kernel;
 
 
 import unit_threaded;
+import jupyter.wire.kernel;
 
+private struct DummyBackend {
+    enum languageInfo = LanguageInfo();
+    ExecutionResult execute(in string) {
+        return ExecutionResult.init;
+    }
+}
 
+@("usage")
 unittest {
+    run!DummyBackend([]).shouldThrowWithMessage("Usage: <exeName> <connectionFileName>");
+    run!DummyBackend(["foobin"]).shouldThrowWithMessage("Usage: foobin <connectionFileName>");
 }