Consolidate entry points

Author: hmaarrfk

setup.py

@@ -51,7 +51,8 @@ def get_version_and_cmdclass(pkg_path):
     name='teensytoany',
     entry_points={
         'console_scripts': [
-            'teensytoany_programmer=teensytoany.programmer:teensytoany_programmer',
+            'teensytoany=teensytoany.cli:teensytoany_cli',
+            'teensytoany_programmer=teensytoany.programmer:main',
             'teensytoany_i2c_scan=teensytoany.i2c_scan:main',
             'teensytoany_list=teensytoany.list:main',
         ],

teensytoany/i2c_scan.py

@@ -1,4 +1,5 @@
 import click
+import warnings
 from packaging.version import Version
 
 import teensytoany
@@ -52,6 +53,7 @@ def main(
     baud_rate=100_100,
     verbose=False,
 ):
+    click.echo("WARNING: teensytoany_i2c_scan is deprecated. Use 'teensytoany i2c_scan' instead.", err=True)
     return i2c_scan(
         serial_number=serial_number,
         interface=interface,

teensytoany/list.py

@@ -1,11 +1,32 @@
 import sys
+import warnings
 
 import click
 
 import teensytoany
 from teensytoany import TeensyToAny
 
 
+def teensytoany_list(
+    manufacturer="TeensyToAny",
+    teensyduino=False,
+):
+    """
+    List available TeensyToAny devices.
+    """
+    if teensyduino:
+        manufacturer = "Teensyduino"
+
+    try:
+        device_serial_numbers = TeensyToAny.device_serial_number_pairs(manufacturer=manufacturer)
+    except RuntimeError:
+        click.echo(f"Error: Could not find any devices with manufacturer '{manufacturer}'.")
+        sys.exit(1)
+
+    for device, serial_number in device_serial_numbers:
+        click.echo(f"Port: {device} -- Serial Number: {serial_number}")
+
+
 @click.command(epilog=f"Version {teensytoany.__version__}")
 @click.option(
     '--manufacturer',
@@ -31,14 +52,8 @@ def main(
     """
     List available TeensyToAny devices.
     """
-    if teensyduino:
-        manufacturer = "Teensyduino"
-
-    try:
-        device_serial_numbers = TeensyToAny.device_serial_number_pairs(manufacturer=manufacturer)
-    except RuntimeError:
-        click.echo(f"Error: Could not find any devices with manufacturer '{manufacturer}'.")
-        sys.exit(1)
-
-    for device, serial_number in device_serial_numbers:
-        click.echo(f"Port: {device} -- Serial Number: {serial_number}")
+    click.echo("WARNING: teensytoany_list is deprecated. Use 'teensytoany list' instead.", err=True)
+    teensytoany_list(
+        manufacturer=manufacturer,
+        teensyduino=teensyduino,
+    )

teensytoany/programmer.py

@@ -3,6 +3,45 @@
 import teensytoany
 
 
+def teensytoany_programmer(
+    serial_number=None,
+    mcu='TEENSY40',
+    firmware_version=None,
+    firmware_variant=None,
+    download_only=False
+):
+    """Program a Teensy device with a given firmware version"""
+    variant_str = f"variant {firmware_variant} of " if firmware_variant else ""
+    if download_only:
+        for mcu_to_download in ['TEENSY40', 'TEENSY32']:
+            if firmware_version is None:
+                firmware_version = teensytoany.TeensyToAny.get_latest_available_firmware_version(
+                    mcu=mcu_to_download, online=True, local=False
+                )
+            print(
+                f"Downloading {variant_str} firmware version {firmware_version} "
+                f"for {mcu_to_download}."
+            )
+            teensytoany.TeensyToAny.download_firmware(
+                mcu=mcu_to_download,
+                version=firmware_version,
+                variant=firmware_variant
+            )
+        return
+
+    print('Programming please wait...')
+    teensytoany.TeensyToAny.program_firmware(
+        serial_number,
+        mcu=mcu,
+        version=firmware_version,
+        variant=firmware_variant
+    )
+    with teensytoany.TeensyToAny(serial_number) as teensy:
+        print(f"TeensyToAny version: {teensy.version}")
+        print(f"TeensyToAny variant: {firmware_variant}")
+        print(f"TeensyToAny serial_number: {teensy.serial_number}")
+
+
 @click.command(epilog=f"Version {teensytoany.__version__}")
 @click.option(
     '--serial-number',
@@ -40,44 +79,23 @@
 )
 # Make the epligue print the version
 @click.version_option(teensytoany.__version__)
-def teensytoany_programmer(
+def main(
     serial_number=None,
     mcu='TEENSY40',
     firmware_version=None,
     firmware_variant=None,
     download_only=False
 ):
     """Program a Teensy device with a given firmware version"""
-    variant_str = f"variant {firmware_variant} of " if firmware_variant else ""
-    if download_only:
-        for mcu_to_download in ['TEENSY40', 'TEENSY32']:
-            if firmware_version is None:
-                firmware_version = teensytoany.TeensyToAny.get_latest_available_firmware_version(
-                    mcu=mcu_to_download, online=True, local=False
-                )
-            print(
-                f"Downloading {variant_str} firmware version {firmware_version} "
-                f"for {mcu_to_download}."
-            )
-            teensytoany.TeensyToAny.download_firmware(
-                mcu=mcu_to_download,
-                version=firmware_version,
-                variant=firmware_variant
-            )
-        return
-
-    print('Programming please wait...')
-    teensytoany.TeensyToAny.program_firmware(
-        serial_number,
+    click.echo("WARNING: teensytoany_programmer is deprecated. Use 'teensytoany programmer' instead.", err=True)
+    teensytoany_programmer(
+        serial_number=serial_number,
         mcu=mcu,
-        version=firmware_version,
-        variant=firmware_variant
+        firmware_version=firmware_version,
+        firmware_variant=firmware_variant,
+        download_only=download_only
     )
-    with teensytoany.TeensyToAny(serial_number) as teensy:
-        print(f"TeensyToAny version: {teensy.version}")
-        print(f"TeensyToAny variant: {firmware_variant}")
-        print(f"TeensyToAny serial_number: {teensy.serial_number}")
 
 
 if __name__ == '__main__':
-    teensytoany_programmer()
+    main()