Add proper CLI, supports upload, download and repl commands

setup.py

@@ -24,6 +24,7 @@
     include_package_data=True,
     python_requires=">=3.5",
     install_requires=[
+        "Click>=7.0",
         "prompt-toolkit>=2.0.10",
         "pyserial>=3.4",
     ],
@@ -34,7 +35,7 @@
     },
     entry_points={
         "console_scripts": [
-            "druid=druid.main:main",
+            "druid=druid.cli:cli",
         ],
     },
 )

src/druid/cli.py

@@ -0,0 +1,62 @@
+""" Command-line interface for druid """
+
+import sys
+import time
+
+import click
+
+from druid import crowlib
+from druid import repl as druid_repl
+
+@click.group(invoke_without_command=True)
+@click.pass_context
+@click.version_option()
+def cli(ctx):
+    """ Terminal interface for crow """
+    if ctx.invoked_subcommand is None:
+        ctx.invoke(repl)
+
+@cli.command(short_help="Download a file from crow")
+def download():
+    """
+    Download a file from crow and print it to stdout
+    """
+    try:
+        crow = crowlib.connect()
+    except ValueError as err:
+        click.echo(err)
+        sys.exit(1)
+
+    crow.write(bytes("^^p", "utf-8"))
+    click.echo(crow.read(1000000).decode())
+    crow.close()
+
+def myprint(string):
+    click.echo(string)
+
+@cli.command(short_help="Upload a file to crow")
+@click.argument("filename", type=click.Path(exists=True))
+def upload(filename):
+    """
+    Upload a file to crow.
+    FILENAME is the path to the Lua file to upload
+    """
+    try:
+        crow = crowlib.connect()
+    except ValueError as err:
+        click.echo(err)
+        sys.exit(1)
+
+    crowlib.upload(crow.write, myprint, filename)
+    click.echo(crow.read(1000000).decode())
+    click.echo("File uploaded")
+    time.sleep(0.5) # wait for new script to be ready
+    crow.write(bytes("^^p", "utf-8"))
+    click.echo(crow.read(1000000).decode())
+    crow.close()
+
+@cli.command()
+@click.argument("filename", type=click.Path(exists=True), required=False)
+def repl(filename):
+    """ Start interactive terminal """
+    druid_repl.main(filename)

src/druid/main.py → src/druid/repl.py

@@ -180,7 +180,7 @@ async def printer():
         await asyncio.sleep(sleeptime)
 
 
-def main():
+def main(script=None):
     logging.config.dictConfig({
         'version': 1,
         'formatters': {
@@ -210,17 +210,17 @@ def main():
     })
 
     global crow
-    loop = asyncio.get_event_loop()
-
     try:
         crow = crowlib.connect()
     except ValueError as err:
         print(err)
-        exit()
+        sys.exit(1)
 
     # run script passed from command line
-    if len(sys.argv) == 2:
-        crowlib.execute(crow.write, myprint, sys.argv[1])
+    if script:
+        crowlib.execute(crow.write, myprint, script)
+
+    loop = asyncio.get_event_loop()
 
     use_asyncio_event_loop()
 
@@ -231,8 +231,4 @@ def main():
         loop.run_until_complete(background_task)
 
     crow.close()
-    exit()
-
-
-if __name__ == '__main__':
-    main()
+    sys.exit()