Merge pull request #617 from balloob/dev

0.8.0.rc1

.coveragerc

@@ -36,9 +36,12 @@ omit =
     homeassistant/components/device_tracker/aruba.py
     homeassistant/components/device_tracker/asuswrt.py
     homeassistant/components/device_tracker/ddwrt.py
+    homeassistant/components/device_tracker/geofancy.py
     homeassistant/components/device_tracker/luci.py
+    homeassistant/components/device_tracker/ubus.py
     homeassistant/components/device_tracker/netgear.py
     homeassistant/components/device_tracker/nmap_tracker.py
+    homeassistant/components/device_tracker/owntracks.py
     homeassistant/components/device_tracker/thomson.py
     homeassistant/components/device_tracker/tomato.py
     homeassistant/components/device_tracker/tplink.py
@@ -47,10 +50,13 @@ omit =
     homeassistant/components/downloader.py
     homeassistant/components/keyboard.py
     homeassistant/components/light/hue.py
+    homeassistant/components/light/mqtt.py
     homeassistant/components/light/limitlessled.py
     homeassistant/components/light/blinksticklight.py
+    homeassistant/components/light/hyperion.py
     homeassistant/components/media_player/cast.py
     homeassistant/components/media_player/denon.py
+    homeassistant/components/media_player/firetv.py
     homeassistant/components/media_player/itunes.py
     homeassistant/components/media_player/kodi.py
     homeassistant/components/media_player/mpd.py
@@ -61,6 +67,7 @@ omit =
     homeassistant/components/notify/instapush.py
     homeassistant/components/notify/nma.py
     homeassistant/components/notify/pushbullet.py
+    homeassistant/components/notify/pushetta.py
     homeassistant/components/notify/pushover.py
     homeassistant/components/notify/slack.py
     homeassistant/components/notify/smtp.py
@@ -70,12 +77,14 @@ omit =
     homeassistant/components/sensor/arest.py
     homeassistant/components/sensor/bitcoin.py
     homeassistant/components/sensor/command_sensor.py
+    homeassistant/components/sensor/cpuspeed.py
     homeassistant/components/sensor/dht.py
     homeassistant/components/sensor/efergy.py
     homeassistant/components/sensor/forecast.py
     homeassistant/components/sensor/glances.py
     homeassistant/components/sensor/mysensors.py
     homeassistant/components/sensor/openweathermap.py
+    homeassistant/components/switch/orvibo.py
     homeassistant/components/sensor/rest.py
     homeassistant/components/sensor/rpi_gpio.py
     homeassistant/components/sensor/sabnzbd.py
@@ -89,10 +98,13 @@ omit =
     homeassistant/components/switch/command_switch.py
     homeassistant/components/switch/edimax.py
     homeassistant/components/switch/hikvisioncam.py
+    homeassistant/components/switch/rest.py
     homeassistant/components/switch/rpi_gpio.py
     homeassistant/components/switch/transmission.py
     homeassistant/components/switch/wemo.py
+    homeassistant/components/thermostat/honeywell.py
     homeassistant/components/thermostat/nest.py
+    homeassistant/components/thermostat/radiotherm.py
 
 
 [report]

CONTRIBUTING.md

