From 56733086e554a06e288740904e5c4a287b57f0a1 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sun, 3 Nov 2019 16:51:33 +0100 Subject: [PATCH 01/19] added signalmessenger integration * allows to send a message (with an attachment) to one or more recipients --- CODEOWNERS | 1 + .../components/signalmessenger/__init__.py | 1 + .../components/signalmessenger/manifest.json | 8 ++ .../components/signalmessenger/notify.py | 96 +++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 homeassistant/components/signalmessenger/__init__.py create mode 100644 homeassistant/components/signalmessenger/manifest.json create mode 100644 homeassistant/components/signalmessenger/notify.py diff --git a/CODEOWNERS b/CODEOWNERS index aed575b52710..9827c5651191 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -260,6 +260,7 @@ homeassistant/components/seventeentrack/* @bachya homeassistant/components/shell_command/* @home-assistant/core homeassistant/components/shiftr/* @fabaff homeassistant/components/shodan/* @fabaff +homeassistant/components/signal/* @bbernhard homeassistant/components/simplisafe/* @bachya homeassistant/components/sinch/* @bendikrb homeassistant/components/slide/* @ualex73 diff --git a/homeassistant/components/signalmessenger/__init__.py b/homeassistant/components/signalmessenger/__init__.py new file mode 100644 index 000000000000..045eb95f1b31 --- /dev/null +++ b/homeassistant/components/signalmessenger/__init__.py @@ -0,0 +1 @@ +"""The signalmessenger component.""" diff --git a/homeassistant/components/signalmessenger/manifest.json b/homeassistant/components/signalmessenger/manifest.json new file mode 100644 index 000000000000..3f58b3fa1558 --- /dev/null +++ b/homeassistant/components/signalmessenger/manifest.json @@ -0,0 +1,8 @@ +{ + "domain": "signalmessenger", + "name": "signalmessenger", + "documentation": "", + "dependencies": [], + "codeowners": ["@bernhard"], + "requirements": [] +} diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signalmessenger/notify.py new file mode 100644 index 000000000000..df3c741a6bf7 --- /dev/null +++ b/homeassistant/components/signalmessenger/notify.py @@ -0,0 +1,96 @@ +"""Signal Messenger for notify component.""" +import logging +import base64 +import requests +import voluptuous as vol + +from homeassistant.components.notify import ( + ATTR_DATA, + PLATFORM_SCHEMA, + BaseNotificationService, +) +import homeassistant.helpers.config_validation as cv + +REQUIREMENTS = [] + +_LOGGER = logging.getLogger(__name__) + +CONF_SENDER_NR = "number" +CONF_RECP_NR = "recipients" +CONF_SIGNAL_CLI_REST_API = "url" +ATTR_FILENAME = "attachment" + +PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( + { + vol.Optional(CONF_SENDER_NR): cv.string, + vol.Optional(CONF_SIGNAL_CLI_REST_API): cv.string, + vol.Optional(CONF_RECP_NR): vol.All(cv.ensure_list, [cv.string]), + } +) + + +def get_service(hass, config, discovery_info=None): + """Get the SignalMessenger notification service.""" + + sender_nr = config.get(CONF_SENDER_NR) + recp_nrs = config.get(CONF_RECP_NR) + signal_cli_rest_api = config.get(CONF_SIGNAL_CLI_REST_API) + + if signal_cli_rest_api is None: + _LOGGER.error("Please specify the URL to the signal-cli REST API") + return None + + if recp_nrs is None: + _LOGGER.error("Please specify at least one recipient number") + return None + + if sender_nr is None: + _LOGGER.error("Please provide a sender number") + return None + + return SignalNotificationService(sender_nr, recp_nrs, signal_cli_rest_api) + + +class SignalNotificationService(BaseNotificationService): + """Implement the notification service for SignalMessenger.""" + + def __init__(self, sender_nr, recp_nrs, signal_cli_rest_api): + """Initialize the service.""" + + self._sender_nr = sender_nr + self._recp_nrs = recp_nrs + self._signal_cli_rest_api = signal_cli_rest_api + + def send_message(self, message="", **kwargs): + """Send a message to a one or more recipients. + + Additionally a file can be attached. + """ + + _LOGGER.info("Sending signal message") + + data = kwargs.get(ATTR_DATA, None) + + filename = None + if data is not None and ATTR_FILENAME in data: + filename = data[ATTR_FILENAME] + + try: + data = { + "message": message, + "number": self._sender_nr, + "recipients": self._recp_nrs, + } + if filename is not None: + with open(filename, "rb") as ofile: + data["base64_attachment"] = base64.b64encode(ofile.read()) + resp = requests.post(self._signal_cli_rest_api + "/v1/send", json=data) + # _LOGGER.debug("Sending signal message to number %s", self._recp_nrs) + if resp.status_code != 201: + json_resp = resp.json() + if "error" in json_resp: + raise Exception(json_resp["error"]) + raise Exception("unknown error while sending signal message") + except Exception as ex: + _LOGGER.error("%s", ex) + raise ex From e27ca695df17c45d2720e746cd3c1ea57a5ce01c Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Mon, 4 Nov 2019 18:40:12 +0100 Subject: [PATCH 02/19] added signalmessenger documentation to manifest file --- CODEOWNERS | 2 +- homeassistant/components/signalmessenger/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 9827c5651191..74c02cc39302 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -260,7 +260,7 @@ homeassistant/components/seventeentrack/* @bachya homeassistant/components/shell_command/* @home-assistant/core homeassistant/components/shiftr/* @fabaff homeassistant/components/shodan/* @fabaff -homeassistant/components/signal/* @bbernhard +homeassistant/components/signalmessenger/* @bernhard homeassistant/components/simplisafe/* @bachya homeassistant/components/sinch/* @bendikrb homeassistant/components/slide/* @ualex73 diff --git a/homeassistant/components/signalmessenger/manifest.json b/homeassistant/components/signalmessenger/manifest.json index 3f58b3fa1558..e172784dbccc 100644 --- a/homeassistant/components/signalmessenger/manifest.json +++ b/homeassistant/components/signalmessenger/manifest.json @@ -1,7 +1,7 @@ { "domain": "signalmessenger", "name": "signalmessenger", - "documentation": "", + "documentation": "https://www.home-assistant.io/integrations/signalmessenger", "dependencies": [], "codeowners": ["@bernhard"], "requirements": [] From 296988b334703a1455c3f2fb4cb66314d6938657 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Mon, 4 Nov 2019 18:45:00 +0100 Subject: [PATCH 03/19] remove debug logging from signalmessenger integration --- homeassistant/components/signalmessenger/notify.py | 1 - 1 file changed, 1 deletion(-) diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signalmessenger/notify.py index df3c741a6bf7..665218a2321b 100644 --- a/homeassistant/components/signalmessenger/notify.py +++ b/homeassistant/components/signalmessenger/notify.py @@ -85,7 +85,6 @@ def send_message(self, message="", **kwargs): with open(filename, "rb") as ofile: data["base64_attachment"] = base64.b64encode(ofile.read()) resp = requests.post(self._signal_cli_rest_api + "/v1/send", json=data) - # _LOGGER.debug("Sending signal message to number %s", self._recp_nrs) if resp.status_code != 201: json_resp = resp.json() if "error" in json_resp: From 05d647197eb148a6e37e8d5976a14c68a03a4738 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Mon, 4 Nov 2019 19:21:58 +0100 Subject: [PATCH 04/19] add signalmessenger to .coveragerc --- .coveragerc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.coveragerc b/.coveragerc index e6f09d60effd..11023ce8570d 100644 --- a/.coveragerc +++ b/.coveragerc @@ -600,6 +600,8 @@ omit = homeassistant/components/shodan/sensor.py homeassistant/components/sht31/sensor.py homeassistant/components/sigfox/sensor.py + homeassistant/components/signalmessenger/__init__.py + homeassistant/components/signalmessenger/notify.py homeassistant/components/simplepush/notify.py homeassistant/components/simplisafe/__init__.py homeassistant/components/simplisafe/alarm_control_panel.py From de6dbed4847ddaf32873383f9dc29b56c3ebc403 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Mon, 4 Nov 2019 21:27:36 +0100 Subject: [PATCH 05/19] fixed typo in signalmessenger manifes --- homeassistant/components/signalmessenger/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/signalmessenger/manifest.json b/homeassistant/components/signalmessenger/manifest.json index e172784dbccc..b5db109ac434 100644 --- a/homeassistant/components/signalmessenger/manifest.json +++ b/homeassistant/components/signalmessenger/manifest.json @@ -3,6 +3,6 @@ "name": "signalmessenger", "documentation": "https://www.home-assistant.io/integrations/signalmessenger", "dependencies": [], - "codeowners": ["@bernhard"], + "codeowners": ["@bbernhard"], "requirements": [] } From ef613f43cff54f8976657cce4f0e7954893578ea Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sun, 10 Nov 2019 21:33:03 +0100 Subject: [PATCH 06/19] moved service specific code to own pypi library --- .../components/signalmessenger/manifest.json | 4 ++- .../components/signalmessenger/notify.py | 31 ++++++------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/homeassistant/components/signalmessenger/manifest.json b/homeassistant/components/signalmessenger/manifest.json index b5db109ac434..10db73de6e3b 100644 --- a/homeassistant/components/signalmessenger/manifest.json +++ b/homeassistant/components/signalmessenger/manifest.json @@ -4,5 +4,7 @@ "documentation": "https://www.home-assistant.io/integrations/signalmessenger", "dependencies": [], "codeowners": ["@bbernhard"], - "requirements": [] + "requirements": [ + "pysignalclirestapi==0.1.2" + ] } diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signalmessenger/notify.py index 665218a2321b..2b9c8ae20a05 100644 --- a/homeassistant/components/signalmessenger/notify.py +++ b/homeassistant/components/signalmessenger/notify.py @@ -1,8 +1,7 @@ """Signal Messenger for notify component.""" import logging -import base64 -import requests import voluptuous as vol +from pysignalclirestapi import SignalCliRestApi from homeassistant.components.notify import ( ATTR_DATA, @@ -34,9 +33,9 @@ def get_service(hass, config, discovery_info=None): sender_nr = config.get(CONF_SENDER_NR) recp_nrs = config.get(CONF_RECP_NR) - signal_cli_rest_api = config.get(CONF_SIGNAL_CLI_REST_API) + signal_cli_rest_api_url = config.get(CONF_SIGNAL_CLI_REST_API) - if signal_cli_rest_api is None: + if signal_cli_rest_api_url is None: _LOGGER.error("Please specify the URL to the signal-cli REST API") return None @@ -48,18 +47,19 @@ def get_service(hass, config, discovery_info=None): _LOGGER.error("Please provide a sender number") return None - return SignalNotificationService(sender_nr, recp_nrs, signal_cli_rest_api) + return SignalNotificationService(sender_nr, recp_nrs, signal_cli_rest_api_url) class SignalNotificationService(BaseNotificationService): """Implement the notification service for SignalMessenger.""" - def __init__(self, sender_nr, recp_nrs, signal_cli_rest_api): + def __init__(self, sender_nr, recp_nrs, signal_cli_rest_api_url): """Initialize the service.""" - self._sender_nr = sender_nr self._recp_nrs = recp_nrs - self._signal_cli_rest_api = signal_cli_rest_api + self._signal_cli_rest_api = SignalCliRestApi( + signal_cli_rest_api_url, sender_nr, api_version=1 + ) def send_message(self, message="", **kwargs): """Send a message to a one or more recipients. @@ -76,20 +76,7 @@ def send_message(self, message="", **kwargs): filename = data[ATTR_FILENAME] try: - data = { - "message": message, - "number": self._sender_nr, - "recipients": self._recp_nrs, - } - if filename is not None: - with open(filename, "rb") as ofile: - data["base64_attachment"] = base64.b64encode(ofile.read()) - resp = requests.post(self._signal_cli_rest_api + "/v1/send", json=data) - if resp.status_code != 201: - json_resp = resp.json() - if "error" in json_resp: - raise Exception(json_resp["error"]) - raise Exception("unknown error while sending signal message") + self._signal_cli_rest_api.send_message(message, self._recp_nrs, filename) except Exception as ex: _LOGGER.error("%s", ex) raise ex From db1c8e1031ee6a164f1d7049197ceb27a9c903af Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Mon, 11 Nov 2019 18:57:02 +0100 Subject: [PATCH 07/19] updated pysignalclirestapi dependeny in manifest.json --- homeassistant/components/signalmessenger/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/signalmessenger/manifest.json b/homeassistant/components/signalmessenger/manifest.json index 10db73de6e3b..0efac4d940b1 100644 --- a/homeassistant/components/signalmessenger/manifest.json +++ b/homeassistant/components/signalmessenger/manifest.json @@ -5,6 +5,6 @@ "dependencies": [], "codeowners": ["@bbernhard"], "requirements": [ - "pysignalclirestapi==0.1.2" + "pysignalclirestapi==0.1.3" ] } From b38a5a9a2af5a83d9318a60470515ca741f295ed Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Mon, 11 Nov 2019 20:45:42 +0100 Subject: [PATCH 08/19] added pysignalclirestapi requirement for signalmessenger component --- requirements_all.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements_all.txt b/requirements_all.txt index deace09aa1ec..e43c8ca83b07 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1756,6 +1756,9 @@ sharp_aquos_rc==0.3.2 # homeassistant.components.shodan shodan==1.19.0 +# homeassistant.components.signalmessenger +pysignalclirestapi==0.1.3 + # homeassistant.components.simplepush simplepush==1.1.4 From 0f0a828e4b2972e2a41c0d015d86c3a75506338d Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Mon, 11 Nov 2019 20:53:04 +0100 Subject: [PATCH 09/19] fixed typo in codeowners --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 74c02cc39302..04220a66c761 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -260,7 +260,7 @@ homeassistant/components/seventeentrack/* @bachya homeassistant/components/shell_command/* @home-assistant/core homeassistant/components/shiftr/* @fabaff homeassistant/components/shodan/* @fabaff -homeassistant/components/signalmessenger/* @bernhard +homeassistant/components/signalmessenger/* @bbernhard homeassistant/components/simplisafe/* @bachya homeassistant/components/sinch/* @bendikrb homeassistant/components/slide/* @ualex73 From 1abf9dd44636a24de8e4c8896adb90d21d04c757 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Tue, 12 Nov 2019 19:12:50 +0100 Subject: [PATCH 10/19] reworked signalmessenger integration based on code review input --- .../components/signalmessenger/manifest.json | 2 +- .../components/signalmessenger/notify.py | 36 +++++++------------ requirements_all.txt | 2 +- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/homeassistant/components/signalmessenger/manifest.json b/homeassistant/components/signalmessenger/manifest.json index 0efac4d940b1..7cc43571991c 100644 --- a/homeassistant/components/signalmessenger/manifest.json +++ b/homeassistant/components/signalmessenger/manifest.json @@ -5,6 +5,6 @@ "dependencies": [], "codeowners": ["@bbernhard"], "requirements": [ - "pysignalclirestapi==0.1.3" + "pysignalclirestapi==0.1.4" ] } diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signalmessenger/notify.py index 2b9c8ae20a05..6389cd967d04 100644 --- a/homeassistant/components/signalmessenger/notify.py +++ b/homeassistant/components/signalmessenger/notify.py @@ -1,7 +1,7 @@ """Signal Messenger for notify component.""" import logging import voluptuous as vol -from pysignalclirestapi import SignalCliRestApi +from pysignalclirestapi import SignalCliRestApi, SignalCliRestApiError from homeassistant.components.notify import ( ATTR_DATA, @@ -21,9 +21,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( { - vol.Optional(CONF_SENDER_NR): cv.string, - vol.Optional(CONF_SIGNAL_CLI_REST_API): cv.string, - vol.Optional(CONF_RECP_NR): vol.All(cv.ensure_list, [cv.string]), + vol.Required(CONF_SENDER_NR): cv.string, + vol.Required(CONF_SIGNAL_CLI_REST_API): cv.string, + vol.Required(CONF_RECP_NR): vol.All(cv.ensure_list, [cv.string]), } ) @@ -35,31 +35,21 @@ def get_service(hass, config, discovery_info=None): recp_nrs = config.get(CONF_RECP_NR) signal_cli_rest_api_url = config.get(CONF_SIGNAL_CLI_REST_API) - if signal_cli_rest_api_url is None: - _LOGGER.error("Please specify the URL to the signal-cli REST API") - return None + signal_cli_rest_api = SignalCliRestApi( + signal_cli_rest_api_url, sender_nr, api_version=1 + ) - if recp_nrs is None: - _LOGGER.error("Please specify at least one recipient number") - return None - - if sender_nr is None: - _LOGGER.error("Please provide a sender number") - return None - - return SignalNotificationService(sender_nr, recp_nrs, signal_cli_rest_api_url) + return SignalNotificationService(recp_nrs, signal_cli_rest_api) class SignalNotificationService(BaseNotificationService): """Implement the notification service for SignalMessenger.""" - def __init__(self, sender_nr, recp_nrs, signal_cli_rest_api_url): + def __init__(self, recp_nrs, signal_cli_rest_api): """Initialize the service.""" self._recp_nrs = recp_nrs - self._signal_cli_rest_api = SignalCliRestApi( - signal_cli_rest_api_url, sender_nr, api_version=1 - ) + self._signal_cli_rest_api = signal_cli_rest_api def send_message(self, message="", **kwargs): """Send a message to a one or more recipients. @@ -67,9 +57,9 @@ def send_message(self, message="", **kwargs): Additionally a file can be attached. """ - _LOGGER.info("Sending signal message") + _LOGGER.debug("Sending signal message") - data = kwargs.get(ATTR_DATA, None) + data = kwargs.get(ATTR_DATA) filename = None if data is not None and ATTR_FILENAME in data: @@ -77,6 +67,6 @@ def send_message(self, message="", **kwargs): try: self._signal_cli_rest_api.send_message(message, self._recp_nrs, filename) - except Exception as ex: + except SignalCliRestApiError as ex: _LOGGER.error("%s", ex) raise ex diff --git a/requirements_all.txt b/requirements_all.txt index e43c8ca83b07..c120043ba8e0 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1757,7 +1757,7 @@ sharp_aquos_rc==0.3.2 shodan==1.19.0 # homeassistant.components.signalmessenger -pysignalclirestapi==0.1.3 +pysignalclirestapi==0.1.4 # homeassistant.components.simplepush simplepush==1.1.4 From f8c02b2a40f20ab3ec562a1b9f5f574a5a67132f Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Tue, 12 Nov 2019 19:55:26 +0100 Subject: [PATCH 11/19] updated requirements for signalmessenger --- requirements_all.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements_all.txt b/requirements_all.txt index c120043ba8e0..87a41486836e 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1446,6 +1446,9 @@ pysesame2==1.0.1 # homeassistant.components.goalfeed pysher==1.0.1 +# homeassistant.components.signalmessenger +pysignalclirestapi==0.1.4 + # homeassistant.components.sma pysma==0.3.4 @@ -1756,9 +1759,6 @@ sharp_aquos_rc==0.3.2 # homeassistant.components.shodan shodan==1.19.0 -# homeassistant.components.signalmessenger -pysignalclirestapi==0.1.4 - # homeassistant.components.simplepush simplepush==1.1.4 From d6cf4a905d07a3b6eaf8d440a05815a184c1ff46 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Tue, 12 Nov 2019 21:56:25 +0100 Subject: [PATCH 12/19] small code improvements in signalmessenger integration * no need to use the get() method to access dict parameters that are required --- homeassistant/components/signalmessenger/notify.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signalmessenger/notify.py index 6389cd967d04..0402ac9f7a4e 100644 --- a/homeassistant/components/signalmessenger/notify.py +++ b/homeassistant/components/signalmessenger/notify.py @@ -31,9 +31,9 @@ def get_service(hass, config, discovery_info=None): """Get the SignalMessenger notification service.""" - sender_nr = config.get(CONF_SENDER_NR) - recp_nrs = config.get(CONF_RECP_NR) - signal_cli_rest_api_url = config.get(CONF_SIGNAL_CLI_REST_API) + sender_nr = config[CONF_SENDER_NR] + recp_nrs = config[CONF_RECP_NR] + signal_cli_rest_api_url = config[CONF_SIGNAL_CLI_REST_API] signal_cli_rest_api = SignalCliRestApi( signal_cli_rest_api_url, sender_nr, api_version=1 From d87ed1ae317f425dcdda0773b6e3baaac57a4cd6 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sat, 16 Nov 2019 13:43:23 +0100 Subject: [PATCH 13/19] small changes in signalmessenger integration * re-ordered import statements * removed empty "requirements" list (not needed) --- homeassistant/components/signalmessenger/notify.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signalmessenger/notify.py index 0402ac9f7a4e..20e09a2bc93c 100644 --- a/homeassistant/components/signalmessenger/notify.py +++ b/homeassistant/components/signalmessenger/notify.py @@ -1,16 +1,13 @@ """Signal Messenger for notify component.""" +import homeassistant.helpers.config_validation as cv import logging import voluptuous as vol -from pysignalclirestapi import SignalCliRestApi, SignalCliRestApiError - from homeassistant.components.notify import ( ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService, ) -import homeassistant.helpers.config_validation as cv - -REQUIREMENTS = [] +from pysignalclirestapi import SignalCliRestApi, SignalCliRestApiError _LOGGER = logging.getLogger(__name__) From 84ff376383e2674ecacaa1641f1e23887be1562d Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sat, 30 Nov 2019 18:44:10 +0100 Subject: [PATCH 14/19] changed import order in signalmessenger integration according to PEP 8 --- homeassistant/components/signalmessenger/notify.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signalmessenger/notify.py index 20e09a2bc93c..82a7c3cc5d46 100644 --- a/homeassistant/components/signalmessenger/notify.py +++ b/homeassistant/components/signalmessenger/notify.py @@ -1,13 +1,17 @@ """Signal Messenger for notify component.""" -import homeassistant.helpers.config_validation as cv import logging + import voluptuous as vol +from pysignalclirestapi import SignalCliRestApi +from pysignalclirestapi import SignalCliRestApiError + +import homeassistant.helpers.config_validation as cv from homeassistant.components.notify import ( ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService, ) -from pysignalclirestapi import SignalCliRestApi, SignalCliRestApiError + _LOGGER = logging.getLogger(__name__) From acdd4ef3f56230010ba4cd19351408a19a3173ea Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sat, 30 Nov 2019 21:49:15 +0100 Subject: [PATCH 15/19] used isort to order includes in signalmessenger integration --- homeassistant/components/signalmessenger/notify.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signalmessenger/notify.py index 82a7c3cc5d46..8fbf9c708734 100644 --- a/homeassistant/components/signalmessenger/notify.py +++ b/homeassistant/components/signalmessenger/notify.py @@ -1,17 +1,15 @@ """Signal Messenger for notify component.""" import logging +from pysignalclirestapi import SignalCliRestApi, SignalCliRestApiError import voluptuous as vol -from pysignalclirestapi import SignalCliRestApi -from pysignalclirestapi import SignalCliRestApiError -import homeassistant.helpers.config_validation as cv from homeassistant.components.notify import ( ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService, ) - +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) From def3060bfa9ec7ac52bf71425382162c825a0d37 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sun, 1 Dec 2019 20:51:42 +0100 Subject: [PATCH 16/19] renamed signalmessenger to signal_messenger --- .../{signalmessenger => signal_messenger}/__init__.py | 0 .../{signalmessenger => signal_messenger}/manifest.json | 4 ++-- .../{signalmessenger => signal_messenger}/notify.py | 0 requirements_all.txt | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename homeassistant/components/{signalmessenger => signal_messenger}/__init__.py (100%) rename homeassistant/components/{signalmessenger => signal_messenger}/manifest.json (75%) rename homeassistant/components/{signalmessenger => signal_messenger}/notify.py (100%) diff --git a/homeassistant/components/signalmessenger/__init__.py b/homeassistant/components/signal_messenger/__init__.py similarity index 100% rename from homeassistant/components/signalmessenger/__init__.py rename to homeassistant/components/signal_messenger/__init__.py diff --git a/homeassistant/components/signalmessenger/manifest.json b/homeassistant/components/signal_messenger/manifest.json similarity index 75% rename from homeassistant/components/signalmessenger/manifest.json rename to homeassistant/components/signal_messenger/manifest.json index 7cc43571991c..e2e241d6ad91 100644 --- a/homeassistant/components/signalmessenger/manifest.json +++ b/homeassistant/components/signal_messenger/manifest.json @@ -1,6 +1,6 @@ { - "domain": "signalmessenger", - "name": "signalmessenger", + "domain": "signal_messenger", + "name": "signal_messenger", "documentation": "https://www.home-assistant.io/integrations/signalmessenger", "dependencies": [], "codeowners": ["@bbernhard"], diff --git a/homeassistant/components/signalmessenger/notify.py b/homeassistant/components/signal_messenger/notify.py similarity index 100% rename from homeassistant/components/signalmessenger/notify.py rename to homeassistant/components/signal_messenger/notify.py diff --git a/requirements_all.txt b/requirements_all.txt index 87a41486836e..22dea6f30813 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1446,7 +1446,7 @@ pysesame2==1.0.1 # homeassistant.components.goalfeed pysher==1.0.1 -# homeassistant.components.signalmessenger +# homeassistant.components.signal_messenger pysignalclirestapi==0.1.4 # homeassistant.components.sma From 49ad23a3f53621437b9eff6a7dd2ec42c4306e5a Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sun, 1 Dec 2019 20:58:39 +0100 Subject: [PATCH 17/19] renamed signalmessenger to signal_messenger in CODEOWNERS file --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 04220a66c761..010fcfc39f00 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -260,7 +260,7 @@ homeassistant/components/seventeentrack/* @bachya homeassistant/components/shell_command/* @home-assistant/core homeassistant/components/shiftr/* @fabaff homeassistant/components/shodan/* @fabaff -homeassistant/components/signalmessenger/* @bbernhard +homeassistant/components/signal_messenger/* @bbernhard homeassistant/components/simplisafe/* @bachya homeassistant/components/sinch/* @bendikrb homeassistant/components/slide/* @ualex73 From b889b114e440b83019ddee9c7e5e6e73b1aaa383 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sun, 1 Dec 2019 21:08:32 +0100 Subject: [PATCH 18/19] changed documentation url in signal_messenger integration to new name --- homeassistant/components/signal_messenger/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/signal_messenger/manifest.json b/homeassistant/components/signal_messenger/manifest.json index e2e241d6ad91..b3494ce8bab8 100644 --- a/homeassistant/components/signal_messenger/manifest.json +++ b/homeassistant/components/signal_messenger/manifest.json @@ -1,7 +1,7 @@ { "domain": "signal_messenger", "name": "signal_messenger", - "documentation": "https://www.home-assistant.io/integrations/signalmessenger", + "documentation": "https://www.home-assistant.io/integrations/signal_messenger", "dependencies": [], "codeowners": ["@bbernhard"], "requirements": [ From 338781373267994cf2e2416bfd1aaf6ab657b1b2 Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Sun, 8 Dec 2019 23:00:16 +0100 Subject: [PATCH 19/19] changed signal messenger naming in .coveragerc --- .coveragerc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index 11023ce8570d..490d6c973085 100644 --- a/.coveragerc +++ b/.coveragerc @@ -600,8 +600,8 @@ omit = homeassistant/components/shodan/sensor.py homeassistant/components/sht31/sensor.py homeassistant/components/sigfox/sensor.py - homeassistant/components/signalmessenger/__init__.py - homeassistant/components/signalmessenger/notify.py + homeassistant/components/signal_messenger/__init__.py + homeassistant/components/signal_messenger/notify.py homeassistant/components/simplepush/notify.py homeassistant/components/simplisafe/__init__.py homeassistant/components/simplisafe/alarm_control_panel.py