From 3733b669471081fa21d35b5eda3d4765aaf14d68 Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Fri, 14 May 2021 21:53:17 +0300
Subject: Initial module structure

---
 .github/workflows/build.yml   |   6 +-
 alarmpy.py                    | 127 ------------------------------------------
 alarmpy/__init__.py           |   0
 alarmpy/alarmpy.py            | 127 ++++++++++++++++++++++++++++++++++++++++++
 alarmpy/tests/__init__.py     |   0
 alarmpy/tests/test_alarmpy.py |   5 ++
 6 files changed, 135 insertions(+), 130 deletions(-)
 delete mode 100644 alarmpy.py
 create mode 100644 alarmpy/__init__.py
 create mode 100644 alarmpy/alarmpy.py
 create mode 100644 alarmpy/tests/__init__.py
 create mode 100644 alarmpy/tests/test_alarmpy.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e4ba0f7..bbe168b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,6 @@ jobs:
       - name: Run pylint
         run: |
           pipenv run lint
-      # - name: Test with pytest
-      #   run: |
-      #     pipenv run test
+      - name: Test with pytest
+        run: |
+          pipenv run test
diff --git a/alarmpy.py b/alarmpy.py
deleted file mode 100644
index f0693c5..0000000
--- a/alarmpy.py
+++ /dev/null
@@ -1,127 +0,0 @@
-import click
-import requests
-
-from datetime import datetime
-from time import sleep, time
-
-
-class Alarm(object):
-
-    URL = "https://www.oref.org.il/WarningMessages/alert/alerts.json"
-
-    HEADERS = {
-        "Referer": "https://www.oref.org.il/11226-he/pakar.aspx",
-        "X-Requested-With": "XMLHttpRequest",
-        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36",
-    }
-
-    def __init__(
-        self,
-        delay=1,
-        routine_delay=60 * 5,
-        alarm_id=False,
-        repeat_alarms=False,
-        quiet=False,
-    ):
-        self.delay = delay
-        self.last_routine_delay = routine_delay
-        self.alarm_id = alarm_id
-        self.repeat_alarms = repeat_alarms
-        self.quiet = quiet
-
-        self.current_alarms = []
-        self.last_routine_output = 0
-
-        self.session = self.init_session()
-
-    def init_session(self):
-        return requests.Session()
-
-    def start(self):
-        while True:
-            try:
-                cities, alarm_id = self.fetch()
-                self.update(cities, alarm_id)
-            except Exception as e:  # pylint: disable=broad-except
-                self.output_error(f"Exception: {e}")
-            finally:
-                sleep(self.delay)
-
-    def fetch(self):
-        try:
-            res = self.session.get(self.URL, headers=self.HEADERS, timeout=1)
-        except requests.Timeout as e:
-            raise Exception("HTTP request timed out") from e
-
-        if not res.content:
-            # empty content means no alarms
-            return [], None
-
-        try:
-            data = res.json()
-            alarm_id = data["id"]
-            cities = data["data"]
-            return cities, alarm_id
-        except ValueError as ve:
-            raise Exception(f"Error parsing JSON: {res.content}") from ve
-        except KeyError as ke:
-            raise Exception(f"Missing keys in JSON data: {data}") from ke
-
-    def update(self, cities, alarm_id):
-        if cities:
-            self.update_alarm(cities, alarm_id)
-        else:
-            self.update_routine()
-
-    def update_alarm(self, cities, alarm_id):
-        if self.repeat_alarms or set(cities) != set(self.current_alarms):
-            self.output_alarms(cities, alarm_id)
-        self.current_alarms = cities
-
-    def update_routine(self):
-        now = time()
-        if (
-            self.current_alarms
-            or now - self.last_routine_output > self.last_routine_delay
-        ):
-            self.output_routine()
-            self.last_routine_output = now
-        self.current_alarms = []
-
-    def output_leading_timestamp(self):
-        now = datetime.now()
-        ts = now.strftime("%Y-%m-%d %H:%M:%S")
-        click.secho(f"{ts} ", nl=False)
-
-    def output_error(self, err):
-        if not self.quiet:
-            self.output_leading_timestamp()
-            click.secho(err, fg="yellow", bold=True)
-
-    def output_routine(self):
-        if not self.quiet:
-            self.output_leading_timestamp()
-            click.secho("No active alarms", fg="green")
-
-    def output_alarms(self, cities, alarm_id):
-        self.output_leading_timestamp()
-        cities_str = ", ".join(cities)
-        click.secho(f"{cities_str} ", fg="red", nl=not self.alarm_id)
-        if self.alarm_id:
-            click.secho(f"({alarm_id})")
-
-
-@click.command()
-@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 alarm(**kwargs):
-    Alarm(**kwargs).start()
-
-
-if __name__ == "__main__":
-    alarm()
diff --git a/alarmpy/__init__.py b/alarmpy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/alarmpy/alarmpy.py b/alarmpy/alarmpy.py
new file mode 100644
index 0000000..f0693c5
--- /dev/null
+++ b/alarmpy/alarmpy.py
@@ -0,0 +1,127 @@
+import click
+import requests
+
+from datetime import datetime
+from time import sleep, time
+
+
+class Alarm(object):
+
+    URL = "https://www.oref.org.il/WarningMessages/alert/alerts.json"
+
+    HEADERS = {
+        "Referer": "https://www.oref.org.il/11226-he/pakar.aspx",
+        "X-Requested-With": "XMLHttpRequest",
+        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36",
+    }
+
+    def __init__(
+        self,
+        delay=1,
+        routine_delay=60 * 5,
+        alarm_id=False,
+        repeat_alarms=False,
+        quiet=False,
+    ):
+        self.delay = delay
+        self.last_routine_delay = routine_delay
+        self.alarm_id = alarm_id
+        self.repeat_alarms = repeat_alarms
+        self.quiet = quiet
+
+        self.current_alarms = []
+        self.last_routine_output = 0
+
+        self.session = self.init_session()
+
+    def init_session(self):
+        return requests.Session()
+
+    def start(self):
+        while True:
+            try:
+                cities, alarm_id = self.fetch()
+                self.update(cities, alarm_id)
+            except Exception as e:  # pylint: disable=broad-except
+                self.output_error(f"Exception: {e}")
+            finally:
+                sleep(self.delay)
+
+    def fetch(self):
+        try:
+            res = self.session.get(self.URL, headers=self.HEADERS, timeout=1)
+        except requests.Timeout as e:
+            raise Exception("HTTP request timed out") from e
+
+        if not res.content:
+            # empty content means no alarms
+            return [], None
+
+        try:
+            data = res.json()
+            alarm_id = data["id"]
+            cities = data["data"]
+            return cities, alarm_id
+        except ValueError as ve:
+            raise Exception(f"Error parsing JSON: {res.content}") from ve
+        except KeyError as ke:
+            raise Exception(f"Missing keys in JSON data: {data}") from ke
+
+    def update(self, cities, alarm_id):
+        if cities:
+            self.update_alarm(cities, alarm_id)
+        else:
+            self.update_routine()
+
+    def update_alarm(self, cities, alarm_id):
+        if self.repeat_alarms or set(cities) != set(self.current_alarms):
+            self.output_alarms(cities, alarm_id)
+        self.current_alarms = cities
+
+    def update_routine(self):
+        now = time()
+        if (
+            self.current_alarms
+            or now - self.last_routine_output > self.last_routine_delay
+        ):
+            self.output_routine()
+            self.last_routine_output = now
+        self.current_alarms = []
+
+    def output_leading_timestamp(self):
+        now = datetime.now()
+        ts = now.strftime("%Y-%m-%d %H:%M:%S")
+        click.secho(f"{ts} ", nl=False)
+
+    def output_error(self, err):
+        if not self.quiet:
+            self.output_leading_timestamp()
+            click.secho(err, fg="yellow", bold=True)
+
+    def output_routine(self):
+        if not self.quiet:
+            self.output_leading_timestamp()
+            click.secho("No active alarms", fg="green")
+
+    def output_alarms(self, cities, alarm_id):
+        self.output_leading_timestamp()
+        cities_str = ", ".join(cities)
+        click.secho(f"{cities_str} ", fg="red", nl=not self.alarm_id)
+        if self.alarm_id:
+            click.secho(f"({alarm_id})")
+
+
+@click.command()
+@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 alarm(**kwargs):
+    Alarm(**kwargs).start()
+
+
+if __name__ == "__main__":
+    alarm()
diff --git a/alarmpy/tests/__init__.py b/alarmpy/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/alarmpy/tests/test_alarmpy.py b/alarmpy/tests/test_alarmpy.py
new file mode 100644
index 0000000..e7aa5cd
--- /dev/null
+++ b/alarmpy/tests/test_alarmpy.py
@@ -0,0 +1,5 @@
+from ..alarmpy import Alarm
+
+
+def test_foo():
+    assert 1 == 1
-- 
cgit v1.3.1