@@ -17,19 +17,19 @@ For help on building your component, please see the [developer documentation](ht
 
 After you finish adding support for your device:
 
- - Update the supported devices in the `README.md` file.
- - Add any new dependencies to `requirements_all.txt`. There is no ordering right now, so just add it to the end.
- - Update the `.coveragerc` file.
- - Provide some documentation for [home-assistant.io](https://home-assistant.io/). The documentation is handled in a separate [git repository](https://github.com/balloob/home-assistant.io).
- - Make sure all your code passes Pylint and flake8 (PEP8 and some more) validation. To generate reports, run `pylint homeassistant > pylint.txt` and `flake8 homeassistant --exclude bower_components,external > flake8.txt`.
+ - Add a link to the website of your device/service/component in the "examples" listing of the `README.md` file.
+ - Add any new dependencies to `requirements_all.txt` if needed. There is no ordering right now, so just add it to the end of the file.
+ - Update the `.coveragerc` file to exclude your platform if there are no tests available.
+ - Provide some documentation for [home-assistant.io](https://home-assistant.io/). It's OK to just add a docstring with configuration details (sample entry for `configuration.yaml` file and alike) to the file header as a start. Visit the [website documentation](https://home-assistant.io/developers/website/) for further information on contributing to [home-assistant.io](https://github.com/balloob/home-assistant.io).
+ - Make sure all your code passes ``pylint`` and ``flake8`` (PEP8 and some more) validation. To check your repository, run `./script/lint`.
  - Create a Pull Request against the [**dev**](https://github.com/balloob/home-assistant/tree/dev) branch of Home Assistant.
  - Check for comments and suggestions on your Pull Request and keep an eye on the [Travis output](https://travis-ci.org/balloob/home-assistant/).
 
-If you've added a component:
+If you add a platform for an existing component, there is usually no need for updating the frontend. Only if you've added a new component that should show up in the frontend, there are more steps needed:
 
  - Update the file [`home-assistant-icons.html`](https://github.com/balloob/home-assistant/blob/master/homeassistant/components/frontend/www_static/polymer/resources/home-assistant-icons.html) with an icon for your domain ([pick one from this list](https://www.polymer-project.org/1.0/components/core-elements/demo.html#core-icon)).
- - Update the demo component with two states that it provides
- - Add your component to home-assistant.conf.example
+ - Update the demo component with two states that it provides.
+ - Add your component to `home-assistant.conf.example`.
 
 Since you've updated `home-assistant-icons.html`, you've made changes to the frontend:
 

Dockerfile

@@ -10,11 +10,10 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends nmap net-tools && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Open Z-Wave disabled because broken
-#RUN apt-get update && \
-#    apt-get install -y cython3 libudev-dev && \
-#    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
-#    pip3 install cython && \
-#    scripts/build_python_openzwave
+RUN apt-get update && \
+   apt-get install -y cython3 libudev-dev && \
+   apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+   pip3 install "cython<0.23" && \
+   script/build_python_openzwave
 
 CMD [ "python", "-m", "homeassistant", "--config", "/config" ]

README.md

@@ -17,9 +17,8 @@ Check out [the website](https://home-assistant.io) for [a demo][demo], installat
 Examples of devices it can interface it:
 
  * Monitoring connected devices to a wireless router: [OpenWrt](https://openwrt.org/), [Tomato](http://www.polarcloud.com/tomato), [Netgear](http://netgear.com), [DD-WRT](http://www.dd-wrt.com/site/index), [TPLink](http://www.tp-link.us/), [ASUSWRT](http://event.asus.com/2013/nw/ASUSWRT/) and any SNMP capable Linksys WAP/WRT
- * 
- * [Philips Hue](http://meethue.com) lights, [WeMo](http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/) switches, [Edimax](http://www.edimax.com/) switches, [Efergy](https://efergy.com) energy monitoring, RFXtrx sensors, and [Tellstick](http://www.telldus.se/products/tellstick) devices and sensors
- * [Google Chromecasts](http://www.google.com/intl/en/chrome/devices/chromecast), [Music Player Daemon](http://www.musicpd.org/), [Logitech Squeezebox](https://en.wikipedia.org/wiki/Squeezebox_%28network_music_player%29), [Plex](https://plex.tv/), [Kodi (XBMC)](http://kodi.tv/), and iTunes (by way of [itunes-api](https://github.com/maddox/itunes-api))
+ * [Philips Hue](http://meethue.com) lights, [WeMo](http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/) switches, [Edimax](http://www.edimax.com/) switches, [Efergy](https://efergy.com) energy monitoring, and [Tellstick](http://www.telldus.se/products/tellstick) devices and sensors
+ * [Google Chromecasts](http://www.google.com/intl/en/chrome/devices/chromecast), [Music Player Daemon](http://www.musicpd.org/), [Logitech Squeezebox](https://en.wikipedia.org/wiki/Squeezebox_%28network_music_player%29), [Plex](https://plex.tv/), [Kodi (XBMC)](http://kodi.tv/), iTunes (by way of [itunes-api](https://github.com/maddox/itunes-api)), and Amazon Fire TV (by way of [python-firetv](https://github.com/happyleavesaoc/python-firetv))
  * Support for [ISY994](https://www.universal-devices.com/residential/isy994i-series/) (Insteon and X10 devices), [Z-Wave](http://www.z-wave.com/), [Nest Thermostats](https://nest.com/), [RFXtrx](http://www.rfxcom.com/), [Arduino](https://www.arduino.cc/), [Raspberry Pi](https://www.raspberrypi.org/), and [Modbus](http://www.modbus.org/)
  * Interaction with [IFTTT](https://ifttt.com/)
  * Integrate data from the [Bitcoin](https://bitcoin.org) network, meteorological data from [OpenWeatherMap](http://openweathermap.org/) and [Forecast.io](https://forecast.io/), [Transmission](http://www.transmissionbt.com/), or [SABnzbd](http://sabnzbd.org).

homeassistant/bootstrap.py

@@ -9,11 +9,12 @@ After bootstrapping you can add your own components or
 start by calling homeassistant.start_home_assistant(bus)
 """
 
-import os
-import sys
+from collections import defaultdict
 import logging
 import logging.handlers
-from collections import defaultdict
+import os
+import shutil
+import sys
 
 import homeassistant.core as core
 import homeassistant.util.dt as date_util
@@ -25,7 +26,7 @@ import homeassistant.components as core_components
 import homeassistant.components.group as group
 from homeassistant.helpers.entity import Entity
 from homeassistant.const import (
-    EVENT_COMPONENT_LOADED, CONF_LATITUDE, CONF_LONGITUDE,
+    __version__, EVENT_COMPONENT_LOADED, CONF_LATITUDE, CONF_LONGITUDE,
     CONF_TEMPERATURE_UNIT, CONF_NAME, CONF_TIME_ZONE, CONF_CUSTOMIZE,
     TEMP_CELCIUS, TEMP_FAHRENHEIT)
 
@@ -34,6 +35,7 @@ _LOGGER = logging.getLogger(__name__)
 ATTR_COMPONENT = 'component'
 
 PLATFORM_FORMAT = '{}.{}'
+ERROR_LOG_FILENAME = 'home-assistant.log'
 
 
 def setup_component(hass, domain, config=None):
@@ -167,6 +169,7 @@ def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
             hass.config.config_dir = config_dir
             mount_local_lib_path(config_dir)
 
+    process_ha_config_upgrade(hass)
     process_ha_core_config(hass, config.get(core.DOMAIN, {}))
 
     if enable_log:
@@ -252,7 +255,7 @@ def enable_logging(hass, verbose=False, daemon=False, log_rotate_days=None):
                 "Colorlog package not found, console coloring disabled")
 
     # Log errors to a file if we have write access to file or config dir
-    err_log_path = hass.config.path('home-assistant.log')
+    err_log_path = hass.config.path(ERROR_LOG_FILENAME)
     err_path_exists = os.path.isfile(err_log_path)
 
     # Check if we can write to the error log if it exists or that
@@ -280,6 +283,31 @@ def enable_logging(hass, verbose=False, daemon=False, log_rotate_days=None):
             'Unable to setup error log %s (access denied)', err_log_path)
 
 
+def process_ha_config_upgrade(hass):
+    """ Upgrade config if necessary. """
+    version_path = hass.config.path('.HA_VERSION')
+
+    try:
+        with open(version_path, 'rt') as inp:
+            conf_version = inp.readline().strip()
+    except FileNotFoundError:
+        # Last version to not have this file
+        conf_version = '0.7.7'
+
+    if conf_version == __version__:
+        return
+
+    _LOGGER.info('Upgrading config directory from %s to %s', conf_version,
+                 __version__)
+
+    lib_path = hass.config.path('lib')
+    if os.path.isdir(lib_path):
+        shutil.rmtree(lib_path)
+
+    with open(version_path, 'wt') as outp:
+        outp.write(__version__)
+
+
 def process_ha_core_config(hass, config):
     """ Processes the [homeassistant] section from the config. """
     hac = hass.config

homeassistant/components/__init__.py

@@ -1,7 +1,6 @@
 """
 homeassistant.components
 ~~~~~~~~~~~~~~~~~~~~~~~~
-
 This package contains components that can be plugged into Home Assistant.
 
 Component design guidelines:
@@ -12,7 +11,6 @@ Each component that tracks states should create state entity names in the
 format "<DOMAIN>.<OBJECT_ID>".
 
 Each component should publish services only under its own domain.
-
 """
 import itertools as it
 import logging

homeassistant/components/alarm_control_panel/__init__.py

@@ -8,7 +8,7 @@ import os
 
 from homeassistant.components import verisure
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
+    ATTR_ENTITY_ID, SERVICE_ALARM_TRIGGER,
     SERVICE_ALARM_DISARM, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_ARM_AWAY)
 from homeassistant.config import load_yaml_config_file
 from homeassistant.helpers.entity import Entity
@@ -29,6 +29,7 @@ SERVICE_TO_METHOD = {
     SERVICE_ALARM_DISARM: 'alarm_disarm',
     SERVICE_ALARM_ARM_HOME: 'alarm_arm_home',
     SERVICE_ALARM_ARM_AWAY: 'alarm_arm_away',
+    SERVICE_ALARM_TRIGGER: 'alarm_trigger'
 }
 
 ATTR_CODE = 'code'
@@ -53,9 +54,9 @@ def setup(hass, config):
         target_alarms = component.extract_from_service(service)
 
         if ATTR_CODE not in service.data:
-            return
-
-        code = service.data[ATTR_CODE]
+            code = None
+        else:
+            code = service.data[ATTR_CODE]
 
         method = SERVICE_TO_METHOD[service.service]
 
@@ -72,36 +73,50 @@ def setup(hass, config):
     return True
 
 
-def alarm_disarm(hass, code, entity_id=None):
+def alarm_disarm(hass, code=None, entity_id=None):
     """ Send the alarm the command for disarm. """
-    data = {ATTR_CODE: code}
-
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
     if entity_id:
         data[ATTR_ENTITY_ID] = entity_id
 
     hass.services.call(DOMAIN, SERVICE_ALARM_DISARM, data)
 
 
-def alarm_arm_home(hass, code, entity_id=None):
+def alarm_arm_home(hass, code=None, entity_id=None):
     """ Send the alarm the command for arm home. """
-    data = {ATTR_CODE: code}
-
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
     if entity_id:
         data[ATTR_ENTITY_ID] = entity_id
 
     hass.services.call(DOMAIN, SERVICE_ALARM_ARM_HOME, data)
 
 
-def alarm_arm_away(hass, code, entity_id=None):
+def alarm_arm_away(hass, code=None, entity_id=None):
     """ Send the alarm the command for arm away. """
-    data = {ATTR_CODE: code}
-
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
     if entity_id:
         data[ATTR_ENTITY_ID] = entity_id
 
     hass.services.call(DOMAIN, SERVICE_ALARM_ARM_AWAY, data)
 
 
+def alarm_trigger(hass, code=None, entity_id=None):
+    """ Send the alarm the command for trigger. """
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_TRIGGER, data)
+
+
 # pylint: disable=no-self-use
 class AlarmControlPanel(Entity):
     """ ABC for alarm control devices. """
@@ -123,6 +138,10 @@ class AlarmControlPanel(Entity):
         """ Send arm away command. """
         raise NotImplementedError()
 
+    def alarm_trigger(self, code=None):
+        """ Send alarm trigger command. """
+        raise NotImplementedError()
+
     @property
     def state_attributes(self):
         """ Return the state attributes. """

homeassistant/components/alarm_control_panel/manual.py

@@ -0,0 +1,149 @@
+"""
+homeassistant.components.alarm_control_panel.manual
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for manual alarms.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.manual/
+"""
+import logging
+import datetime
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.helpers.event import track_point_in_time
+import homeassistant.util.dt as dt_util
+
+from homeassistant.const import (
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = []
+
+DEFAULT_ALARM_NAME = 'HA Alarm'
+DEFAULT_PENDING_TIME = 60
+DEFAULT_TRIGGER_TIME = 120
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Sets up the manual alarm platform. """
+
+    add_devices([ManualAlarm(
+        hass,
+        config.get('name', DEFAULT_ALARM_NAME),
+        config.get('code'),
+        config.get('pending_time', DEFAULT_PENDING_TIME),
+        config.get('trigger_time', DEFAULT_TRIGGER_TIME),
+        )])
+
+
+# pylint: disable=too-many-arguments, too-many-instance-attributes
+# pylint: disable=abstract-method
+class ManualAlarm(alarm.AlarmControlPanel):
+    """
+    Represents an alarm status.
+
+    When armed, will be pending for 'pending_time', after that armed.
+    When triggered, will be pending for 'trigger_time'. After that will be
+    triggered for 'trigger_time', after that we return to disarmed.
+    """
+
+    def __init__(self, hass, name, code, pending_time, trigger_time):
+        self._state = STATE_ALARM_DISARMED
+        self._hass = hass
+        self._name = name
+        self._code = str(code) if code else None
+        self._pending_time = datetime.timedelta(seconds=pending_time)
+        self._trigger_time = datetime.timedelta(seconds=trigger_time)
+        self._state_ts = None
+
+    @property
+    def should_poll(self):
+        """ No polling needed. """
+        return False
+
+    @property
+    def name(self):
+        """ Returns the name of the device. """
+        return self._name
+
+    @property
+    def state(self):
+        """ Returns the state of the device. """
+        if self._state in (STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY) and \
+           self._pending_time and self._state_ts + self._pending_time > \
+           dt_util.utcnow():
+            return STATE_ALARM_PENDING
+
+        if self._state == STATE_ALARM_TRIGGERED and self._trigger_time:
+            if self._state_ts + self._pending_time > dt_util.utcnow():
+                return STATE_ALARM_PENDING
+            elif (self._state_ts + self._pending_time +
+                  self._trigger_time) < dt_util.utcnow():
+                return STATE_ALARM_DISARMED
+
+        return self._state
+
+    @property
+    def code_format(self):
+        """ One or more characters. """
+        return None if self._code is None else '.+'
+
+    def alarm_disarm(self, code=None):
+        """ Send disarm command. """
+        if not self._validate_code(code, STATE_ALARM_DISARMED):
+            return
+
+        self._state = STATE_ALARM_DISARMED
+        self._state_ts = dt_util.utcnow()
+        self.update_ha_state()
+
+    def alarm_arm_home(self, code=None):
+        """ Send arm home command. """
+        if not self._validate_code(code, STATE_ALARM_ARMED_HOME):
+            return
+
+        self._state = STATE_ALARM_ARMED_HOME
+        self._state_ts = dt_util.utcnow()
+        self.update_ha_state()
+
+        if self._pending_time:
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self._state_ts + self._pending_time)
+
+    def alarm_arm_away(self, code=None):
+        """ Send arm away command. """
+        if not self._validate_code(code, STATE_ALARM_ARMED_AWAY):
+            return
+
+        self._state = STATE_ALARM_ARMED_AWAY
+        self._state_ts = dt_util.utcnow()
+        self.update_ha_state()
+
+        if self._pending_time:
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self._state_ts + self._pending_time)
+
+    def alarm_trigger(self, code=None):
+        """ Send alarm trigger command. No code needed. """
+        self._state = STATE_ALARM_TRIGGERED
+        self._state_ts = dt_util.utcnow()
+        self.update_ha_state()
+
+        if self._trigger_time:
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self._state_ts + self._pending_time)
+
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self._state_ts + self._pending_time + self._trigger_time)
+
+    def _validate_code(self, code, state):
+        """ Validate given code. """
+        check = self._code is None or code == self._code
+        if not check:
+            _LOGGER.warning('Invalid code given for %s', state)
+        return check

homeassistant/components/alarm_control_panel/mqtt.py

@@ -1,68 +1,18 @@
 """
 homeassistant.components.alarm_control_panel.mqtt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 This platform enables the possibility to control a MQTT alarm.
-In this platform, 'state_topic' and 'command_topic' are required.
-The alarm will only change state after receiving the a new state
-from 'state_topic'. If these messages are published with RETAIN flag,
-the MQTT alarm will receive an instant state update after subscription
-and will start with correct state. Otherwise, the initial state will
-be 'unknown'.
 
-Configuration:
-
-alarm_control_panel:
-  platform: mqtt
-  name: "MQTT Alarm"
-  state_topic: "home/alarm"
-  command_topic: "home/alarm/set"
-  qos: 0
-  payload_disarm: "DISARM"
-  payload_arm_home: "ARM_HOME"
-  payload_arm_away: "ARM_AWAY"
-  code: "mySecretCode"
-
-Variables:
-
-name
-*Optional
-The name of the alarm. Default is 'MQTT Alarm'.
-
-state_topic
-*Required
-The MQTT topic subscribed to receive state updates.
-
-command_topic
-*Required
-The MQTT topic to publish commands to change the alarm state.
-
-qos
-*Optional
-The maximum QoS level of the state topic. Default is 0.
-This QoS will also be used to publishing messages.
-
-payload_disarm
-*Optional
-The payload do disarm alarm. Default is "DISARM".
-
-payload_arm_home
-*Optional
-The payload to set armed-home mode. Default is "ARM_HOME".
-
-payload_arm_away
-*Optional
-The payload to set armed-away mode. Default is "ARM_AWAY".
-
-code
-*Optional
-If defined, specifies a code to enable or disable the alarm in the frontend.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.mqtt/
 """
 import logging
 import homeassistant.components.mqtt as mqtt
 import homeassistant.components.alarm_control_panel as alarm
 
-from homeassistant.const import (STATE_UNKNOWN)
+from homeassistant.const import (
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -99,6 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
 
 # pylint: disable=too-many-arguments, too-many-instance-attributes
+# pylint: disable=abstract-method
 class MqttAlarm(alarm.AlarmControlPanel):
     """ represents a MQTT alarm status within home assistant. """
 
@@ -113,10 +64,15 @@ class MqttAlarm(alarm.AlarmControlPanel):
         self._payload_disarm = payload_disarm
         self._payload_arm_home = payload_arm_home
         self._payload_arm_away = payload_arm_away
-        self._code = code
+        self._code = str(code) if code else None
 
         def message_received(topic, payload, qos):
             """ A new MQTT message has been received. """
+            if payload not in (STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME,
+                               STATE_ALARM_ARMED_AWAY, STATE_ALARM_PENDING,
+                               STATE_ALARM_TRIGGERED):
+                _LOGGER.warning('Received unexpected payload: %s', payload)
+                return
             self._state = payload
             self.update_ha_state()
 
@@ -144,24 +100,28 @@ class MqttAlarm(alarm.AlarmControlPanel):
 
     def alarm_disarm(self, code=None):
         """ Send disarm command. """
-        if code == str(self._code) or self.code_format is None:
-            mqtt.publish(self.hass, self._command_topic,
-                         self._payload_disarm, self._qos)
-        else:
-            _LOGGER.warning("Wrong code entered while disarming!")
+        if not self._validate_code(code, 'disarming'):
+            return
+        mqtt.publish(self.hass, self._command_topic,
+                     self._payload_disarm, self._qos)
 
     def alarm_arm_home(self, code=None):
         """ Send arm home command. """
-        if code == str(self._code) or self.code_format is None:
-            mqtt.publish(self.hass, self._command_topic,
-                         self._payload_arm_home, self._qos)
-        else:
-            _LOGGER.warning("Wrong code entered while arming home!")
+        if not self._validate_code(code, 'arming home'):
+            return
+        mqtt.publish(self.hass, self._command_topic,
+                     self._payload_arm_home, self._qos)
 
     def alarm_arm_away(self, code=None):
         """ Send arm away command. """
-        if code == str(self._code) or self.code_format is None:
-            mqtt.publish(self.hass, self._command_topic,
-                         self._payload_arm_away, self._qos)
-        else:
-            _LOGGER.warning("Wrong code entered while arming away!")
+        if not self._validate_code(code, 'arming away'):
+            return
+        mqtt.publish(self.hass, self._command_topic,
+                     self._payload_arm_away, self._qos)
+
+    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

homeassistant/components/alarm_control_panel/verisure.py

@@ -2,6 +2,9 @@
 homeassistant.components.alarm_control_panel.verisure
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Interfaces with Verisure alarm control panel.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/verisure/
 """
 import logging
 
@@ -33,6 +36,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     add_devices(alarms)
 
 
+# pylint: disable=abstract-method
 class VerisureAlarm(alarm.AlarmControlPanel):
     """ Represents a Verisure alarm status. """
 

homeassistant/components/api.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.api
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides a Rest API for Home Assistant.
+
+For more details about the RESTful API, please refer to the documentation at
+https://home-assistant.io/developers/api/
 """
 import re
 import logging
@@ -12,13 +14,14 @@ import json
 import homeassistant.core as ha
 from homeassistant.helpers.state import TrackStates
 import homeassistant.remote as rem
+from homeassistant.bootstrap import ERROR_LOG_FILENAME
 from homeassistant.const import (
     URL_API, URL_API_STATES, URL_API_EVENTS, URL_API_SERVICES, URL_API_STREAM,
     URL_API_EVENT_FORWARD, URL_API_STATES_ENTITY, URL_API_COMPONENTS,
-    URL_API_CONFIG, URL_API_BOOTSTRAP,
+    URL_API_CONFIG, URL_API_BOOTSTRAP, URL_API_ERROR_LOG,
     EVENT_TIME_CHANGED, EVENT_HOMEASSISTANT_STOP, MATCH_ALL,
     HTTP_OK, HTTP_CREATED, HTTP_BAD_REQUEST, HTTP_NOT_FOUND,
-    HTTP_UNPROCESSABLE_ENTITY)
+    HTTP_UNPROCESSABLE_ENTITY, CONTENT_TYPE_TEXT_PLAIN)
 
 
 DOMAIN = 'api'
@@ -87,6 +90,9 @@ def setup(hass, config):
     hass.http.register_path(
         'GET', URL_API_COMPONENTS, _handle_get_api_components)
 
+    hass.http.register_path('GET', URL_API_ERROR_LOG,
+                            _handle_get_api_error_log)
+
     return True
 
 
@@ -339,6 +345,13 @@ def _handle_get_api_components(handler, path_match, data):
     handler.write_json(handler.server.hass.config.components)
 
 
+def _handle_get_api_error_log(handler, path_match, data):
+    """ Returns the logged errors for this session. """
+    error_path = handler.server.hass.config.path(ERROR_LOG_FILENAME)
+    with open(error_path, 'rb') as error_log:
+        handler.write_file_pointer(CONTENT_TYPE_TEXT_PLAIN, error_log)
+
+
 def _services_json(hass):
     """ Generate services data to JSONify. """
     return [{"domain": key, "services": value}

homeassistant/components/arduino.py

@@ -4,26 +4,8 @@ components.arduino
 Arduino component that connects to a directly attached Arduino board which
 runs with the Firmata firmware.
 
-Configuration:
-
-To use the Arduino board you will need to add something like the following
-to your configuration.yaml file.
-
-arduino:
-    port: /dev/ttyACM0
-
-Variables:
-
-port
-*Required
-The port where is your board connected to your Home Assistant system.
-If you are using an original Arduino the port will be named ttyACM*. The exact
-number can be determined with 'ls /dev/ttyACM*' or check your 'dmesg'/
-'journalctl -f' output. Keep in mind that Arduino clones are often using a
-different name for the port (e.g. '/dev/ttyUSB*').
-
-A word of caution: The Arduino is not storing states. This means that with
-every initialization the pins are set to off/low.
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/arduino/
 """
 import logging
 

homeassistant/components/automation/__init__.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.automation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Allows to setup simple automation rules via the config file.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/automation/
 """
 import logging
 

homeassistant/components/automation/event.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.automation.event
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Offers event listening automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#event-trigger
 """
 import logging
 

homeassistant/components/automation/mqtt.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.automation.mqtt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Offers MQTT listening automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#mqtt-trigger
 """
 import logging
 

homeassistant/components/automation/numeric_state.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.automation.numeric_state
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Offers numeric state listening automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#numeric-state-trigger
 """
 import logging
 

homeassistant/components/automation/state.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.automation.state
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Offers state listening automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#state-trigger
 """
 import logging
 
@@ -28,6 +30,11 @@ def trigger(hass, config, action):
     from_state = config.get(CONF_FROM, MATCH_ALL)
     to_state = config.get(CONF_TO) or config.get(CONF_STATE) or MATCH_ALL
 
+    if isinstance(from_state, bool) or isinstance(to_state, bool):
+        logging.getLogger(__name__).error(
+            'Config error. Surround to/from values with quotes.')
+        return False
+
     def state_automation_listener(entity, from_s, to_s):
         """ Listens for state changes and calls action. """
         action()

homeassistant/components/automation/sun.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.automation.sun
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Offers sun based automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#sun-trigger
 """
 import logging
 from datetime import timedelta

homeassistant/components/automation/time.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.automation.time
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Offers time listening automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#time-trigger
 """
 import logging
 

homeassistant/components/automation/zone.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.automation.zone
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Offers zone automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#zone-trigger
 """
 import logging
 

homeassistant/components/browser.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.browser
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to launch a webbrowser on the host machine.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/browser/
 """
 
 DOMAIN = "browser"

homeassistant/components/camera/__init__.py

@@ -4,24 +4,8 @@ homeassistant.components.camera
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Component to interface with various cameras.
 
-The following features are supported:
- - Returning recorded camera images and streams
- - Proxying image requests via HA for external access
- - Converting a still image url into a live video stream
-
-Upcoming features
- - Recording
- - Snapshot
- - Motion Detection Recording(for supported cameras)
- - Automatic Configuration(for supported cameras)
- - Creation of child entities for supported functions
- - Collating motion event images passed via FTP into time based events
- - A service for calling camera functions
- - Camera movement(panning)
- - Zoom
- - Light/Nightvision toggling
- - Support for more devices
- - Expanded documentation
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/camera/
 """
 import requests
 import logging
@@ -103,7 +87,10 @@ def setup(hass, config):
 
         if camera:
             response = camera.camera_image()
-            handler.wfile.write(response)
+            if response is not None:
+                handler.wfile.write(response)
+            else:
+                handler.send_response(HTTP_NOT_FOUND)
         else:
             handler.send_response(HTTP_NOT_FOUND)
 
@@ -145,7 +132,8 @@ def setup(hass, config):
             while True:
 
                 img_bytes = camera.camera_image()
-
+                if img_bytes is None:
+                    continue
                 headers_str = '\r\n'.join((
                     'Content-length: {}'.format(len(img_bytes)),
                     'Content-type: image/jpeg',

homeassistant/components/camera/foscam.py

@@ -3,51 +3,14 @@ homeassistant.components.camera.foscam
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This component provides basic support for Foscam IP cameras.
 
-As part of the basic support the following features will be provided:
--MJPEG video streaming
-
-To use this component, add the following to your configuration.yaml file.
-
-camera:
-  platform: foscam
-  name: Door Camera
-  ip: 192.168.0.123
-  port: 88
-  username: YOUR_USERNAME
-  password: YOUR_PASSWORD
-
-Variables:
-
-ip
-*Required
-The IP address of your Foscam device.
-
-username
-*Required
-The username of a visitor or operator of your camera. Oddly admin accounts
-don't seem to have access to take snapshots.
-
-password
-*Required
-The password for accessing your camera.
-
-name
-*Optional
-This parameter allows you to override the name of your camera in homeassistant.
-
-port
-*Optional
-The port that the camera is running on. The default is 88.
-
 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/camera.foscam.html
+https://home-assistant.io/components/camera.foscam/
 """
 import logging
 from homeassistant.helpers import validate_config
 from homeassistant.components.camera import DOMAIN
 from homeassistant.components.camera import Camera
 import requests
-import re
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -76,7 +39,7 @@ class FoscamCamera(Camera):
         self._username = device_info.get('username')
         self._password = device_info.get('password')
         self._snap_picture_url = self._base_url \
-            + 'cgi-bin/CGIProxy.fcgi?cmd=snapPicture&usr=' \
+            + 'cgi-bin/CGIProxy.fcgi?cmd=snapPicture2&usr=' \
             + self._username + '&pwd=' + self._password
         self._name = device_info.get('name', 'Foscam Camera')
 
@@ -86,17 +49,9 @@ class FoscamCamera(Camera):
     def camera_image(self):
         """ Return a still image reponse from the camera. """
 
-        # send the request to snap a picture
+        # Send the request to snap a picture and return raw jpg data
         response = requests.get(self._snap_picture_url)
 
-        # parse the response to find the image file name
-
-        pattern = re.compile('src="[.][.]/(.*[.]jpg)"')
-        filename = pattern.search(response.content.decode("utf-8")).group(1)
-
-        # send request for the image
-        response = requests.get(self._base_url + filename)
-
         return response.content
 
     @property

homeassistant/components/camera/generic.py

@@ -3,43 +3,8 @@ homeassistant.components.camera.generic
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for IP Cameras.
 
-This component provides basic support for IP cameras. For the basic support to
-work you camera must support accessing a JPEG snapshot via a URL and you will
-need to specify the "still_image_url" parameter which should be the location of
-the JPEG image.
-
-As part of the basic support the following features will be provided:
-- MJPEG video streaming
-- Saving a snapshot
-- Recording(JPEG frame capture)
-
-To use this component, add the following to your configuration.yaml file.
-
-camera:
-    platform: generic
-    name: Door Camera
-    username: YOUR_USERNAME
-    password: YOUR_PASSWORD
-    still_image_url: http://YOUR_CAMERA_IP_AND_PORT/image.jpg
-
-Variables:
-
-still_image_url
-*Required
-The URL your camera serves the image on, eg. http://192.168.1.21:2112/
-
-name
-*Optional
-This parameter allows you to override the name of your camera in Home
-Assistant.
-
-username
-*Optional
-The username for accessing your camera.
-
-password
-*Optional
-The password for accessing your camera.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.generic/
 """
 import logging
 from requests.auth import HTTPBasicAuth
@@ -77,11 +42,19 @@ class GenericCamera(Camera):
     def camera_image(self):
         """ Return a still image reponse from the camera. """
         if self._username and self._password:
-            response = requests.get(
-                self._still_image_url,
-                auth=HTTPBasicAuth(self._username, self._password))
+            try:
+                response = requests.get(
+                    self._still_image_url,
+                    auth=HTTPBasicAuth(self._username, self._password))
+            except requests.exceptions.RequestException as error:
+                _LOGGER.error('Error getting camera image: %s', error)
+                return None
         else:
-            response = requests.get(self._still_image_url)
+            try:
+                response = requests.get(self._still_image_url)
+            except requests.exceptions.RequestException as error:
+                _LOGGER.error('Error getting camera image: %s', error)
+                return None
 
         return response.content
 

homeassistant/components/camera/mjpeg.py

@@ -0,0 +1,71 @@
+"""
+homeassistant.components.camera.mjpeg
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for IP Cameras.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.mjpeg/
+"""
+import logging
+from requests.auth import HTTPBasicAuth
+from homeassistant.helpers import validate_config
+from homeassistant.components.camera import DOMAIN
+from homeassistant.components.camera import Camera
+import requests
+from contextlib import closing
+
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ Adds a mjpeg IP Camera. """
+    if not validate_config({DOMAIN: config}, {DOMAIN: ['mjpeg_url']},
+                           _LOGGER):
+        return None
+
+    add_devices_callback([MjpegCamera(config)])
+
+
+# pylint: disable=too-many-instance-attributes
+class MjpegCamera(Camera):
+    """
+    A generic implementation of an IP camera that is reachable over a URL.
+    """
+
+    def __init__(self, device_info):
+        super().__init__()
+        self._name = device_info.get('name', 'Mjpeg Camera')
+        self._username = device_info.get('username')
+        self._password = device_info.get('password')
+        self._mjpeg_url = device_info['mjpeg_url']
+
+    def camera_image(self):
+        """ Return a still image response from the camera. """
+
+        def process_response(response):
+            """ Take in a response object, return the jpg from it. """
+            data = b''
+            for chunk in response.iter_content(1024):
+                data += chunk
+                jpg_start = data.find(b'\xff\xd8')
+                jpg_end = data.find(b'\xff\xd9')
+                if jpg_start != -1 and jpg_end != -1:
+                    jpg = data[jpg_start:jpg_end + 2]
+                    return jpg
+
+        if self._username and self._password:
+            with closing(requests.get(self._mjpeg_url,
+                                      auth=HTTPBasicAuth(self._username,
+                                                         self._password),
+                                      stream=True)) as response:
+                return process_response(response)
+        else:
+            with closing(requests.get(self._mjpeg_url,
+                                      stream=True)) as response:
+                return process_response(response)
+
+    @property
+    def name(self):
+        """ Return the name of this device. """
+        return self._name

homeassistant/components/conversation.py

@@ -1,9 +1,10 @@
 """
 homeassistant.components.conversation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to have conversations with Home Assistant.
-This is more a proof of concept.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/conversation/
 """
 import logging
 import re

homeassistant/components/demo.py

@@ -10,14 +10,15 @@ import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
 import homeassistant.loader as loader
 from homeassistant.const import (
-    CONF_PLATFORM, ATTR_ENTITY_PICTURE, ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME)
+    CONF_PLATFORM, ATTR_ENTITY_ID)
 
 DOMAIN = "demo"
 
-DEPENDENCIES = ['introduction', 'conversation']
+DEPENDENCIES = ['conversation', 'introduction', 'zone']
 
 COMPONENTS_WITH_DEMO_PLATFORM = [
-    'switch', 'light', 'sensor', 'thermostat', 'media_player', 'notify']
+    'device_tracker', 'light', 'media_player', 'notify', 'switch', 'sensor',
+    'thermostat']
 
 
 def setup(hass, config):
@@ -63,6 +64,14 @@ def setup(hass, config):
             'still_image_url': 'http://home-assistant.io/demo/webcam.jpg',
         }})
 
+    # Setup alarm_control_panel
+    bootstrap.setup_component(
+        hass, 'alarm_control_panel',
+        {'alarm_control_panel': {
+            'platform': 'manual',
+            'name': 'Test Alarm',
+        }})
+
     # Setup scripts
     bootstrap.setup_component(
         hass, 'script',
@@ -102,25 +111,6 @@ def setup(hass, config):
              }},
             ]})
 
-    # Setup fake device tracker
-    hass.states.set("device_tracker.paulus", "home",
-                    {ATTR_ENTITY_PICTURE:
-                     "http://graph.facebook.com/297400035/picture",
-                     ATTR_FRIENDLY_NAME: 'Paulus'})
-    hass.states.set("device_tracker.anne_therese", "not_home",
-                    {ATTR_FRIENDLY_NAME: 'Anne Therese',
-                     'latitude': hass.config.latitude + 0.002,
-                     'longitude': hass.config.longitude + 0.002})
-
-    hass.states.set("group.all_devices", "home",
-                    {
-                        "auto": True,
-                        ATTR_ENTITY_ID: [
-                            "device_tracker.paulus",
-                            "device_tracker.anne_therese"
-                        ]
-                    })
-
     # Setup configurator
     configurator_ids = []
 

homeassistant/components/device_sun_light_trigger.py

@@ -1,9 +1,11 @@
 """
 homeassistant.components.device_sun_light_trigger
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Provides functionality to turn on lights based on the state of the sun and
+devices.
 
-Provides functionality to turn on lights based on
-the state of the sun and devices.
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/device_sun_light_trigger/
 """
 import logging
 from datetime import timedelta

homeassistant/components/device_tracker/__init__.py

@@ -1,25 +1,10 @@
 """
 homeassistant.components.device_tracker
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to keep track of devices.
 
-device_tracker:
-  platform: netgear
-
-  # Optional
-
-  # How many seconds to wait after not seeing device to consider it not home
-  consider_home: 180
-
-  # Seconds between each scan
-  interval_seconds: 12
-
-  # New found devices auto found
-  track_new_devices: yes
-
-  # Maximum distance from home we consider people home
-  range_home: 100
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/device_tracker/
 """
 # pylint: disable=too-many-instance-attributes, too-many-arguments
 # pylint: disable=too-many-locals

homeassistant/components/device_tracker/actiontec.py

@@ -4,41 +4,8 @@ homeassistant.components.device_tracker.actiontec
 Device tracker platform that supports scanning an Actiontec MI424WR
 (Verizon FIOS) router for device presence.
 
-This device tracker needs telnet to be enabled on the router.
-
-Configuration:
-
-To use the Actiontec tracker you will need to add something like the
-following to your configuration.yaml file. If you experience disconnects
-you can modify the home_interval variable.
-
-device_tracker:
-  platform: actiontec
-  host: YOUR_ROUTER_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-  # optional:
-  home_interval: 10
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
-
-home_interval
-*Optional
-If the home_interval is set then the component will not let a device
-be AWAY if it has been HOME in the last home_interval minutes. This is
-in addition to the 3 minute wait built into the device_tracker component.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.actiontec/
 """
 import logging
 from datetime import timedelta
@@ -50,20 +17,19 @@ import telnetlib
 import homeassistant.util.dt as dt_util
 from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
 from homeassistant.helpers import validate_config
-from homeassistant.util import Throttle, convert
+from homeassistant.util import Throttle
 from homeassistant.components.device_tracker import DOMAIN
 
 # Return cached results if last scan was less then this time ago
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
 
-# interval in minutes to exclude devices from a scan while they are home
-CONF_HOME_INTERVAL = "home_interval"
-
 _LOGGER = logging.getLogger(__name__)
 
 _LEASES_REGEX = re.compile(
     r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})' +
-    r'\smac:\s(?P<mac>([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))')
+    r'\smac:\s(?P<mac>([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))' +
+    r'\svalid\sfor:\s(?P<timevalid>(-?\d+))' +
+    r'\ssec')
 
 
 # pylint: disable=unused-argument
@@ -73,9 +39,7 @@ def get_scanner(hass, config):
                            {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
                            _LOGGER):
         return None
-
     scanner = ActiontecDeviceScanner(config[DOMAIN])
-
     return scanner if scanner.success_init else None
 
 Device = namedtuple("Device", ["mac", "ip", "last_update"])
@@ -91,19 +55,11 @@ class ActiontecDeviceScanner(object):
         self.host = config[CONF_HOST]
         self.username = config[CONF_USERNAME]
         self.password = config[CONF_PASSWORD]
-        minutes = convert(config.get(CONF_HOME_INTERVAL), int, 0)
-        self.home_interval = timedelta(minutes=minutes)
-
         self.lock = threading.Lock()
-
         self.last_results = []
-
-        # Test the router is accessible
         data = self.get_actiontec_data()
         self.success_init = data is not None
         _LOGGER.info("actiontec scanner initialized")
-        if self.home_interval:
-            _LOGGER.info("home_interval set to: %s", self.home_interval)
 
     def scan_devices(self):
         """
@@ -133,27 +89,13 @@ class ActiontecDeviceScanner(object):
             return False
 
         with self.lock:
-            exclude_targets = set()
-            exclude_target_list = []
             now = dt_util.now()
-            if self.home_interval:
-                for host in self.last_results:
-                    if host.last_update + self.home_interval > now:
-                        exclude_targets.add(host)
-                if len(exclude_targets) > 0:
-                    exclude_target_list = [t.ip for t in exclude_targets]
-
             actiontec_data = self.get_actiontec_data()
             if not actiontec_data:
                 return False
-            self.last_results = []
-            for client in exclude_target_list:
-                if client in actiontec_data:
-                    actiontec_data.pop(client)
-            for name, data in actiontec_data.items():
-                device = Device(data['mac'], name, now)
-                self.last_results.append(device)
-            self.last_results.extend(exclude_targets)
+            self.last_results = [Device(data['mac'], name, now)
+                                 for name, data in actiontec_data.items()
+                                 if data['timevalid'] > -60]
             _LOGGER.info("actiontec scan successful")
             return True
 
@@ -186,6 +128,7 @@ class ActiontecDeviceScanner(object):
             if match is not None:
                 devices[match.group('ip')] = {
                     'ip': match.group('ip'),
-                    'mac': match.group('mac').upper()
+                    'mac': match.group('mac').upper(),
+                    'timevalid': int(match.group('timevalid'))
                     }
         return devices

homeassistant/components/device_tracker/aruba.py

@@ -4,33 +4,8 @@ homeassistant.components.device_tracker.aruba
 Device tracker platform that supports scanning a Aruba Access Point for device
 presence.
 
-This device tracker needs telnet to be enabled on the router.
-
-Configuration:
-
-To use the Aruba tracker you will need to add something like the following
-to your configuration.yaml file. You also need to enable Telnet in the
-configuration page of your router.
-
-device_tracker:
-  platform: aruba
-  host: YOUR_ACCESS_POINT_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.aruba/
 """
 import logging
 from datetime import timedelta

homeassistant/components/device_tracker/asuswrt.py

@@ -4,32 +4,8 @@ homeassistant.components.device_tracker.asuswrt
 Device tracker platform that supports scanning a ASUSWRT router for device
 presence.
 
-This device tracker needs telnet to be enabled on the router.
-
-Configuration:
-
-To use the ASUSWRT tracker you will need to add something like the following
-to your configuration.yaml file.
-
-device_tracker:
-  platform: asuswrt
-  host: YOUR_ROUTER_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.asuswrt/
 """
 import logging
 from datetime import timedelta
@@ -158,6 +134,10 @@ class AsusWrtDeviceScanner(object):
         for lease in leases_result:
             match = _LEASES_REGEX.search(lease.decode('utf-8'))
 
+            if not match:
+                _LOGGER.warning("Could not parse lease row: %s", lease)
+                continue
+
             # For leases where the client doesn't set a hostname, ensure
             # it is blank and not '*', which breaks the entity_id down
             # the line
@@ -174,6 +154,9 @@ class AsusWrtDeviceScanner(object):
 
         for neighbor in neighbors:
             match = _IP_NEIGH_REGEX.search(neighbor.decode('utf-8'))
+            if not match:
+                _LOGGER.warning("Could not parse neighbor row: %s", neighbor)
+                continue
             if match.group('ip') in devices:
                 devices[match.group('ip')]['status'] = match.group('status')
         return devices

homeassistant/components/device_tracker/ddwrt.py

@@ -4,30 +4,8 @@ homeassistant.components.device_tracker.ddwrt
 Device tracker platform that supports scanning a DD-WRT router for device
 presence.
 
-Configuration:
-
-To use the DD-WRT tracker you will need to add something like the following
-to your configuration.yaml file.
-
-device_tracker:
-  platform: ddwrt
-  host: YOUR_ROUTER_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.ddwrt/
 """
 import logging
 from datetime import timedelta

homeassistant/components/device_tracker/demo.py

@@ -1,7 +1,6 @@
 """
 homeassistant.components.device_tracker.demo
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Demo platform for the device tracker.
 
 device_tracker:

homeassistant/components/device_tracker/geofancy.py

@@ -0,0 +1,70 @@
+"""
+homeassistant.components.device_tracker.geofancy
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Geofancy platform for the device tracker.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.geofancy/
+"""
+from homeassistant.const import (
+    HTTP_UNPROCESSABLE_ENTITY, HTTP_INTERNAL_SERVER_ERROR)
+
+DEPENDENCIES = ['http']
+
+_SEE = 0
+
+URL_API_GEOFANCY_ENDPOINT = "/api/geofancy"
+
+
+def setup_scanner(hass, config, see):
+    """ Set up an endpoint for the Geofancy app. """
+
+    # Use a global variable to keep setup_scanner compact when using a callback
+    global _SEE
+    _SEE = see
+
+    # POST would be semantically better, but that currently does not work
+    # since Geofancy sends the data as key1=value1&key2=value2
+    # in the request body, while Home Assistant expects json there.
+
+    hass.http.register_path(
+        'GET', URL_API_GEOFANCY_ENDPOINT, _handle_get_api_geofancy)
+
+    return True
+
+
+def _handle_get_api_geofancy(handler, path_match, data):
+    """ Geofancy message received. """
+
+    if not isinstance(data, dict):
+        handler.write_json_message(
+            "Error while parsing Geofancy message.",
+            HTTP_INTERNAL_SERVER_ERROR)
+        return
+    if 'latitude' not in data or 'longitude' not in data:
+        handler.write_json_message(
+            "Location not specified.",
+            HTTP_UNPROCESSABLE_ENTITY)
+        return
+    if 'device' not in data or 'id' not in data:
+        handler.write_json_message(
+            "Device id or location id not specified.",
+            HTTP_UNPROCESSABLE_ENTITY)
+        return
+
+    try:
+        gps_coords = (float(data['latitude']), float(data['longitude']))
+    except ValueError:
+        # If invalid latitude / longitude format
+        handler.write_json_message(
+            "Invalid latitude / longitude format.",
+            HTTP_UNPROCESSABLE_ENTITY)
+        return
+
+    # entity id's in Home Assistant must be alphanumerical
+    device_uuid = data['device']
+    device_entity_id = device_uuid.replace('-', '')
+
+    _SEE(dev_id=device_entity_id, gps=gps_coords, location_name=data['id'])
+
+    handler.write_json_message("Geofancy message processed")

homeassistant/components/device_tracker/luci.py

@@ -4,33 +4,8 @@ homeassistant.components.device_tracker.luci
 Device tracker platform that supports scanning a OpenWRT router for device
 presence.
 
-It's required that the luci RPC package is installed on the OpenWRT router:
-# opkg install luci-mod-rpc
-
-Configuration:
-
-To use the Luci tracker you will need to add something like the following
-to your configuration.yaml file.
-
-device_tracker:
-  platform: luci
-  host: YOUR_ROUTER_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.luci/
 """
 import logging
 import json

homeassistant/components/device_tracker/mqtt.py

@@ -1,15 +1,10 @@
 """
 homeassistant.components.device_tracker.mqtt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 MQTT platform for the device tracker.
 
-device_tracker:
-  platform: mqtt
-  qos: 1
-  devices:
-    paulus_oneplus: /location/paulus
-    annetherese_n4: /location/annetherese
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.mqtt/
 """
 import logging
 from homeassistant import util

homeassistant/components/device_tracker/netgear.py

@@ -4,30 +4,8 @@ homeassistant.components.device_tracker.netgear
 Device tracker platform that supports scanning a Netgear router for device
 presence.
 
-Configuration:
-
-To use the Netgear tracker you will need to add something like the following
-to your configuration.yaml file.
-
-device_tracker:
-  platform: netgear
-  host: YOUR_ROUTER_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.netgear/
 """
 import logging
 from datetime import timedelta

homeassistant/components/device_tracker/nmap_tracker.py

@@ -3,26 +3,8 @@ homeassistant.components.device_tracker.nmap
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Device tracker platform that supports scanning a network with nmap.
 
-Configuration:
-
-To use the nmap tracker you will need to add something like the following
-to your configuration.yaml file.
-
-device_tracker:
-  platform: nmap_tracker
-  hosts: 192.168.1.1/24
-
-Variables:
-
-hosts
-*Required
-The IP addresses to scan in the network-prefix notation (192.168.1.1/24) or
-the range notation (192.168.1.1-255).
-
-home_interval
-*Optional
-Number of minutes it will not scan devices that it found in previous results.
-This is to save battery.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.nmap_scanner/
 """
 import logging
 from datetime import timedelta

homeassistant/components/device_tracker/owntracks.py

@@ -1,11 +1,10 @@
 """
 homeassistant.components.device_tracker.owntracks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 OwnTracks platform for the device tracker.
 
-device_tracker:
-  platform: owntracks
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.owntracks/
 """
 import json
 import logging

homeassistant/components/device_tracker/snmp.py

@@ -5,7 +5,7 @@ Device tracker platform that supports fetching WiFi associations
 through SNMP.
 
 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/device_tracker.snmp.html
+https://home-assistant.io/components/device_tracker.snmp/
 """
 import logging
 from datetime import timedelta
@@ -45,9 +45,12 @@ class SnmpScanner(object):
     This class queries any SNMP capable Acces Point for connected devices.
     """
     def __init__(self, config):
-        self.host = config[CONF_HOST]
-        self.community = config[CONF_COMMUNITY]
-        self.baseoid = config[CONF_BASEOID]
+        from pysnmp.entity.rfc3413.oneliner import cmdgen
+        self.snmp = cmdgen.CommandGenerator()
+
+        self.host = cmdgen.UdpTransportTarget((config[CONF_HOST], 161))
+        self.community = cmdgen.CommunityData(config[CONF_COMMUNITY])
+        self.baseoid = cmdgen.MibVariable(config[CONF_BASEOID])
 
         self.lock = threading.Lock()
 
@@ -91,16 +94,11 @@ class SnmpScanner(object):
 
     def get_snmp_data(self):
         """ Fetch mac addresses from WAP via SNMP. """
-        from pysnmp.entity.rfc3413.oneliner import cmdgen
 
         devices = []
 
-        snmp = cmdgen.CommandGenerator()
-        errindication, errstatus, errindex, restable = snmp.nextCmd(
-            cmdgen.CommunityData(self.community),
-            cmdgen.UdpTransportTarget((self.host, 161)),
-            cmdgen.MibVariable(self.baseoid)
-        )
+        errindication, errstatus, errindex, restable = self.snmp.nextCmd(
+            self.community, self.host, self.baseoid)
 
         if errindication:
             _LOGGER.error("SNMPLIB error: %s", errindication)

homeassistant/components/device_tracker/thomson.py

@@ -4,32 +4,8 @@ homeassistant.components.device_tracker.thomson
 Device tracker platform that supports scanning a THOMSON router for device
 presence.
 
-This device tracker needs telnet to be enabled on the router.
-
-Configuration:
-
-To use the THOMSON tracker you will need to add something like the following
-to your configuration.yaml file.
-
-device_tracker:
-  platform: thomson
-  host: YOUR_ROUTER_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.thomson/
 """
 import logging
 from datetime import timedelta

homeassistant/components/device_tracker/tomato.py

@@ -4,36 +4,8 @@ homeassistant.components.device_tracker.tomato
 Device tracker platform that supports scanning a Tomato router for device
 presence.
 
-Configuration:
-
-To use the Tomato tracker you will need to add something like the following
-to your configuration.yaml file.
-
-device_tracker:
-  platform: tomato
-  host: YOUR_ROUTER_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-  http_id: ABCDEFG
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
-
-http_id
-*Required
-The value can be obtained by logging in to the Tomato admin interface and
-search for http_id in the page source code.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.tomato/
 """
 import logging
 import json

homeassistant/components/device_tracker/tplink.py

@@ -4,30 +4,8 @@ homeassistant.components.device_tracker.tplink
 Device tracker platform that supports scanning a TP-Link router for device
 presence.
 
-Configuration:
-
-To use the TP-Link tracker you will need to add something like the following
-to your configuration.yaml file.
-
-device_tracker:
-  platform: tplink
-  host: YOUR_ROUTER_IP
-  username: YOUR_ADMIN_USERNAME
-  password: YOUR_ADMIN_PASSWORD
-
-Variables:
-
-host
-*Required
-The IP address of your router, e.g. 192.168.1.1.
-
-username
-*Required
-The username of an user with administrative privileges, usually 'admin'.
-
-password
-*Required
-The password for your given admin account.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.tplink/
 """
 import base64
 import logging
@@ -54,10 +32,13 @@ def get_scanner(hass, config):
                            _LOGGER):
         return None
 
-    scanner = Tplink2DeviceScanner(config[DOMAIN])
+    scanner = Tplink3DeviceScanner(config[DOMAIN])
 
     if not scanner.success_init:
-        scanner = TplinkDeviceScanner(config[DOMAIN])
+        scanner = Tplink2DeviceScanner(config[DOMAIN])
+
+        if not scanner.success_init:
+            scanner = TplinkDeviceScanner(config[DOMAIN])
 
     return scanner if scanner.success_init else None
 
@@ -156,7 +137,7 @@ class Tplink2DeviceScanner(TplinkDeviceScanner):
         with self.lock:
             _LOGGER.info("Loading wireless clients...")
 
-            url = 'http://{}/data/map_access_wireless_client_grid.json'\
+            url = 'http://{}/data/map_access_wireless_client_grid.json' \
                 .format(self.host)
             referer = 'http://{}'.format(self.host)
 
@@ -166,7 +147,7 @@ class Tplink2DeviceScanner(TplinkDeviceScanner):
             b64_encoded_username_password = base64.b64encode(
                 username_password.encode('ascii')
             ).decode('ascii')
-            cookie = 'Authorization=Basic {}'\
+            cookie = 'Authorization=Basic {}' \
                 .format(b64_encoded_username_password)
 
             response = requests.post(url, headers={'referer': referer,
@@ -183,7 +164,119 @@ class Tplink2DeviceScanner(TplinkDeviceScanner):
                 self.last_results = {
                     device['mac_addr'].replace('-', ':'): device['name']
                     for device in result
-                }
+                    }
+                return True
+
+            return False
+
+
+class Tplink3DeviceScanner(TplinkDeviceScanner):
+    """
+    This class queries the Archer C9 router running version 150811 or higher
+    of TP-Link firmware for connected devices.
+    """
+
+    def __init__(self, config):
+        self.stok = ''
+        self.sysauth = ''
+        super(Tplink3DeviceScanner, self).__init__(config)
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing found device ids.
+        """
+
+        self._update_info()
+        return self.last_results.keys()
+
+    # pylint: disable=no-self-use
+    def get_device_name(self, device):
+        """
+        The TP-Link firmware doesn't save the name of the wireless device.
+        We are forced to use the MAC address as name here.
+        """
+
+        return self.last_results.get(device)
+
+    def _get_auth_tokens(self):
+        """
+        Retrieves auth tokens from the router.
+        """
+
+        _LOGGER.info("Retrieving auth tokens...")
+
+        url = 'http://{}/cgi-bin/luci/;stok=/login?form=login' \
+            .format(self.host)
+        referer = 'http://{}/webpages/login.html'.format(self.host)
+
+        # if possible implement rsa encryption of password here
+
+        response = requests.post(url,
+                                 params={'operation': 'login',
+                                         'username': self.username,
+                                         'password': self.password},
+                                 headers={'referer': referer})
+
+        try:
+            self.stok = response.json().get('data').get('stok')
+            _LOGGER.info(self.stok)
+            regex_result = re.search('sysauth=(.*);',
+                                     response.headers['set-cookie'])
+            self.sysauth = regex_result.group(1)
+            _LOGGER.info(self.sysauth)
+            return True
+        except ValueError:
+            _LOGGER.error("Couldn't fetch auth tokens!")
+            return False
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """
+        Ensures the information from the TP-Link router is up to date.
+        Returns boolean if scanning successful.
+        """
+
+        with self.lock:
+            if (self.stok == '') or (self.sysauth == ''):
+                self._get_auth_tokens()
+
+            _LOGGER.info("Loading wireless clients...")
+
+            url = 'http://{}/cgi-bin/luci/;stok={}/admin/wireless?form=statistics' \
+                .format(self.host, self.stok)
+            referer = 'http://{}/webpages/index.html'.format(self.host)
+
+            response = requests.post(url,
+                                     params={'operation': 'load'},
+                                     headers={'referer': referer},
+                                     cookies={'sysauth': self.sysauth})
+
+            try:
+                json_response = response.json()
+
+                if json_response.get('success'):
+                    result = response.json().get('data')
+                else:
+                    if json_response.get('errorcode') == 'timeout':
+                        _LOGGER.info("Token timed out. "
+                                     "Relogging on next scan.")
+                        self.stok = ''
+                        self.sysauth = ''
+                        return False
+                    else:
+                        _LOGGER.error("An unknown error happened "
+                                      "while fetching data.")
+                        return False
+            except ValueError:
+                _LOGGER.error("Router didn't respond with JSON. "
+                              "Check if credentials are correct.")
+                return False
+
+            if result:
+                self.last_results = {
+                    device['mac'].replace('-', ':'): device['mac']
+                    for device in result
+                    }
                 return True
 
             return False

homeassistant/components/device_tracker/ubus.py

@@ -0,0 +1,173 @@
+"""
+homeassistant.components.device_tracker.ubus
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a OpenWRT router for device
+presence.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.ubus/
+"""
+import logging
+import json
+from datetime import timedelta
+import re
+import threading
+import requests
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.helpers import validate_config
+from homeassistant.util import Throttle
+from homeassistant.components.device_tracker import DOMAIN
+
+# Return cached results if last scan was less then this time ago
+MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def get_scanner(hass, config):
+    """ Validates config and returns a Luci scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+
+    scanner = UbusDeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+# pylint: disable=too-many-instance-attributes
+class UbusDeviceScanner(object):
+    """
+    This class queries a wireless router running OpenWrt firmware
+    for connected devices. Adapted from Tomato scanner.
+
+    Configure your routers' ubus ACL based on following instructions:
+
+    http://wiki.openwrt.org/doc/techref/ubus
+
+    Read only access will be fine.
+
+    To use this class you have to install rpcd-mod-file package
+    in your OpenWrt router:
+
+    opkg install rpcd-mod-file
+
+    """
+
+    def __init__(self, config):
+        host = config[CONF_HOST]
+        username, password = config[CONF_USERNAME], config[CONF_PASSWORD]
+
+        self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);")
+        self.lock = threading.Lock()
+        self.last_results = {}
+        self.url = 'http://{}/ubus'.format(host)
+
+        self.session_id = _get_session_id(self.url, username, password)
+        self.hostapd = []
+        self.leasefile = None
+        self.mac2name = None
+        self.success_init = self.session_id is not None
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing found device ids.
+        """
+
+        self._update_info()
+
+        return self.last_results
+
+    def get_device_name(self, device):
+        """ Returns the name of the given device or None if we don't know. """
+
+        with self.lock:
+            if self.leasefile is None:
+                result = _req_json_rpc(self.url, self.session_id,
+                                       'call', 'uci', 'get',
+                                       config="dhcp", type="dnsmasq")
+                if result:
+                    values = result["values"].values()
+                    self.leasefile = next(iter(values))["leasefile"]
+                else:
+                    return
+
+            if self.mac2name is None:
+                result = _req_json_rpc(self.url, self.session_id,
+                                       'call', 'file', 'read',
+                                       path=self.leasefile)
+                if result:
+                    self.mac2name = dict()
+                    for line in result["data"].splitlines():
+                        hosts = line.split(" ")
+                        self.mac2name[hosts[1].upper()] = hosts[3]
+                else:
+                    # Error, handled in the _req_json_rpc
+                    return
+
+            return self.mac2name.get(device.upper(), None)
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """
+        Ensures the information from the Luci router is up to date.
+        Returns boolean if scanning successful.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            _LOGGER.info("Checking ARP")
+
+            if not self.hostapd:
+                hostapd = _req_json_rpc(self.url, self.session_id,
+                                        'list', 'hostapd.*', '')
+                self.hostapd.extend(hostapd.keys())
+
+            self.last_results = []
+            results = 0
+            for hostapd in self.hostapd:
+                result = _req_json_rpc(self.url, self.session_id,
+                                       'call', hostapd, 'get_clients')
+
+                if result:
+                    results = results + 1
+                    self.last_results.extend(result['clients'].keys())
+
+            return bool(results)
+
+
+def _req_json_rpc(url, session_id, rpcmethod, subsystem, method, **params):
+    """ Perform one JSON RPC operation. """
+
+    data = json.dumps({"jsonrpc": "2.0",
+                       "id": 1,
+                       "method": rpcmethod,
+                       "params": [session_id,
+                                  subsystem,
+                                  method,
+                                  params]})
+
+    try:
+        res = requests.post(url, data=data, timeout=5)
+
+    except requests.exceptions.Timeout:
+        return
+
+    if res.status_code == 200:
+        response = res.json()
+
+        if rpcmethod == "call":
+            return response["result"][1]
+        else:
+            return response["result"]
+
+
+def _get_session_id(url, username, password):
+    """ Get authentication token for the given host+username+password. """
+    res = _req_json_rpc(url, "00000000000000000000000000000000", 'call',
+                        'session', 'login', username=username,
+                        password=password)
+    return res["ubus_rpc_session"]

homeassistant/components/discovery.py

@@ -1,7 +1,6 @@
 """
 homeassistant.components.discovery
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Starts a service to scan in intervals for new devices.
 
 Will emit EVENT_PLATFORM_DISCOVERED whenever a new service has been discovered.
@@ -19,7 +18,7 @@ from homeassistant.const import (
 
 DOMAIN = "discovery"
 DEPENDENCIES = []
-REQUIREMENTS = ['netdisco==0.4.2']
+REQUIREMENTS = ['netdisco==0.5.1']
 
 SCAN_INTERVAL = 300  # seconds
 
@@ -28,6 +27,7 @@ SERVICE_HUE = 'philips_hue'
 SERVICE_CAST = 'google_cast'
 SERVICE_NETGEAR = 'netgear_router'
 SERVICE_SONOS = 'sonos'
+SERVICE_PLEX = 'plex_mediaserver'
 
 SERVICE_HANDLERS = {
     SERVICE_WEMO: "switch",
@@ -35,6 +35,7 @@ SERVICE_HANDLERS = {
     SERVICE_HUE: "light",
     SERVICE_NETGEAR: 'device_tracker',
     SERVICE_SONOS: 'media_player',
+    SERVICE_PLEX: 'media_player',
 }
 
 
@@ -88,6 +89,7 @@ def setup(hass, config):
                 ATTR_DISCOVERED: info
             })
 
+    # pylint: disable=unused-argument
     def start_discovery(event):
         """ Start discovering. """
         netdisco = DiscoveryService(SCAN_INTERVAL)

homeassistant/components/downloader.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.downloader
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to download files.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/downloader/
 """
 import os
 import logging
@@ -42,6 +44,10 @@ def setup(hass, config):
 
     download_path = config[DOMAIN][CONF_DOWNLOAD_DIR]
 
+    # If path is relative, we assume relative to HASS config dir
+    if not os.path.isabs(download_path):
+        download_path = hass.config.path(download_path)
+
     if not os.path.isdir(download_path):
 
         logger.error(

homeassistant/components/frontend/__init__.py

@@ -8,7 +8,7 @@ import re
 import os
 import logging
 
-from . import version
+from . import version, mdi_version
 import homeassistant.util as util
 from homeassistant.const import URL_ROOT, HTTP_OK
 from homeassistant.config import get_default_config_dir
@@ -22,9 +22,11 @@ _LOGGER = logging.getLogger(__name__)
 
 FRONTEND_URLS = [
     URL_ROOT, '/logbook', '/history', '/map', '/devService', '/devState',
-    '/devEvent']
+    '/devEvent', '/devInfo']
 STATES_URL = re.compile(r'/states(/([a-zA-Z\._\-0-9/]+)|)')
 
+_FINGERPRINT = re.compile(r'^(\w+)-[a-z0-9]{32}\.(\w+)$', re.IGNORECASE)
+
 
 def setup(hass, config):
     """ Setup serving the frontend. """
@@ -72,6 +74,7 @@ def _handle_get_root(handler, path_match, data):
 
     template_html = template_html.replace('{{ app_url }}', app_url)
     template_html = template_html.replace('{{ auth }}', auth)
+    template_html = template_html.replace('{{ icons }}', mdi_version.VERSION)
 
     handler.wfile.write(template_html.encode("UTF-8"))
 
@@ -80,9 +83,10 @@ def _handle_get_static(handler, path_match, data):
     """ Returns a static file for the frontend. """
     req_file = util.sanitize_path(path_match.group('file'))
 
-    # Strip md5 hash out of frontend filename
-    if re.match(r'^frontend-[A-Za-z0-9]{32}\.html$', req_file):
-        req_file = "frontend.html"
+    # Strip md5 hash out
+    fingerprinted = _FINGERPRINT.match(req_file)
+    if fingerprinted:
+        req_file = "{}.{}".format(*fingerprinted.groups())
 
     path = os.path.join(os.path.dirname(__file__), 'www_static', req_file)
 

homeassistant/components/frontend/index.html.template

@@ -46,6 +46,6 @@
     </div>
     <script src='/static/webcomponents-lite.min.js'></script>
     <link rel='import' href='/static/{{ app_url }}' />
-    <home-assistant auth='{{ auth }}'></home-assistant>
+    <home-assistant auth='{{ auth }}' icons='{{ icons }}'></home-assistant>
   </body>
 </html>

homeassistant/components/frontend/mdi_version.py

@@ -0,0 +1,2 @@
+""" DO NOT MODIFY. Auto-generated by update_mdi script """
+VERSION = "38EF63D0474411E4B3CF842B2B6CFE1B"

homeassistant/components/frontend/version.py

@@ -1,2 +1,2 @@
 """ DO NOT MODIFY. Auto-generated by build_frontend script """
-VERSION = "c4722afa376379bc4457d54bb9a38cee"
+VERSION = "b75e3c9ebd3de2dae0912a89499127a9"

homeassistant/components/group.py

@@ -1,10 +1,11 @@
 """
 homeassistant.components.group
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to group devices that can be turned on or off.
-"""
 
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/group/
+"""
 import homeassistant.core as ha
 from homeassistant.helpers import generate_entity_id
 from homeassistant.helpers.event import track_state_change

homeassistant/components/history.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.history
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provide pre-made queries on top of the recorder component.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/history/
 """
 import re
 from datetime import timedelta

homeassistant/components/http.py

@@ -1,76 +1,11 @@
 """
-homeassistant.components.httpinterface
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+homeassistant.components.http
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This module provides an API and a HTTP interface for debug purposes.
 
-By default it will run on port 8123.
-
-All API calls have to be accompanied by an 'api_password' parameter and will
-return JSON. If successful calls will return status code 200 or 201.
-
-Other status codes that can occur are:
- - 400 (Bad Request)
- - 401 (Unauthorized)
- - 404 (Not Found)
- - 405 (Method not allowed)
-
-The api supports the following actions:
-
-/api - GET
-Returns message if API is up and running.
-Example result:
-{
-  "message": "API running."
-}
-
-/api/states - GET
-Returns a list of entities for which a state is available
-Example result:
-[
-    { .. state object .. },
-    { .. state object .. }
-]
-
-/api/states/<entity_id> - GET
-Returns the current state from an entity
-Example result:
-{
-    "attributes": {
-        "next_rising": "07:04:15 29-10-2013",
-        "next_setting": "18:00:31 29-10-2013"
-    },
-    "entity_id": "weather.sun",
-    "last_changed": "23:24:33 28-10-2013",
-    "state": "below_horizon"
-}
-
-/api/states/<entity_id> - POST
-Updates the current state of an entity. Returns status code 201 if successful
-with location header of updated resource and as body the new state.
-parameter: new_state - string
-optional parameter: attributes - JSON encoded object
-Example result:
-{
-    "attributes": {
-        "next_rising": "07:04:15 29-10-2013",
-        "next_setting": "18:00:31 29-10-2013"
-    },
-    "entity_id": "weather.sun",
-    "last_changed": "23:24:33 28-10-2013",
-    "state": "below_horizon"
-}
-
-/api/events/<event_type> - POST
-Fires an event with event_type
-optional parameter: event_data - JSON encoded object
-Example result:
-{
-    "message": "Event download_file fired."
-}
-
+For more details about the RESTful API, please refer to the documentation at
+https://home-assistant.io/developers/api/
 """
-
 import json
 import threading
 import logging

homeassistant/components/ifttt.py

@@ -1,23 +1,10 @@
 """
 homeassistant.components.ifttt
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This component enable you to trigger Maker IFTTT recipes.
-Check https://ifttt.com/maker for details.
-
-Configuration:
-
-To use Maker IFTTT you will need to add something like the following to your
-config/configuration.yaml.
-
-ifttt:
-  key: xxxxx-x-xxxxxxxxxxxxx
-
-Variables:
-
-key
-*Required
-Your api key
 
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/ifttt/
 """
 import logging
 import requests

homeassistant/components/introduction.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.introduction
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Component that will help guide the user taking its first steps.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/introduction/
 """
 import logging
 
@@ -24,13 +26,13 @@ def setup(hass, config=None):
         Here are some resources to get started:
 
          - Configuring Home Assistant:
-           https://home-assistant.io/getting-started/configuration.html
+           https://home-assistant.io/getting-started/configuration/
 
          - Available components:
            https://home-assistant.io/components/
 
          - Troubleshooting your configuration:
-           https://home-assistant.io/getting-started/troubleshooting-configuration.html
+           https://home-assistant.io/getting-started/troubleshooting-configuration/
 
          - Getting help:
            https://home-assistant.io/help/

homeassistant/components/isy994.py

@@ -5,7 +5,7 @@ Connects to an ISY-994 controller and loads relevant components to control its
 devices. Also contains the base classes for ISY Sensors, Lights, and Switches.
 
 For configuration details please visit the documentation for this component at
-https://home-assistant.io/components/isy994.html
+https://home-assistant.io/components/isy994/
 """
 import logging
 from urllib.parse import urlparse

homeassistant/components/keyboard.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.keyboard
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to emulate keyboard presses on host machine.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/keyboard/
 """
 import logging
 

homeassistant/components/light/__init__.py

@@ -1,58 +1,16 @@
 """
 homeassistant.components.light
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to interact with lights.
 
-It offers the following services:
-
-TURN_OFF - Turns one or multiple lights off.
-
-Supports following parameters:
- - transition
-   Integer that represents the time the light should take to transition to
-   the new state.
- - entity_id
-   String or list of strings that point at entity_ids of lights.
-
-TURN_ON - Turns one or multiple lights on and change attributes.
-
-Supports following parameters:
- - transition
-   Integer that represents the time the light should take to transition to
-   the new state.
-
- - entity_id
-   String or list of strings that point at entity_ids of lights.
-
- - profile
-   String with the name of one of the built-in profiles (relax, energize,
-   concentrate, reading) or one of the custom profiles defined in
-   light_profiles.csv in the current working directory.
-
-   Light profiles define a xy color and a brightness.
-
-   If a profile is given and a brightness or xy color then the profile values
-   will be overwritten.
-
- - xy_color
-   A list containing two floats representing the xy color you want the light
-   to be.
-
- - rgb_color
-   A list containing three integers representing the xy color you want the
-   light to be.
-
- - brightness
-   Integer between 0 and 255 representing how bright you want the light to be.
-
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/light/
 """
-
 import logging
 import os
 import csv
 
-from homeassistant.components import group, discovery, wink, isy994
+from homeassistant.components import group, discovery, wink, isy994, zwave
 from homeassistant.config import load_yaml_config_file
 from homeassistant.const import (
     STATE_ON, SERVICE_TURN_ON, SERVICE_TURN_OFF, ATTR_ENTITY_ID)
@@ -77,6 +35,7 @@ ATTR_TRANSITION = "transition"
 # lists holding color values
 ATTR_RGB_COLOR = "rgb_color"
 ATTR_XY_COLOR = "xy_color"
+ATTR_COLOR_TEMP = "color_temp"
 
 # int with value 0 .. 255 representing brightness of the light
 ATTR_BRIGHTNESS = "brightness"
@@ -92,6 +51,7 @@ FLASH_LONG = "long"
 # Apply an effect to the light, can be EFFECT_COLORLOOP
 ATTR_EFFECT = "effect"
 EFFECT_COLORLOOP = "colorloop"
+EFFECT_WHITE = "white"
 
 LIGHT_PROFILES_FILE = "light_profiles.csv"
 
@@ -100,11 +60,14 @@ DISCOVERY_PLATFORMS = {
     wink.DISCOVER_LIGHTS: 'wink',
     isy994.DISCOVER_LIGHTS: 'isy994',
     discovery.SERVICE_HUE: 'hue',
+    zwave.DISCOVER_LIGHTS: 'zwave',
 }
 
 PROP_TO_ATTR = {
     'brightness': ATTR_BRIGHTNESS,
-    'color_xy': ATTR_XY_COLOR,
+    'color_temp': ATTR_COLOR_TEMP,
+    'rgb_color': ATTR_RGB_COLOR,
+    'xy_color': ATTR_XY_COLOR,
 }
 
 _LOGGER = logging.getLogger(__name__)
@@ -119,8 +82,8 @@ def is_on(hass, entity_id=None):
 
 # pylint: disable=too-many-arguments
 def turn_on(hass, entity_id=None, transition=None, brightness=None,
-            rgb_color=None, xy_color=None, profile=None, flash=None,
-            effect=None):
+            rgb_color=None, xy_color=None, color_temp=None, profile=None,
+            flash=None, effect=None):
     """ Turns all or specified light on. """
     data = {
         key: value for key, value in [
@@ -130,6 +93,7 @@ def turn_on(hass, entity_id=None, transition=None, brightness=None,
             (ATTR_BRIGHTNESS, brightness),
             (ATTR_RGB_COLOR, rgb_color),
             (ATTR_XY_COLOR, xy_color),
+            (ATTR_COLOR_TEMP, color_temp),
             (ATTR_FLASH, flash),
             (ATTR_EFFECT, effect),
         ] if value is not None
@@ -150,7 +114,7 @@ def turn_off(hass, entity_id=None, transition=None):
     hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
 
 
-# pylint: disable=too-many-branches, too-many-locals
+# pylint: disable=too-many-branches, too-many-locals, too-many-statements
 def setup(hass, config):
     """ Exposes light control via statemachine and services. """
 
@@ -240,6 +204,15 @@ def setup(hass, config):
                 # ValueError if value could not be converted to float
                 pass
 
+        if ATTR_COLOR_TEMP in dat:
+            # color_temp should be an int of mirads value
+            colortemp = dat.get(ATTR_COLOR_TEMP)
+
+            # Without this check, a ctcolor with value '99' would work
+            # These values are based on Philips Hue, may need ajustment later
+            if isinstance(colortemp, int) and 154 <= colortemp <= 500:
+                params[ATTR_COLOR_TEMP] = colortemp
+
         if ATTR_RGB_COLOR in dat:
             try:
                 # rgb_color should be a list containing 3 ints
@@ -247,26 +220,17 @@ def setup(hass, config):
 
                 if len(rgb_color) == 3:
                     params[ATTR_RGB_COLOR] = [int(val) for val in rgb_color]
-                    params[ATTR_XY_COLOR] = \
-                        color_util.color_RGB_to_xy(int(rgb_color[0]),
-                                                   int(rgb_color[1]),
-                                                   int(rgb_color[2]))
 
             except (TypeError, ValueError):
                 # TypeError if rgb_color is not iterable
                 # ValueError if not all values can be converted to int
                 pass
 
-        if ATTR_FLASH in dat:
-            if dat[ATTR_FLASH] == FLASH_SHORT:
-                params[ATTR_FLASH] = FLASH_SHORT
+        if dat.get(ATTR_FLASH) in (FLASH_SHORT, FLASH_LONG):
+            params[ATTR_FLASH] = dat[ATTR_FLASH]
 
-            elif dat[ATTR_FLASH] == FLASH_LONG:
-                params[ATTR_FLASH] = FLASH_LONG
-
-        if ATTR_EFFECT in dat:
-            if dat[ATTR_EFFECT] == EFFECT_COLORLOOP:
-                params[ATTR_EFFECT] = EFFECT_COLORLOOP
+        if dat.get(ATTR_EFFECT) in (EFFECT_COLORLOOP, EFFECT_WHITE):
+            params[ATTR_EFFECT] = dat[ATTR_EFFECT]
 
         for light in target_lights:
             light.turn_on(**params)
@@ -297,10 +261,20 @@ class Light(ToggleEntity):
         return None
 
     @property
-    def color_xy(self):
+    def xy_color(self):
         """ XY color value [float, float]. """
         return None
 
+    @property
+    def rgb_color(self):
+        """ RGB color value [int, int, int] """
+        return None
+
+    @property
+    def color_temp(self):
+        """ CT color value in mirads. """
+        return None
+
     @property
     def device_state_attributes(self):
         """ Returns device specific state attributes. """
@@ -317,6 +291,12 @@ class Light(ToggleEntity):
                 if value:
                     data[attr] = value
 
+            if ATTR_RGB_COLOR not in data and ATTR_XY_COLOR in data and \
+               ATTR_BRIGHTNESS in data:
+                data[ATTR_RGB_COLOR] = color_util.color_xy_brightness_to_RGB(
+                    data[ATTR_XY_COLOR][0], data[ATTR_XY_COLOR][1],
+                    data[ATTR_BRIGHTNESS])
+
         device_attr = self.device_state_attributes
 
         if device_attr is not None:

homeassistant/components/light/blinksticklight.py

@@ -4,7 +4,7 @@ homeassistant.components.light.blinksticklight
 Support for Blinkstick lights.
 
 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/light.blinksticklight.html
+https://home-assistant.io/components/light.blinksticklight/
 """
 import logging
 

homeassistant/components/light/demo.py

@@ -1,37 +1,40 @@
 """
 homeassistant.components.light.demo
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Demo platform that implements lights.
 
 """
 import random
 
 from homeassistant.components.light import (
-    Light, ATTR_BRIGHTNESS, ATTR_XY_COLOR)
+    Light, ATTR_BRIGHTNESS, ATTR_RGB_COLOR, ATTR_COLOR_TEMP)
 
 
 LIGHT_COLORS = [
-    [0.368, 0.180],
-    [0.460, 0.470],
+    [237, 224, 33],
+    [255, 63, 111],
 ]
 
+LIGHT_TEMPS = [240, 380]
+
 
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     """ Find and return demo lights. """
     add_devices_callback([
         DemoLight("Bed Light", False),
-        DemoLight("Ceiling Lights", True, LIGHT_COLORS[0]),
-        DemoLight("Kitchen Lights", True, LIGHT_COLORS[1])
+        DemoLight("Ceiling Lights", True, LIGHT_COLORS[0], LIGHT_TEMPS[1]),
+        DemoLight("Kitchen Lights", True, LIGHT_COLORS[1], LIGHT_TEMPS[0])
     ])
 
 
 class DemoLight(Light):
     """ Provides a demo switch. """
-    def __init__(self, name, state, xy=None, brightness=180):
+    # pylint: disable=too-many-arguments
+    def __init__(self, name, state, rgb=None, ct=None, brightness=180):
         self._name = name
         self._state = state
-        self._xy = xy or random.choice(LIGHT_COLORS)
+        self._rgb = rgb or random.choice(LIGHT_COLORS)
+        self._ct = ct or random.choice(LIGHT_TEMPS)
         self._brightness = brightness
 
     @property
@@ -50,9 +53,14 @@ class DemoLight(Light):
         return self._brightness
 
     @property
-    def color_xy(self):
-        """ XY color value. """
-        return self._xy
+    def rgb_color(self):
+        """ rgb color value. """
+        return self._rgb
+
+    @property
+    def color_temp(self):
+        """ CT color temperature. """
+        return self._ct
 
     @property
     def is_on(self):
@@ -63,8 +71,11 @@ class DemoLight(Light):
         """ Turn the device on. """
         self._state = True
 
-        if ATTR_XY_COLOR in kwargs:
-            self._xy = kwargs[ATTR_XY_COLOR]
+        if ATTR_RGB_COLOR in kwargs:
+            self._rgb = kwargs[ATTR_RGB_COLOR]
+
+        if ATTR_COLOR_TEMP in kwargs:
+            self._ct = kwargs[ATTR_COLOR_TEMP]
 
         if ATTR_BRIGHTNESS in kwargs:
             self._brightness = kwargs[ATTR_BRIGHTNESS]

homeassistant/components/light/hue.py

@@ -2,19 +2,25 @@
 homeassistant.components.light.hue
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for Hue lights.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.hue/
 """
+import json
 import logging
+import os
 import socket
 from datetime import timedelta
 from urllib.parse import urlparse
 
 from homeassistant.loader import get_component
 import homeassistant.util as util
+import homeassistant.util.color as color_util
 from homeassistant.const import CONF_HOST, DEVICE_DEFAULT_NAME
 from homeassistant.components.light import (
-    Light, ATTR_BRIGHTNESS, ATTR_XY_COLOR, ATTR_TRANSITION,
-    ATTR_FLASH, FLASH_LONG, FLASH_SHORT, ATTR_EFFECT,
-    EFFECT_COLORLOOP)
+    Light, ATTR_BRIGHTNESS, ATTR_XY_COLOR, ATTR_COLOR_TEMP,
+    ATTR_TRANSITION, ATTR_FLASH, FLASH_LONG, FLASH_SHORT,
+    ATTR_EFFECT, EFFECT_COLORLOOP, ATTR_RGB_COLOR)
 
 REQUIREMENTS = ['phue==0.8']
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
@@ -28,21 +34,37 @@ _CONFIGURING = {}
 _LOGGER = logging.getLogger(__name__)
 
 
+def _find_host_from_config(hass):
+    """ Attempt to detect host based on existing configuration. """
+    path = hass.config.path(PHUE_CONFIG_FILE)
+
+    if not os.path.isfile(path):
+        return None
+
+    try:
+        with open(path) as inp:
+            return next(json.loads(''.join(inp)).keys().__iter__())
+    except (ValueError, AttributeError, StopIteration):
+        # ValueError if can't parse as JSON
+        # AttributeError if JSON value is not a dict
+        # StopIteration if no keys
+        return None
+
+
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     """ Gets the Hue lights. """
-    try:
-        # pylint: disable=unused-variable
-        import phue  # noqa
-    except ImportError:
-        _LOGGER.exception("Error while importing dependency phue.")
-
-        return
-
     if discovery_info is not None:
         host = urlparse(discovery_info[1]).hostname
     else:
         host = config.get(CONF_HOST, None)
 
+        if host is None:
+            host = _find_host_from_config(hass)
+
+        if host is None:
+            _LOGGER.error('No host found in configuration')
+            return False
+
     # Only act if we are not already configuring this host
     if host in _CONFIGURING:
         return
@@ -123,6 +145,7 @@ def request_configuration(host, hass, add_devices_callback):
 
         return
 
+    # pylint: disable=unused-argument
     def hue_configuration_callback(data):
         """ Actions to do when our configuration callback is called. """
         setup_bridge(host, hass, add_devices_callback)
@@ -162,10 +185,15 @@ class HueLight(Light):
         return self.info['state']['bri']
 
     @property
-    def color_xy(self):
+    def xy_color(self):
         """ XY color value. """
         return self.info['state'].get('xy')
 
+    @property
+    def color_temp(self):
+        """ CT color value. """
+        return self.info['state'].get('ct')
+
     @property
     def is_on(self):
         """ True if device is on. """
@@ -187,6 +215,12 @@ class HueLight(Light):
 
         if ATTR_XY_COLOR in kwargs:
             command['xy'] = kwargs[ATTR_XY_COLOR]
+        elif ATTR_RGB_COLOR in kwargs:
+            command['xy'] = color_util.color_RGB_to_xy(
+                *(int(val) for val in kwargs[ATTR_RGB_COLOR]))
+
+        if ATTR_COLOR_TEMP in kwargs:
+            command['ct'] = kwargs[ATTR_COLOR_TEMP]
 
         flash = kwargs.get(ATTR_FLASH)
 

homeassistant/components/light/hyperion.py

@@ -0,0 +1,126 @@
+"""
+homeassistant.components.light.hyperion
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for Hyperion remotes.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.hyperion/
+"""
+import logging
+import socket
+import json
+
+from homeassistant.const import CONF_HOST
+from homeassistant.components.light import (Light, ATTR_RGB_COLOR)
+
+_LOGGER = logging.getLogger(__name__)
+REQUIREMENTS = []
+
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ Sets up a Hyperion server remote """
+    host = config.get(CONF_HOST, None)
+    port = config.get("port", 19444)
+    device = Hyperion(host, port)
+    if device.setup():
+        add_devices_callback([device])
+        return True
+    else:
+        return False
+
+
+class Hyperion(Light):
+    """ Represents a Hyperion remote """
+
+    def __init__(self, host, port):
+        self._host = host
+        self._port = port
+        self._name = host
+        self._is_available = True
+        self._rgb_color = [255, 255, 255]
+
+    @property
+    def name(self):
+        """ Return the hostname of the server. """
+        return self._name
+
+    @property
+    def rgb_color(self):
+        """ Last RGB color value set. """
+        return self._rgb_color
+
+    @property
+    def is_on(self):
+        """ True if the device is online. """
+        return self._is_available
+
+    def turn_on(self, **kwargs):
+        """ Turn the lights on. """
+        if self._is_available:
+            if ATTR_RGB_COLOR in kwargs:
+                self._rgb_color = kwargs[ATTR_RGB_COLOR]
+
+            self.json_request({"command": "color", "priority": 128,
+                               "color": self._rgb_color})
+
+    def turn_off(self, **kwargs):
+        """ Disconnect the remote. """
+        self.json_request({"command": "clearall"})
+
+    def update(self):
+        """ Ping the remote. """
+        # just see if the remote port is open
+        self._is_available = self.json_request()
+
+    def setup(self):
+        """ Get the hostname of the remote. """
+        response = self.json_request({"command": "serverinfo"})
+        if response:
+            self._name = response["info"]["hostname"]
+            return True
+
+        return False
+
+    def json_request(self, request=None, wait_for_response=False):
+        """ Communicate with the json server. """
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock.settimeout(5)
+
+        try:
+            sock.connect((self._host, self._port))
+        except OSError:
+            sock.close()
+            return False
+
+        if not request:
+            # no communication needed, simple presence detection returns True
+            sock.close()
+            return True
+
+        sock.send(bytearray(json.dumps(request) + "\n", "utf-8"))
+        try:
+            buf = sock.recv(4096)
+        except socket.timeout:
+            # something is wrong, assume it's offline
+            sock.close()
+            return False
+
+        # read until a newline or timeout
+        buffering = True
+        while buffering:
+            if "\n" in str(buf, "utf-8"):
+                response = str(buf, "utf-8").split("\n")[0]
+                buffering = False
+            else:
+                try:
+                    more = sock.recv(4096)
+                except socket.timeout:
+                    more = None
+                if not more:
+                    buffering = False
+                    response = str(buf, "utf-8")
+                else:
+                    buf += more
+
+        sock.close()
+        return json.loads(response)

homeassistant/components/light/isy994.py

@@ -2,6 +2,9 @@
 homeassistant.components.light.isy994
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for ISY994 lights.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/isy994/
 """
 import logging
 

homeassistant/components/light/limitlessled.py

@@ -1,44 +1,52 @@
 """
 homeassistant.components.light.limitlessled
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for LimitlessLED bulbs.
 
-Support for LimitlessLED bulbs, also known as...
-
-- EasyBulb
-- AppLight
-- AppLamp
-- MiLight
-- LEDme
-- dekolight
-- iLight
-
-Configuration:
-
-To use limitlessled you will need to add the following to your
-configuration.yaml file.
-
-light:
-  platform: limitlessled
-  bridges:
-    - host: 192.168.1.10
-      group_1_name: Living Room
-      group_2_name: Bedroom
-      group_3_name: Office
-      group_3_type: white
-      group_4_name: Kitchen
-    - host: 192.168.1.11
-      group_2_name: Basement
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.limitlessled/
 """
 import logging
 
 from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.components.light import (Light, ATTR_BRIGHTNESS,
-                                            ATTR_XY_COLOR)
-from homeassistant.util.color import color_RGB_to_xy
+                                            ATTR_RGB_COLOR, ATTR_EFFECT,
+                                            EFFECT_COLORLOOP, EFFECT_WHITE)
 
 _LOGGER = logging.getLogger(__name__)
 REQUIREMENTS = ['ledcontroller==1.1.0']
 
+COLOR_TABLE = {
+    'white': [0xFF, 0xFF, 0xFF],
+    'violet': [0xEE, 0x82, 0xEE],
+    'royal_blue': [0x41, 0x69, 0xE1],
+    'baby_blue': [0x87, 0xCE, 0xFA],
+    'aqua': [0x00, 0xFF, 0xFF],
+    'royal_mint': [0x7F, 0xFF, 0xD4],
+    'seafoam_green': [0x2E, 0x8B, 0x57],
+    'green': [0x00, 0x80, 0x00],
+    'lime_green': [0x32, 0xCD, 0x32],
+    'yellow': [0xFF, 0xFF, 0x00],
+    'yellow_orange': [0xDA, 0xA5, 0x20],
+    'orange': [0xFF, 0xA5, 0x00],
+    'red': [0xFF, 0x00, 0x00],
+    'pink': [0xFF, 0xC0, 0xCB],
+    'fusia': [0xFF, 0x00, 0xFF],
+    'lilac': [0xDA, 0x70, 0xD6],
+    'lavendar': [0xE6, 0xE6, 0xFA],
+}
+
+
+def _distance_squared(rgb1, rgb2):
+    """ Return sum of squared distances of each color part. """
+    return sum((val1-val2)**2 for val1, val2 in zip(rgb1, rgb2))
+
+
+def _rgb_to_led_color(rgb_color):
+    """ Convert an RGB color to the closest color string and color. """
+    return sorted((_distance_squared(rgb_color, color), name)
+                  for name, color in COLOR_TABLE.items())[0][1]
+
 
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     """ Gets the LimitlessLED lights. """
@@ -120,49 +128,15 @@ class RGBWLimitlessLED(LimitlessLED):
         super().__init__(pool, controller_id, group, name, 'rgbw')
 
         self._brightness = 100
-        self._xy_color = color_RGB_to_xy(255, 255, 255)
-
-        # Build a color table that maps an RGB color to a color string
-        # recognized by LedController's set_color method
-        self._color_table = [(color_RGB_to_xy(*x[0]), x[1]) for x in [
-            ((0xFF, 0xFF, 0xFF), 'white'),
-            ((0xEE, 0x82, 0xEE), 'violet'),
-            ((0x41, 0x69, 0xE1), 'royal_blue'),
-            ((0x87, 0xCE, 0xFA), 'baby_blue'),
-            ((0x00, 0xFF, 0xFF), 'aqua'),
-            ((0x7F, 0xFF, 0xD4), 'royal_mint'),
-            ((0x2E, 0x8B, 0x57), 'seafoam_green'),
-            ((0x00, 0x80, 0x00), 'green'),
-            ((0x32, 0xCD, 0x32), 'lime_green'),
-            ((0xFF, 0xFF, 0x00), 'yellow'),
-            ((0xDA, 0xA5, 0x20), 'yellow_orange'),
-            ((0xFF, 0xA5, 0x00), 'orange'),
-            ((0xFF, 0x00, 0x00), 'red'),
-            ((0xFF, 0xC0, 0xCB), 'pink'),
-            ((0xFF, 0x00, 0xFF), 'fusia'),
-            ((0xDA, 0x70, 0xD6), 'lilac'),
-            ((0xE6, 0xE6, 0xFA), 'lavendar'),
-        ]]
+        self._led_color = 'white'
 
     @property
     def brightness(self):
         return self._brightness
 
     @property
-    def color_xy(self):
-        return self._xy_color
-
-    def _xy_to_led_color(self, xy_color):
-        """ Convert an XY color to the closest LedController color string. """
-        def abs_dist_squared(p_0, p_1):
-            """ Returns the absolute value of the squared distance """
-            return abs((p_0[0] - p_1[0])**2 + (p_0[1] - p_1[1])**2)
-
-        candidates = [(abs_dist_squared(xy_color, x[0]), x[1]) for x in
-                      self._color_table]
-
-        # First candidate in the sorted list is closest to desired color:
-        return sorted(candidates)[0][1]
+    def rgb_color(self):
+        return COLOR_TABLE[self._led_color]
 
     def turn_on(self, **kwargs):
         """ Turn the device on. """
@@ -171,13 +145,23 @@ class RGBWLimitlessLED(LimitlessLED):
         if ATTR_BRIGHTNESS in kwargs:
             self._brightness = kwargs[ATTR_BRIGHTNESS]
 
-        if ATTR_XY_COLOR in kwargs:
-            self._xy_color = kwargs[ATTR_XY_COLOR]
+        if ATTR_RGB_COLOR in kwargs:
+            self._led_color = _rgb_to_led_color(kwargs[ATTR_RGB_COLOR])
 
-        self.pool.execute(self.controller_id, "set_color",
-                          self._xy_to_led_color(self._xy_color), self.group)
+        effect = kwargs.get(ATTR_EFFECT)
+
+        if effect == EFFECT_COLORLOOP:
+            self.pool.execute(self.controller_id, "disco", self.group)
+        elif effect == EFFECT_WHITE:
+            self.pool.execute(self.controller_id, "white", self.group)
+        else:
+            self.pool.execute(self.controller_id, "set_color",
+                              self._led_color, self.group)
+
+        # Brightness can be set independently of color
         self.pool.execute(self.controller_id, "set_brightness",
                           self._brightness / 255.0, self.group)
+
         self.update_ha_state()
 
 

homeassistant/components/light/mqtt.py

@@ -0,0 +1,184 @@
+"""
+homeassistant.components.light.mqtt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Allows to configure a MQTT light.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.mqtt/
+"""
+import logging
+
+import homeassistant.util.color as color_util
+import homeassistant.components.mqtt as mqtt
+from homeassistant.components.light import (Light,
+                                            ATTR_BRIGHTNESS, ATTR_RGB_COLOR)
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "MQTT Light"
+DEFAULT_QOS = 0
+DEFAULT_PAYLOAD_ON = "on"
+DEFAULT_PAYLOAD_OFF = "off"
+DEFAULT_RGB_PATTERN = "%d,%d,%d"
+DEFAULT_OPTIMISTIC = False
+
+DEPENDENCIES = ['mqtt']
+
+# pylint: disable=unused-argument
+
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ Add MQTT Light. """
+
+    if config.get('command_topic') is None:
+        _LOGGER.error("Missing required variable: command_topic")
+        return False
+
+    add_devices_callback([MqttLight(
+        hass,
+        config.get('name', DEFAULT_NAME),
+        {"state_topic": config.get('state_topic'),
+         "command_topic": config.get('command_topic'),
+         "brightness_state_topic": config.get('brightness_state_topic'),
+         "brightness_command_topic":
+             config.get('brightness_command_topic'),
+         "rgb_state_topic": config.get('rgb_state_topic'),
+         "rgb_command_topic": config.get('rgb_command_topic')},
+        config.get('rgb', None),
+        config.get('qos', DEFAULT_QOS),
+        {"on": config.get('payload_on', DEFAULT_PAYLOAD_ON),
+         "off": config.get('payload_off', DEFAULT_PAYLOAD_OFF)},
+        config.get('brightness'),
+        config.get('optimistic', DEFAULT_OPTIMISTIC))])
+
+# pylint: disable=too-many-instance-attributes
+
+
+class MqttLight(Light):
+    """ Provides a MQTT light. """
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, hass, name,
+                 topic,
+                 rgb, qos,
+                 payload,
+                 brightness, optimistic):
+
+        self._hass = hass
+        self._name = name
+        self._topic = topic
+        self._rgb = rgb
+        self._qos = qos
+        self._payload = payload
+        self._brightness = brightness
+        self._optimistic = optimistic
+        self._state = False
+        self._xy = None
+
+        def message_received(topic, payload, qos):
+            """ A new MQTT message has been received. """
+            if payload == self._payload["on"]:
+                self._state = True
+            elif payload == self._payload["off"]:
+                self._state = False
+
+            self.update_ha_state()
+
+        if self._topic["state_topic"] is None:
+            # force optimistic mode
+            self._optimistic = True
+        else:
+            # Subscribe the state_topic
+            mqtt.subscribe(self._hass, self._topic["state_topic"],
+                           message_received, self._qos)
+
+        def brightness_received(topic, payload, qos):
+            """ A new MQTT message for the brightness has been received. """
+            self._brightness = int(payload)
+            self.update_ha_state()
+
+        def rgb_received(topic, payload, qos):
+            """ A new MQTT message has been received. """
+            self._rgb = [int(val) for val in payload.split(',')]
+            self._xy = color_util.color_RGB_to_xy(int(self._rgb[0]),
+                                                  int(self._rgb[1]),
+                                                  int(self._rgb[2]))
+            self.update_ha_state()
+
+        if self._topic["brightness_state_topic"] is not None:
+            mqtt.subscribe(self._hass, self._topic["brightness_state_topic"],
+                           brightness_received, self._qos)
+            self._brightness = 255
+        else:
+            self._brightness = None
+
+        if self._topic["rgb_state_topic"] is not None:
+            mqtt.subscribe(self._hass, self._topic["rgb_state_topic"],
+                           rgb_received, self._qos)
+            self._xy = [0, 0]
+        else:
+            self._xy = None
+
+    @property
+    def brightness(self):
+        """ Brightness of this light between 0..255. """
+        return self._brightness
+
+    @property
+    def rgb_color(self):
+        """ RGB color value. """
+        return self._rgb
+
+    @property
+    def color_xy(self):
+        """ RGB color value. """
+        return self._xy
+
+    @property
+    def should_poll(self):
+        """ No polling needed for a MQTT light. """
+        return False
+
+    @property
+    def name(self):
+        """ Returns the name of the device if any. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ True if device is on. """
+        return self._state
+
+    def turn_on(self, **kwargs):
+        """ Turn the device on. """
+
+        if ATTR_RGB_COLOR in kwargs and \
+           self._topic["rgb_command_topic"] is not None:
+            self._rgb = kwargs[ATTR_RGB_COLOR]
+            rgb = DEFAULT_RGB_PATTERN % tuple(self._rgb)
+            mqtt.publish(self._hass, self._topic["rgb_command_topic"],
+                         rgb, self._qos)
+
+        if ATTR_BRIGHTNESS in kwargs and \
+           self._topic["brightness_command_topic"] is not None:
+            self._brightness = kwargs[ATTR_BRIGHTNESS]
+            mqtt.publish(self._hass, self._topic["brightness_command_topic"],
+                         self._brightness, self._qos)
+
+        mqtt.publish(self._hass, self._topic["command_topic"],
+                     self._payload["on"], self._qos)
+
+        if self._optimistic:
+            # optimistically assume that switch has changed state
+            self._state = True
+            self.update_ha_state()
+
+    def turn_off(self, **kwargs):
+        """ Turn the device off. """
+        mqtt.publish(self._hass, self._topic["command_topic"],
+                     self._payload["off"], self._qos)
+
+        if self._optimistic:
+            # optimistically assume that switch has changed state
+            self._state = False
+            self.update_ha_state()

homeassistant/components/light/rfxtrx.py

@@ -4,7 +4,7 @@ homeassistant.components.light.rfxtrx
 Support for RFXtrx lights.
 
 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/light.rfxtrx.html
+https://home-assistant.io/components/light.rfxtrx/
 """
 import logging
 import homeassistant.components.rfxtrx as rfxtrx
@@ -59,6 +59,11 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 
         # Check if entity exists or previously added automatically
         if entity_id in rfxtrx.RFX_DEVICES:
+            _LOGGER.debug(
+                "EntityID: %s light_update. Command: %s",
+                entity_id,
+                event.values['Command']
+            )
             if event.values['Command'] == 'On'\
                     or event.values['Command'] == 'Off':
                 if event.values['Command'] == 'On':

homeassistant/components/light/services.yaml

@@ -20,6 +20,10 @@ turn_on:
       description: Color for the light in XY-format
       example: '[0.52, 0.43]'
 
+    color_temp:
+      description: Color temperature for the light in mireds (154-500)
+      example: '250'
+
     brightness:
       description: Number between 0..255 indicating brightness
       example: 120

homeassistant/components/light/tellstick.py

@@ -2,6 +2,9 @@
 homeassistant.components.light.tellstick
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for Tellstick lights.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.tellstick/
 """
 import logging
 # pylint: disable=no-name-in-module, import-error

homeassistant/components/light/vera.py

@@ -1,60 +1,22 @@
 """
 homeassistant.components.light.vera
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Support for Vera lights. This component is useful if you wish for switches
-connected to your Vera controller to appear as lights in Home Assistant.
-All switches will be added as a light unless you exclude them in the config.
-
-Configuration:
-
-To use the Vera lights you will need to add something like the following to
-your configuration.yaml file.
-
-light:
-  platform: vera
-  vera_controller_url: http://YOUR_VERA_IP:3480/
-  device_data:
-    12:
-      name: My awesome switch
-      exclude: true
-    13:
-      name: Another switch
-
-Variables:
-
-vera_controller_url
-*Required
-This is the base URL of your vera controller including the port number if not
-running on 80. Example: http://192.168.1.21:3480/
-
-device_data
-*Optional
-This contains an array additional device info for your Vera devices. It is not
-required and if not specified all lights configured in your Vera controller
-will be added with default values. You should use the id of your vera device
-as the key for the device within device_data.
-
-These are the variables for the device_data array:
-
-name
-*Optional
-This parameter allows you to override the name of your Vera device in the HA
-interface, if not specified the value configured for the device in your Vera
-will be used.
-
-exclude
-*Optional
-This parameter allows you to exclude the specified device from Home Assistant,
-it should be set to "true" if you want this device excluded.
+Support for Vera lights.
 
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.vera/
 """
 import logging
+import time
+
 from requests.exceptions import RequestException
 from homeassistant.components.switch.vera import VeraSwitch
 
-REQUIREMENTS = ['https://github.com/balloob/home-assistant-vera-api/archive/'
-                'a8f823066ead6c7da6fb5e7abaf16fef62e63364.zip'
-                '#python-vera==0.1']
+from homeassistant.components.light import ATTR_BRIGHTNESS
+
+REQUIREMENTS = ['https://github.com/pavoni/home-assistant-vera-api/archive/'
+                'efdba4e63d58a30bc9b36d9e01e69858af9130b8.zip'
+                '#python-vera==0.1.1']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -77,7 +39,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     controller = veraApi.VeraController(base_url)
     devices = []
     try:
-        devices = controller.get_devices(['Switch', 'On/Off Switch'])
+        devices = controller.get_devices([
+            'Switch',
+            'On/Off Switch',
+            'Dimmable Switch'])
     except RequestException:
         # There was a network related error connecting to the vera controller
         _LOGGER.exception("Error communicating with Vera API")
@@ -89,6 +54,28 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
         exclude = extra_data.get('exclude', False)
 
         if exclude is not True:
-            lights.append(VeraSwitch(device, extra_data))
+            lights.append(VeraLight(device, extra_data))
 
     add_devices_callback(lights)
+
+
+class VeraLight(VeraSwitch):
+    """ Represents a Vera Light, including dimmable. """
+
+    @property
+    def state_attributes(self):
+        attr = super().state_attributes or {}
+
+        if self.vera_device.is_dimmable:
+            attr[ATTR_BRIGHTNESS] = self.vera_device.get_brightness()
+
+        return attr
+
+    def turn_on(self, **kwargs):
+        if ATTR_BRIGHTNESS in kwargs and self.vera_device.is_dimmable:
+            self.vera_device.set_brightness(kwargs[ATTR_BRIGHTNESS])
+        else:
+            self.vera_device.switch_on()
+
+        self.last_command_send = time.time()
+        self.is_on_status = True

homeassistant/components/light/wink.py

@@ -2,6 +2,9 @@
 homeassistant.components.light.wink
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for Wink lights.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.wink/
 """
 import logging
 
@@ -10,8 +13,8 @@ from homeassistant.components.wink import WinkToggleDevice
 from homeassistant.const import CONF_ACCESS_TOKEN
 
 REQUIREMENTS = ['https://github.com/balloob/python-wink/archive/'
-                'c2b700e8ca866159566ecf5e644d9c297f69f257.zip'
-                '#python-wink==0.1']
+                '9eb39eaba0717922815e673ad1114c685839d890.zip'
+                '#python-wink==0.1.1']
 
 
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):

