From 0607c8f4b4306ba31629decbe4fe92be3549e92f Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 22 Dec 2015 08:59:11 -0800 Subject: [PATCH 1/6] Version bump to 0.10.1 --- homeassistant/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/const.py b/homeassistant/const.py index deda344f4da..dd8db09d392 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -1,7 +1,7 @@ # coding: utf-8 """ Constants used by Home Assistant components. """ -__version__ = "0.10.0" +__version__ = "0.10.1" # Can be used to specify a catch all when registering state or event listeners. MATCH_ALL = '*' From 308969e6dded921d7a50ad35168aee253f407389 Mon Sep 17 00:00:00 2001 From: Daren Lord Date: Wed, 13 Jan 2016 23:09:39 -0700 Subject: [PATCH 2/6] Adding in alarm.com control panel. --- .../alarm_control_panel/alarmdotcom.py | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 homeassistant/components/alarm_control_panel/alarmdotcom.py diff --git a/homeassistant/components/alarm_control_panel/alarmdotcom.py b/homeassistant/components/alarm_control_panel/alarmdotcom.py new file mode 100644 index 00000000000..0736f4c2a8e --- /dev/null +++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py @@ -0,0 +1,97 @@ +""" +homeassistant.components.alarm_control_panel.alarmdotcom +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Interfaces with Verisure alarm control panel. +For more details about this platform, please refer to the documentation at +https://home-assistant.io/components/alarmdotcom/ +""" +import logging + +import homeassistant.components.alarm_control_panel as alarm +from homeassistant.const import CONF_USERNAME, CONF_PASSWORD + +from homeassistant.const import ( + STATE_UNKNOWN, + STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY) + +_LOGGER = logging.getLogger(__name__) + + +REQUIREMENTS = ['https://github.com/Xorso/pyalarmdotcom' + '/archive/0.0.7.zip' + '#pyalarmdotcom==0.0.7'] +DEFAULT_NAME = 'Alarm.com' + + +def setup_platform(hass, config, add_devices, discovery_info=None): + """ Setup Alarm.com control panel """ + + username = config.get(CONF_USERNAME) + password = config.get(CONF_PASSWORD) + + if username is None or password is None: + _LOGGER.error('Must specify username and password!') + return False + + add_devices([AlarmDotCom(hass, + config.get('name', DEFAULT_NAME), + config.get('code'), + username, + password)]) + + +class AlarmDotCom(alarm.AlarmControlPanel): + """ Represents a Alarm.com status within HA """ + + def __init__(self, hass, name, code, username, password): + from pyalarmdotcom.pyalarmdotcom import Alarmdotcom + self._alarm = Alarmdotcom(username, password, timeout=10) + self._hass = hass + self._name = name + self._code = str(code) if code else None + + @property + def should_poll(self): + return True + + @property + def name(self): + return self._name + + @property + def code_format(self): + """ One or more characters if code is defined """ + return None if self._code is None else '.+' + + @property + def state(self): + if self._alarm.state == 'Disarmed': + return STATE_ALARM_DISARMED + elif self._alarm.state == 'Armed Stay': + return STATE_ALARM_ARMED_HOME + elif self._alarm.state == 'Armed Away': + return STATE_ALARM_ARMED_AWAY + else: + return STATE_UNKNOWN + + def alarm_disarm(self, code=None): + if not self._validate_code(code, 'arming home'): + return + self._alarm.disarm() + + def alarm_arm_home(self, code=None): + if not self._validate_code(code, 'arming home'): + return + self._alarm.arm_stay() + + def alarm_arm_away(self, code=None): + if not self._validate_code(code, 'arming home'): + return + self._alarm.arm_away() + + def _validate_code(self, code, state): + """ Validate given code. """ + check = self._code is None or code == self._code + if not check: + _LOGGER.warning('Wrong code entered for %s', state) + return check From 303cb8e3501fe21a25adb20f385d3c8e406706e3 Mon Sep 17 00:00:00 2001 From: Daren Lord Date: Wed, 13 Jan 2016 23:18:52 -0700 Subject: [PATCH 3/6] Adding alarmdotcom to coveragerc --- .coveragerc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.coveragerc b/.coveragerc index 272ace975c4..cc2653a022e 100644 --- a/.coveragerc +++ b/.coveragerc @@ -5,6 +5,8 @@ omit = homeassistant/__main__.py # omit pieces of code that rely on external devices being present + homeassistant/components/alarm_control_panel/alarmdotcom.py + homeassistant/components/arduino.py homeassistant/components/*/arduino.py From 87cecd7e950e02ac768c1406f0667588e1192aef Mon Sep 17 00:00:00 2001 From: Daren Lord Date: Wed, 13 Jan 2016 23:22:42 -0700 Subject: [PATCH 4/6] Adding to requirements_all --- requirements_all.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/requirements_all.txt b/requirements_all.txt index 1bc00b4c46d..369067ff3fc 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -6,6 +6,9 @@ pip>=7.0.0 vincenty==0.1.3 jinja2>=2.8 +# homeassistant.components.alarm_control_panel.alarmdotcom +https://github.com/Xorso/pyalarmdotcom/archive/0.0.7.zip#pyalarmdotcom==0.0.7 + # homeassistant.components.arduino PyMata==2.07a @@ -48,6 +51,9 @@ blinkstick==1.1.7 # homeassistant.components.light.hue phue==0.8 +# homeassistant.components.light.lifx +https://github.com/avaidyam/lazylights/archive/master.zip#lazylights==3.0.0 + # homeassistant.components.light.limitlessled limitlessled==1.0.0 From 7a2d049ce303cf374dfb6d4f5299ccb713b4170f Mon Sep 17 00:00:00 2001 From: Daren Lord Date: Wed, 13 Jan 2016 23:33:19 -0700 Subject: [PATCH 5/6] Removing LIFX from requirements_all.txt --- requirements_all.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/requirements_all.txt b/requirements_all.txt index 369067ff3fc..780cb941dd3 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -51,9 +51,6 @@ blinkstick==1.1.7 # homeassistant.components.light.hue phue==0.8 -# homeassistant.components.light.lifx -https://github.com/avaidyam/lazylights/archive/master.zip#lazylights==3.0.0 - # homeassistant.components.light.limitlessled limitlessled==1.0.0 From 34f124190c76aaf5f9e25a436b048704c397f94b Mon Sep 17 00:00:00 2001 From: Daren Lord Date: Thu, 14 Jan 2016 06:29:12 -0700 Subject: [PATCH 6/6] Fixing pylint errors --- homeassistant/components/alarm_control_panel/alarmdotcom.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/homeassistant/components/alarm_control_panel/alarmdotcom.py b/homeassistant/components/alarm_control_panel/alarmdotcom.py index 0736f4c2a8e..d10afc429e6 100644 --- a/homeassistant/components/alarm_control_panel/alarmdotcom.py +++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py @@ -40,6 +40,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None): password)]) +# pylint: disable=too-many-arguments, too-many-instance-attributes +# pylint: disable=abstract-method class AlarmDotCom(alarm.AlarmControlPanel): """ Represents a Alarm.com status within HA """ @@ -78,16 +80,19 @@ class AlarmDotCom(alarm.AlarmControlPanel): if not self._validate_code(code, 'arming home'): return self._alarm.disarm() + self.update_ha_state() def alarm_arm_home(self, code=None): if not self._validate_code(code, 'arming home'): return self._alarm.arm_stay() + self.update_ha_state() def alarm_arm_away(self, code=None): if not self._validate_code(code, 'arming home'): return self._alarm.arm_away() + self.update_ha_state() def _validate_code(self, code, state): """ Validate given code. """