Split into classes

5 files changed, 32 insertions, 24 deletions

diff --git a/Pipfile b/Pipfile
index 6a9c049..fdb2f33 100644
--- a/Pipfile
+++ b/Pipfile
@@ -16,7 +16,7 @@ twine = "*"
 build = "*"
 
 [scripts]
-alarmpy = "python alarmpy/alarmpy.py"
+alarmpy = "python alarmpy/cli.py"
 format = "black alarmpy"
 formatcheck = "black --check alarmpy"
 lint = "pylint -j 0 -d R,C alarmpy"
diff --git a/alarmpy/alarmpy.py b/alarmpy/alarm.py
index f230cd4..45fe98a 100644
--- a/alarmpy/alarmpy.py
+++ b/alarmpy/alarm.py
@@ -144,25 +144,3 @@ class Alarm:
             for city in cities
         ]
         return ", ".join(localized_cities)
-
-
-@click.command()
-@click.option(
-    "--language",
-    default="he",
-    type=click.Choice(["en", "he", "ar", "ru"]),
-    help="Alert language ",
-)
-@click.option("--delay", default=1, help="Polling delay in seconds")
-@click.option(
-    "--routine-delay", default=60 * 5, help="Routine message delay in seconds"
-)
-@click.option("--alarm-id", is_flag=True, help="Print alarm IDs")
-@click.option("--repeat-alarms", is_flag=True, help="Do not suppress ongoing alarms")
-@click.option("--quiet", is_flag=True, help="Print only active alarms")
-def cli(**kwargs):
-    Alarm(**kwargs).start()
-
-
-if __name__ == "__main__":
-    cli()
diff --git a/alarmpy/cli.py b/alarmpy/cli.py
new file mode 100644
index 0000000..790fcd2
--- /dev/null
+++ b/alarmpy/cli.py
@@ -0,0 +1,27 @@
+import click
+
+from alarm import Alarm
+from display import Display
+
+
+@click.command()
+@click.option(
+    "--language",
+    default="he",
+    type=click.Choice(["en", "he", "ar", "ru"]),
+    help="Alert language ",
+)
+@click.option("--delay", default=1, help="Polling delay in seconds")
+@click.option(
+    "--routine-delay", default=60 * 5, help="Routine message delay in seconds"
+)
+@click.option("--alarm-id", is_flag=True, help="Print alarm IDs")
+@click.option("--repeat-alarms", is_flag=True, help="Do not suppress ongoing alarms")
+@click.option("--quiet", is_flag=True, help="Print only active alarms")
+def cli(**kwargs):
+    _d = Display(**kwargs)
+    Alarm(**kwargs).start()
+
+
+if __name__ == "__main__":
+    cli()
diff --git a/alarmpy/display.py b/alarmpy/display.py
new file mode 100644
index 0000000..d1ecb09
--- /dev/null
+++ b/alarmpy/display.py
@@ -0,0 +1,3 @@
+class Display:
+    def __init__(self, **_kwargs):
+        pass
diff --git a/setup.py b/setup.py
index 0f3aa40..b9afa4b 100644
--- a/setup.py
+++ b/setup.py
@@ -27,5 +27,5 @@ setuptools.setup(
     package_data={"alarmpy": ["data/*.json"]},
     python_requires=">=3.6",
     install_requires=["requests", "click", "blessed"],
-    entry_points={"console_scripts": ["alarmpy = alarmpy:cli"]},
+    entry_points={"console_scripts": ["alarmpy = cli:cli"]},
 )