homeassistant/components/light/zwave.py

@@ -0,0 +1,126 @@
+"""
+homeassistant.components.light.zwave
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for Z-Wave lights.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.zwave/
+"""
+# pylint: disable=import-error
+from openzwave.network import ZWaveNetwork
+from pydispatch import dispatcher
+
+import homeassistant.components.zwave as zwave
+
+from homeassistant.const import STATE_ON, STATE_OFF
+from homeassistant.components.light import (Light, ATTR_BRIGHTNESS)
+from threading import Timer
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Find and add Z-Wave lights. """
+    if discovery_info is None:
+        return
+
+    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
+    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
+
+    if value.command_class != zwave.COMMAND_CLASS_SWITCH_MULTILEVEL:
+        return
+    if value.type != zwave.TYPE_BYTE:
+        return
+    if value.genre != zwave.GENRE_USER:
+        return
+
+    value.set_change_verified(False)
+    add_devices([ZwaveDimmer(value)])
+
+
+def brightness_state(value):
+    """
+    Returns the brightness and state according to the current data of given
+    value.
+    """
+    if value.data > 0:
+        return (value.data / 99) * 255, STATE_ON
+    else:
+        return 255, STATE_OFF
+
+
+class ZwaveDimmer(Light):
+    """ Provides a Z-Wave dimmer. """
+    # pylint: disable=too-many-arguments
+    def __init__(self, value):
+        self._value = value
+        self._node = value.node
+
+        self._brightness, self._state = brightness_state(value)
+
+        # Used for value change event handling
+        self._refreshing = False
+        self._timer = None
+
+        dispatcher.connect(
+            self._value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED)
+
+    def _value_changed(self, value):
+        """ Called when a value has changed on the network. """
+        if self._value.value_id != value.value_id:
+            return
+
+        if self._refreshing:
+            self._refreshing = False
+            self._brightness, self._state = brightness_state(value)
+        else:
+            def _refresh_value():
+                """Used timer callback for delayed value refresh."""
+                self._refreshing = True
+                self._value.refresh()
+
+            if self._timer is not None and self._timer.isAlive():
+                self._timer.cancel()
+
+            self._timer = Timer(2, _refresh_value)
+            self._timer.start()
+
+        self.update_ha_state()
+
+    @property
+    def should_poll(self):
+        """ No polling needed for a light. """
+        return False
+
+    @property
+    def name(self):
+        """ Returns the name of the device if any. """
+        name = self._node.name or "{}".format(self._node.product_name)
+
+        return "{}".format(name or self._value.label)
+
+    @property
+    def brightness(self):
+        """ Brightness of this light between 0..255. """
+        return self._brightness
+
+    @property
+    def is_on(self):
+        """ True if device is on. """
+        return self._state == STATE_ON
+
+    def turn_on(self, **kwargs):
+        """ Turn the device on. """
+
+        if ATTR_BRIGHTNESS in kwargs:
+            self._brightness = kwargs[ATTR_BRIGHTNESS]
+
+        # Zwave multilevel switches use a range of [0, 99] to control
+        # brightness.
+        brightness = (self._brightness / 255) * 99
+
+        if self._node.set_dimmer(self._value.value_id, brightness):
+            self._state = STATE_ON
+
+    def turn_off(self, **kwargs):
+        """ Turn the device off. """
+        if self._node.set_dimmer(self._value.value_id, 0):
+            self._state = STATE_OFF

homeassistant/components/logbook.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.logbook
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Parses events and generates a human log.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/logbook/
 """
 from datetime import timedelta
 from itertools import groupby

