Add a basic CLI for Basilisp REPL (#167)

* Add a basic CLI for Basilisp REPL

* Fix linting issues

* Okay but actually this time

Author: chrisrink10

Makefile

@@ -13,7 +13,7 @@ lint:
 .PHONY: repl
 repl:
 	@pipenv install
-	@pipenv run python -m basilisp.main
+	@pipenv run python -m basilisp.cli repl
 
 
 .PHONY: coverage

Pipfile

@@ -15,6 +15,7 @@ yapf = "*"
 [packages]
 astor = "*"
 atomos = "*"
+click = "*"
 pyfunctional = "*"
 pyrsistent = "*"
 python-dateutil = "*"

Pipfile.lock

@@ -20,7 +20,7 @@ pip install basilisp
 Once Basilisp is installed, you can enter into the REPL using:
 
 ```bash
-python -m basilisp.main
+basilisp repl
 ```
 
 Basilisp features many of the same functions and idioms as [Clojure](https://clojure.org/)

README.md

@@ -0,0 +1,87 @@
+# noinspection PyUnresolvedReferences
+import readline  # noqa: F401
+import traceback
+import types
+
+import click
+
+import basilisp.compiler as compiler
+import basilisp.lang.runtime as runtime
+import basilisp.main as basilisp
+import basilisp.reader as reader
+
+
+@click.group()
+def cli():
+    """Basilisp is a Lisp dialect inspired by Clojure targeting Python 3."""
+    pass
+
+
+def eval_file(filename: str, ctx: compiler.CompilerContext, module: types.ModuleType):
+    """Evaluate a file with the given name into a Python module AST node."""
+    last = None
+    for form in reader.read_file(filename, resolver=runtime.resolve_alias):
+        last = compiler.compile_and_exec_form(form, ctx, module, filename)
+    return last
+
+
+def eval_str(s: str, ctx: compiler.CompilerContext, module: types.ModuleType):
+    """Evaluate the forms in a string into a Python module AST node."""
+    last = None
+    for form in reader.read_str(s, resolver=runtime.resolve_alias):
+        last = compiler.compile_and_exec_form(form, ctx, module, source_filename='REPL Input')
+    return last
+
+
+@cli.command(short_help='start the Basilisp REPL')
+@click.option('--default-ns', default=runtime._REPL_DEFAULT_NS, help='default namespace to use for the REPL')
+def repl(default_ns):
+    basilisp.init()
+    ctx = compiler.CompilerContext()
+    ns_var = runtime.set_current_ns(default_ns)
+    while True:
+        ns: runtime.Namespace = ns_var.value
+        try:
+            lsrc = input(f'{ns.name}=> ')
+        except EOFError:
+            break
+        except KeyboardInterrupt:
+            print('')
+            continue
+
+        if len(lsrc) == 0:
+            continue
+
+        try:
+            print(compiler.lrepr(eval_str(lsrc, ctx, ns.module)))
+        except reader.SyntaxError as e:
+            traceback.print_exception(reader.SyntaxError, e, e.__traceback__)
+            continue
+        except compiler.CompilerException as e:
+            traceback.print_exception(compiler.CompilerException, e,
+                                      e.__traceback__)
+            continue
+        except Exception as e:
+            traceback.print_exception(Exception, e, e.__traceback__)
+            continue
+
+
+@cli.command(short_help='run a Basilisp script or code')
+@click.argument('file-or-code')
+@click.option('-c', '--code', is_flag=True, help='if provided, treat argument as a string of code')
+@click.option('--in-ns', default=runtime._REPL_DEFAULT_NS, help='namespace to use for the code')
+def run(file_or_code, code, in_ns):
+    """Run a Basilisp script or a line of code, if it is provided."""
+    basilisp.init()
+    ctx = compiler.CompilerContext()
+    ns_var = runtime.set_current_ns(in_ns)
+    ns: runtime.Namespace = ns_var.value
+
+    if code:
+        print(compiler.lrepr(eval_str(file_or_code, ctx, ns.module)))
+    else:
+        print(compiler.lrepr(eval_file(file_or_code, ctx, ns.module)))
+
+
+if __name__ == "__main__":
+    cli()

basilisp/cli.py

@@ -1,59 +1,7 @@
 import importlib
-# noinspection PyUnresolvedReferences
-import readline  # noqa: F401
-import traceback
-import types
 
-import basilisp.compiler as compiler
 import basilisp.importer as importer
 import basilisp.lang.runtime as runtime
-import basilisp.reader as reader
-
-
-def eval_file(filename: str, ctx: compiler.CompilerContext, module: types.ModuleType):
-    """Evaluate a file with the given name into a Python module AST node."""
-    last = None
-    for form in reader.read_file(filename, resolver=runtime.resolve_alias):
-        last = compiler.compile_and_exec_form(form, ctx, module, filename)
-    return last
-
-
-def eval_str(s: str, ctx: compiler.CompilerContext, module: types.ModuleType):
-    """Evaluate the forms in a string into a Python module AST node."""
-    last = None
-    for form in reader.read_str(s, resolver=runtime.resolve_alias):
-        last = compiler.compile_and_exec_form(form, ctx, module, source_filename='REPL Input')
-    return last
-
-
-def repl(default_ns=runtime._REPL_DEFAULT_NS):
-    ctx = compiler.CompilerContext()
-    ns_var = runtime.set_current_ns(default_ns)
-    while True:
-        ns: runtime.Namespace = ns_var.value
-        try:
-            lsrc = input(f'{ns.name}=> ')
-        except EOFError:
-            break
-        except KeyboardInterrupt:
-            print('')
-            continue
-
-        if len(lsrc) == 0:
-            continue
-
-        try:
-            print(compiler.lrepr(eval_str(lsrc, ctx, ns.module)))
-        except reader.SyntaxError as e:
-            traceback.print_exception(reader.SyntaxError, e, e.__traceback__)
-            continue
-        except compiler.CompilerException as e:
-            traceback.print_exception(compiler.CompilerException, e,
-                                      e.__traceback__)
-            continue
-        except Exception as e:
-            traceback.print_exception(Exception, e, e.__traceback__)
-            continue
 
 
 def init():
@@ -62,8 +10,3 @@ def init():
     runtime.bootstrap()
     importer.hook_imports()
     importlib.import_module('basilisp.core')
-
-
-if __name__ == "__main__":
-    init()
-    repl()

basilisp/main.py

@@ -23,6 +23,7 @@
 REQUIRED = [
     'astor',
     'atomos',
+    'click',
     'pyfunctional',
     'pyrsistent',
     'pytest',
@@ -101,9 +102,9 @@ def run(self):
     url=URL,
     packages=find_packages(exclude=('tests',)),
 
-    # entry_points={
-    #     'console_scripts': ['mycli=mymodule:cli'],
-    # },
+    entry_points={
+        'console_scripts': ['basilisp=basilisp.cli:cli'],
+    },
     install_requires=REQUIRED,
     extras_require=EXTRAS,
     include_package_data=True,