homeassistant/components/logger.py

@@ -0,0 +1,84 @@
+"""
+homeassistant.components.logger
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Component that will help set the level of logging for components.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/logger/
+"""
+import logging
+from collections import OrderedDict
+
+DOMAIN = 'logger'
+DEPENDENCIES = []
+
+LOGSEVERITY = {
+    'CRITICAL': 50,
+    'FATAL': 50,
+    'ERROR': 40,
+    'WARNING': 30,
+    'WARN': 30,
+    'INFO': 20,
+    'DEBUG': 10,
+    'NOTSET': 0
+}
+
+LOGGER_DEFAULT = 'default'
+LOGGER_LOGS = 'logs'
+
+
+class HomeAssistantLogFilter(logging.Filter):
+    """ A log filter. """
+    # pylint: disable=no-init,too-few-public-methods
+
+    def __init__(self, logfilter):
+        super().__init__()
+
+        self.logfilter = logfilter
+
+    def filter(self, record):
+
+        # Log with filtered severity
+        if LOGGER_LOGS in self.logfilter:
+            for filtername in self.logfilter[LOGGER_LOGS]:
+                logseverity = self.logfilter[LOGGER_LOGS][filtername]
+                if record.name.startswith(filtername):
+                    return record.levelno >= logseverity
+
+        # Log with default severity
+        default = self.logfilter[LOGGER_DEFAULT]
+        return record.levelno >= default
+
+
+def setup(hass, config=None):
+    """ Setup the logger component. """
+
+    logfilter = dict()
+
+    # Set default log severity
+    logfilter[LOGGER_DEFAULT] = LOGSEVERITY['DEBUG']
+    if LOGGER_DEFAULT in config.get(DOMAIN):
+        logfilter[LOGGER_DEFAULT] = LOGSEVERITY[
+            config.get(DOMAIN)[LOGGER_DEFAULT].upper()
+        ]
+
+    # Compute log severity for components
+    if LOGGER_LOGS in config.get(DOMAIN):
+        for key, value in config.get(DOMAIN)[LOGGER_LOGS].items():
+            config.get(DOMAIN)[LOGGER_LOGS][key] = LOGSEVERITY[value.upper()]
+
+        logs = OrderedDict(
+            sorted(
+                config.get(DOMAIN)[LOGGER_LOGS].items(),
+                key=lambda t: len(t[0]),
+                reverse=True
+            )
+        )
+
+        logfilter[LOGGER_LOGS] = logs
+
+    # Set log filter for all log handler
+    for handler in logging.root.handlers:
+        handler.addFilter(HomeAssistantLogFilter(logfilter))
+
+    return True

homeassistant/components/media_player/__init__.py

@@ -1,8 +1,10 @@
 """
 homeassistant.components.media_player
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Component to interface with various media players.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/media_player/
 """
 import logging
 import os
@@ -28,6 +30,7 @@ ENTITY_ID_FORMAT = DOMAIN + '.{}'
 DISCOVERY_PLATFORMS = {
     discovery.SERVICE_CAST: 'cast',
     discovery.SERVICE_SONOS: 'sonos',
+    discovery.SERVICE_PLEX: 'plex',
 }
 
 SERVICE_YOUTUBE_VIDEO = 'play_youtube_video'

homeassistant/components/media_player/cast.py

@@ -3,22 +3,8 @@ homeassistant.components.media_player.chromecast
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Provides functionality to interact with Cast devices on the network.
 
-WARNING: This platform is currently not working due to a changed Cast API.
-
-Configuration:
-
-To use the chromecast integration you will need to add something like the
-following to your configuration.yaml file.
-
-media_player:
-  platform: chromecast
-  host: 192.168.1.9
-
-Variables:
-
-host
-*Optional
-Use only if you don't want to scan for devices.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.cast/
 """
 import logging
 

homeassistant/components/media_player/denon.py

@@ -2,42 +2,9 @@
 homeassistant.components.media_player.denon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Provides an interface to Denon Network Receivers.
-Developed for a Denon DRA-N5, see
-http://www.denon.co.uk/chg/product/compactsystems/networkmusicsystems/ceolpiccolo
 
-A few notes:
-    - As long as this module is active and connected, the receiver does
-      not seem to accept additional telnet connections.
-
-    - Be careful with the volume. 50% or even 100% are very loud.
-
-    - To be able to wake up the receiver, activate the "remote" setting
-      in the receiver's settings.
-
-    - Play and pause are supported, toggling is not possible.
-
-    - Seeking cannot be implemented as the UI sends absolute positions.
-      Only seeking via simulated button presses is possible.
-
-Configuration:
-
-To use your Denon you will need to add something like the following to
-your config/configuration.yaml:
-
-media_player:
-  platform: denon
-  name: Music station
-  host: 192.168.0.123
-
-Variables:
-
-host
-*Required
-The ip of the player. Example: 192.168.0.123
-
-name
-*Optional
-The name of the device.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.denon/
 """
 import telnetlib
 import logging
@@ -67,13 +34,15 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             CONF_HOST)
         return False
 
-    add_devices([
-        DenonDevice(
-            config.get('name', 'Music station'),
-            config.get('host'))
-    ])
-
-    return True
+    denon = DenonDevice(
+        config.get("name", "Music station"),
+        config.get("host")
+    )
+    if denon.update():
+        add_devices([denon])
+        return True
+    else:
+        return False
 
 
 class DenonDevice(MediaPlayerDevice):
@@ -84,28 +53,41 @@ class DenonDevice(MediaPlayerDevice):
     def __init__(self, name, host):
         self._name = name
         self._host = host
-        self._telnet = telnetlib.Telnet(self._host)
+        self._pwstate = "PWSTANDBY"
+        self._volume = 0
+        self._muted = False
+        self._mediasource = ""
 
-    def query(self, message):
-        """ Send request and await response from server """
+    @classmethod
+    def telnet_request(cls, telnet, command):
+        """ Executes `command` and returns the response. """
+        telnet.write(command.encode("ASCII") + b"\r")
+        return telnet.read_until(b"\r", timeout=0.2).decode("ASCII").strip()
+
+    def telnet_command(self, command):
+        """ Establishes a telnet connection and sends `command`. """
+        telnet = telnetlib.Telnet(self._host)
+        telnet.write(command.encode("ASCII") + b"\r")
+        telnet.read_very_eager()  # skip response
+        telnet.close()
+
+    def update(self):
         try:
-            # unspecified command, should be ignored
-            self._telnet.write("?".encode('UTF-8') + b'\r')
-        except (EOFError, BrokenPipeError, ConnectionResetError):
-            self._telnet.open(self._host)
+            telnet = telnetlib.Telnet(self._host)
+        except ConnectionRefusedError:
+            return False
 
-        self._telnet.read_very_eager()  # skip what is not requested
+        self._pwstate = self.telnet_request(telnet, "PW?")
+        # PW? sends also SISTATUS, which is not interesting
+        telnet.read_until(b"\r", timeout=0.2)
 
-        self._telnet.write(message.encode('ASCII') + b'\r')
-        # timeout 200ms, defined by protocol
-        resp = self._telnet.read_until(b'\r', timeout=0.2)\
-            .decode('UTF-8').strip()
+        volume_str = self.telnet_request(telnet, "MV?")[len("MV"):]
+        self._volume = int(volume_str) / 60
+        self._muted = (self.telnet_request(telnet, "MU?") == "MUON")
+        self._mediasource = self.telnet_request(telnet, "SI?")[len("SI"):]
 
-        if message == "PW?":
-            # workaround; PW? sends also SISTATUS
-            self._telnet.read_until(b'\r', timeout=0.2)
-
-        return resp
+        telnet.close()
+        return True
 
     @property
     def name(self):
@@ -115,10 +97,9 @@ class DenonDevice(MediaPlayerDevice):
     @property
     def state(self):
         """ Returns the state of the device. """
-        pwstate = self.query('PW?')
-        if pwstate == "PWSTANDBY":
+        if self._pwstate == "PWSTANDBY":
             return STATE_OFF
-        if pwstate == "PWON":
+        if self._pwstate == "PWON":
             return STATE_ON
 
         return STATE_UNKNOWN
@@ -126,17 +107,17 @@ class DenonDevice(MediaPlayerDevice):
     @property
     def volume_level(self):
         """ Volume level of the media player (0..1). """
-        return int(self.query('MV?')[len('MV'):]) / 60
+        return self._volume
 
     @property
     def is_volume_muted(self):
         """ Boolean if volume is currently muted. """
-        return self.query('MU?') == "MUON"
+        return self._muted
 
     @property
     def media_title(self):
         """ Current media source. """
-        return self.query('SI?')[len('SI'):]
+        return self._mediasource
 
     @property
     def supported_media_commands(self):
@@ -145,24 +126,24 @@ class DenonDevice(MediaPlayerDevice):
 
     def turn_off(self):
         """ turn_off media player. """
-        self.query('PWSTANDBY')
+        self.telnet_command("PWSTANDBY")
 
     def volume_up(self):
         """ volume_up media player. """
-        self.query('MVUP')
+        self.telnet_command("MVUP")
 
     def volume_down(self):
         """ volume_down media player. """
-        self.query('MVDOWN')
+        self.telnet_command("MVDOWN")
 
     def set_volume_level(self, volume):
         """ set volume level, range 0..1. """
         # 60dB max
-        self.query('MV' + str(round(volume * 60)).zfill(2))
+        self.telnet_command("MV" + str(round(volume * 60)).zfill(2))
 
     def mute_volume(self, mute):
         """ mute (true) or unmute (false) media player. """
-        self.query('MU' + ('ON' if mute else 'OFF'))
+        self.telnet_command("MU" + ("ON" if mute else "OFF"))
 
     def media_play_pause(self):
         """ media_play_pause media player. """
@@ -170,22 +151,22 @@ class DenonDevice(MediaPlayerDevice):
 
     def media_play(self):
         """ media_play media player. """
-        self.query('NS9A')
+        self.telnet_command("NS9A")
 
     def media_pause(self):
         """ media_pause media player. """
-        self.query('NS9B')
+        self.telnet_command("NS9B")
 
     def media_next_track(self):
         """ Send next track command. """
-        self.query('NS9D')
+        self.telnet_command("NS9D")
 
     def media_previous_track(self):
-        self.query('NS9E')
+        self.telnet_command("NS9E")
 
     def media_seek(self, position):
         raise NotImplementedError()
 
     def turn_on(self):
         """ turn the media player on. """
-        self.query('PWON')
+        self.telnet_command("PWON")

homeassistant/components/media_player/firetv.py

@@ -0,0 +1,190 @@
+"""
+homeassistant.components.media_player.firetv
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Provides functionality to interact with FireTV devices.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.firetv/
+"""
+import logging
+import requests
+
+from homeassistant.const import (
+    STATE_PLAYING, STATE_PAUSED, STATE_IDLE, STATE_OFF,
+    STATE_UNKNOWN, STATE_STANDBY)
+
+from homeassistant.components.media_player import (
+    MediaPlayerDevice,
+    SUPPORT_PAUSE, SUPPORT_VOLUME_SET,
+    SUPPORT_TURN_ON, SUPPORT_TURN_OFF,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_NEXT_TRACK)
+
+SUPPORT_FIRETV = SUPPORT_PAUSE | \
+    SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PREVIOUS_TRACK | \
+    SUPPORT_NEXT_TRACK | SUPPORT_VOLUME_SET
+
+DOMAIN = 'firetv'
+DEVICE_LIST_URL = 'http://{0}/devices/list'
+DEVICE_STATE_URL = 'http://{0}/devices/state/{1}'
+DEVICE_ACTION_URL = 'http://{0}/devices/action/{1}/{2}'
+
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Sets up the FireTV platform. """
+    host = config.get('host', 'localhost:5556')
+    device_id = config.get('device', 'default')
+    try:
+        response = requests.get(DEVICE_LIST_URL.format(host)).json()
+        if device_id in response['devices'].keys():
+            add_devices([
+                FireTVDevice(
+                    host,
+                    device_id,
+                    config.get('name', 'Amazon Fire TV')
+                )
+            ])
+            _LOGGER.info(
+                'Device %s accessible and ready for control', device_id)
+        else:
+            _LOGGER.warn(
+                'Device %s is not registered with firetv-server', device_id)
+    except requests.exceptions.RequestException:
+        _LOGGER.error('Could not connect to firetv-server at %s', host)
+
+
+class FireTV(object):
+    """ firetv-server client.
+
+    Should a native Python 3 ADB module become available, python-firetv can
+    support Python 3, it can be added as a dependency, and this class can be
+    dispensed of.
+
+    For now, it acts as a client to the firetv-server HTTP server (which must
+    be running via Python 2).
+    """
+
+    def __init__(self, host, device_id):
+        self.host = host
+        self.device_id = device_id
+
+    @property
+    def state(self):
+        """ Get the device state. An exception means UNKNOWN state. """
+        try:
+            response = requests.get(
+                DEVICE_STATE_URL.format(
+                    self.host,
+                    self.device_id
+                    )
+                ).json()
+            return response.get('state', STATE_UNKNOWN)
+        except requests.exceptions.RequestException:
+            _LOGGER.error(
+                'Could not retrieve device state for %s', self.device_id)
+            return STATE_UNKNOWN
+
+    def action(self, action_id):
+        """ Perform an action on the device. """
+        try:
+            requests.get(
+                DEVICE_ACTION_URL.format(
+                    self.host,
+                    self.device_id,
+                    action_id
+                    )
+                )
+        except requests.exceptions.RequestException:
+            _LOGGER.error(
+                'Action request for %s was not accepted for device %s',
+                action_id, self.device_id)
+
+
+class FireTVDevice(MediaPlayerDevice):
+    """ Represents an Amazon Fire TV device on the network. """
+
+    def __init__(self, host, device, name):
+        self._firetv = FireTV(host, device)
+        self._name = name
+        self._state = STATE_UNKNOWN
+
+    @property
+    def name(self):
+        """ Get the device name. """
+        return self._name
+
+    @property
+    def should_poll(self):
+        """ Device should be polled. """
+        return True
+
+    @property
+    def supported_media_commands(self):
+        """ Flags of media commands that are supported. """
+        return SUPPORT_FIRETV
+
+    @property
+    def state(self):
+        """ State of the player. """
+        return self._state
+
+    def update(self):
+        """ Update device state. """
+        self._state = {
+            'idle': STATE_IDLE,
+            'off': STATE_OFF,
+            'play': STATE_PLAYING,
+            'pause': STATE_PAUSED,
+            'standby': STATE_STANDBY,
+            'disconnected': STATE_UNKNOWN,
+        }.get(self._firetv.state, STATE_UNKNOWN)
+
+    def turn_on(self):
+        """ Turns on the device. """
+        self._firetv.action('turn_on')
+
+    def turn_off(self):
+        """ Turns off the device. """
+        self._firetv.action('turn_off')
+
+    def media_play(self):
+        """ Send play command. """
+        self._firetv.action('media_play')
+
+    def media_pause(self):
+        """ Send pause command. """
+        self._firetv.action('media_pause')
+
+    def media_play_pause(self):
+        """ Send play/pause command. """
+        self._firetv.action('media_play_pause')
+
+    def volume_up(self):
+        """ Send volume up command. """
+        self._firetv.action('volume_up')
+
+    def volume_down(self):
+        """ Send volume down command. """
+        self._firetv.action('volume_down')
+
+    def media_previous_track(self):
+        """ Send previous track command (results in rewind). """
+        self._firetv.action('media_previous')
+
+    def media_next_track(self):
+        """ Send next track command (results in fast-forward). """
+        self._firetv.action('media_next')
+
+    def media_seek(self, position):
+        raise NotImplementedError()
+
+    def mute_volume(self, mute):
+        raise NotImplementedError()
+
+    def play_youtube(self, media_id):
+        raise NotImplementedError()
+
+    def set_volume_level(self, volume):
+        raise NotImplementedError()

homeassistant/components/media_player/itunes.py

@@ -1,36 +1,10 @@
 """
 homeassistant.components.media_player.itunes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Provides an interface to iTunes-API (https://github.com/maddox/itunes-api)
-
-The iTunes media player will allow you to control your iTunes instance. You
-can play/pause/next/previous/mute, adjust volume, etc.
-
-In addition to controlling iTunes, your available AirPlay endpoints will be
-added as media players as well. You can then individually address them append
-turn them on, turn them off, or adjust their volume.
-
-Configuration:
-
-To use iTunes you will need to add something like the following to
-your configuration.yaml file.
-
-media_player:
-  platform: itunes
-  name: iTunes
-  host: http://192.168.1.16
-  port: 8181
-
-Variables:
-
-name
-*Optional
-The name of the device.
-
-url
-*Required
-URL of your running version of iTunes-API. Example: http://192.168.1.50:8181
+Provides an interface to iTunes API.
 
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.itunes/
 """
 import logging
 
@@ -157,11 +131,9 @@ class Itunes(object):
         path = '/airplay_devices/' + device_id + '/volume'
         return self._request('PUT', path, {'level': level})
 
-# pylint: disable=unused-argument
-# pylint: disable=abstract-method
+
+# pylint: disable=unused-argument, abstract-method
 # pylint: disable=too-many-instance-attributes
-
-
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """ Sets up the itunes platform. """
 
@@ -179,7 +151,6 @@ class ItunesDevice(MediaPlayerDevice):
     """ Represents a iTunes-API instance. """
 
     # pylint: disable=too-many-public-methods
-
     def __init__(self, name, host, port, add_devices):
         self._name = name
         self._host = host

homeassistant/components/media_player/kodi.py

@@ -3,35 +3,8 @@ homeassistant.components.media_player.kodi
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Provides an interface to the XBMC/Kodi JSON-RPC API
 
-Configuration:
-
-To use the Kodi you will need to add something like the following to
-your configuration.yaml file.
-
-media_player:
-  platform: kodi
-  name: Kodi
-  url: http://192.168.0.123/jsonrpc
-  user: kodi
-  password: my_secure_password
-
-Variables:
-
-name
-*Optional
-The name of the device.
-
-url
-*Required
-The URL of the XBMC/Kodi JSON-RPC API. Example: http://192.168.0.123/jsonrpc
-
-user
-*Optional
-The XBMC/Kodi HTTP username.
-
-password
-*Optional
-The XBMC/Kodi HTTP password.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.kodi/
 """
 import urllib
 import logging

homeassistant/components/media_player/mpd.py

@@ -3,35 +3,8 @@ homeassistant.components.media_player.mpd
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Provides functionality to interact with a Music Player Daemon.
 
-Configuration:
-
-To use MPD you will need to add something like the following to your
-configuration.yaml file.
-
-media_player:
-  platform: mpd
-  server: 127.0.0.1
-  port: 6600
-  location: bedroom
-  password: superSecretPassword123
-
-Variables:
-
-server
-*Required
-IP address of the Music Player Daemon. Example: 192.168.1.32
-
-port
-*Optional
-Port of the Music Player Daemon, defaults to 6600. Example: 6600
-
-location
-*Optional
-Location of your Music Player Daemon.
-
-password
-*Optional
-Password for your Music Player Daemon.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.mpd/
 """
 import logging
 import socket

homeassistant/components/media_player/plex.py

@@ -4,40 +4,116 @@ homeassistant.components.media_player.plex
 Provides an interface to the Plex API.
 
 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/media_player.plex.html
+https://home-assistant.io/components/media_player.plex/
 """
+import os
+import json
 import logging
 from datetime import timedelta
+from urllib.parse import urlparse
 
+from homeassistant.loader import get_component
+import homeassistant.util as util
 from homeassistant.components.media_player import (
     MediaPlayerDevice, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK,
     SUPPORT_NEXT_TRACK, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_VIDEO)
 from homeassistant.const import (
-    STATE_IDLE, STATE_PLAYING, STATE_PAUSED, STATE_OFF, STATE_UNKNOWN)
-import homeassistant.util as util
+    DEVICE_DEFAULT_NAME, STATE_IDLE, STATE_PLAYING,
+    STATE_PAUSED, STATE_OFF, STATE_UNKNOWN)
 
-REQUIREMENTS = ['https://github.com/adrienbrault/python-plexapi/archive/'
-                'df2d0847e801d6d5cda920326d693cf75f304f1a.zip'
-                '#python-plexapi==1.0.2']
+REQUIREMENTS = ['plexapi==1.1.0']
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
 MIN_TIME_BETWEEN_FORCED_SCANS = timedelta(seconds=1)
 
+PLEX_CONFIG_FILE = 'plex.conf'
+
+# Map ip to request id for configuring
+_CONFIGURING = {}
 _LOGGER = logging.getLogger(__name__)
 
 SUPPORT_PLEX = SUPPORT_PAUSE | SUPPORT_PREVIOUS_TRACK | SUPPORT_NEXT_TRACK
 
 
-# pylint: disable=abstract-method, unused-argument
-def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Sets up the plex platform. """
-    from plexapi.myplex import MyPlexUser
-    from plexapi.exceptions import BadRequest
+def config_from_file(filename, config=None):
+    ''' Small configuration file management function'''
+    if config:
+        # We're writing configuration
+        try:
+            with open(filename, 'w') as fdesc:
+                fdesc.write(json.dumps(config))
+        except IOError as error:
+            _LOGGER.error('Saving config file failed: %s', error)
+            return False
+        return True
+    else:
+        # We're reading config
+        if os.path.isfile(filename):
+            try:
+                with open(filename, 'r') as fdesc:
+                    return json.loads(fdesc.read())
+            except IOError as error:
+                _LOGGER.error('Reading config file failed: %s', error)
+                # This won't work yet
+                return False
+        else:
+            return {}
+
+
+# pylint: disable=abstract-method, unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ Sets up the plex platform. """
+
+    config = config_from_file(hass.config.path(PLEX_CONFIG_FILE))
+    if len(config):
+        # Setup a configured PlexServer
+        host, token = config.popitem()
+        token = token['token']
+    # Via discovery
+    elif discovery_info is not None:
+        # Parse discovery data
+        host = urlparse(discovery_info[1]).netloc
+        _LOGGER.info('Discovered PLEX server: %s', host)
+
+        if host in _CONFIGURING:
+            return
+        token = None
+    else:
+        return
+
+    setup_plexserver(host, token, hass, add_devices_callback)
+
+
+# pylint: disable=too-many-branches
+def setup_plexserver(host, token, hass, add_devices_callback):
+    ''' Setup a plexserver based on host parameter'''
+    import plexapi.server
+    import plexapi.exceptions
+
+    try:
+        plexserver = plexapi.server.PlexServer('http://%s' % host, token)
+    except (plexapi.exceptions.BadRequest,
+            plexapi.exceptions.Unauthorized,
+            plexapi.exceptions.NotFound) as error:
+        _LOGGER.info(error)
+        # No token or wrong token
+        request_configuration(host, hass, add_devices_callback)
+        return
+
+    # If we came here and configuring this host, mark as done
+    if host in _CONFIGURING:
+        request_id = _CONFIGURING.pop(host)
+        configurator = get_component('configurator')
+        configurator.request_done(request_id)
+        _LOGGER.info('Discovery configuration done!')
+
+    # Save config
+    if not config_from_file(
+            hass.config.path(PLEX_CONFIG_FILE),
+            {host: {'token': token}}):
+        _LOGGER.error('failed to save config file')
+
+    _LOGGER.info('Connected to: htts://%s', host)
 
-    name = config.get('name', '')
-    user = config.get('user', '')
-    password = config.get('password', '')
-    plexuser = MyPlexUser.signin(user, password)
-    plexserver = plexuser.getResource(name).connect()
     plex_clients = {}
     plex_sessions = {}
 
@@ -45,34 +121,34 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     def update_devices():
         """ Updates the devices objects. """
         try:
-            devices = plexuser.devices()
-        except BadRequest:
+            devices = plexserver.clients()
+        except plexapi.exceptions.BadRequest:
             _LOGGER.exception("Error listing plex devices")
             return
 
         new_plex_clients = []
         for device in devices:
-            if (all(x not in ['client', 'player'] for x in device.provides)
-                    or 'PlexAPI' == device.product):
+            # For now, let's allow all deviceClass types
+            if device.deviceClass in ['badClient']:
                 continue
 
-            if device.clientIdentifier not in plex_clients:
+            if device.machineIdentifier not in plex_clients:
                 new_client = PlexClient(device, plex_sessions, update_devices,
                                         update_sessions)
-                plex_clients[device.clientIdentifier] = new_client
+                plex_clients[device.machineIdentifier] = new_client
                 new_plex_clients.append(new_client)
             else:
-                plex_clients[device.clientIdentifier].set_device(device)
+                plex_clients[device.machineIdentifier].set_device(device)
 
         if new_plex_clients:
-            add_devices(new_plex_clients)
+            add_devices_callback(new_plex_clients)
 
     @util.Throttle(MIN_TIME_BETWEEN_SCANS, MIN_TIME_BETWEEN_FORCED_SCANS)
     def update_sessions():
         """ Updates the sessions objects. """
         try:
             sessions = plexserver.sessions()
-        except BadRequest:
+        except plexapi.exceptions.BadRequest:
             _LOGGER.exception("Error listing plex sessions")
             return
 
@@ -84,10 +160,34 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     update_sessions()
 
 
+def request_configuration(host, hass, add_devices_callback):
+    """ Request configuration steps from the user. """
+    configurator = get_component('configurator')
+
+    # We got an error if this method is called while we are configuring
+    if host in _CONFIGURING:
+        configurator.notify_errors(
+            _CONFIGURING[host], "Failed to register, please try again.")
+
+        return
+
+    def plex_configuration_callback(data):
+        """ Actions to do when our configuration callback is called. """
+        setup_plexserver(host, data.get('token'), hass, add_devices_callback)
+
+    _CONFIGURING[host] = configurator.request_config(
+        hass, "Plex Media Server", plex_configuration_callback,
+        description=('Enter the X-Plex-Token'),
+        description_image="/static/images/config_plex_mediaserver.png",
+        submit_caption="Confirm",
+        fields=[{'id': 'token', 'name': 'X-Plex-Token', 'type': ''}]
+    )
+
+
 class PlexClient(MediaPlayerDevice):
     """ Represents a Plex device. """
 
-    # pylint: disable=too-many-public-methods
+    # pylint: disable=too-many-public-methods, attribute-defined-outside-init
     def __init__(self, device, plex_sessions, update_devices, update_sessions):
         self.plex_sessions = plex_sessions
         self.update_devices = update_devices
@@ -99,17 +199,23 @@ class PlexClient(MediaPlayerDevice):
         self.device = device
 
     @property
-    def session(self):
-        """ Returns the session, if any. """
-        if self.device.clientIdentifier not in self.plex_sessions:
-            return None
-
-        return self.plex_sessions[self.device.clientIdentifier]
+    def unique_id(self):
+        """ Returns the id of this plex client """
+        return "{}.{}".format(
+            self.__class__, self.device.machineIdentifier or self.device.name)
 
     @property
     def name(self):
         """ Returns the name of the device. """
-        return self.device.name or self.device.product or self.device.device
+        return self.device.name or DEVICE_DEFAULT_NAME
+
+    @property
+    def session(self):
+        """ Returns the session, if any. """
+        if self.device.machineIdentifier not in self.plex_sessions:
+            return None
+
+        return self.plex_sessions[self.device.machineIdentifier]
 
     @property
     def state(self):
@@ -120,7 +226,8 @@ class PlexClient(MediaPlayerDevice):
                 return STATE_PLAYING
             elif state == 'paused':
                 return STATE_PAUSED
-        elif self.device.isReachable:
+        # This is nasty. Need to find a way to determine alive
+        elif self.device:
             return STATE_IDLE
         else:
             return STATE_OFF
@@ -196,16 +303,16 @@ class PlexClient(MediaPlayerDevice):
 
     def media_play(self):
         """ media_play media player. """
-        self.device.play({'type': 'video'})
+        self.device.play()
 
     def media_pause(self):
         """ media_pause media player. """
-        self.device.pause({'type': 'video'})
+        self.device.pause()
 
     def media_next_track(self):
         """ Send next track command. """
-        self.device.skipNext({'type': 'video'})
+        self.device.skipNext()
 
     def media_previous_track(self):
         """ Send previous track command. """
-        self.device.skipPrevious({'type': 'video'})
+        self.device.skipPrevious()

homeassistant/components/media_player/sonos.py

@@ -1,17 +1,11 @@
 """
 homeassistant.components.media_player.sonos
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Provides an interface to Sonos players (via SoCo)
 
-Configuration:
-
-To use SoCo, add something like this to your configuration:
-
-media_player:
-  platform: sonos
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.sonos/
 """
-
 import logging
 import datetime
 
@@ -56,8 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     return True
 
 
-# pylint: disable=too-many-instance-attributes
-# pylint: disable=too-many-public-methods
+# pylint: disable=too-many-instance-attributes, too-many-public-methods
 # pylint: disable=abstract-method
 class SonosDevice(MediaPlayerDevice):
     """ Represents a Sonos device. """
@@ -74,7 +67,7 @@ class SonosDevice(MediaPlayerDevice):
         return True
 
     def update_sonos(self, now):
-        """ Updates state, called by track_utc_time_change """
+        """ Updates state, called by track_utc_time_change. """
         self.update_ha_state(True)
 
     @property
@@ -162,31 +155,31 @@ class SonosDevice(MediaPlayerDevice):
         return SUPPORT_SONOS
 
     def turn_off(self):
-        """ turn_off media player. """
+        """ Turn off media player. """
         self._player.pause()
 
     def volume_up(self):
-        """ volume_up media player. """
+        """ Volume up media player. """
         self._player.volume += 1
 
     def volume_down(self):
-        """ volume_down media player. """
+        """ Volume down media player. """
         self._player.volume -= 1
 
     def set_volume_level(self, volume):
-        """ set volume level, range 0..1. """
+        """ Set volume level, range 0..1. """
         self._player.volume = str(int(volume * 100))
 
     def mute_volume(self, mute):
-        """ mute (true) or unmute (false) media player. """
+        """ Mute (true) or unmute (false) media player. """
         self._player.mute = mute
 
     def media_play(self):
-        """ media_play media player. """
+        """ Send paly command. """
         self._player.play()
 
     def media_pause(self):
-        """ media_pause media player. """
+        """ Send pause command. """
         self._player.pause()
 
     def media_next_track(self):
@@ -202,5 +195,5 @@ class SonosDevice(MediaPlayerDevice):
         self._player.seek(str(datetime.timedelta(seconds=int(position))))
 
     def turn_on(self):
-        """ turn the media player on. """
+        """ Turn the media player on. """
         self._player.play()

homeassistant/components/media_player/squeezebox.py

@@ -1,39 +1,11 @@
 """
 homeassistant.components.media_player.squeezebox
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Provides an interface to the Logitech SqueezeBox API
 
-Configuration:
-
-To use SqueezeBox add something something like the following to your
-configuration.yaml file.
-
-media_player:
-  platform: squeezebox
-  host: 192.168.1.21
-  port: 9090
-  username: user
-  password: password
-
-Variables:
-
-host
-*Required
-The host name or address of the Logitech Media Server.
-
-port
-*Optional
-Telnet port to Logitech Media Server, default 9090.
-
-usermame
-*Optional
-Username, if password protection is enabled.
-
-password
-*Optional
-Password, if password protection is enabled.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.squeezebox/
 """
-
 import logging
 import telnetlib
 import urllib.parse
@@ -201,7 +173,7 @@ class SqueezeBoxDevice(MediaPlayerDevice):
     def volume_level(self):
         """ Volume level of the media player (0..1). """
         if 'mixer volume' in self._status:
-            return int(self._status['mixer volume']) / 100.0
+            return int(float(self._status['mixer volume'])) / 100.0
 
     @property
     def is_volume_muted(self):
@@ -291,7 +263,7 @@ class SqueezeBoxDevice(MediaPlayerDevice):
 
     def media_pause(self):
         """ media_pause media player. """
-        self._lms.query(self._id, 'pause', '0')
+        self._lms.query(self._id, 'pause', '1')
         self.update_ha_state()
 
     def media_next_track(self):

homeassistant/components/modbus.py

@@ -3,27 +3,8 @@ homeassistant.components.modbus
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Modbus component, using pymodbus (python3 branch).
 
-Configuration:
-
-To use the Modbus component you will need to add something like the following
-to your configuration.yaml file.
-
-#Modbus TCP
-modbus:
-    type: tcp
-    host: 127.0.0.1
-    port: 2020
-
-#Modbus RTU
-modbus:
-    type: serial
-    method: rtu
-    port: /dev/ttyUSB0
-    baudrate: 9600
-    stopbits: 1
-    bytesize: 8
-    parity: N
-
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/modbus/
 """
 import logging
 

homeassistant/components/mqtt/__init__.py

@@ -1,52 +1,10 @@
 """
 homeassistant.components.mqtt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-MQTT component, using paho-mqtt. This component needs a MQTT broker like
-Mosquitto or Mosca. The Eclipse Foundation is running a public MQTT server
-at iot.eclipse.org. If you prefer to use that one, keep in mind to adjust
-the topic/client ID and that your messages are public.
+MQTT component, using paho-mqtt.
 
-Configuration:
-
-To use MQTT you will need to add something like the following to your
-config/configuration.yaml.
-
-mqtt:
-  broker: 127.0.0.1
-
-Or, if you want more options:
-
-mqtt:
-  broker: 127.0.0.1
-  port: 1883
-  client_id: home-assistant-1
-  keepalive: 60
-  username: your_username
-  password: your_secret_password
-  certificate: /home/paulus/dev/addtrustexternalcaroot.crt
-
-Variables:
-
-broker
-*Required
-This is the IP address of your MQTT broker, e.g. 192.168.1.32.
-
-port
-*Optional
-The network port to connect to. Default is 1883.
-
-client_id
-*Optional
-Client ID that Home Assistant will use. Has to be unique on the server.
-Default is a random generated one.
-
-keepalive
-*Optional
-The keep alive in seconds for this client. Default is 60.
-
-certificate
-*Optional
-Certificate to use for encrypting the connection to the broker.
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/mqtt/
 """
 import logging
 import os

homeassistant/components/notify/__init__.py

@@ -1,15 +1,17 @@
 """
 homeassistant.components.notify
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to notify people.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/notify/
 """
 from functools import partial
 import logging
 import os
 
+import homeassistant.bootstrap as bootstrap
 from homeassistant.config import load_yaml_config_file
-from homeassistant.loader import get_component
 from homeassistant.helpers import config_per_platform
 
 from homeassistant.const import CONF_NAME
@@ -21,6 +23,9 @@ DEPENDENCIES = []
 ATTR_TITLE = "title"
 ATTR_TITLE_DEFAULT = "Home Assistant"
 
+# Target of the notification (user, device, etc)
+ATTR_TARGET = 'target'
+
 # Text to notify user of
 ATTR_MESSAGE = "message"
 
@@ -43,16 +48,15 @@ def setup(hass, config):
 
     for platform, p_config in config_per_platform(config, DOMAIN, _LOGGER):
         # get platform
-        notify_implementation = get_component(
-            'notify.{}'.format(platform))
+        notify_implementation = bootstrap.prepare_setup_platform(
+            hass, config, DOMAIN, platform)
 
         if notify_implementation is None:
             _LOGGER.error("Unknown notification service specified.")
             continue
 
         # create platform service
-        notify_service = notify_implementation.get_service(
-            hass, {DOMAIN: p_config})
+        notify_service = notify_implementation.get_service(hass, p_config)
 
         if notify_service is None:
             _LOGGER.error("Failed to initialize notification service %s",
@@ -68,8 +72,9 @@ def setup(hass, config):
                 return
 
             title = call.data.get(ATTR_TITLE, ATTR_TITLE_DEFAULT)
+            target = call.data.get(ATTR_TARGET)
 
-            notify_service.send_message(message, title=title)
+            notify_service.send_message(message, title=title, target=target)
 
         # register service
         service_call_handler = partial(notify_message, notify_service)

homeassistant/components/notify/file.py

@@ -3,26 +3,8 @@ homeassistant.components.notify.file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 File notification service.
 
-Configuration:
-
-To use the File notifier you will need to add something like the following
-to your configuration.yaml file.
-
-notify:
-  platform: file
-  filename: FILENAME
-  timestamp: 1 or 0
-
-Variables:
-
-filename
-*Required
-Name of the file to use. The file will be created if it doesn't exist and saved
-in your config/ folder.
-
-timestamp
-*Required
-Add a timestamp to the entry, valid entries are 1 or 0.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/notify.file/
 """
 import logging
 import os
@@ -38,14 +20,14 @@ _LOGGER = logging.getLogger(__name__)
 def get_service(hass, config):
     """ Get the file notification service. """
 
-    if not validate_config(config,
+    if not validate_config({DOMAIN: config},
                            {DOMAIN: ['filename',
                                      'timestamp']},
                            _LOGGER):
         return None
 
-    filename = config[DOMAIN]['filename']
-    timestamp = config[DOMAIN]['timestamp']
+    filename = config['filename']
+    timestamp = config['timestamp']
 
     return FileNotificationService(hass, filename, timestamp)
 

homeassistant/components/notify/instapush.py

@@ -3,56 +3,14 @@ homeassistant.components.notify.instapush
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Instapush notification service.
 
-Configuration:
-
-To use the Instapush notifier you will need to add something like the following
-to your configuration.yaml file.
-
-notify:
-  platform: instapush
-  api_key: YOUR_APP_KEY
-  app_secret: YOUR_APP_SECRET
-  event: YOUR_EVENT
-  tracker: YOUR_TRACKER
-
-Variables:
-
-api_key
-*Required
-To retrieve this value log into your account at https://instapush.im and go
-to 'APPS', choose an app, and check 'Basic Info'.
-
-app_secret
-*Required
-To get this value log into your account at https://instapush.im and go to
-'APPS'. The 'Application ID' can be found under 'Basic Info'.
-
-event
-*Required
-To retrieve a valid event log into your account at https://instapush.im and go
-to 'APPS'. If you have no events to use with Home Assistant, create one event
-for your app.
-
-tracker
-*Required
-To retrieve the tracker value log into your account at https://instapush.im and
-go to 'APPS', choose the app, and check the event entries.
-
-Example usage of Instapush if you have an event 'notification' and a tracker
-'home-assistant'.
-
-curl -X POST \
-    -H "x-instapush-appid: YOUR_APP_KEY" \
-    -H "x-instapush-appsecret: YOUR_APP_SECRET" \
-    -H "Content-Type: application/json" \
-      -d '{"event":"notification","trackers":{"home-assistant":"Switch 1"}}' \
-    https://api.instapush.im/v1/post
-
-Details for the API : https://instapush.im/developer/rest
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/notify.instapush/
 """
 import logging
 import json
 
+import requests
+
 from homeassistant.helpers import validate_config
 from homeassistant.components.notify import (
     DOMAIN, ATTR_TITLE, BaseNotificationService)
@@ -65,7 +23,7 @@ _RESOURCE = 'https://api.instapush.im/v1/'
 def get_service(hass, config):
     """ Get the instapush notification service. """
 
-    if not validate_config(config,
+    if not validate_config({DOMAIN: config},
                            {DOMAIN: [CONF_API_KEY,
                                      'app_secret',
                                      'event',
@@ -73,52 +31,29 @@ def get_service(hass, config):
                            _LOGGER):
         return None
 
+    headers = {'x-instapush-appid': config[CONF_API_KEY],
+               'x-instapush-appsecret': config['app_secret']}
+
     try:
-        import requests
-
-    except ImportError:
-        _LOGGER.exception(
-            "Unable to import requests. "
-            "Did you maybe not install the 'Requests' package?")
-
+        response = requests.get(_RESOURCE + 'events/list',
+                                headers=headers).json()
+    except ValueError:
+        _LOGGER.error('Unexpected answer from Instapush API.')
         return None
 
-    # pylint: disable=unused-variable
-    try:
-        response = requests.get(_RESOURCE)
+    if 'error' in response:
+        _LOGGER.error(response['msg'])
+        return None
 
-    except requests.ConnectionError:
+    if len([app for app in response if app['title'] == config['event']]) == 0:
         _LOGGER.error(
-            "Connection error "
-            "Please check if https://instapush.im is available.")
-
+            "No app match your given value. "
+            "Please create an app at https://instapush.im")
         return None
 
-    instapush = requests.Session()
-    headers = {'x-instapush-appid': config[DOMAIN][CONF_API_KEY],
-               'x-instapush-appsecret': config[DOMAIN]['app_secret']}
-    response = instapush.get(_RESOURCE + 'events/list',
-                             headers=headers)
-
-    try:
-        if response.json()['error']:
-            _LOGGER.error(response.json()['msg'])
-    # pylint: disable=bare-except
-    except:
-        try:
-            next(events for events in response.json()
-                 if events['title'] == config[DOMAIN]['event'])
-        except StopIteration:
-            _LOGGER.error(
-                "No event match your given value. "
-                "Please create an event at https://instapush.im")
-        else:
-            return InstapushNotificationService(
-                config[DOMAIN].get(CONF_API_KEY),
-                config[DOMAIN]['app_secret'],
-                config[DOMAIN]['event'],
-                config[DOMAIN]['tracker']
-                )
+    return InstapushNotificationService(
+        config[CONF_API_KEY], config['app_secret'], config['event'],
+        config['tracker'])
 
 
 # pylint: disable=too-few-public-methods
@@ -126,9 +61,6 @@ class InstapushNotificationService(BaseNotificationService):
     """ Implements notification service for Instapush. """
 
     def __init__(self, api_key, app_secret, event, tracker):
-        # pylint: disable=no-name-in-module, unused-variable
-        from requests import Session
-
         self._api_key = api_key
         self._app_secret = app_secret
         self._event = event
@@ -138,8 +70,6 @@ class InstapushNotificationService(BaseNotificationService):
             'x-instapush-appsecret': self._app_secret,
             'Content-Type': 'application/json'}
 
-        self.instapush = Session()
-
     def send_message(self, message="", **kwargs):
         """ Send a message to a user. """
 
@@ -148,10 +78,8 @@ class InstapushNotificationService(BaseNotificationService):
         data = {"event": self._event,
                 "trackers": {self._tracker: title + " : " + message}}
 
-        response = self.instapush.post(
-            _RESOURCE + 'post',
-            data=json.dumps(data),
-            headers=self._headers)
+        response = requests.post(_RESOURCE + 'post', data=json.dumps(data),
+                                 headers=self._headers)
 
         if response.json()['status'] == 401:
             _LOGGER.error(

homeassistant/components/notify/nma.py

@@ -3,27 +3,14 @@ homeassistant.components.notify.nma
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 NMA (Notify My Android) notification service.
 
-Configuration:
-
-To use the NMA notifier you will need to add something like the following
-to your configuration.yaml file.
-
-notify:
-  platform: nma
-  api_key: YOUR_API_KEY
-
-Variables:
-
-api_key
-*Required
-Enter the API key for NMA. Go to https://www.notifymyandroid.com and create a
-new API key to use with Home Assistant.
-
-Details for the API : https://www.notifymyandroid.com/api.jsp
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/notify.nma/
 """
 import logging
 import xml.etree.ElementTree as ET
 
+import requests
+
 from homeassistant.helpers import validate_config
 from homeassistant.components.notify import (
     DOMAIN, ATTR_TITLE, BaseNotificationService)
@@ -36,31 +23,20 @@ _RESOURCE = 'https://www.notifymyandroid.com/publicapi/'
 def get_service(hass, config):
     """ Get the NMA notification service. """
 
-    if not validate_config(config,
+    if not validate_config({DOMAIN: config},
                            {DOMAIN: [CONF_API_KEY]},
                            _LOGGER):
         return None
 
-    try:
-        # pylint: disable=unused-variable
-        from requests import Session
-
-    except ImportError:
-        _LOGGER.exception(
-            "Unable to import requests. "
-            "Did you maybe not install the 'Requests' package?")
-
-        return None
-
-    nma = Session()
-    response = nma.get(_RESOURCE + 'verify',
-                       params={"apikey": config[DOMAIN][CONF_API_KEY]})
+    response = requests.get(_RESOURCE + 'verify',
+                            params={"apikey": config[CONF_API_KEY]})
     tree = ET.fromstring(response.content)
 
     if tree[0].tag == 'error':
         _LOGGER.error("Wrong API key supplied. %s", tree[0].text)
-    else:
-        return NmaNotificationService(config[DOMAIN][CONF_API_KEY])
+        return None
+
+    return NmaNotificationService(config[CONF_API_KEY])
 
 
 # pylint: disable=too-few-public-methods
@@ -68,26 +44,20 @@ class NmaNotificationService(BaseNotificationService):
     """ Implements notification service for NMA. """
 
     def __init__(self, api_key):
-        # pylint: disable=no-name-in-module, unused-variable
-        from requests import Session
-
         self._api_key = api_key
-        self._data = {"apikey": self._api_key}
-
-        self.nma = Session()
 
     def send_message(self, message="", **kwargs):
         """ Send a message to a user. """
 
-        title = kwargs.get(ATTR_TITLE)
+        data = {
+            "apikey": self._api_key,
+            "application": 'home-assistant',
+            "event": kwargs.get(ATTR_TITLE),
+            "description": message,
+            "priority": 0,
+        }
 
-        self._data['application'] = 'home-assistant'
-        self._data['event'] = title
-        self._data['description'] = message
-        self._data['priority'] = 0
-
-        response = self.nma.get(_RESOURCE + 'notify',
-                                params=self._data)
+        response = requests.get(_RESOURCE + 'notify', params=data)
         tree = ET.fromstring(response.content)
 
         if tree[0].tag == 'error':

homeassistant/components/notify/pushbullet.py

@@ -3,73 +3,119 @@ homeassistant.components.notify.pushbullet
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 PushBullet platform for notify component.
 
-Configuration:
-
-To use the PushBullet notifier you will need to add something like the
-following to your configuration.yaml file.
-
-notify:
-  platform: pushbullet
-  api_key: YOUR_API_KEY
-
-Variables:
-
-api_key
-*Required
-Enter the API key for PushBullet. Go to https://www.pushbullet.com/ to retrieve
-your API key.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/notify.pushbullet/
 """
 import logging
 
-from homeassistant.helpers import validate_config
 from homeassistant.components.notify import (
-    DOMAIN, ATTR_TITLE, BaseNotificationService)
+    ATTR_TITLE, ATTR_TARGET, BaseNotificationService)
 from homeassistant.const import CONF_API_KEY
 
 _LOGGER = logging.getLogger(__name__)
-REQUIREMENTS = ['pushbullet.py==0.7.1']
+REQUIREMENTS = ['pushbullet.py==0.9.0']
 
 
+# pylint: disable=unused-argument
 def get_service(hass, config):
     """ Get the PushBullet notification service. """
+    from pushbullet import PushBullet
+    from pushbullet import InvalidKeyError
 
-    if not validate_config(config,
-                           {DOMAIN: [CONF_API_KEY]},
-                           _LOGGER):
+    if CONF_API_KEY not in config:
+        _LOGGER.error("Unable to find config key '%s'", CONF_API_KEY)
         return None
 
     try:
-        # pylint: disable=unused-variable
-        from pushbullet import PushBullet, InvalidKeyError  # noqa
-
-    except ImportError:
-        _LOGGER.exception(
-            "Unable to import pushbullet. "
-            "Did you maybe not install the 'pushbullet.py' package?")
-
-        return None
-
-    try:
-        return PushBulletNotificationService(config[DOMAIN][CONF_API_KEY])
-
+        pushbullet = PushBullet(config[CONF_API_KEY])
     except InvalidKeyError:
         _LOGGER.error(
             "Wrong API key supplied. "
             "Get it at https://www.pushbullet.com/account")
+        return None
+
+    return PushBulletNotificationService(pushbullet)
 
 
 # pylint: disable=too-few-public-methods
 class PushBulletNotificationService(BaseNotificationService):
     """ Implements notification service for Pushbullet. """
 
-    def __init__(self, api_key):
-        from pushbullet import PushBullet
+    def __init__(self, pb):
+        self.pushbullet = pb
+        self.pbtargets = {}
+        self.refresh()
 
-        self.pushbullet = PushBullet(api_key)
+    def refresh(self):
+        '''
+        Refresh devices, contacts, channels, etc
 
-    def send_message(self, message="", **kwargs):
-        """ Send a message to a user. """
+        pbtargets stores all targets available from this pushbullet instance
+        into a dict. These are PB objects!. It sacrifices a bit of memory
+        for faster processing at send_message
+        '''
+        self.pushbullet.refresh()
+        self.pbtargets = {
+            'device':
+                {tgt.nickname: tgt for tgt in self.pushbullet.devices},
+            'contact':
+                {tgt.email: tgt for tgt in self.pushbullet.contacts},
+            'channel':
+                {tgt.channel_tag: tgt for tgt in self.pushbullet.channels},
+        }
 
+    def send_message(self, message=None, **kwargs):
+        """
+        Send a message to a specified target.
+        If no target specified, a 'normal' push will be sent to all devices
+        linked to the PB account.
+        """
+        targets = kwargs.get(ATTR_TARGET)
         title = kwargs.get(ATTR_TITLE)
+        refreshed = False
 
-        self.pushbullet.push_note(title, message)
+        if not targets:
+            # Backward compatebility, notify all devices in own account
+            self.pushbullet.push_note(title, message)
+            _LOGGER.info('Sent notification to self')
+            return
+
+        # Make list if not so
+        if not isinstance(targets, list):
+            targets = [targets]
+
+        # Main loop, Process all targets specified
+        for target in targets:
+
+            # Allow for untargeted push, combined with other types
+            if target in ['device', 'device/']:
+                self.pushbullet.push_note(title, message)
+                _LOGGER.info('Sent notification to self')
+                continue
+
+            try:
+                ttype, tname = target.split('/', 1)
+            except ValueError:
+                _LOGGER.error('Invalid target syntax: %s', target)
+                continue
+
+            # Refresh if name not found. While awaiting periodic refresh
+            # solution in component, poor mans refresh ;)
+            if ttype not in self.pbtargets:
+                _LOGGER.error('Invalid target syntax: %s', target)
+                continue
+            if tname not in self.pbtargets[ttype] and not refreshed:
+                self.refresh()
+                refreshed = True
+
+            # Attempt push_note on a dict value. Keys are types & target
+            # name. Dict pbtargets has all *actual* targets.
+            try:
+                self.pbtargets[ttype][tname].push_note(title, message)
+            except KeyError:
+                _LOGGER.error('No such target: %s.%s', ttype, tname)
+                continue
+            except self.pushbullet.errors.PushError:
+                _LOGGER.error('Notify failed to: %s.%s', ttype, tname)
+                continue
+            _LOGGER.info('Sent notification to %s.%s', ttype, tname)

homeassistant/components/notify/pushetta.py

@@ -0,0 +1,63 @@
+"""
+homeassistant.components.notify.pushetta
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Pushetta platform for notify component.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/notify.pushetta/
+"""
+import logging
+
+from homeassistant.helpers import validate_config
+from homeassistant.components.notify import (
+    DOMAIN, ATTR_TITLE, BaseNotificationService)
+from homeassistant.const import CONF_API_KEY
+
+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['pushetta==1.0.15']
+
+
+def get_service(hass, config):
+    """ Get the Pushetta notification service. """
+
+    from pushetta import Pushetta, exceptions
+
+    if not validate_config({DOMAIN: config},
+                           {DOMAIN: [CONF_API_KEY, 'channel_name']},
+                           _LOGGER):
+        return None
+
+    try:
+        pushetta = Pushetta(config[CONF_API_KEY])
+        pushetta.pushMessage(config['channel_name'], "Home Assistant started")
+    except exceptions.TokenValidationError:
+        _LOGGER.error("Please check your access token")
+        return None
+    except exceptions.ChannelNotFoundError:
+        _LOGGER.error("Channel '%s' not found", config['channel_name'])
+        return None
+
+    return PushettaNotificationService(config[CONF_API_KEY],
+                                       config['channel_name'])
+
+
+# pylint: disable=too-few-public-methods
+class PushettaNotificationService(BaseNotificationService):
+    """ Implements notification service for Pushetta. """
+
+    def __init__(self, api_key, channel_name):
+
+        from pushetta import Pushetta
+
+        self._api_key = api_key
+        self._channel_name = channel_name
+        self.pushetta = Pushetta(self._api_key)
+
+    def send_message(self, message="", **kwargs):
+        """ Send a message to a user. """
+
+        title = kwargs.get(ATTR_TITLE)
+
+        self.pushetta.pushMessage(self._channel_name,
+                                  "{} {}".format(title, message))

homeassistant/components/notify/pushover.py

@@ -3,35 +3,8 @@ homeassistant.components.notify.pushover
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Pushover platform for notify component.
 
-Configuration:
-
-To use the Pushover notifier you will need to add something like the following
-to your configuration.yaml file.
-
-notify:
-  platform: pushover
-  api_key: ABCDEFGHJKLMNOPQRSTUVXYZ
-  user_key: ABCDEFGHJKLMNOPQRSTUVXYZ
-
-Variables:
-
-api_key
-*Required
-This parameter is optional but should be configured, in order to get an API
-key you should go to https://pushover.net and register a new application.
-
-This is a quote from the pushover website regarding free/open source apps:
-"If you are creating a client-side library, application, or open source project
-that will be redistributed and installed by end-users, you may want to require
-each of your users to register their own application rather than including your
-own API token with the software."
-
-When setting up the application I recommend using the icon located here:
-https://home-assistant.io/images/favicon-192x192.png
-
-user_key
-*Required
-To retrieve this value log into your account at https://pushover.net
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/notify.pushover/
 """
 import logging
 
@@ -48,32 +21,21 @@ _LOGGER = logging.getLogger(__name__)
 def get_service(hass, config):
     """ Get the pushover notification service. """
 
-    if not validate_config(config,
+    if not validate_config({DOMAIN: config},
                            {DOMAIN: ['user_key', CONF_API_KEY]},
                            _LOGGER):
         return None
 
-    try:
-        # pylint: disable=no-name-in-module, unused-variable
-        from pushover import InitError
-
-    except ImportError:
-        _LOGGER.exception(
-            "Unable to import pushover. "
-            "Did you maybe not install the 'python-pushover.py' package?")
-
-        return None
+    from pushover import InitError
 
     try:
-        api_token = config[DOMAIN].get(CONF_API_KEY)
-        return PushoverNotificationService(
-            config[DOMAIN]['user_key'],
-            api_token)
-
+        return PushoverNotificationService(config['user_key'],
+                                           config[CONF_API_KEY])
     except InitError:
         _LOGGER.error(
             "Wrong API key supplied. "
             "Get it at https://pushover.net")
+        return None
 
 
 # pylint: disable=too-few-public-methods
@@ -81,7 +43,6 @@ class PushoverNotificationService(BaseNotificationService):
     """ Implements notification service for Pushover. """
 
     def __init__(self, user_key, api_token):
-        # pylint: disable=no-name-in-module, unused-variable
         from pushover import Client
         self._user_key = user_key
         self._api_token = api_token
@@ -90,11 +51,9 @@ class PushoverNotificationService(BaseNotificationService):
 
     def send_message(self, message="", **kwargs):
         """ Send a message to a user. """
-
-        # pylint: disable=no-name-in-module
         from pushover import RequestError
-        title = kwargs.get(ATTR_TITLE)
+
         try:
-            self.pushover.send_message(message, title=title)
+            self.pushover.send_message(message, title=kwargs.get(ATTR_TITLE))
         except RequestError:
             _LOGGER.exception("Could not send pushover notification")

homeassistant/components/notify/services.yaml

@@ -0,0 +1,15 @@
+notify:
+  description: Send a notification
+
+  fields:
+    message:
+      description: Message body of the notification.
+      example: The garage door has been open for 10 minutes.
+
+    title:
+      description: Optional title for your notification.
+      example: 'Your Garage Door Friend'
+
+    target:
+      description: Target of the notification. Optional depending on the platform
+      example: platform specific

homeassistant/components/notify/slack.py

@@ -3,33 +3,13 @@ homeassistant.components.notify.slack
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Slack platform for notify component.
 
-Configuration:
-
-To use the Slack notifier you will need to add something like the following
-to your configuration.yaml file.
-
-notify:
-    platform: slack
-    api_key: ABCDEFGHJKLMNOPQRSTUVXYZ
-    default_channel: '#general'
-
-Variables:
-
-api_key
-*Required
-The slack API token to use for sending slack messages.
-You can get your slack API token here https://api.slack.com/web?sudo=1
-
-default_channel
-*Required
-The default channel to post to if no channel is explicitly specified when
-sending the notification message.
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/notify.slack/
 """
 import logging
 
 from homeassistant.helpers import validate_config
-from homeassistant.components.notify import (
-    DOMAIN, BaseNotificationService)
+from homeassistant.components.notify import DOMAIN, BaseNotificationService
 from homeassistant.const import CONF_API_KEY
 
 REQUIREMENTS = ['slacker==0.6.8']
@@ -39,34 +19,22 @@ _LOGGER = logging.getLogger(__name__)
 # pylint: disable=unused-variable
 def get_service(hass, config):
     """ Get the slack notification service. """
+    import slacker
 
-    if not validate_config(config,
+    if not validate_config({DOMAIN: config},
                            {DOMAIN: ['default_channel', CONF_API_KEY]},
                            _LOGGER):
         return None
 
     try:
-        # pylint: disable=no-name-in-module, unused-variable
-        from slacker import Error as SlackError
-
-    except ImportError:
-        _LOGGER.exception(
-            "Unable to import slacker. "
-            "Did you maybe not install the 'slacker.py' package?")
-
-        return None
-
-    try:
-        api_token = config[DOMAIN].get(CONF_API_KEY)
-
         return SlackNotificationService(
-            config[DOMAIN]['default_channel'],
-            api_token)
+            config['default_channel'],
+            config[CONF_API_KEY])
 
-    except SlackError as ex:
-        _LOGGER.error(
+    except slacker.Error:
+        _LOGGER.exception(
             "Slack authentication failed")
-        _LOGGER.exception(ex)
+        return None
 
 
 # pylint: disable=too-few-public-methods
@@ -75,6 +43,7 @@ class SlackNotificationService(BaseNotificationService):
 
     def __init__(self, default_channel, api_token):
         from slacker import Slacker
+
         self._default_channel = default_channel
         self._api_token = api_token
         self.slack = Slacker(self._api_token)
@@ -82,11 +51,11 @@ class SlackNotificationService(BaseNotificationService):
 
     def send_message(self, message="", **kwargs):
         """ Send a message to a user. """
+        import slacker
 
-        from slacker import Error as SlackError
         channel = kwargs.get('channel', self._default_channel)
+
         try:
             self.slack.chat.post_message(channel, message)
-        except SlackError as ex:
+        except slacker.Error:
             _LOGGER.exception("Could not send slack notification")
-            _LOGGER.exception(ex)