Merge pull request #2132 from home-assistant/hotfix-20-1

Hotfix 0.20.1
Ignore assertions from python threading when looking for leaked threads.
2026-01-10 17:47:16 +01:00 · 2016-05-22 09:11:47 -07:00 · 2016-05-22 00:22:19 -04:00 · 2016-05-22 00:21:19 -04:00 · 2016-05-21 14:17:02 -07:00 · 2016-05-21 14:15:42 -07:00
291 changed files with 11389 additions and 9625 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -5,18 +5,21 @@ omit =
    homeassistant/__main__.py

    # omit pieces of code that rely on external devices being present
-    homeassistant/components/alarm_control_panel/alarmdotcom.py
-    homeassistant/components/alarm_control_panel/nx584.py
+    homeassistant/components/apcupsd.py
+    homeassistant/components/*/apcupsd.py

    homeassistant/components/arduino.py
    homeassistant/components/*/arduino.py

-    homeassistant/components/apcupsd.py
-    homeassistant/components/*/apcupsd.py
-
    homeassistant/components/bloomsky.py
    homeassistant/components/*/bloomsky.py

+    homeassistant/components/dweet.py
+    homeassistant/components/*/dweet.py
+
+    homeassistant/components/ecobee.py
+    homeassistant/components/*/ecobee.py
+
    homeassistant/components/insteon_hub.py
    homeassistant/components/*/insteon_hub.py

@@ -26,21 +29,40 @@ omit =
    homeassistant/components/modbus.py
    homeassistant/components/*/modbus.py

-    homeassistant/components/tellstick.py
-    homeassistant/components/*/tellstick.py
+    homeassistant/components/mysensors.py
+    homeassistant/components/*/mysensors.py
+
+    homeassistant/components/nest.py
+    homeassistant/components/*/nest.py
+
+    homeassistant/components/octoprint.py
+    homeassistant/components/*/octoprint.py
+
+    homeassistant/components/qwikswitch.py
+    homeassistant/components/*/qwikswitch.py
+
+    homeassistant/components/rpi_gpio.py
+    homeassistant/components/*/rpi_gpio.py
+
+    homeassistant/components/scsgate.py
+    homeassistant/components/*/scsgate.py

    homeassistant/components/tellduslive.py
    homeassistant/components/*/tellduslive.py

+    homeassistant/components/tellstick.py
+    homeassistant/components/*/tellstick.py
+
+    homeassistant/components/*/thinkingcleaner.py
+
    homeassistant/components/vera.py
    homeassistant/components/*/vera.py

-    homeassistant/components/ecobee.py
-    homeassistant/components/*/ecobee.py
-
    homeassistant/components/verisure.py
    homeassistant/components/*/verisure.py

+    homeassistant/components/*/webostv.py
+
    homeassistant/components/wemo.py
    homeassistant/components/*/wemo.py

@@ -53,18 +75,8 @@ omit =
    homeassistant/components/zwave.py
    homeassistant/components/*/zwave.py

-    homeassistant/components/mysensors.py
-    homeassistant/components/*/mysensors.py
-
-    homeassistant/components/nest.py
-    homeassistant/components/*/nest.py
-
-    homeassistant/components/rpi_gpio.py
-    homeassistant/components/*/rpi_gpio.py
-
-    homeassistant/components/scsgate.py
-    homeassistant/components/*/scsgate.py
-
+    homeassistant/components/alarm_control_panel/alarmdotcom.py
+    homeassistant/components/alarm_control_panel/nx584.py
    homeassistant/components/binary_sensor/arest.py
    homeassistant/components/binary_sensor/rest.py
    homeassistant/components/browser.py
@@ -76,6 +88,7 @@ omit =
    homeassistant/components/device_tracker/actiontec.py
    homeassistant/components/device_tracker/aruba.py
    homeassistant/components/device_tracker/asuswrt.py
+    homeassistant/components/device_tracker/bluetooth_tracker.py
    homeassistant/components/device_tracker/ddwrt.py
    homeassistant/components/device_tracker/fritz.py
    homeassistant/components/device_tracker/icloud.py
@@ -89,6 +102,7 @@ omit =
    homeassistant/components/device_tracker/ubus.py
    homeassistant/components/discovery.py
    homeassistant/components/downloader.py
+    homeassistant/components/feedreader.py
    homeassistant/components/garage_door/wink.py
    homeassistant/components/ifttt.py
    homeassistant/components/keyboard.py
@@ -100,20 +114,27 @@ omit =
    homeassistant/components/media_player/cast.py
    homeassistant/components/media_player/denon.py
    homeassistant/components/media_player/firetv.py
+    homeassistant/components/media_player/gpmdp.py
    homeassistant/components/media_player/itunes.py
    homeassistant/components/media_player/kodi.py
+    homeassistant/components/media_player/lg_netcast.py
    homeassistant/components/media_player/mpd.py
+    homeassistant/components/media_player/onkyo.py
+    homeassistant/components/media_player/panasonic_viera.py
+    homeassistant/components/media_player/pioneer.py
    homeassistant/components/media_player/plex.py
+    homeassistant/components/media_player/roku.py
    homeassistant/components/media_player/samsungtv.py
    homeassistant/components/media_player/snapcast.py
    homeassistant/components/media_player/sonos.py
    homeassistant/components/media_player/squeezebox.py
-    homeassistant/components/media_player/onkyo.py
-    homeassistant/components/media_player/panasonic_viera.py
    homeassistant/components/media_player/yamaha.py
+    homeassistant/components/notify/aws_lambda.py
+    homeassistant/components/notify/aws_sns.py
+    homeassistant/components/notify/aws_sqs.py
    homeassistant/components/notify/free_mobile.py
-    homeassistant/components/notify/googlevoice.py
    homeassistant/components/notify/gntp.py
+    homeassistant/components/notify/googlevoice.py
    homeassistant/components/notify/instapush.py
    homeassistant/components/notify/message_bird.py
    homeassistant/components/notify/nma.py
@@ -126,6 +147,7 @@ omit =
    homeassistant/components/notify/smtp.py
    homeassistant/components/notify/syslog.py
    homeassistant/components/notify/telegram.py
+    homeassistant/components/notify/twilio_sms.py
    homeassistant/components/notify/twitter.py
    homeassistant/components/notify/xmpp.py
    homeassistant/components/scene/hunterdouglas_powerview.py
@@ -134,22 +156,25 @@ omit =
    homeassistant/components/sensor/cpuspeed.py
    homeassistant/components/sensor/deutsche_bahn.py
    homeassistant/components/sensor/dht.py
-    homeassistant/components/sensor/dweet.py
    homeassistant/components/sensor/efergy.py
    homeassistant/components/sensor/eliqonline.py
+    homeassistant/components/sensor/fitbit.py
    homeassistant/components/sensor/forecast.py
    homeassistant/components/sensor/glances.py
+    homeassistant/components/sensor/google_travel_time.py
    homeassistant/components/sensor/gtfs.py
-    homeassistant/components/sensor/netatmo.py
-    homeassistant/components/sensor/nzbget.py
+    homeassistant/components/sensor/lastfm.py
    homeassistant/components/sensor/loopenergy.py
+    homeassistant/components/sensor/netatmo.py
    homeassistant/components/sensor/neurio_energy.py
+    homeassistant/components/sensor/nzbget.py
    homeassistant/components/sensor/onewire.py
    homeassistant/components/sensor/openweathermap.py
    homeassistant/components/sensor/rest.py
    homeassistant/components/sensor/sabnzbd.py
    homeassistant/components/sensor/speedtest.py
    homeassistant/components/sensor/steam_online.py
+    homeassistant/components/sensor/supervisord.py
    homeassistant/components/sensor/swiss_public_transport.py
    homeassistant/components/sensor/systemmonitor.py
    homeassistant/components/sensor/temper.py
@@ -159,6 +184,7 @@ omit =
    homeassistant/components/sensor/twitch.py
    homeassistant/components/sensor/uber.py
    homeassistant/components/sensor/worldclock.py
+    homeassistant/components/switch/acer_projector.py
    homeassistant/components/switch/arest.py
    homeassistant/components/switch/dlink.py
    homeassistant/components/switch/edimax.py
@@ -167,12 +193,16 @@ omit =
    homeassistant/components/switch/orvibo.py
    homeassistant/components/switch/pulseaudio_loopback.py
    homeassistant/components/switch/rest.py
+    homeassistant/components/switch/rpi_rf.py
    homeassistant/components/switch/transmission.py
    homeassistant/components/switch/wake_on_lan.py
+    homeassistant/components/thermostat/eq3btsmart.py
    homeassistant/components/thermostat/heatmiser.py
    homeassistant/components/thermostat/homematic.py
    homeassistant/components/thermostat/proliphix.py
    homeassistant/components/thermostat/radiotherm.py
+    homeassistant/components/upnp.py
+    homeassistant/components/zeroconf.py


 [report]
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-Feature requests should go in the forum: https://community.home-assistant.io/c/feature-requests
+Make sure you run the latest version before reporting an issue. Feature requests should go in the forum: https://community.home-assistant.io/c/feature-requests

 **Home Assistant release (`hass --version`):**

--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,6 +3,8 @@

 **Related issue (if applicable):** #

+**Pull request in [home-assistant.io](https://github.com/home-assistant/home-assistant.io) with documentation (if applicable):** home-assistant/home-assistant.io#
+
 **Example entry for `configuration.yaml` (if applicable):**
 ```yaml

@@ -10,6 +12,9 @@

 **Checklist:**

+If user exposed functionality or configuration variables are added/changed:
+  - [ ] Documentation added/updated in [home-assistant.io](https://github.com/home-assistant/home-assistant.io)
+
 If code communicates with devices:
  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
  - [ ] New dependencies have been added to the `REQUIREMENTS` variable ([example][ex-requir]).
@@ -23,6 +28,6 @@ If the code does not interact with devices:

 [fork]: http://stackoverflow.com/a/7244456
 [squash]: https://github.com/ginatrapani/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit
-[ex-requir]: https://github.com/balloob/home-assistant/blob/dev/homeassistant/components/keyboard.py#L16
-[ex-import]: https://github.com/balloob/home-assistant/blob/dev/homeassistant/components/keyboard.py#L51
+[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L16
+[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L51

--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ config/custom_components/*
 !config/custom_components/hello_world.py
 !config/custom_components/mqtt_example.py

+tests/config/deps
 tests/config/home-assistant.log

 # Hide sublime text stuff
@@ -77,7 +78,10 @@ nosetests.xml
 pyvenv.cfg
 pip-selfcheck.json
 venv
+.venv

 # vimmy stuff
 *.swp
 *.swo
+
+ctags.tmp
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "homeassistant/components/frontend/www_static/home-assistant-polymer"]
 	path = homeassistant/components/frontend/www_static/home-assistant-polymer
-	url = https://github.com/balloob/home-assistant-polymer.git
+	url = https://github.com/home-assistant/home-assistant-polymer.git
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,10 +4,10 @@ Everybody is invited and welcome to contribute to Home Assistant. There is a lot

 The process is straight-forward.

- - Fork the Home Assistant [git repository](https://github.com/balloob/home-assistant).
+ - Fork the Home Assistant [git repository](https://github.com/home-assistant/home-assistant).
 - Write the code for your device, notification service, sensor, or IoT thing.
 - Ensure tests work.
- - Create a Pull Request against the [**dev**](https://github.com/balloob/home-assistant/tree/dev) branch of Home Assistant.
+ - Create a Pull Request against the [**dev**](https://github.com/home-assistant/home-assistant/tree/dev) branch of Home Assistant.

 Still interested? Then you should read the next sections and get more details. 

@@ -20,20 +20,20 @@ After you finish adding support for your device:
 - Check that all dependencies are included via the `REQUIREMENTS` variable in your platform/component and only imported inside functions that use them.
 - Add any new dependencies to `requirements_all.txt` if needed. Use `script/gen_requirements_all.py`.
 - Update the `.coveragerc` file to exclude your platform if there are no tests available or your new code uses a 3rd party library for communication with the device/service/sensor.
- - 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).
+ - 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/home-assistant/home-assistant.io).
 - Make sure all your code passes ``pylint`` and ``flake8`` (PEP8 and some more) validation. To check your repository, run `tox` or `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 [CI output](https://travis-ci.org/balloob/home-assistant/).
+ - Create a Pull Request against the [**dev**](https://github.com/home-assistant/home-assistant/tree/dev) branch of Home Assistant.
+ - Check for comments and suggestions on your Pull Request and keep an eye on the [CI output](https://travis-ci.org/home-assistant/home-assistant/).

 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 file [`home-assistant-icons.html`](https://github.com/home-assistant/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`.

 Since you've updated `home-assistant-icons.html`, you've made changes to the frontend:

- - Run `build_frontend`. This will build a new version of the frontend. Make sure you add the changed files `frontend.py` and `frontend.html` to the commit.
+ - Run `script/build_frontend`. This will build a new version of the frontend. Make sure you add the changed files `frontend.py` and `frontend.html` to the commit.

 ### Setting states

@@ -46,11 +46,11 @@ A state can have several attributes that will help the frontend in displaying yo
 - `unit_of_measurement`: this will be appended to the state in the interface
 - `hidden`: This is a suggestion to the frontend on if the state should be hidden

-These attributes are defined in [homeassistant.components](https://github.com/balloob/home-assistant/blob/master/homeassistant/components/__init__.py#L25).
+These attributes are defined in [homeassistant.components](https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/__init__.py#L25).

 ### Proper Visibility Handling

-Generally, when creating a new entity for Home Assistant you will want it to be a class that inherits the [homeassistant.helpers.entity.Entity](https://github.com/balloob/home-assistant/blob/master/homeassistant/helpers/entity.py) class. If this is done, visibility will be handled for you. 
+Generally, when creating a new entity for Home Assistant you will want it to be a class that inherits the [homeassistant.helpers.entity.Entity](https://github.com/home-assistant/home-assistant/blob/master/homeassistant/helpers/entity.py) class. If this is done, visibility will be handled for you. 
 You can set a suggestion for your entity's visibility by setting the hidden property by doing something similar to the following.

 ```python
--- a/12
+++ b/12
@@ -8,9 +8,9 @@ WORKDIR /usr/src/app

 RUN pip3 install --no-cache-dir colorlog cython

-# For the nmap tracker
+# For the nmap tracker, bluetooth tracker, Z-Wave
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends nmap net-tools cython3 libudev-dev sudo && \
+    apt-get install -y --no-install-recommends nmap net-tools cython3 libudev-dev sudo libglib2.0-dev && \
    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

 COPY script/build_python_openzwave script/build_python_openzwave
@@ -21,6 +21,14 @@ RUN script/build_python_openzwave && \
 COPY requirements_all.txt requirements_all.txt
 RUN pip3 install --no-cache-dir -r requirements_all.txt

+RUN wget http://www.openssl.org/source/openssl-1.0.2h.tar.gz && \
+    tar -xvzf openssl-1.0.2h.tar.gz && \
+    cd openssl-1.0.2h && \
+    ./config --prefix=/usr/ && \
+    make && \
+    make install && \
+    rm -rf openssl-1.0.2h*
+
 # Copy source
 COPY . .

--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-Home Assistant |Build Status| |Coverage Status| |Join the chat at https://gitter.im/balloob/home-assistant|
-===========================================================================================================
+Home Assistant |Build Status| |Coverage Status| |Join the chat at https://gitter.im/home-assistant/home-assistant| |Join the dev chat at https://gitter.im/home-assistant/home-assistant/devs|
+==============================================================================================================================================================================================

 Home Assistant is a home automation platform running on Python 3. The
 goal of Home Assistant is to be able to track and control all devices at
@@ -80,19 +80,21 @@ Built home automation on top of your devices:

 The system is built modular so support for other devices or actions can
 be implemented easily. See also the `section on
-architecture <https://home-assistant.io/developers/architecture.html>`__
+architecture <https://home-assistant.io/developers/architecture/>`__
 and the `section on creating your own
-components <https://home-assistant.io/developers/creating_components.html>`__.
+components <https://home-assistant.io/developers/creating_components/>`__.

 If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help
 section <https://home-assistant.io/help/>`__ how to reach us.

-.. |Build Status| image:: https://travis-ci.org/balloob/home-assistant.svg?branch=master
-   :target: https://travis-ci.org/balloob/home-assistant
-.. |Coverage Status| image:: https://img.shields.io/coveralls/balloob/home-assistant.svg
-   :target: https://coveralls.io/r/balloob/home-assistant?branch=master
-.. |Join the chat at https://gitter.im/balloob/home-assistant| image:: https://badges.gitter.im/Join%20Chat.svg
-   :target: https://gitter.im/balloob/home-assistant?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-.. |screenshot-states| image:: https://raw.github.com/balloob/home-assistant/master/docs/screenshots.png
+.. |Build Status| image:: https://travis-ci.org/home-assistant/home-assistant.svg?branch=master
+   :target: https://travis-ci.org/home-assistant/home-assistant
+.. |Coverage Status| image:: https://img.shields.io/coveralls/home-assistant/home-assistant.svg
+   :target: https://coveralls.io/r/home-assistant/home-assistant?branch=master
+.. |Join the chat at https://gitter.im/home-assistant/home-assistant| image:: https://img.shields.io/badge/gitter-general-blue.svg
+   :target: https://gitter.im/home-assistant/home-assistant?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+.. |Join the dev chat at https://gitter.im/home-assistant/home-assistant/devs| image:: https://img.shields.io/badge/gitter-development-yellowgreen.svg
+   :target: https://gitter.im/home-assistant/home-assistant/devs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+.. |screenshot-states| image:: https://raw.github.com/home-assistant/home-assistant/master/docs/screenshots.png
   :target: https://home-assistant.io/demo/
--- a/config/configuration.yaml.example
+++ b/config/configuration.yaml.example
@@ -7,7 +7,7 @@ homeassistant:
  latitude: 32.87336
  longitude: 117.22743

-  # C for Celcius, F for Fahrenheit
+  # C for Celsius, F for Fahrenheit
  temperature_unit: C

  # Pick yours from here:
--- a/config/custom_components/mqtt_example.py
+++ b/config/custom_components/mqtt_example.py
@@ -14,7 +14,7 @@ To use the mqtt_example component you will need to add the following to your
 configuration.yaml file.

 mqtt_example:
-  topic: home-assistant/mqtt_example
+  topic: "home-assistant/mqtt_example"
 """
 import homeassistant.loader as loader

@@ -29,7 +29,7 @@ DEFAULT_TOPIC = 'home-assistant/mqtt_example'


 def setup(hass, config):
-    """Setup the  MQTT example component."""
+    """Setup the MQTT example component."""
    mqtt = loader.get_component('mqtt')
    topic = config[DOMAIN].get('topic', DEFAULT_TOPIC)
    entity_id = 'mqtt_example.last_message'
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -3,11 +3,12 @@ from __future__ import print_function

 import argparse
 import os
+import platform
 import signal
+import subprocess
 import sys
 import threading
 import time
-from multiprocessing import Process

 from homeassistant.const import (
    __version__,
@@ -31,7 +32,7 @@ def validate_python():
 def ensure_config_path(config_dir):
    """Validate the configuration directory."""
    import homeassistant.config as config_util
-    lib_dir = os.path.join(config_dir, 'lib')
+    lib_dir = os.path.join(config_dir, 'deps')

    # Test if configuration directory exists
    if not os.path.isdir(config_dir):
@@ -87,8 +88,7 @@ def get_arguments():
    parser.add_argument(
        '--debug',
        action='store_true',
-        help='Start Home Assistant in debug mode. Runs in single process to '
-        'enable use of interactive debuggers.')
+        help='Start Home Assistant in debug mode')
    parser.add_argument(
        '--open-ui',
        action='store_true',
@@ -123,15 +123,20 @@ def get_arguments():
        '--restart-osx',
        action='store_true',
        help='Restarts on OS X.')
-    if os.name != "nt":
+    parser.add_argument(
+        '--runner',
+        action='store_true',
+        help='On restart exit with code {}'.format(RESTART_EXIT_CODE))
+    if os.name == "posix":
        parser.add_argument(
            '--daemon',
            action='store_true',
            help='Run Home Assistant as daemon')

    arguments = parser.parse_args()
-    if os.name == "nt":
+    if os.name != "posix" or arguments.debug or arguments.runner:
        arguments.daemon = False
+
    return arguments


@@ -144,13 +149,21 @@ def daemonize():

    # Decouple fork
    os.setsid()
-    os.umask(0)

    # Create second fork
    pid = os.fork()
    if pid > 0:
        sys.exit(0)

+    # redirect standard file descriptors to devnull
+    infd = open(os.devnull, 'r')
+    outfd = open(os.devnull, 'a+')
+    sys.stdout.flush()
+    sys.stderr.flush()
+    os.dup2(infd.fileno(), sys.stdin.fileno())
+    os.dup2(outfd.fileno(), sys.stdout.fileno())
+    os.dup2(outfd.fileno(), sys.stderr.fileno())
+

 def check_pid(pid_file):
    """Check that HA is not already running."""
@@ -161,6 +174,10 @@ def check_pid(pid_file):
        # PID File does not exist
        return

+    # If we just restarted, we just found our own pidfile.
+    if pid == os.getpid():
+        return
+
    try:
        os.kill(pid, 0)
    except OSError:
@@ -220,29 +237,61 @@ def uninstall_osx():
    print("Home Assistant has been uninstalled.")


-def setup_and_run_hass(config_dir, args, top_process=False):
-    """Setup HASS and run.
+def closefds_osx(min_fd, max_fd):
+    """Make sure file descriptors get closed when we restart.

-    Block until stopped. Will assume it is running in a subprocess unless
-    top_process is set to true.
+    We cannot call close on guarded fds, and we cannot easily test which fds
+    are guarded. But we can set the close-on-exec flag on everything we want to
+    get rid of.
    """
+    from fcntl import fcntl, F_GETFD, F_SETFD, FD_CLOEXEC
+
+    for _fd in range(min_fd, max_fd):
+        try:
+            val = fcntl(_fd, F_GETFD)
+            if not val & FD_CLOEXEC:
+                fcntl(_fd, F_SETFD, val | FD_CLOEXEC)
+        except IOError:
+            pass
+
+
+def cmdline():
+    """Collect path and arguments to re-execute the current hass instance."""
+    if sys.argv[0].endswith('/__main__.py'):
+        modulepath = os.path.dirname(sys.argv[0])
+        os.environ['PYTHONPATH'] = os.path.dirname(modulepath)
+    return [sys.executable] + [arg for arg in sys.argv if arg != '--daemon']
+
+
+def setup_and_run_hass(config_dir, args):
+    """Setup HASS and run."""
    from homeassistant import bootstrap

+    # Run a simple daemon runner process on Windows to handle restarts
+    if os.name == 'nt' and '--runner' not in sys.argv:
+        args = cmdline() + ['--runner']
+        while True:
+            try:
+                subprocess.check_call(args)
+                sys.exit(0)
+            except subprocess.CalledProcessError as exc:
+                if exc.returncode != RESTART_EXIT_CODE:
+                    sys.exit(exc.returncode)
+
    if args.demo_mode:
        config = {
            'frontend': {},
            'demo': {}
        }
        hass = bootstrap.from_config_dict(
-            config, config_dir=config_dir, daemon=args.daemon,
-            verbose=args.verbose, skip_pip=args.skip_pip,
-            log_rotate_days=args.log_rotate_days)
+            config, config_dir=config_dir, verbose=args.verbose,
+            skip_pip=args.skip_pip, log_rotate_days=args.log_rotate_days)
    else:
        config_file = ensure_config_file(config_dir)
        print('Config directory:', config_dir)
        hass = bootstrap.from_config_file(
-            config_file, daemon=args.daemon, verbose=args.verbose,
-            skip_pip=args.skip_pip, log_rotate_days=args.log_rotate_days)
+            config_file, verbose=args.verbose, skip_pip=args.skip_pip,
+            log_rotate_days=args.log_rotate_days)

    if hass is None:
        return
@@ -256,42 +305,76 @@ def setup_and_run_hass(config_dir, args, top_process=False):

        hass.bus.listen_once(EVENT_HOMEASSISTANT_START, open_browser)

+    print('Starting Home-Assistant')
    hass.start()
    exit_code = int(hass.block_till_stopped())

-    if not top_process:
-        sys.exit(exit_code)
    return exit_code


-def run_hass_process(hass_proc):
-    """Run a child hass process. Returns True if it should be restarted."""
-    requested_stop = threading.Event()
-    hass_proc.daemon = True
-
-    def request_stop(*args):
-        """Request hass stop, *args is for signal handler callback."""
-        requested_stop.set()
-        hass_proc.terminate()
+def try_to_restart():
+    """Attempt to clean up state and start a new homeassistant instance."""
+    # Things should be mostly shut down already at this point, now just try
+    # to clean up things that may have been left behind.
+    sys.stderr.write('Home Assistant attempting to restart.\n')

+    # Count remaining threads, ideally there should only be one non-daemonized
+    # thread left (which is us). Nothing we really do with it, but it might be
+    # useful when debugging shutdown/restart issues.
    try:
-        signal.signal(signal.SIGTERM, request_stop)
-    except ValueError:
-        print('Could not bind to SIGTERM. Are you running in a thread?')
+        nthreads = sum(thread.isAlive() and not thread.isDaemon()
+                       for thread in threading.enumerate())
+        if nthreads > 1:
+            sys.stderr.write(
+                "Found {} non-daemonic threads.\n".format(nthreads))

-    hass_proc.start()
-    try:
-        hass_proc.join()
-    except KeyboardInterrupt:
-        request_stop()
+    # Somehow we sometimes seem to trigger an assertion in the python threading
+    # module. It seems we find threads that have no associated OS level thread
+    # which are not marked as stopped at the python level.
+    except AssertionError:
+        sys.stderr.write("Failed to count non-daemonic threads.\n")
+
+    # Send terminate signal to all processes in our process group which
+    # should be any children that have not themselves changed the process
+    # group id. Don't bother if couldn't even call setpgid.
+    if hasattr(os, 'setpgid'):
+        sys.stderr.write("Signalling child processes to terminate...\n")
+        os.kill(0, signal.SIGTERM)
+
+        # wait for child processes to terminate
        try:
-            hass_proc.join()
-        except KeyboardInterrupt:
-            return False
+            while True:
+                time.sleep(1)
+                if os.waitpid(0, os.WNOHANG) == (0, 0):
+                    break
+        except OSError:
+            pass

-    return (not requested_stop.isSet() and
-            hass_proc.exitcode == RESTART_EXIT_CODE,
-            hass_proc.exitcode)
+    elif os.name == 'nt':
+        # Maybe one of the following will work, but how do we indicate which
+        # processes are our children if there is no process group?
+        # os.kill(0, signal.CTRL_C_EVENT)
+        # os.kill(0, signal.CTRL_BREAK_EVENT)
+        pass
+
+    # Try to not leave behind open filedescriptors with the emphasis on try.
+    try:
+        max_fd = os.sysconf("SC_OPEN_MAX")
+    except ValueError:
+        max_fd = 256
+
+    if platform.system() == 'Darwin':
+        closefds_osx(3, max_fd)
+    else:
+        os.closerange(3, max_fd)
+
+    # Now launch into a new instance of Home-Assistant. If this fails we
+    # fall through and exit with error 100 (RESTART_EXIT_CODE) in which case
+    # systemd will restart us when RestartForceExitStatus=100 is set in the
+    # systemd.service file.
+    sys.stderr.write("Restarting Home-Assistant\n")
+    args = cmdline()
+    os.execv(args[0], args)


 def main():
@@ -325,21 +408,17 @@ def main():
    if args.pid_file:
        write_pid(args.pid_file)

-    # Run hass in debug mode if requested
-    if args.debug:
-        sys.stderr.write('Running in debug mode. '
-                         'Home Assistant will not be able to restart.\n')
-        exit_code = setup_and_run_hass(config_dir, args, top_process=True)
-        if exit_code == RESTART_EXIT_CODE:
-            sys.stderr.write('Home Assistant requested a '
-                             'restart in debug mode.\n')
-        return exit_code
+    # Create new process group if we can
+    if hasattr(os, 'setpgid'):
+        try:
+            os.setpgid(0, 0)
+        except PermissionError:
+            pass
+
+    exit_code = setup_and_run_hass(config_dir, args)
+    if exit_code == RESTART_EXIT_CODE and not args.runner:
+        try_to_restart()

-    # Run hass as child process. Restart if necessary.
-    keep_running = True
-    while keep_running:
-        hass_proc = Process(target=setup_and_run_hass, args=(config_dir, args))
-        keep_running, exit_code = run_hass_process(hass_proc)
    return exit_code


--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -14,6 +14,7 @@ import homeassistant.components as core_components
 import homeassistant.components.group as group
 import homeassistant.config as config_util
 import homeassistant.core as core
+import homeassistant.helpers.config_validation as cv
 import homeassistant.loader as loader
 import homeassistant.util.dt as date_util
 import homeassistant.util.location as loc_util
@@ -21,7 +22,7 @@ import homeassistant.util.package as pkg_util
 from homeassistant.const import (
    CONF_CUSTOMIZE, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME,
    CONF_TEMPERATURE_UNIT, CONF_TIME_ZONE, EVENT_COMPONENT_LOADED,
-    TEMP_CELCIUS, TEMP_FAHRENHEIT, PLATFORM_FORMAT, __version__)
+    TEMP_CELSIUS, TEMP_FAHRENHEIT, PLATFORM_FORMAT, __version__)
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
    event_decorators, service, config_per_platform, extract_domain_configs)
@@ -65,7 +66,7 @@ def _handle_requirements(hass, component, name):
        return True

    for req in component.REQUIREMENTS:
-        if not pkg_util.install_package(req, target=hass.config.path('lib')):
+        if not pkg_util.install_package(req, target=hass.config.path('deps')):
            _LOGGER.error('Not initializing %s because could not install '
                          'dependency %s', name, req)
            return False
@@ -103,7 +104,7 @@ def _setup_component(hass, domain, config):
            try:
                config = component.CONFIG_SCHEMA(config)
            except vol.MultipleInvalid as ex:
-                _LOGGER.error('Invalid config for [%s]: %s', domain, ex)
+                cv.log_exception(_LOGGER, ex, domain, config)
                return False

        elif hasattr(component, 'PLATFORM_SCHEMA'):
@@ -113,12 +114,11 @@ def _setup_component(hass, domain, config):
                try:
                    p_validated = component.PLATFORM_SCHEMA(p_config)
                except vol.MultipleInvalid as ex:
-                    _LOGGER.error('Invalid platform config for [%s]: %s. %s',
-                                  domain, ex, p_config)
+                    cv.log_exception(_LOGGER, ex, domain, p_config)
                    return False

                # Not all platform components follow same pattern for platforms
-                # Sof if p_name is None we are not going to validate platform
+                # So if p_name is None we are not going to validate platform
                # (the automation component is one of them)
                if p_name is None:
                    platforms.append(p_validated)
@@ -135,9 +135,8 @@ def _setup_component(hass, domain, config):
                    try:
                        p_validated = platform.PLATFORM_SCHEMA(p_validated)
                    except vol.MultipleInvalid as ex:
-                        _LOGGER.error(
-                            'Invalid platform config for [%s.%s]: %s. %s',
-                            domain, p_name, ex, p_config)
+                        cv.log_exception(_LOGGER, ex, '{}.{}'
+                                         .format(domain, p_name), p_validated)
                        return False

                platforms.append(p_validated)
@@ -211,12 +210,12 @@ def prepare_setup_platform(hass, config, domain, platform_name):

 def mount_local_lib_path(config_dir):
    """Add local library to Python Path."""
-    sys.path.insert(0, os.path.join(config_dir, 'lib'))
+    sys.path.insert(0, os.path.join(config_dir, 'deps'))


 # pylint: disable=too-many-branches, too-many-statements, too-many-arguments
 def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
-                     verbose=False, daemon=False, skip_pip=False,
+                     verbose=False, skip_pip=False,
                     log_rotate_days=None):
    """Try to configure Home Assistant from a config dict.

@@ -229,17 +228,19 @@ 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)

+    core_config = config.get(core.DOMAIN, {})
+
    try:
        process_ha_core_config(hass, config_util.CORE_CONFIG_SCHEMA(
-            config.get(core.DOMAIN, {})))
+            core_config))
    except vol.MultipleInvalid as ex:
-        _LOGGER.error('Invalid config for [homeassistant]: %s', ex)
+        cv.log_exception(_LOGGER, ex, 'homeassistant', core_config)
        return None

    process_ha_config_upgrade(hass)

    if enable_log:
-        enable_logging(hass, verbose, daemon, log_rotate_days)
+        enable_logging(hass, verbose, log_rotate_days)

    hass.config.skip_pip = skip_pip
    if skip_pip:
@@ -277,8 +278,8 @@ def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
    return hass


-def from_config_file(config_path, hass=None, verbose=False, daemon=False,
-                     skip_pip=True, log_rotate_days=None):
+def from_config_file(config_path, hass=None, verbose=False, skip_pip=True,
+                     log_rotate_days=None):
    """Read the configuration file and try to start all the functionality.

    Will add functionality to 'hass' parameter if given,
@@ -292,7 +293,7 @@ def from_config_file(config_path, hass=None, verbose=False, daemon=False,
    hass.config.config_dir = config_dir
    mount_local_lib_path(config_dir)

-    enable_logging(hass, verbose, daemon, log_rotate_days)
+    enable_logging(hass, verbose, log_rotate_days)

    try:
        config_dict = config_util.load_yaml_config_file(config_path)
@@ -303,28 +304,27 @@ def from_config_file(config_path, hass=None, verbose=False, daemon=False,
                            skip_pip=skip_pip)


-def enable_logging(hass, verbose=False, daemon=False, log_rotate_days=None):
+def enable_logging(hass, verbose=False, log_rotate_days=None):
    """Setup the logging."""
-    if not daemon:
-        logging.basicConfig(level=logging.INFO)
-        fmt = ("%(log_color)s%(asctime)s %(levelname)s (%(threadName)s) "
-               "[%(name)s] %(message)s%(reset)s")
-        try:
-            from colorlog import ColoredFormatter
-            logging.getLogger().handlers[0].setFormatter(ColoredFormatter(
-                fmt,
-                datefmt='%y-%m-%d %H:%M:%S',
-                reset=True,
-                log_colors={
-                    'DEBUG': 'cyan',
-                    'INFO': 'green',
-                    'WARNING': 'yellow',
-                    'ERROR': 'red',
-                    'CRITICAL': 'red',
-                }
-            ))
-        except ImportError:
-            pass
+    logging.basicConfig(level=logging.INFO)
+    fmt = ("%(log_color)s%(asctime)s %(levelname)s (%(threadName)s) "
+           "[%(name)s] %(message)s%(reset)s")
+    try:
+        from colorlog import ColoredFormatter
+        logging.getLogger().handlers[0].setFormatter(ColoredFormatter(
+            fmt,
+            datefmt='%y-%m-%d %H:%M:%S',
+            reset=True,
+            log_colors={
+                'DEBUG': 'cyan',
+                'INFO': 'green',
+                'WARNING': 'yellow',
+                'ERROR': 'red',
+                'CRITICAL': 'red',
+            }
+        ))
+    except ImportError:
+        pass

    # Log errors to a file if we have write access to file or config dir
    err_log_path = hass.config.path(ERROR_LOG_FILENAME)
@@ -372,10 +372,16 @@ def process_ha_config_upgrade(hass):
    _LOGGER.info('Upgrading config directory from %s to %s', conf_version,
                 __version__)

+    # This was where dependencies were installed before v0.18
+    # Probably should keep this around until ~v0.20.
    lib_path = hass.config.path('lib')
    if os.path.isdir(lib_path):
        shutil.rmtree(lib_path)

+    lib_path = hass.config.path('deps')
+    if os.path.isdir(lib_path):
+        shutil.rmtree(lib_path)
+
    with open(version_path, 'wt') as outp:
        outp.write(__version__)

@@ -434,7 +440,7 @@ def process_ha_core_config(hass, config):
        if info.use_fahrenheit:
            hac.temperature_unit = TEMP_FAHRENHEIT
        else:
-            hac.temperature_unit = TEMP_CELCIUS
+            hac.temperature_unit = TEMP_CELSIUS

    if hac.location_name is None:
        hac.location_name = info.city
--- a/homeassistant/components/alarm_control_panel/init.py
+++ b/homeassistant/components/alarm_control_panel/init.py
@@ -7,12 +7,15 @@ https://home-assistant.io/components/alarm_control_panel/
 import logging
 import os

+import voluptuous as vol
+
 from homeassistant.components import verisure
 from homeassistant.const import (
    ATTR_CODE, ATTR_CODE_FORMAT, 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.config_validation import PLATFORM_SCHEMA  # noqa
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent

@@ -38,6 +41,11 @@ ATTR_TO_PROPERTY = [
    ATTR_CODE_FORMAT
 ]

+ALARM_SERVICE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_CODE): cv.string,
+})
+

 def setup(hass, config):
    """Track states and offer events for sensors."""
@@ -51,10 +59,7 @@ def setup(hass, config):
        """Map services to methods on Alarm."""
        target_alarms = component.extract_from_service(service)

-        if ATTR_CODE not in service.data:
-            code = None
-        else:
-            code = service.data[ATTR_CODE]
+        code = service.data.get(ATTR_CODE)

        method = SERVICE_TO_METHOD[service.service]

@@ -68,8 +73,8 @@ def setup(hass, config):

    for service in SERVICE_TO_METHOD:
        hass.services.register(DOMAIN, service, alarm_service_handler,
-                               descriptions.get(service))
-
+                               descriptions.get(service),
+                               schema=ALARM_SERVICE_SCHEMA)
    return True


--- a/homeassistant/components/alarm_control_panel/verisure.py
+++ b/homeassistant/components/alarm_control_panel/verisure.py
@@ -48,6 +48,11 @@ class VerisureAlarm(alarm.AlarmControlPanel):
        """Return the state of the device."""
        return self._state

+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return hub.available
+
    @property
    def code_format(self):
        """The code format as regex."""
--- a/homeassistant/components/alexa.py
+++ b/homeassistant/components/alexa.py
@@ -8,8 +8,7 @@ import enum
 import logging

 from homeassistant.const import HTTP_OK, HTTP_UNPROCESSABLE_ENTITY
-from homeassistant.helpers.service import call_from_config
-from homeassistant.helpers import template
+from homeassistant.helpers import template, script

 DOMAIN = 'alexa'
 DEPENDENCIES = ['http']
@@ -27,7 +26,14 @@ CONF_ACTION = 'action'

 def setup(hass, config):
    """Activate Alexa component."""
-    _CONFIG.update(config[DOMAIN].get(CONF_INTENTS, {}))
+    intents = config[DOMAIN].get(CONF_INTENTS, {})
+
+    for name, intent in intents.items():
+        if CONF_ACTION in intent:
+            intent[CONF_ACTION] = script.Script(hass, intent[CONF_ACTION],
+                                                "Alexa intent {}".format(name))
+
+    _CONFIG.update(intents)

    hass.http.register_path('POST', API_ENDPOINT, _handle_alexa, True)

@@ -91,7 +97,7 @@ def _handle_alexa(handler, path_match, data):
                          card['content'])

    if action is not None:
-        call_from_config(handler.server.hass, action, True)
+        action.run(response.variables)

    handler.write_json(response.as_dict())

--- a/homeassistant/components/api.py
+++ b/homeassistant/components/api.py
@@ -16,9 +16,10 @@ from homeassistant.const import (
    CONTENT_TYPE_TEXT_PLAIN, EVENT_HOMEASSISTANT_STOP, EVENT_TIME_CHANGED,
    HTTP_BAD_REQUEST, HTTP_CREATED, HTTP_HEADER_CONTENT_TYPE, HTTP_NOT_FOUND,
    HTTP_OK, HTTP_UNPROCESSABLE_ENTITY, MATCH_ALL, URL_API, URL_API_COMPONENTS,
-    URL_API_CONFIG, URL_API_ERROR_LOG, URL_API_EVENT_FORWARD, URL_API_EVENTS,
-    URL_API_LOG_OUT, URL_API_SERVICES, URL_API_STATES, URL_API_STATES_ENTITY,
-    URL_API_STREAM, URL_API_TEMPLATE)
+    URL_API_CONFIG, URL_API_DISCOVERY_INFO, URL_API_ERROR_LOG,
+    URL_API_EVENT_FORWARD, URL_API_EVENTS, URL_API_LOG_OUT, URL_API_SERVICES,
+    URL_API_STATES, URL_API_STATES_ENTITY, URL_API_STREAM, URL_API_TEMPLATE,
+    __version__)
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.state import TrackStates
 from homeassistant.helpers import template
@@ -37,13 +38,18 @@ def setup(hass, config):
    # /api - for validation purposes
    hass.http.register_path('GET', URL_API, _handle_get_api)

-    # /api/stream
-    hass.http.register_path('GET', URL_API_STREAM, _handle_get_api_stream)
-
    # /api/config
    hass.http.register_path('GET', URL_API_CONFIG, _handle_get_api_config)

-    # /states
+    # /api/discovery_info
+    hass.http.register_path('GET', URL_API_DISCOVERY_INFO,
+                            _handle_get_api_discovery_info,
+                            require_auth=False)
+
+    # /api/stream
+    hass.http.register_path('GET', URL_API_STREAM, _handle_get_api_stream)
+
+    # /api/states
    hass.http.register_path('GET', URL_API_STATES, _handle_get_api_states)
    hass.http.register_path(
        'GET', re.compile(r'/api/states/(?P<entity_id>[a-zA-Z\._0-9]+)'),
@@ -58,13 +64,13 @@ def setup(hass, config):
        'DELETE', re.compile(r'/api/states/(?P<entity_id>[a-zA-Z\._0-9]+)'),
        _handle_delete_state_entity)

-    # /events
+    # /api/events
    hass.http.register_path('GET', URL_API_EVENTS, _handle_get_api_events)
    hass.http.register_path(
        'POST', re.compile(r'/api/events/(?P<event_type>[a-zA-Z\._0-9]+)'),
        _handle_api_post_events_event)

-    # /services
+    # /api/services
    hass.http.register_path('GET', URL_API_SERVICES, _handle_get_api_services)
    hass.http.register_path(
        'POST',
@@ -73,23 +79,23 @@ def setup(hass, config):
                    r'(?P<service>[a-zA-Z\._0-9]+)')),
        _handle_post_api_services_domain_service)

-    # /event_forwarding
+    # /api/event_forwarding
    hass.http.register_path(
        'POST', URL_API_EVENT_FORWARD, _handle_post_api_event_forward)
    hass.http.register_path(
        'DELETE', URL_API_EVENT_FORWARD, _handle_delete_api_event_forward)

-    # /components
+    # /api/components
    hass.http.register_path(
        'GET', URL_API_COMPONENTS, _handle_get_api_components)

-    # /error_log
+    # /api/error_log
    hass.http.register_path('GET', URL_API_ERROR_LOG,
                            _handle_get_api_error_log)

    hass.http.register_path('POST', URL_API_LOG_OUT, _handle_post_api_log_out)

-    # /template
+    # /api/template
    hass.http.register_path('POST', URL_API_TEMPLATE,
                            _handle_post_api_template)

@@ -176,6 +182,17 @@ def _handle_get_api_config(handler, path_match, data):
    handler.write_json(handler.server.hass.config.as_dict())


+def _handle_get_api_discovery_info(handler, path_match, data):
+    needs_auth = (handler.server.hass.config.api.api_password is not None)
+    params = {
+        'base_url': handler.server.hass.config.api.base_url,
+        'location_name': handler.server.hass.config.location_name,
+        'requires_api_password': needs_auth,
+        'version': __version__
+    }
+    handler.write_json(params)
+
+
 def _handle_get_api_states(handler, path_match, data):
    """Return a dict containing all entity ids and their state."""
    handler.write_json(handler.server.hass.states.all())
--- a/homeassistant/components/arduino.py
+++ b/homeassistant/components/arduino.py
@@ -11,7 +11,7 @@ from homeassistant.const import (
 from homeassistant.helpers import validate_config

 DOMAIN = "arduino"
-REQUIREMENTS = ['PyMata==2.07a']
+REQUIREMENTS = ['PyMata==2.12']
 BOARD = None
 _LOGGER = logging.getLogger(__name__)

@@ -69,7 +69,7 @@ class ArduinoBoard(object):
                                     self._board.ANALOG)
        elif mode == 'digital' and direction == 'in':
            self._board.set_pin_mode(pin,
-                                     self._board.OUTPUT,
+                                     self._board.INPUT,
                                     self._board.DIGITAL)
        elif mode == 'digital' and direction == 'out':
            self._board.set_pin_mode(pin,
--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -9,10 +9,10 @@ import logging
 import voluptuous as vol

 from homeassistant.bootstrap import prepare_setup_platform
-from homeassistant.const import CONF_PLATFORM
+from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM
 from homeassistant.components import logbook
-from homeassistant.helpers import extract_domain_configs
-from homeassistant.helpers.service import call_from_config
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import extract_domain_configs, script, condition
 from homeassistant.loader import get_platform
 import homeassistant.helpers.config_validation as cv

@@ -51,8 +51,6 @@ def _platform_validator(method, schema):
        if not hasattr(platform, schema):
            return config

-        print('validating config', method, config)
-
        return getattr(platform, schema)(config)

    return validator
@@ -76,10 +74,11 @@ _CONDITION_SCHEMA = vol.Any(
        [
            vol.All(
                vol.Schema({
-                    vol.Required(CONF_PLATFORM): cv.platform_validator(DOMAIN),
+                    CONF_PLATFORM: str,
+                    CONF_CONDITION: str,
                }, extra=vol.ALLOW_EXTRA),
-                _platform_validator(METHOD_IF_ACTION, 'IF_ACTION_SCHEMA'),
-            )
+                cv.has_at_least_one_key(CONF_PLATFORM, CONF_CONDITION),
+            ),
        ]
    )
 )
@@ -90,21 +89,23 @@ PLATFORM_SCHEMA = vol.Schema({
    vol.Required(CONF_CONDITION_TYPE, default=DEFAULT_CONDITION_TYPE):
        vol.All(vol.Lower, vol.Any(CONDITION_TYPE_AND, CONDITION_TYPE_OR)),
    CONF_CONDITION: _CONDITION_SCHEMA,
-    vol.Required(CONF_ACTION): cv.SERVICE_SCHEMA,
+    vol.Required(CONF_ACTION): cv.SCRIPT_SCHEMA,
 })


 def setup(hass, config):
    """Setup the automation."""
+    success = False
    for config_key in extract_domain_configs(config, DOMAIN):
        conf = config[config_key]

        for list_no, config_block in enumerate(conf):
            name = config_block.get(CONF_ALIAS, "{}, {}".format(config_key,
                                                                list_no))
-            _setup_automation(hass, config_block, name, config)
+            success = (_setup_automation(hass, config_block, name, config) or
+                       success)

-    return True
+    return success


 def _setup_automation(hass, config_block, name, config):
@@ -124,12 +125,13 @@ def _setup_automation(hass, config_block, name, config):

 def _get_action(hass, config, name):
    """Return an action based on a configuration."""
-    def action():
+    script_obj = script.Script(hass, config, name)
+
+    def action(variables=None):
        """Action to be executed."""
        _LOGGER.info('Executing %s', name)
        logbook.log_entry(hass, name, 'has been triggered', DOMAIN)
-
-        call_from_config(hass, config)
+        script_obj.run(variables)

    return action

@@ -139,6 +141,11 @@ def _process_if(hass, config, p_config, action):
    cond_type = p_config.get(CONF_CONDITION_TYPE,
                             DEFAULT_CONDITION_TYPE).lower()

+    # Deprecated since 0.19 - 5/5/2016
+    if cond_type != DEFAULT_CONDITION_TYPE:
+        _LOGGER.warning('Using condition_type: "or" is deprecated. Please use '
+                        '"condition: or" instead.')
+
    if_configs = p_config.get(CONF_CONDITION)
    use_trigger = if_configs == CONDITION_USE_TRIGGER_VALUES

@@ -147,38 +154,47 @@ def _process_if(hass, config, p_config, action):

    checks = []
    for if_config in if_configs:
-        platform = _resolve_platform(METHOD_IF_ACTION, hass, config,
-                                     if_config.get(CONF_PLATFORM))
-        if platform is None:
-            continue
+        # Deprecated except for used by use_trigger_values
+        # since 0.19 - 5/5/2016
+        if CONF_PLATFORM in if_config:
+            if not use_trigger:
+                _LOGGER.warning("Please switch your condition configuration "
+                                "to use 'condition' instead of 'platform'.")
+            if_config = dict(if_config)
+            if_config[CONF_CONDITION] = if_config.pop(CONF_PLATFORM)

-        check = platform.if_action(hass, if_config)
+            # To support use_trigger_values with state trigger accepting
+            # multiple entity_ids to monitor.
+            if_entity_id = if_config.get(ATTR_ENTITY_ID)
+            if isinstance(if_entity_id, list) and len(if_entity_id) == 1:
+                if_config[ATTR_ENTITY_ID] = if_entity_id[0]

-        # Invalid conditions are allowed if we base it on trigger
-        if check is None and not use_trigger:
-            return None
-
-        checks.append(check)
+        try:
+            checks.append(condition.from_config(if_config))
+        except HomeAssistantError as ex:
+            # Invalid conditions are allowed if we base it on trigger
+            if use_trigger:
+                _LOGGER.warning('Ignoring invalid condition: %s', ex)
+            else:
+                _LOGGER.warning('Invalid condition: %s', ex)
+                return None

    if cond_type == CONDITION_TYPE_AND:
-        def if_action():
+        def if_action(variables=None):
            """AND all conditions."""
-            if all(check() for check in checks):
-                action()
+            if all(check(hass, variables) for check in checks):
+                action(variables)
    else:
-        def if_action():
+        def if_action(variables=None):
            """OR all conditions."""
-            if any(check() for check in checks):
-                action()
+            if any(check(hass, variables) for check in checks):
+                action(variables)

    return if_action


 def _process_trigger(hass, config, trigger_configs, name, action):
    """Setup the triggers."""
-    if isinstance(trigger_configs, dict):
-        trigger_configs = [trigger_configs]
-
    for conf in trigger_configs:
        platform = _resolve_platform(METHOD_TRIGGER, hass, config,
                                     conf.get(CONF_PLATFORM))
--- a/homeassistant/components/automation/event.py
+++ b/homeassistant/components/automation/event.py
@@ -6,27 +6,38 @@ at https://home-assistant.io/components/automation/#event-trigger
 """
 import logging

+import voluptuous as vol
+
+from homeassistant.const import CONF_PLATFORM
+from homeassistant.helpers import config_validation as cv
+
 CONF_EVENT_TYPE = "event_type"
 CONF_EVENT_DATA = "event_data"

 _LOGGER = logging.getLogger(__name__)

+TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'event',
+    vol.Required(CONF_EVENT_TYPE): cv.string,
+    vol.Optional(CONF_EVENT_DATA): dict,
+})
+

 def trigger(hass, config, action):
    """Listen for events based on configuration."""
    event_type = config.get(CONF_EVENT_TYPE)
-
-    if event_type is None:
-        _LOGGER.error("Missing configuration key %s", CONF_EVENT_TYPE)
-        return False
-
    event_data = config.get(CONF_EVENT_DATA)

    def handle_event(event):
        """Listen for events and calls the action when data matches."""
        if not event_data or all(val == event.data.get(key) for key, val
                                 in event_data.items()):
-            action()
+            action({
+                'trigger': {
+                    'platform': 'event',
+                    'event': event,
+                },
+            })

    hass.bus.listen(event_type, handle_event)
    return True
--- a/homeassistant/components/automation/mqtt.py
+++ b/homeassistant/components/automation/mqtt.py
@@ -30,7 +30,14 @@ def trigger(hass, config, action):
    def mqtt_automation_listener(msg_topic, msg_payload, qos):
        """Listen for MQTT messages."""
        if payload is None or payload == msg_payload:
-            action()
+            action({
+                'trigger': {
+                    'platform': 'mqtt',
+                    'topic': msg_topic,
+                    'payload': msg_payload,
+                    'qos': qos,
+                }
+            })

    mqtt.subscribe(hass, topic, mqtt_automation_listener)

--- a/homeassistant/components/automation/numeric_state.py
+++ b/homeassistant/components/automation/numeric_state.py
@@ -5,101 +5,65 @@ For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#numeric-state-trigger
 """
 import logging
-from functools import partial

-from homeassistant.const import CONF_VALUE_TEMPLATE
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_VALUE_TEMPLATE, CONF_PLATFORM, CONF_ENTITY_ID,
+    CONF_BELOW, CONF_ABOVE)
 from homeassistant.helpers.event import track_state_change
-from homeassistant.helpers import template
+from homeassistant.helpers import condition, config_validation as cv

-CONF_ENTITY_ID = "entity_id"
-CONF_BELOW = "below"
-CONF_ABOVE = "above"
+TRIGGER_SCHEMA = vol.All(vol.Schema({
+    vol.Required(CONF_PLATFORM): 'numeric_state',
+    vol.Required(CONF_ENTITY_ID): cv.entity_ids,
+    CONF_BELOW: vol.Coerce(float),
+    CONF_ABOVE: vol.Coerce(float),
+    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+}), cv.has_at_least_one_key(CONF_BELOW, CONF_ABOVE))

 _LOGGER = logging.getLogger(__name__)


-def _renderer(hass, value_template, state):
-    """Render the state value."""
-    if value_template is None:
-        return state.state
-
-    return template.render(hass, value_template, {'state': state})
-
-
 def trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
-
-    if entity_id is None:
-        _LOGGER.error("Missing configuration key %s", CONF_ENTITY_ID)
-        return False
-
    below = config.get(CONF_BELOW)
    above = config.get(CONF_ABOVE)
    value_template = config.get(CONF_VALUE_TEMPLATE)

-    if below is None and above is None:
-        _LOGGER.error("Missing configuration key."
-                      " One of %s or %s is required",
-                      CONF_BELOW, CONF_ABOVE)
-        return False
-
-    renderer = partial(_renderer, hass, value_template)
-
    # pylint: disable=unused-argument
    def state_automation_listener(entity, from_s, to_s):
        """Listen for state changes and calls action."""
-        # Fire action if we go from outside range into range
-        if _in_range(above, below, renderer(to_s)) and \
-           (from_s is None or not _in_range(above, below, renderer(from_s))):
-            action()
+        if to_s is None:
+            return
+
+        variables = {
+            'trigger': {
+                'platform': 'numeric_state',
+                'entity_id': entity,
+                'below': below,
+                'above': above,
+            }
+        }
+
+        # If new one doesn't match, nothing to do
+        if not condition.numeric_state(
+                hass, to_s, below, above, value_template, variables):
+            return
+
+        # Only match if old didn't exist or existed but didn't match
+        # Written as: skip if old one did exist and matched
+        if from_s is not None and condition.numeric_state(
+                hass, from_s, below, above, value_template, variables):
+            return
+
+        variables['trigger']['from_state'] = from_s
+        variables['trigger']['to_state'] = to_s
+
+        action(variables)

    track_state_change(
        hass, entity_id, state_automation_listener)

    return True
-
-
-def if_action(hass, config):
-    """Wrap action method with state based condition."""
-    entity_id = config.get(CONF_ENTITY_ID)
-
-    if entity_id is None:
-        _LOGGER.error("Missing configuration key %s", CONF_ENTITY_ID)
-        return None
-
-    below = config.get(CONF_BELOW)
-    above = config.get(CONF_ABOVE)
-    value_template = config.get(CONF_VALUE_TEMPLATE)
-
-    if below is None and above is None:
-        _LOGGER.error("Missing configuration key."
-                      " One of %s or %s is required",
-                      CONF_BELOW, CONF_ABOVE)
-        return None
-
-    renderer = partial(_renderer, hass, value_template)
-
-    def if_numeric_state():
-        """Test numeric state condition."""
-        state = hass.states.get(entity_id)
-        return state is not None and _in_range(above, below, renderer(state))
-
-    return if_numeric_state
-
-
-def _in_range(range_start, range_end, value):
-    """Check if value is inside the range."""
-    try:
-        value = float(value)
-    except ValueError:
-        _LOGGER.warning("Value returned from template is not a number: %s",
-                        value)
-        return False
-
-    if range_start is not None and range_end is not None:
-        return float(range_start) <= value < float(range_end)
-    elif range_end is not None:
-        return value < float(range_end)
-    else:
-        return float(range_start) <= value
--- a/homeassistant/components/automation/state.py
+++ b/homeassistant/components/automation/state.py
@@ -4,15 +4,11 @@ Offer 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
 """
-from datetime import timedelta
-
 import voluptuous as vol

 import homeassistant.util.dt as dt_util
 from homeassistant.const import (
    EVENT_STATE_CHANGED, EVENT_TIME_CHANGED, MATCH_ALL, CONF_PLATFORM)
-from homeassistant.components.automation.time import (
-    CONF_HOURS, CONF_MINUTES, CONF_SECONDS)
 from homeassistant.helpers.event import track_state_change, track_point_in_time
 import homeassistant.helpers.config_validation as cv

@@ -22,46 +18,19 @@ CONF_TO = "to"
 CONF_STATE = "state"
 CONF_FOR = "for"

-BASE_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): 'state',
-    vol.Required(CONF_ENTITY_ID): cv.entity_id,
-    # These are str on purpose. Want to catch YAML conversions
-    CONF_STATE: str,
-    CONF_FOR: vol.All(vol.Schema({
-        CONF_HOURS: vol.Coerce(int),
-        CONF_MINUTES: vol.Coerce(int),
-        CONF_SECONDS: vol.Coerce(int),
-    }), cv.has_at_least_one_key(CONF_HOURS, CONF_MINUTES, CONF_SECONDS)),
-})
-
-TRIGGER_SCHEMA = vol.Schema(vol.All(
-    BASE_SCHEMA.extend({
+TRIGGER_SCHEMA = vol.All(
+    vol.Schema({
+        vol.Required(CONF_PLATFORM): 'state',
+        vol.Required(CONF_ENTITY_ID): cv.entity_ids,
        # These are str on purpose. Want to catch YAML conversions
        CONF_FROM: str,
        CONF_TO: str,
+        CONF_STATE: str,
+        CONF_FOR: vol.All(cv.time_period, cv.positive_timedelta),
    }),
    vol.Any(cv.key_dependency(CONF_FOR, CONF_TO),
            cv.key_dependency(CONF_FOR, CONF_STATE))
-))
-
-IF_ACTION_SCHEMA = vol.Schema(vol.All(
-    BASE_SCHEMA,
-    cv.key_dependency(CONF_FOR, CONF_STATE)
-))
-
-
-def get_time_config(config):
-    """Helper function to extract the time specified in the configuration."""
-    if CONF_FOR not in config:
-        return None
-
-    hours = config[CONF_FOR].get(CONF_HOURS)
-    minutes = config[CONF_FOR].get(CONF_MINUTES)
-    seconds = config[CONF_FOR].get(CONF_SECONDS)
-
-    return timedelta(hours=(hours or 0.0),
-                     minutes=(minutes or 0.0),
-                     seconds=(seconds or 0.0))
+)


 def trigger(hass, config, action):
@@ -69,52 +38,48 @@ def trigger(hass, config, action):
    entity_id = config.get(CONF_ENTITY_ID)
    from_state = config.get(CONF_FROM, MATCH_ALL)
    to_state = config.get(CONF_TO) or config.get(CONF_STATE) or MATCH_ALL
-    time_delta = get_time_config(config)
+    time_delta = config.get(CONF_FOR)

    def state_automation_listener(entity, from_s, to_s):
        """Listen for state changes and calls action."""
+        def call_action():
+            """Call action with right context."""
+            action({
+                'trigger': {
+                    'platform': 'state',
+                    'entity_id': entity,
+                    'from_state': from_s,
+                    'to_state': to_s,
+                    'for': time_delta,
+                }
+            })
+
+        if time_delta is None:
+            call_action()
+            return
+
        def state_for_listener(now):
            """Fire on state changes after a delay and calls action."""
            hass.bus.remove_listener(
-                EVENT_STATE_CHANGED, for_state_listener)
-            action()
+                EVENT_STATE_CHANGED, attached_state_for_cancel)
+            call_action()

        def state_for_cancel_listener(entity, inner_from_s, inner_to_s):
            """Fire on changes and cancel for listener if changed."""
-            if inner_to_s == to_s:
+            if inner_to_s.state == to_s.state:
                return
-            hass.bus.remove_listener(EVENT_TIME_CHANGED, for_time_listener)
-            hass.bus.remove_listener(
-                EVENT_STATE_CHANGED, for_state_listener)
+            hass.bus.remove_listener(EVENT_TIME_CHANGED,
+                                     attached_state_for_listener)
+            hass.bus.remove_listener(EVENT_STATE_CHANGED,
+                                     attached_state_for_cancel)

-        if time_delta is not None:
-            target_tm = dt_util.utcnow() + time_delta
-            for_time_listener = track_point_in_time(
-                hass, state_for_listener, target_tm)
-            for_state_listener = track_state_change(
-                hass, entity_id, state_for_cancel_listener,
-                MATCH_ALL, MATCH_ALL)
-        else:
-            action()
+        attached_state_for_listener = track_point_in_time(
+            hass, state_for_listener, dt_util.utcnow() + time_delta)
+
+        attached_state_for_cancel = track_state_change(
+            hass, entity, state_for_cancel_listener)

    track_state_change(
        hass, entity_id, state_automation_listener, from_state, to_state)

    return True
-
-
-def if_action(hass, config):
-    """Wrap action method with state based condition."""
-    entity_id = config.get(CONF_ENTITY_ID)
-    state = config.get(CONF_STATE)
-    time_delta = get_time_config(config)
-
-    def if_state():
-        """Test if condition."""
-        is_state = hass.states.is_state(entity_id, state)
-        return (time_delta is None and is_state or
-                time_delta is not None and
-                dt_util.utcnow() - time_delta >
-                hass.states.get(entity_id).last_changed)
-
-    return if_state
--- a/homeassistant/components/automation/sun.py
+++ b/homeassistant/components/automation/sun.py
@@ -9,108 +9,41 @@ import logging

 import voluptuous as vol

-from homeassistant.const import CONF_PLATFORM
-import homeassistant.util.dt as dt_util
-from homeassistant.components import sun
+from homeassistant.const import (
+    CONF_EVENT, CONF_OFFSET, CONF_PLATFORM, SUN_EVENT_SUNRISE)
 from homeassistant.helpers.event import track_sunrise, track_sunset
 import homeassistant.helpers.config_validation as cv

 DEPENDENCIES = ['sun']

-CONF_OFFSET = 'offset'
-CONF_EVENT = 'event'
-CONF_BEFORE = "before"
-CONF_BEFORE_OFFSET = "before_offset"
-CONF_AFTER = "after"
-CONF_AFTER_OFFSET = "after_offset"
-
-EVENT_SUNSET = 'sunset'
-EVENT_SUNRISE = 'sunrise'
-
 _LOGGER = logging.getLogger(__name__)

-
-_SUN_EVENT = vol.All(vol.Lower, vol.Any(EVENT_SUNRISE, EVENT_SUNSET))
-
 TRIGGER_SCHEMA = vol.Schema({
    vol.Required(CONF_PLATFORM): 'sun',
-    vol.Required(CONF_EVENT): _SUN_EVENT,
-    vol.Required(CONF_OFFSET, default=timedelta(0)): cv.time_offset,
+    vol.Required(CONF_EVENT): cv.sun_event,
+    vol.Required(CONF_OFFSET, default=timedelta(0)): cv.time_period,
 })

-IF_ACTION_SCHEMA = vol.All(
-    vol.Schema({
-        vol.Required(CONF_PLATFORM): 'sun',
-        CONF_BEFORE: _SUN_EVENT,
-        CONF_AFTER: _SUN_EVENT,
-        vol.Required(CONF_BEFORE_OFFSET, default=timedelta(0)): cv.time_offset,
-        vol.Required(CONF_AFTER_OFFSET, default=timedelta(0)): cv.time_offset,
-    }),
-    cv.has_at_least_one_key(CONF_BEFORE, CONF_AFTER),
-)
-

 def trigger(hass, config, action):
    """Listen for events based on configuration."""
    event = config.get(CONF_EVENT)
    offset = config.get(CONF_OFFSET)

+    def call_action():
+        """Call action with right context."""
+        action({
+            'trigger': {
+                'platform': 'sun',
+                'event': event,
+                'offset': offset,
+            },
+        })
+
    # Do something to call action
-    if event == EVENT_SUNRISE:
-        track_sunrise(hass, action, offset)
+    if event == SUN_EVENT_SUNRISE:
+        track_sunrise(hass, call_action, offset)
    else:
-        track_sunset(hass, action, offset)
+        track_sunset(hass, call_action, offset)

    return True
-
-
-def if_action(hass, config):
-    """Wrap action method with sun based condition."""
-    before = config.get(CONF_BEFORE)
-    after = config.get(CONF_AFTER)
-    before_offset = config.get(CONF_BEFORE_OFFSET)
-    after_offset = config.get(CONF_AFTER_OFFSET)
-
-    if before is None:
-        def before_func():
-            """Return no point in time."""
-            return None
-    elif before == EVENT_SUNRISE:
-        def before_func():
-            """Return time before sunrise."""
-            return sun.next_rising(hass) + before_offset
-    else:
-        def before_func():
-            """Return time before sunset."""
-            return sun.next_setting(hass) + before_offset
-
-    if after is None:
-        def after_func():
-            """Return no point in time."""
-            return None
-    elif after == EVENT_SUNRISE:
-        def after_func():
-            """Return time after sunrise."""
-            return sun.next_rising(hass) + after_offset
-    else:
-        def after_func():
-            """Return time after sunset."""
-            return sun.next_setting(hass) + after_offset
-
-    def time_if():
-        """Validate time based if-condition."""
-        now = dt_util.now()
-        before = before_func()
-        after = after_func()
-
-        if before is not None and now > now.replace(hour=before.hour,
-                                                    minute=before.minute):
-            return False
-
-        if after is not None and now < now.replace(hour=after.hour,
-                                                   minute=after.minute):
-            return False
-
-        return True
-
-    return time_if
--- a/homeassistant/components/automation/template.py
+++ b/homeassistant/components/automation/template.py
@@ -9,9 +9,9 @@ import logging
 import voluptuous as vol

 from homeassistant.const import (
-    CONF_VALUE_TEMPLATE, EVENT_STATE_CHANGED, CONF_PLATFORM)
-from homeassistant.exceptions import TemplateError
-from homeassistant.helpers import template
+    CONF_VALUE_TEMPLATE, CONF_PLATFORM, MATCH_ALL)
+from homeassistant.helpers import condition
+from homeassistant.helpers.event import track_state_change
 import homeassistant.helpers.config_validation as cv


@@ -30,40 +30,24 @@ def trigger(hass, config, action):
    # Local variable to keep track of if the action has already been triggered
    already_triggered = False

-    def event_listener(event):
+    def state_changed_listener(entity_id, from_s, to_s):
        """Listen for state changes and calls action."""
        nonlocal already_triggered
-        template_result = _check_template(hass, value_template)
+        template_result = condition.template(hass, value_template)

        # Check to see if template returns true
        if template_result and not already_triggered:
            already_triggered = True
-            action()
+            action({
+                'trigger': {
+                    'platform': 'template',
+                    'entity_id': entity_id,
+                    'from_state': from_s,
+                    'to_state': to_s,
+                },
+            })
        elif not template_result:
            already_triggered = False

-    hass.bus.listen(EVENT_STATE_CHANGED, event_listener)
+    track_state_change(hass, MATCH_ALL, state_changed_listener)
    return True
-
-
-def if_action(hass, config):
-    """Wrap action method with state based condition."""
-    value_template = config.get(CONF_VALUE_TEMPLATE)
-
-    return lambda: _check_template(hass, value_template)
-
-
-def _check_template(hass, value_template):
-    """Check if result of template is true."""
-    try:
-        value = template.render(hass, value_template, {})
-    except TemplateError as ex:
-        if ex.args and ex.args[0].startswith(
-                "UndefinedError: 'None' has no attribute"):
-            # Common during HA startup - so just a warning
-            _LOGGER.warning(ex)
-        else:
-            _LOGGER.error(ex)
-        return False
-
-    return value.lower() == 'true'
--- a/homeassistant/components/automation/time.py
+++ b/homeassistant/components/automation/time.py
@@ -6,99 +6,48 @@ at https://home-assistant.io/components/automation/#time-trigger
 """
 import logging

-import homeassistant.util.dt as dt_util
+import voluptuous as vol
+
+from homeassistant.const import CONF_AFTER, CONF_PLATFORM
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_time_change

 CONF_HOURS = "hours"
 CONF_MINUTES = "minutes"
 CONF_SECONDS = "seconds"
-CONF_BEFORE = "before"
-CONF_AFTER = "after"
-CONF_WEEKDAY = "weekday"
-
-WEEKDAYS = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']

 _LOGGER = logging.getLogger(__name__)

+TRIGGER_SCHEMA = vol.All(vol.Schema({
+    vol.Required(CONF_PLATFORM): 'time',
+    CONF_AFTER: cv.time,
+    CONF_HOURS: vol.Any(vol.Coerce(int), vol.Coerce(str)),
+    CONF_MINUTES: vol.Any(vol.Coerce(int), vol.Coerce(str)),
+    CONF_SECONDS: vol.Any(vol.Coerce(int), vol.Coerce(str)),
+}), cv.has_at_least_one_key(CONF_HOURS, CONF_MINUTES,
+                            CONF_SECONDS, CONF_AFTER))
+

 def trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    if CONF_AFTER in config:
-        after = dt_util.parse_time_str(config[CONF_AFTER])
-        if after is None:
-            _error_time(config[CONF_AFTER], CONF_AFTER)
-            return False
+        after = config.get(CONF_AFTER)
        hours, minutes, seconds = after.hour, after.minute, after.second
-    elif (CONF_HOURS in config or CONF_MINUTES in config or
-          CONF_SECONDS in config):
+    else:
        hours = config.get(CONF_HOURS)
        minutes = config.get(CONF_MINUTES)
        seconds = config.get(CONF_SECONDS)
-    else:
-        _LOGGER.error('One of %s, %s, %s OR %s needs to be specified',
-                      CONF_HOURS, CONF_MINUTES, CONF_SECONDS, CONF_AFTER)
-        return False

    def time_automation_listener(now):
        """Listen for time changes and calls action."""
-        action()
+        action({
+            'trigger': {
+                'platform': 'time',
+                'now': now,
+            },
+        })

    track_time_change(hass, time_automation_listener,
                      hour=hours, minute=minutes, second=seconds)

    return True
-
-
-def if_action(hass, config):
-    """Wrap action method with time based condition."""
-    before = config.get(CONF_BEFORE)
-    after = config.get(CONF_AFTER)
-    weekday = config.get(CONF_WEEKDAY)
-
-    if before is None and after is None and weekday is None:
-        _LOGGER.error(
-            "Missing if-condition configuration key %s, %s or %s",
-            CONF_BEFORE, CONF_AFTER, CONF_WEEKDAY)
-        return None
-
-    if before is not None:
-        before = dt_util.parse_time_str(before)
-        if before is None:
-            _error_time(before, CONF_BEFORE)
-            return None
-
-    if after is not None:
-        after = dt_util.parse_time_str(after)
-        if after is None:
-            _error_time(after, CONF_AFTER)
-            return None
-
-    def time_if():
-        """Validate time based if-condition."""
-        now = dt_util.now()
-        if before is not None and now > now.replace(hour=before.hour,
-                                                    minute=before.minute):
-            return False
-
-        if after is not None and now < now.replace(hour=after.hour,
-                                                   minute=after.minute):
-            return False
-
-        if weekday is not None:
-            now_weekday = WEEKDAYS[now.weekday()]
-
-            if isinstance(weekday, str) and weekday != now_weekday or \
-               now_weekday not in weekday:
-                return False
-
-        return True
-
-    return time_if
-
-
-def _error_time(value, key):
-    """Helper method to print error."""
-    _LOGGER.error(
-        "Received invalid value for '%s': %s", key, value)
-    if isinstance(value, int):
-        _LOGGER.error('Make sure you wrap time values in quotes')
--- a/homeassistant/components/automation/zone.py
+++ b/homeassistant/components/automation/zone.py
@@ -6,33 +6,24 @@ at https://home-assistant.io/components/automation/#zone-trigger
 """
 import voluptuous as vol

-from homeassistant.components import zone
 from homeassistant.const import (
-    ATTR_GPS_ACCURACY, ATTR_LATITUDE, ATTR_LONGITUDE, MATCH_ALL, CONF_PLATFORM)
+    CONF_EVENT, CONF_ENTITY_ID, CONF_ZONE, MATCH_ALL, CONF_PLATFORM)
 from homeassistant.helpers.event import track_state_change
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    condition, config_validation as cv, location)

-CONF_ENTITY_ID = "entity_id"
-CONF_ZONE = "zone"
-CONF_EVENT = "event"
 EVENT_ENTER = "enter"
 EVENT_LEAVE = "leave"
 DEFAULT_EVENT = EVENT_ENTER

 TRIGGER_SCHEMA = vol.Schema({
    vol.Required(CONF_PLATFORM): 'zone',
-    vol.Required(CONF_ENTITY_ID): cv.entity_id,
+    vol.Required(CONF_ENTITY_ID): cv.entity_ids,
    vol.Required(CONF_ZONE): cv.entity_id,
    vol.Required(CONF_EVENT, default=DEFAULT_EVENT):
        vol.Any(EVENT_ENTER, EVENT_LEAVE),
 })

-IF_ACTION_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): 'zone',
-    vol.Required(CONF_ENTITY_ID): cv.entity_id,
-    vol.Required(CONF_ZONE): cv.entity_id,
-})
-

 def trigger(hass, config, action):
    """Listen for state changes based on configuration."""
@@ -42,46 +33,32 @@ def trigger(hass, config, action):

    def zone_automation_listener(entity, from_s, to_s):
        """Listen for state changes and calls action."""
-        if from_s and None in (from_s.attributes.get(ATTR_LATITUDE),
-                               from_s.attributes.get(ATTR_LONGITUDE)) or \
-            None in (to_s.attributes.get(ATTR_LATITUDE),
-                     to_s.attributes.get(ATTR_LONGITUDE)):
+        if from_s and not location.has_location(from_s) or \
+           not location.has_location(to_s):
            return

-        from_match = _in_zone(hass, zone_entity_id, from_s) if from_s else None
-        to_match = _in_zone(hass, zone_entity_id, to_s)
+        zone_state = hass.states.get(zone_entity_id)
+        if from_s:
+            from_match = condition.zone(hass, zone_state, from_s)
+        else:
+            from_match = False
+        to_match = condition.zone(hass, zone_state, to_s)

        # pylint: disable=too-many-boolean-expressions
        if event == EVENT_ENTER and not from_match and to_match or \
           event == EVENT_LEAVE and from_match and not to_match:
-            action()
+            action({
+                'trigger': {
+                    'platform': 'zone',
+                    'entity_id': entity,
+                    'from_state': from_s,
+                    'to_state': to_s,
+                    'zone': zone_state,
+                    'event': event,
+                },
+            })

    track_state_change(
        hass, entity_id, zone_automation_listener, MATCH_ALL, MATCH_ALL)

    return True
-
-
-def if_action(hass, config):
-    """Wrap action method with zone based condition."""
-    entity_id = config.get(CONF_ENTITY_ID)
-    zone_entity_id = config.get(CONF_ZONE)
-
-    def if_in_zone():
-        """Test if condition."""
-        return _in_zone(hass, zone_entity_id, hass.states.get(entity_id))
-
-    return if_in_zone
-
-
-def _in_zone(hass, zone_entity_id, state):
-    """Check if state is in zone."""
-    if not state or None in (state.attributes.get(ATTR_LATITUDE),
-                             state.attributes.get(ATTR_LONGITUDE)):
-        return False
-
-    zone_state = hass.states.get(zone_entity_id)
-    return zone_state and zone.in_zone(
-        zone_state, state.attributes.get(ATTR_LATITUDE),
-        state.attributes.get(ATTR_LONGITUDE),
-        state.attributes.get(ATTR_GPS_ACCURACY, 0))
--- a/homeassistant/components/binary_sensor/command_line.py
+++ b/homeassistant/components/binary_sensor/command_line.py
@@ -1,13 +1,14 @@
 """
-Support for custom shell commands to to retrieve values.
+Support for custom shell commands to retrieve values.

 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/binary_sensor.command/
+https://home-assistant.io/components/binary_sensor.command_line/
 """
 import logging
 from datetime import timedelta

-from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.binary_sensor import (BinarySensorDevice,
+                                                    SENSOR_CLASSES)
 from homeassistant.components.sensor.command_line import CommandSensorData
 from homeassistant.const import CONF_VALUE_TEMPLATE
 from homeassistant.helpers import template
@@ -15,6 +16,7 @@ from homeassistant.helpers import template
 _LOGGER = logging.getLogger(__name__)

 DEFAULT_NAME = "Binary Command Sensor"
+DEFAULT_SENSOR_CLASS = None
 DEFAULT_PAYLOAD_ON = 'ON'
 DEFAULT_PAYLOAD_OFF = 'OFF'

@@ -29,28 +31,35 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        _LOGGER.error('Missing required variable: "command"')
        return False

+    sensor_class = config.get('sensor_class')
+    if sensor_class not in SENSOR_CLASSES:
+        _LOGGER.warning('Unknown sensor class: %s', sensor_class)
+        sensor_class = DEFAULT_SENSOR_CLASS
+
    data = CommandSensorData(config.get('command'))

    add_devices([CommandBinarySensor(
        hass,
        data,
        config.get('name', DEFAULT_NAME),
+        sensor_class,
        config.get('payload_on', DEFAULT_PAYLOAD_ON),
        config.get('payload_off', DEFAULT_PAYLOAD_OFF),
        config.get(CONF_VALUE_TEMPLATE)
    )])


-# pylint: disable=too-many-arguments
+# pylint: disable=too-many-arguments, too-many-instance-attributes
 class CommandBinarySensor(BinarySensorDevice):
    """Represent a command line binary sensor."""

-    def __init__(self, hass, data, name, payload_on,
+    def __init__(self, hass, data, name, sensor_class, payload_on,
                 payload_off, value_template):
        """Initialize the Command line binary sensor."""
        self._hass = hass
        self.data = data
        self._name = name
+        self._sensor_class = sensor_class
        self._state = False
        self._payload_on = payload_on
        self._payload_off = payload_off
@@ -67,6 +76,11 @@ class CommandBinarySensor(BinarySensorDevice):
        """Return true if the binary sensor is on."""
        return self._state

+    @ property
+    def sensor_class(self):
+        """Return the class of the binary sensor."""
+        return self._sensor_class
+
    def update(self):
        """Get the latest data and updates the state."""
        self.data.update()
--- a/homeassistant/components/binary_sensor/mysensors.py
+++ b/homeassistant/components/binary_sensor/mysensors.py
@@ -6,11 +6,10 @@ https://home-assistant.io/components/binary_sensor.mysensors/
 """
 import logging

-from homeassistant.const import (
-    ATTR_BATTERY_LEVEL, STATE_OFF, STATE_ON)
-from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, SENSOR_CLASSES)
-from homeassistant.loader import get_component
+from homeassistant.components import mysensors
+from homeassistant.components.binary_sensor import (SENSOR_CLASSES,
+                                                    BinarySensorDevice)
+from homeassistant.const import STATE_ON

 _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = []
@@ -23,8 +22,6 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    if discovery_info is None:
        return

-    mysensors = get_component('mysensors')
-
    for gateway in mysensors.GATEWAYS.values():
        # Define the S_TYPES and V_TYPES that the platform should handle as
        # states. Map them in a dict of lists.
@@ -49,76 +46,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
            map_sv_types, devices, add_devices, MySensorsBinarySensor))


-class MySensorsBinarySensor(BinarySensorDevice):
-    """Represent the value of a MySensors child node."""
-
-    # pylint: disable=too-many-arguments,too-many-instance-attributes
-
-    def __init__(
-            self, gateway, node_id, child_id, name, value_type, child_type):
-        """
-        Setup class attributes on instantiation.
-
-        Args:
-        gateway (GatewayWrapper): Gateway object.
-        node_id (str): Id of node.
-        child_id (str): Id of child.
-        name (str): Entity name.
-        value_type (str): Value type of child. Value is entity state.
-        child_type (str): Child type of child.
-
-        Attributes:
-        gateway (GatewayWrapper): Gateway object.
-        node_id (str): Id of node.
-        child_id (str): Id of child.
-        _name (str): Entity name.
-        value_type (str): Value type of child. Value is entity state.
-        child_type (str): Child type of child.
-        battery_level (int): Node battery level.
-        _values (dict): Child values. Non state values set as state attributes.
-        mysensors (module): Mysensors main component module.
-        """
-        self.gateway = gateway
-        self.node_id = node_id
-        self.child_id = child_id
-        self._name = name
-        self.value_type = value_type
-        self.child_type = child_type
-        self.battery_level = 0
-        self._values = {}
-        self.mysensors = get_component('mysensors')
-
-    @property
-    def should_poll(self):
-        """Mysensor gateway pushes its state to HA."""
-        return False
-
-    @property
-    def name(self):
-        """The name of this entity."""
-        return self._name
-
-    @property
-    def device_state_attributes(self):
-        """Return device specific state attributes."""
-        attr = {
-            self.mysensors.ATTR_PORT: self.gateway.port,
-            self.mysensors.ATTR_NODE_ID: self.node_id,
-            self.mysensors.ATTR_CHILD_ID: self.child_id,
-            ATTR_BATTERY_LEVEL: self.battery_level,
-        }
-
-        set_req = self.gateway.const.SetReq
-
-        for value_type, value in self._values.items():
-            if value_type != self.value_type:
-                try:
-                    attr[set_req(value_type).name] = value
-                except ValueError:
-                    _LOGGER.error('value_type %s is not valid for mysensors '
-                                  'version %s', value_type,
-                                  self.gateway.version)
-        return attr
+class MySensorsBinarySensor(
+        mysensors.MySensorsDeviceEntity, BinarySensorDevice):
+    """Represent the value of a MySensors Binary Sensor child node."""

    @property
    def is_on(self):
@@ -146,23 +76,3 @@ class MySensorsBinarySensor(BinarySensorDevice):
            })
        if class_map.get(self.child_type) in SENSOR_CLASSES:
            return class_map.get(self.child_type)
-
-    @property
-    def available(self):
-        """Return True if entity is available."""
-        return self.value_type in self._values
-
-    def update(self):
-        """Update the controller with the latest values from a sensor."""
-        node = self.gateway.sensors[self.node_id]
-        child = node.children[self.child_id]
-        for value_type, value in child.values.items():
-            _LOGGER.debug(
-                "%s: value_type %s, value = %s", self._name, value_type, value)
-            if value_type == self.gateway.const.SetReq.V_TRIPPED:
-                self._values[value_type] = STATE_ON if int(
-                    value) == 1 else STATE_OFF
-            else:
-                self._values[value_type] = value
-
-        self.battery_level = node.battery_level
--- a/homeassistant/components/binary_sensor/nest.py
+++ b/homeassistant/components/binary_sensor/nest.py
@@ -4,12 +4,14 @@ Support for Nest Thermostat Binary Sensors.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.nest/
 """
-import logging
-import socket
+import voluptuous as vol

 import homeassistant.components.nest as nest
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.sensor.nest import NestSensor
+from homeassistant.const import (
+    CONF_PLATFORM, CONF_SCAN_INTERVAL, CONF_MONITORED_CONDITIONS
+)

 DEPENDENCIES = ['nest']
 BINARY_TYPES = ['fan',
@@ -23,25 +25,19 @@ BINARY_TYPES = ['fan',
                'hvac_emer_heat_state',
                'online']

+PLATFORM_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): nest.DOMAIN,
+    vol.Optional(CONF_SCAN_INTERVAL):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+    vol.Required(CONF_MONITORED_CONDITIONS): [vol.In(BINARY_TYPES)],
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup Nest binary sensors."""
-    logger = logging.getLogger(__name__)
-    try:
-        for structure in nest.NEST.structures:
-            for device in structure.devices:
-                for variable in config['monitored_conditions']:
-                    if variable in BINARY_TYPES:
-                        add_devices([NestBinarySensor(structure,
-                                                      device,
-                                                      variable)])
-                    else:
-                        logger.error('Nest sensor type: "%s" does not exist',
-                                     variable)
-    except socket.error:
-        logger.error(
-            "Connection error logging into the nest web service."
-        )
+    for structure, device in nest.devices():
+        add_devices([NestBinarySensor(structure, device, variable)
+                     for variable in config[CONF_MONITORED_CONDITIONS]])


 class NestBinarySensor(NestSensor, BinarySensorDevice):
--- a/homeassistant/components/binary_sensor/octoprint.py
+++ b/homeassistant/components/binary_sensor/octoprint.py
@@ -0,0 +1,109 @@
+"""
+Support for monitoring OctoPrint binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.octoprint/
+"""
+import logging
+import requests
+
+from homeassistant.const import CONF_NAME, STATE_ON, STATE_OFF
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.loader import get_component
+
+DEPENDENCIES = ["octoprint"]
+
+SENSOR_TYPES = {
+    # API Endpoint, Group, Key, unit
+    "Printing": ["printer", "state", "printing", None],
+    "Printing Error": ["printer", "state", "error", None]
+}
+
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the available OctoPrint binary sensors."""
+    octoprint = get_component('octoprint')
+    name = config.get(CONF_NAME, "OctoPrint")
+    monitored_conditions = config.get("monitored_conditions",
+                                      SENSOR_TYPES.keys())
+
+    devices = []
+    for octo_type in monitored_conditions:
+        if octo_type in SENSOR_TYPES:
+            new_sensor = OctoPrintBinarySensor(octoprint.OCTOPRINT,
+                                               octo_type,
+                                               SENSOR_TYPES[octo_type][2],
+                                               name,
+                                               SENSOR_TYPES[octo_type][3],
+                                               SENSOR_TYPES[octo_type][0],
+                                               SENSOR_TYPES[octo_type][1],
+                                               "flags")
+            devices.append(new_sensor)
+        else:
+            _LOGGER.error("Unknown OctoPrint sensor type: %s", octo_type)
+    add_devices(devices)
+
+
+# pylint: disable=too-many-instance-attributes
+class OctoPrintBinarySensor(BinarySensorDevice):
+    """Representation an OctoPrint binary sensor."""
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, api, condition, sensor_type, sensor_name,
+                 unit, endpoint, group, tool=None):
+        """Initialize a new OctoPrint sensor."""
+        self.sensor_name = sensor_name
+        if tool is None:
+            self._name = sensor_name + ' ' + condition
+        else:
+            self._name = sensor_name + ' ' + condition
+        self.sensor_type = sensor_type
+        self.api = api
+        self._state = False
+        self._unit_of_measurement = unit
+        self.api_endpoint = endpoint
+        self.api_group = group
+        self.api_tool = tool
+        # Set initial state
+        self.update()
+        _LOGGER.debug("Created OctoPrint binary sensor %r", self)
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self.is_on
+
+    @property
+    def is_on(self):
+        """Return true if binary sensor is on."""
+        if self._state:
+            return STATE_ON
+        else:
+            return STATE_OFF
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return None
+
+    def update(self):
+        """Update state of sensor."""
+        try:
+            self._state = self.api.update(self.sensor_type,
+                                          self.api_endpoint,
+                                          self.api_group,
+                                          self.api_tool)
+        except requests.exceptions.ConnectionError:
+            # Error calling the api, already logged in api.update()
+            return
+
+        if self._state is None:
+            _LOGGER.warning("Unable to locate value for %s", self.sensor_type)
--- a/homeassistant/components/binary_sensor/vera.py
+++ b/homeassistant/components/binary_sensor/vera.py
@@ -49,8 +49,7 @@ class VeraBinarySensor(VeraDevice, BinarySensorDevice):
            last_tripped = self.vera_device.last_trip
            if last_tripped is not None:
                utc_time = dt_util.utc_from_timestamp(int(last_tripped))
-                attr[ATTR_LAST_TRIP_TIME] = dt_util.datetime_to_str(
-                    utc_time)
+                attr[ATTR_LAST_TRIP_TIME] = utc_time.isoformat()
            else:
                attr[ATTR_LAST_TRIP_TIME] = None
            tripped = self.vera_device.is_tripped
--- a/homeassistant/components/binary_sensor/wink.py
+++ b/homeassistant/components/binary_sensor/wink.py
@@ -7,10 +7,10 @@ at https://home-assistant.io/components/sensor.wink/
 import logging

 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.const import CONF_ACCESS_TOKEN
+from homeassistant.const import CONF_ACCESS_TOKEN, ATTR_BATTERY_LEVEL
 from homeassistant.helpers.entity import Entity

-REQUIREMENTS = ['python-wink==0.6.4']
+REQUIREMENTS = ['python-wink==0.7.6']

 # These are the available sensors mapped to binary_sensor class
 SENSOR_TYPES = {
@@ -48,6 +48,7 @@ class WinkBinarySensorDevice(BinarySensorDevice, Entity):
        """Initialize the Wink binary sensor."""
        self.wink = wink
        self._unit_of_measurement = self.wink.UNIT
+        self._battery = self.wink.battery_level
        self.capability = self.wink.capability()

    @property
@@ -85,3 +86,16 @@ class WinkBinarySensorDevice(BinarySensorDevice, Entity):
    def update(self):
        """Update state of the sensor."""
        self.wink.update_state()
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        if self._battery:
+            return {
+                ATTR_BATTERY_LEVEL: self._battery_level,
+            }
+
+    @property
+    def _battery_level(self):
+        """Return the battery level."""
+        return self.wink.battery_level * 100
--- a/homeassistant/components/binary_sensor/zwave.py
+++ b/homeassistant/components/binary_sensor/zwave.py
@@ -8,11 +8,7 @@ import logging
 import datetime
 import homeassistant.util.dt as dt_util
 from homeassistant.helpers.event import track_point_in_time
-
-from homeassistant.components.zwave import (
-    ATTR_NODE_ID, ATTR_VALUE_ID,
-    COMMAND_CLASS_SENSOR_BINARY, NETWORK,
-    ZWaveDeviceEntity, get_config_value)
+from homeassistant.components import zwave
 from homeassistant.components.binary_sensor import (
    DOMAIN,
    BinarySensorDevice)
@@ -36,11 +32,11 @@ DEVICE_MAPPINGS = {

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Z-Wave platform for sensors."""
-    if discovery_info is None or NETWORK is None:
+    if discovery_info is None or zwave.NETWORK is None:
        return

-    node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]
-    value = node.values[discovery_info[ATTR_VALUE_ID]]
+    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
+    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
    value.set_change_verified(False)

    # Make sure that we have values for the key before converting to int
@@ -53,18 +49,19 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        if specific_sensor_key in DEVICE_MAPPINGS:
            if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_NO_OFF_EVENT:
                # Default the multiplier to 4
-                re_arm_multiplier = (get_config_value(value.node, 9) or 4)
+                re_arm_multiplier = (zwave.get_config_value(value.node,
+                                                            9) or 4)
                add_devices([
                    ZWaveTriggerSensor(value, "motion",
                                       hass, re_arm_multiplier * 8)
                ])
                return

-    if value.command_class == COMMAND_CLASS_SENSOR_BINARY:
+    if value.command_class == zwave.COMMAND_CLASS_SENSOR_BINARY:
        add_devices([ZWaveBinarySensor(value, None)])


-class ZWaveBinarySensor(BinarySensorDevice, ZWaveDeviceEntity):
+class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity):
    """Representation of a binary sensor within Z-Wave."""

    def __init__(self, value, sensor_class):
@@ -74,7 +71,7 @@ class ZWaveBinarySensor(BinarySensorDevice, ZWaveDeviceEntity):
        from openzwave.network import ZWaveNetwork
        from pydispatch import dispatcher

-        ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+        zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN)

        dispatcher.connect(
            self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED)
--- a/homeassistant/components/browser.py
+++ b/homeassistant/components/browser.py
@@ -4,10 +4,18 @@ Provides functionality to launch a web browser on the host machine.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/browser/
 """
+import voluptuous as vol

 DOMAIN = "browser"
 SERVICE_BROWSE_URL = "browse_url"

+ATTR_URL = 'url'
+ATTR_URL_DEFAULT = 'https://www.google.com'
+
+SERVICE_BROWSE_URL_SCHEMA = vol.Schema({
+    vol.Required(ATTR_URL, default=ATTR_URL_DEFAULT): vol.Url,
+})
+

 def setup(hass, config):
    """Listen for browse_url events."""
@@ -15,8 +23,7 @@ def setup(hass, config):

    hass.services.register(DOMAIN, SERVICE_BROWSE_URL,
                           lambda service:
-                           webbrowser.open(
-                               service.data.get(
-                                   'url', 'https://www.google.com')))
+                           webbrowser.open(service.data[ATTR_URL]),
+                           schema=SERVICE_BROWSE_URL_SCHEMA)

    return True
--- a/homeassistant/components/configurator.py
+++ b/homeassistant/components/configurator.py
@@ -19,6 +19,8 @@ SERVICE_CONFIGURE = "configure"
 STATE_CONFIGURE = "configure"
 STATE_CONFIGURED = "configured"

+ATTR_LINK_NAME = "link_name"
+ATTR_LINK_URL = "link_url"
 ATTR_CONFIGURE_ID = "configure_id"
 ATTR_DESCRIPTION = "description"
 ATTR_DESCRIPTION_IMAGE = "description_image"
@@ -34,7 +36,7 @@ _LOGGER = logging.getLogger(__name__)
 # pylint: disable=too-many-arguments
 def request_config(
        hass, name, callback, description=None, description_image=None,
-        submit_caption=None, fields=None):
+        submit_caption=None, fields=None, link_name=None, link_url=None):
    """Create a new request for configuration.

    Will return an ID to be used for sequent calls.
@@ -43,7 +45,8 @@ def request_config(

    request_id = instance.request_config(
        name, callback,
-        description, description_image, submit_caption, fields)
+        description, description_image, submit_caption,
+        fields, link_name, link_url)

    _REQUESTS[request_id] = instance

@@ -100,7 +103,8 @@ class Configurator(object):
    # pylint: disable=too-many-arguments
    def request_config(
            self, name, callback,
-            description, description_image, submit_caption, fields):
+            description, description_image, submit_caption,
+            fields, link_name, link_url):
        """Setup a request for configuration."""
        entity_id = generate_entity_id(ENTITY_ID_FORMAT, name, hass=self.hass)

@@ -121,6 +125,8 @@ class Configurator(object):
                (ATTR_DESCRIPTION, description),
                (ATTR_DESCRIPTION_IMAGE, description_image),
                (ATTR_SUBMIT_CAPTION, submit_caption),
+                (ATTR_LINK_NAME, link_name),
+                (ATTR_LINK_URL, link_url),
            ] if value is not None
        })

--- a/homeassistant/components/conversation.py
+++ b/homeassistant/components/conversation.py
@@ -8,9 +8,12 @@ import logging
 import re
 import warnings

+import voluptuous as vol
+
 from homeassistant import core
 from homeassistant.const import (
    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON)
+import homeassistant.helpers.config_validation as cv

 DOMAIN = "conversation"

@@ -18,6 +21,10 @@ SERVICE_PROCESS = "process"

 ATTR_TEXT = "text"

+SERVICE_PROCESS_SCHEMA = vol.Schema({
+    vol.Required(ATTR_TEXT): vol.All(cv.string, vol.Lower),
+})
+
 REGEX_TURN_COMMAND = re.compile(r'turn (?P<name>(?: |\w)+) (?P<command>\w+)')

 REQUIREMENTS = ['fuzzywuzzy==0.8.0']
@@ -32,11 +39,7 @@ def setup(hass, config):

    def process(service):
        """Parse text into commands."""
-        if ATTR_TEXT not in service.data:
-            logger.error("Received process service call without a text")
-            return
-
-        text = service.data[ATTR_TEXT].lower()
+        text = service.data[ATTR_TEXT]
        match = REGEX_TURN_COMMAND.match(text)

        if not match:
@@ -67,6 +70,6 @@ def setup(hass, config):
            logger.error(
                'Got unsupported command %s from text %s', command, text)

-    hass.services.register(DOMAIN, SERVICE_PROCESS, process)
-
+    hass.services.register(DOMAIN, SERVICE_PROCESS, process,
+                           schema=SERVICE_PROCESS_SCHEMA)
    return True
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -21,6 +21,7 @@ COMPONENTS_WITH_DEMO_PLATFORM = [
    'camera',
    'device_tracker',
    'garage_door',
+    'hvac',
    'light',
    'lock',
    'media_player',
--- a/homeassistant/components/device_tracker/init.py
+++ b/homeassistant/components/device_tracker/init.py
@@ -94,7 +94,7 @@ def setup(hass, config):
    yaml_path = hass.config.path(YAML_DEVICES)

    conf = config.get(DOMAIN, {})
-    if isinstance(conf, list):
+    if isinstance(conf, list) and len(conf) > 0:
        conf = conf[0]
    consider_home = timedelta(
        seconds=util.convert(conf.get(CONF_CONSIDER_HOME), int,
--- a/homeassistant/components/device_tracker/asuswrt.py
+++ b/homeassistant/components/device_tracker/asuswrt.py
@@ -19,13 +19,16 @@ from homeassistant.util import Throttle
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)
+REQUIREMENTS = ['pexpect==4.0.1']

+_LEASES_CMD = 'cat /var/lib/misc/dnsmasq.leases'
 _LEASES_REGEX = re.compile(
    r'\w+\s' +
    r'(?P<mac>(([0-9a-f]{2}[:-]){5}([0-9a-f]{2})))\s' +
    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})\s' +
    r'(?P<host>([^\s]+))')

+_IP_NEIGH_CMD = 'ip neigh'
 _IP_NEIGH_REGEX = re.compile(
    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})\s' +
    r'\w+\s' +
@@ -55,6 +58,7 @@ class AsusWrtDeviceScanner(object):
        self.host = config[CONF_HOST]
        self.username = str(config[CONF_USERNAME])
        self.password = str(config[CONF_PASSWORD])
+        self.protocol = config.get('protocol')

        self.lock = threading.Lock()

@@ -100,8 +104,26 @@ class AsusWrtDeviceScanner(object):
            self.last_results = active_clients
            return True

-    def get_asuswrt_data(self):
-        """Retrieve data from ASUSWRT and return parsed result."""
+    def ssh_connection(self):
+        """Retrieve data from ASUSWRT via the ssh protocol."""
+        from pexpect import pxssh
+        try:
+            ssh = pxssh.pxssh()
+            ssh.login(self.host, self.username, self.password)
+            ssh.sendline(_IP_NEIGH_CMD)
+            ssh.prompt()
+            neighbors = ssh.before.split(b'\n')[1:-1]
+            ssh.sendline(_LEASES_CMD)
+            ssh.prompt()
+            leases_result = ssh.before.split(b'\n')[1:-1]
+            ssh.logout()
+            return (neighbors, leases_result)
+        except pxssh.ExceptionPxssh as exc:
+            _LOGGER.exception('Unexpected response from router: %s', exc)
+            return ('', '')
+
+    def telnet_connection(self):
+        """Retrieve data from ASUSWRT via the telnet protocol."""
        try:
            telnet = telnetlib.Telnet(self.host)
            telnet.read_until(b'login: ')
@@ -109,18 +131,26 @@ class AsusWrtDeviceScanner(object):
            telnet.read_until(b'Password: ')
            telnet.write((self.password + '\n').encode('ascii'))
            prompt_string = telnet.read_until(b'#').split(b'\n')[-1]
-            telnet.write('ip neigh\n'.encode('ascii'))
+            telnet.write('{}\n'.format(_IP_NEIGH_CMD).encode('ascii'))
            neighbors = telnet.read_until(prompt_string).split(b'\n')[1:-1]
-            telnet.write('cat /var/lib/misc/dnsmasq.leases\n'.encode('ascii'))
+            telnet.write('{}\n'.format(_LEASES_CMD).encode('ascii'))
            leases_result = telnet.read_until(prompt_string).split(b'\n')[1:-1]
            telnet.write('exit\n'.encode('ascii'))
+            return (neighbors, leases_result)
        except EOFError:
            _LOGGER.exception("Unexpected response from router")
-            return
+            return ('', '')
        except ConnectionRefusedError:
-            _LOGGER.exception("Connection refused by router," +
+            _LOGGER.exception("Connection refused by router,"
                              " is telnet enabled?")
-            return
+            return ('', '')
+
+    def get_asuswrt_data(self):
+        """Retrieve data from ASUSWRT and return parsed result."""
+        if self.protocol == 'telnet':
+            neighbors, leases_result = self.telnet_connection()
+        else:
+            neighbors, leases_result = self.ssh_connection()

        devices = {}
        for lease in leases_result:
--- a/homeassistant/components/device_tracker/bluetooth_tracker.py
+++ b/homeassistant/components/device_tracker/bluetooth_tracker.py
@@ -0,0 +1,91 @@
+"""Tracking for bluetooth devices."""
+import logging
+from datetime import timedelta
+
+from homeassistant.helpers.event import track_point_in_utc_time
+from homeassistant.components.device_tracker import (
+    YAML_DEVICES,
+    CONF_TRACK_NEW,
+    CONF_SCAN_INTERVAL,
+    DEFAULT_SCAN_INTERVAL,
+    load_config,
+)
+import homeassistant.util as util
+import homeassistant.util.dt as dt_util
+
+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['pybluez==0.22']
+
+BT_PREFIX = 'BT_'
+
+
+def setup_scanner(hass, config, see):
+    """Setup the Bluetooth Scanner."""
+    # pylint: disable=import-error
+    import bluetooth
+
+    def see_device(device):
+        """Mark a device as seen."""
+        see(mac=BT_PREFIX + device[0], host_name=device[1])
+
+    def discover_devices():
+        """Discover bluetooth devices."""
+        result = bluetooth.discover_devices(duration=8,
+                                            lookup_names=True,
+                                            flush_cache=True,
+                                            lookup_class=False)
+        _LOGGER.debug("Bluetooth devices discovered = " + str(len(result)))
+        return result
+
+    yaml_path = hass.config.path(YAML_DEVICES)
+    devs_to_track = []
+    devs_donot_track = []
+
+    # Load all known devices.
+    # We just need the devices so set consider_home and home range
+    # to 0
+    for device in load_config(yaml_path, hass, 0, 0):
+        # check if device is a valid bluetooth device
+        if device.mac and device.mac[:3].upper() == BT_PREFIX:
+            if device.track:
+                devs_to_track.append(device.mac[3:])
+            else:
+                devs_donot_track.append(device.mac[3:])
+
+    # if track new devices is true discover new devices
+    # on startup.
+    track_new = util.convert(config.get(CONF_TRACK_NEW), bool,
+                             len(devs_to_track) == 0)
+    if track_new:
+        for dev in discover_devices():
+            if dev[0] not in devs_to_track and \
+               dev[0] not in devs_donot_track:
+                devs_to_track.append(dev[0])
+                see_device(dev)
+
+    if not devs_to_track:
+        _LOGGER.warning("No bluetooth devices to track!")
+        return False
+
+    interval = util.convert(config.get(CONF_SCAN_INTERVAL), int,
+                            DEFAULT_SCAN_INTERVAL)
+
+    def update_bluetooth(now):
+        """Lookup bluetooth device and update status."""
+        try:
+            for mac in devs_to_track:
+                _LOGGER.debug("Scanning " + mac)
+                result = bluetooth.lookup_name(mac, timeout=5)
+                if not result:
+                    # Could not lookup device name
+                    continue
+                see_device((mac, result))
+        except bluetooth.BluetoothError:
+            _LOGGER.exception('Error looking up bluetooth device!')
+        track_point_in_utc_time(hass, update_bluetooth,
+                                now + timedelta(seconds=interval))
+
+    update_bluetooth(dt_util.utcnow())
+
+    return True
--- a/homeassistant/components/device_tracker/fritz.py
+++ b/homeassistant/components/device_tracker/fritz.py
@@ -12,7 +12,9 @@ from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle

-REQUIREMENTS = ['fritzconnection==0.4.6']
+REQUIREMENTS = ['https://github.com/deisi/fritzconnection/archive/'
+                'b5c14515e1c8e2652b06b6316a7f3913df942841.zip'
+                '#fritzconnection==0.4.6']

 # Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
--- a/homeassistant/components/device_tracker/icloud.py
+++ b/homeassistant/components/device_tracker/icloud.py
@@ -12,7 +12,7 @@ from homeassistant.helpers.event import track_utc_time_change

 _LOGGER = logging.getLogger(__name__)

-REQUIREMENTS = ['pyicloud==0.7.2']
+REQUIREMENTS = ['pyicloud==0.8.3']

 CONF_INTERVAL = 'interval'
 DEFAULT_INTERVAL = 8
--- a/homeassistant/components/device_tracker/netgear.py
+++ b/homeassistant/components/device_tracker/netgear.py
@@ -9,14 +9,15 @@ import threading
 from datetime import timedelta

 from homeassistant.components.device_tracker import DOMAIN
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, \
+ CONF_PORT
 from homeassistant.util import Throttle

 # Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)
-REQUIREMENTS = ['pynetgear==0.3.2']
+REQUIREMENTS = ['pynetgear==0.3.3']


 def get_scanner(hass, config):
@@ -25,12 +26,13 @@ def get_scanner(hass, config):
    host = info.get(CONF_HOST)
    username = info.get(CONF_USERNAME)
    password = info.get(CONF_PASSWORD)
+    port = info.get(CONF_PORT)

    if password is not None and host is None:
        _LOGGER.warning('Found username or password but no host')
        return None

-    scanner = NetgearDeviceScanner(host, username, password)
+    scanner = NetgearDeviceScanner(host, username, password, port)

    return scanner if scanner.success_init else None

@@ -38,7 +40,7 @@ def get_scanner(hass, config):
 class NetgearDeviceScanner(object):
    """Queries a Netgear wireless router using the SOAP-API."""

-    def __init__(self, host, username, password):
+    def __init__(self, host, username, password, port):
        """Initialize the scanner."""
        import pynetgear

@@ -49,8 +51,10 @@ class NetgearDeviceScanner(object):
            self._api = pynetgear.Netgear()
        elif username is None:
            self._api = pynetgear.Netgear(password, host)
-        else:
+        elif port is None:
            self._api = pynetgear.Netgear(password, host, username)
+        else:
+            self._api = pynetgear.Netgear(password, host, username, port)

        _LOGGER.info("Logging in")

--- a/homeassistant/components/device_tracker/owntracks.py
+++ b/homeassistant/components/device_tracker/owntracks.py
@@ -11,7 +11,7 @@ from collections import defaultdict

 import homeassistant.components.mqtt as mqtt
 from homeassistant.const import STATE_HOME
-from homeassistant.util import convert
+from homeassistant.util import convert, slugify

 DEPENDENCIES = ['mqtt']

@@ -34,21 +34,39 @@ def setup_scanner(hass, config, see):
    """Setup an OwnTracks tracker."""
    max_gps_accuracy = config.get(CONF_MAX_GPS_ACCURACY)

-    def owntracks_location_update(topic, payload, qos):
-        """MQTT message received."""
-        # Docs on available data:
-        # http://owntracks.org/booklet/tech/json/#_typelocation
+    def validate_payload(payload, data_type):
+        """Validate OwnTracks payload."""
        try:
            data = json.loads(payload)
        except ValueError:
            # If invalid JSON
-            _LOGGER.error(
-                'Unable to parse payload as JSON: %s', payload)
-            return
+            _LOGGER.error('Unable to parse payload as JSON: %s', payload)
+            return None
+        if not isinstance(data, dict) or data.get('_type') != data_type:
+            _LOGGER.debug('Skipping %s update for following data '
+                          'because of missing or malformatted data: %s',
+                          data_type, data)
+            return None
+        if max_gps_accuracy is not None and \
+                convert(data.get('acc'), float, 0.0) > max_gps_accuracy:
+            _LOGGER.debug('Skipping %s update because expected GPS '
+                          'accuracy %s is not met: %s',
+                          data_type, max_gps_accuracy, data)
+            return None
+        if convert(data.get('acc'), float, 1.0) == 0.0:
+            _LOGGER.debug('Skipping %s update because GPS accuracy'
+                          'is zero',
+                          data_type)
+            return None

-        if (not isinstance(data, dict) or data.get('_type') != 'location') or (
-                max_gps_accuracy is not None and
-                convert(data.get('acc'), float, 0.0) > max_gps_accuracy):
+        return data
+
+    def owntracks_location_update(topic, payload, qos):
+        """MQTT message received."""
+        # Docs on available data:
+        # http://owntracks.org/booklet/tech/json/#_typelocation
+        data = validate_payload(payload, 'location')
+        if not data:
            return

        dev_id, kwargs = _parse_see_args(topic, data)
@@ -65,44 +83,36 @@ def setup_scanner(hass, config, see):
            see_beacons(dev_id, kwargs)

    def owntracks_event_update(topic, payload, qos):
-        # pylint: disable=too-many-branches, too-many-statements
        """MQTT event (geofences) received."""
        # Docs on available data:
        # http://owntracks.org/booklet/tech/json/#_typetransition
-        try:
-            data = json.loads(payload)
-        except ValueError:
-            # If invalid JSON
-            _LOGGER.error(
-                'Unable to parse payload as JSON: %s', payload)
-            return
-
-        if not isinstance(data, dict) or data.get('_type') != 'transition':
+        data = validate_payload(payload, 'transition')
+        if not data:
            return

        if data.get('desc') is None:
            _LOGGER.error(
-                "Location missing from `enter/exit` message - "
+                "Location missing from `Entering/Leaving` message - "
                "please turn `Share` on in OwnTracks app")
            return
        # OwnTracks uses - at the start of a beacon zone
        # to switch on 'hold mode' - ignore this
-        location = data['desc'].lstrip("-")
+        location = slugify(data['desc'].lstrip("-"))
        if location.lower() == 'home':
            location = STATE_HOME

        dev_id, kwargs = _parse_see_args(topic, data)

-        if data['event'] == 'enter':
+        def enter_event():
+            """Execute enter event."""
            zone = hass.states.get("zone.{}".format(location))
            with LOCK:
-                if zone is None:
-                    if data['t'] == 'b':
-                        # Not a HA zone, and a beacon so assume mobile
-                        beacons = MOBILE_BEACONS_ACTIVE[dev_id]
-                        if location not in beacons:
-                            beacons.append(location)
-                        _LOGGER.info("Added beacon %s", location)
+                if zone is None and data.get('t') == 'b':
+                    # Not a HA zone, and a beacon so assume mobile
+                    beacons = MOBILE_BEACONS_ACTIVE[dev_id]
+                    if location not in beacons:
+                        beacons.append(location)
+                    _LOGGER.info("Added beacon %s", location)
                else:
                    # Normal region
                    regions = REGIONS_ENTERED[dev_id]
@@ -114,7 +124,8 @@ def setup_scanner(hass, config, see):
                see(**kwargs)
                see_beacons(dev_id, kwargs)

-        elif data['event'] == 'leave':
+        def leave_event():
+            """Execute leave event."""
            with LOCK:
                regions = REGIONS_ENTERED[dev_id]
                if location in regions:
@@ -146,6 +157,10 @@ def setup_scanner(hass, config, see):
                    beacons.remove(location)
                    _LOGGER.info("Remove beacon %s", location)

+        if data['event'] == 'enter':
+            enter_event()
+        elif data['event'] == 'leave':
+            leave_event()
        else:
            _LOGGER.error(
                'Misformatted mqtt msgs, _type=transition, event=%s',
--- a/homeassistant/components/device_tracker/unifi.py
+++ b/homeassistant/components/device_tracker/unifi.py
@@ -12,7 +12,8 @@ from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
 from homeassistant.helpers import validate_config

 # Unifi package doesn't list urllib3 as a requirement
-REQUIREMENTS = ['urllib3', 'unifi==1.2.4']
+REQUIREMENTS = ['urllib3', 'unifi==1.2.5']
+
 _LOGGER = logging.getLogger(__name__)
 CONF_PORT = 'port'

--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -15,10 +15,12 @@ from homeassistant.const import (
    EVENT_PLATFORM_DISCOVERED)

 DOMAIN = "discovery"
-REQUIREMENTS = ['netdisco==0.6.1']
+REQUIREMENTS = ['netdisco==0.6.7']

 SCAN_INTERVAL = 300  # seconds

+LOAD_PLATFORM = 'load_platform'
+
 SERVICE_WEMO = 'belkin_wemo'
 SERVICE_HUE = 'philips_hue'
 SERVICE_CAST = 'google_cast'
@@ -27,6 +29,7 @@ SERVICE_SONOS = 'sonos'
 SERVICE_PLEX = 'plex_mediaserver'
 SERVICE_SQUEEZEBOX = 'logitech_mediaserver'
 SERVICE_PANASONIC_VIERA = 'panasonic_viera'
+SERVICE_ROKU = 'roku'

 SERVICE_HANDLERS = {
    SERVICE_WEMO: "wemo",
@@ -37,6 +40,7 @@ SERVICE_HANDLERS = {
    SERVICE_PLEX: 'media_player',
    SERVICE_SQUEEZEBOX: 'media_player',
    SERVICE_PANASONIC_VIERA: 'media_player',
+    SERVICE_ROKU: 'media_player',
 }


@@ -52,7 +56,7 @@ def listen(hass, service, callback):

    def discovery_event_listener(event):
        """Listen for discovery events."""
-        if event.data[ATTR_SERVICE] in service:
+        if ATTR_SERVICE in event.data and event.data[ATTR_SERVICE] in service:
            callback(event.data[ATTR_SERVICE], event.data.get(ATTR_DISCOVERED))

    hass.bus.listen(EVENT_PLATFORM_DISCOVERED, discovery_event_listener)
@@ -73,6 +77,32 @@ def discover(hass, service, discovered=None, component=None, hass_config=None):
    hass.bus.fire(EVENT_PLATFORM_DISCOVERED, data)


+def load_platform(hass, component, platform, info=None, hass_config=None):
+    """Helper method for generic platform loading.
+
+    This method allows a platform to be loaded dynamically without it being
+    known at runtime (in the DISCOVERY_PLATFORMS list of the component).
+    Advantages of using this method:
+    - Any component & platforms combination can be dynamically added
+    - A component (i.e. light) does not have to import every component
+      that can dynamically add a platform (e.g. wemo, wink, insteon_hub)
+    - Custom user components can take advantage of discovery/loading
+
+    Target components will be loaded and an EVENT_PLATFORM_DISCOVERED will be
+    fired to load the platform. The event will contain:
+        { ATTR_SERVICE = LOAD_PLATFORM + '.' + <<component>>
+          ATTR_DISCOVERED = {LOAD_PLATFORM: <<platform>>} }
+
+    * dev note: This listener can be found in entity_component.py
+    """
+    if info is None:
+        info = {LOAD_PLATFORM: platform}
+    else:
+        info[LOAD_PLATFORM] = platform
+    discover(hass, LOAD_PLATFORM + '.' + component, info, component,
+             hass_config)
+
+
 def setup(hass, config):
    """Start a discovery service."""
    logger = logging.getLogger(__name__)
--- a/homeassistant/components/downloader.py
+++ b/homeassistant/components/downloader.py
@@ -10,8 +10,10 @@ import re
 import threading

 import requests
+import voluptuous as vol

 from homeassistant.helpers import validate_config
+import homeassistant.helpers.config_validation as cv
 from homeassistant.util import sanitize_filename

 DOMAIN = "downloader"
@@ -21,6 +23,11 @@ SERVICE_DOWNLOAD_FILE = "download_file"
 ATTR_URL = "url"
 ATTR_SUBDIR = "subdir"

+SERVICE_DOWNLOAD_FILE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_URL): vol.Url,
+    vol.Optional(ATTR_SUBDIR): cv.string,
+})
+
 CONF_DOWNLOAD_DIR = 'download_dir'


@@ -48,10 +55,6 @@ def setup(hass, config):

    def download_file(service):
        """Start thread to download file specified in the URL."""
-        if ATTR_URL not in service.data:
-            logger.error("Service called but 'url' parameter not specified.")
-            return
-
        def do_download():
            """Download the file."""
            try:
@@ -127,7 +130,7 @@ def setup(hass, config):

        threading.Thread(target=do_download).start()

-    hass.services.register(DOMAIN, SERVICE_DOWNLOAD_FILE,
-                           download_file)
+    hass.services.register(DOMAIN, SERVICE_DOWNLOAD_FILE, download_file,
+                           schema=SERVICE_DOWNLOAD_FILE_SCHEMA)

    return True
--- a/homeassistant/components/dweet.py
+++ b/homeassistant/components/dweet.py
@@ -0,0 +1,73 @@
+"""
+A component which allows you to send data to Dweet.io.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/dweet/
+"""
+import logging
+from datetime import timedelta
+import voluptuous as vol
+
+from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNKNOWN
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import state as state_helper
+from homeassistant.util import Throttle
+
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = "dweet"
+DEPENDENCIES = []
+
+REQUIREMENTS = ['dweepy==0.2.0']
+
+CONF_NAME = 'name'
+CONF_WHITELIST = 'whitelist'
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=1)
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_NAME): cv.string,
+        vol.Required(CONF_WHITELIST): cv.string,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+# pylint: disable=too-many-locals
+def setup(hass, config):
+    """Setup the Dweet.io component."""
+    conf = config[DOMAIN]
+    name = conf[CONF_NAME]
+    whitelist = conf.get(CONF_WHITELIST, [])
+    json_body = {}
+
+    def dweet_event_listener(event):
+        """Listen for new messages on the bus and sends them to Dweet.io."""
+        state = event.data.get('new_state')
+        if state is None or state.state in (STATE_UNKNOWN, '') \
+                or state.entity_id not in whitelist:
+            return
+
+        try:
+            _state = state_helper.state_as_number(state)
+        except ValueError:
+            _state = state.state
+
+        json_body[state.attributes.get('friendly_name')] = _state
+
+        send_data(name, json_body)
+
+    hass.bus.listen(EVENT_STATE_CHANGED, dweet_event_listener)
+
+    return True
+
+
+@Throttle(MIN_TIME_BETWEEN_UPDATES)
+def send_data(name, msg):
+    """Send the collected data to Dweet.io."""
+    import dweepy
+    try:
+        dweepy.dweet_for(name, msg)
+    except dweepy.DweepyError:
+        _LOGGER.error("Error saving data '%s' to Dweet.io", msg)
--- a/homeassistant/components/ecobee.py
+++ b/homeassistant/components/ecobee.py
@@ -22,7 +22,7 @@ HOLD_TEMP = 'hold_temp'

 REQUIREMENTS = [
    'https://github.com/nkgilley/python-ecobee-api/archive/'
-    '92a2f330cbaf601d0618456fdd97e5a8c42c1c47.zip#python-ecobee==0.0.4']
+    '4a884bc146a93991b4210f868f3d6aecf0a181e6.zip#python-ecobee==0.0.5']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/feedreader.py
+++ b/homeassistant/components/feedreader.py
@@ -0,0 +1,110 @@
+"""
+Support for RSS/Atom feed.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/feedreader/
+"""
+from datetime import datetime
+from logging import getLogger
+import voluptuous as vol
+from homeassistant.const import EVENT_HOMEASSISTANT_START
+from homeassistant.helpers.event import track_utc_time_change
+
+REQUIREMENTS = ['feedparser==5.2.1']
+_LOGGER = getLogger(__name__)
+DOMAIN = "feedreader"
+EVENT_FEEDREADER = "feedreader"
+# pylint: disable=no-value-for-parameter
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: {
+        'urls': [vol.Url()],
+    }
+}, extra=vol.ALLOW_EXTRA)
+MAX_ENTRIES = 20
+
+
+# pylint: disable=too-few-public-methods
+class FeedManager(object):
+    """Abstraction over feedparser module."""
+
+    def __init__(self, url, hass):
+        """Initialize the FeedManager object, poll every hour."""
+        self._url = url
+        self._feed = None
+        self._hass = hass
+        self._firstrun = True
+        # Initialize last entry timestamp as epoch time
+        self._last_entry_timestamp = datetime.utcfromtimestamp(0).timetuple()
+        hass.bus.listen_once(EVENT_HOMEASSISTANT_START,
+                             lambda _: self._update())
+        track_utc_time_change(hass, lambda now: self._update(),
+                              minute=0, second=0)
+
+    def _log_no_entries(self):
+        """Send no entries log at debug level."""
+        _LOGGER.debug('No new entries in feed "%s"', self._url)
+
+    def _update(self):
+        """Update the feed and publish new entries to the event bus."""
+        import feedparser
+        _LOGGER.info('Fetching new data from feed "%s"', self._url)
+        self._feed = feedparser.parse(self._url,
+                                      etag=None if not self._feed
+                                      else self._feed.get('etag'),
+                                      modified=None if not self._feed
+                                      else self._feed.get('modified'))
+        if not self._feed:
+            _LOGGER.error('Error fetching feed data from "%s"', self._url)
+        else:
+            if self._feed.bozo != 0:
+                _LOGGER.error('Error parsing feed "%s"', self._url)
+            # Using etag and modified, if there's no new data available,
+            # the entries list will be empty
+            elif len(self._feed.entries) > 0:
+                _LOGGER.debug('%s entri(es) available in feed "%s"',
+                              len(self._feed.entries),
+                              self._url)
+                if len(self._feed.entries) > MAX_ENTRIES:
+                    _LOGGER.debug('Publishing only the first %s entries '
+                                  'in feed "%s"', MAX_ENTRIES, self._url)
+                    self._feed.entries = self._feed.entries[0:MAX_ENTRIES]
+                self._publish_new_entries()
+            else:
+                self._log_no_entries()
+        _LOGGER.info('Fetch from feed "%s" completed', self._url)
+
+    def _update_and_fire_entry(self, entry):
+        """Update last_entry_timestamp and fire entry."""
+        # We are lucky, `published_parsed` data available,
+        # let's make use of it to publish only new available
+        # entries since the last run
+        if 'published_parsed' in entry.keys():
+            self._last_entry_timestamp = max(entry.published_parsed,
+                                             self._last_entry_timestamp)
+        else:
+            _LOGGER.debug('No `published_parsed` info available '
+                          'for entry "%s"', entry.title)
+        entry.update({'feed_url': self._url})
+        self._hass.bus.fire(EVENT_FEEDREADER, entry)
+
+    def _publish_new_entries(self):
+        """Publish new entries to the event bus."""
+        new_entries = False
+        for entry in self._feed.entries:
+            if self._firstrun or (
+                    'published_parsed' in entry.keys() and
+                    entry.published_parsed > self._last_entry_timestamp):
+                self._update_and_fire_entry(entry)
+                new_entries = True
+            else:
+                _LOGGER.debug('Entry "%s" already processed', entry.title)
+        if not new_entries:
+            self._log_no_entries()
+        self._firstrun = False
+
+
+def setup(hass, config):
+    """Setup the feedreader component."""
+    urls = config.get(DOMAIN)['urls']
+    feeds = [FeedManager(url, hass) for url in urls]
+    return len(feeds) > 0
--- a/homeassistant/components/frontend/index.html.template
+++ b/homeassistant/components/frontend/index.html.template
@@ -28,20 +28,55 @@
        left: 0;
        right: 0;
        bottom: 0;
-        margin-bottom: 123px;
+        margin-bottom: 97px;
+        font-family: Roboto, sans-serif;
+        font-size: 0pt;
+        transition: font-size 2s;
+      }
+
+      #ha-init-skeleton paper-spinner {
+        height: 28px;
+      }
+
+      #ha-init-skeleton a {
+        color: #03A9F4;
+        text-decoration: none;
+        font-weight: bold;
+      }
+
+      #ha-init-skeleton.error {
+        font-size: 16px;
+      }
+
+      #ha-init-skeleton.error img,
+      #ha-init-skeleton.error paper-spinner {
+        display: none;
      }
    </style>
-    <link rel='import' href='/static/{{ app_url }}' async>
+    <script>
+      function initError() {
+        document
+          .getElementById('ha-init-skeleton')
+          .classList.add('error');
+      }
+    </script>
+    <link rel='import' href='/static/{{ app_url }}' onerror='initError()' async>
  </head>
  <body fullbleed>
-    <div id='ha-init-skeleton'><img src='/static/favicon-192x192.png' height='192'></div>
+    <div id='ha-init-skeleton'>
+      <img src='/static/favicon-192x192.png' height='192'>
+      <paper-spinner active></paper-spinner>
+      Home Assistant had trouble<br>connecting to the server.<br><br><a href='/'>TRY AGAIN</a>
+    </div>
    <script>
-      var webComponentsSupported = ('registerElement' in document &&
-                                    'import' in document.createElement('link') &&
-                                    'content' in document.createElement('template'))
+      var webComponentsSupported = (
+        'registerElement' in document &&
+        'import' in document.createElement('link') &&
+        'content' in document.createElement('template'));
      if (!webComponentsSupported) {
        var script = document.createElement('script')
        script.async = true
+        script.onerror = initError;
        script.src = '/static/webcomponents-lite.min.js'
        document.head.appendChild(script)
      }
--- a/homeassistant/components/frontend/mdi_version.py
+++ b/homeassistant/components/frontend/mdi_version.py
@@ -1,2 +1,2 @@
 """DO NOT MODIFY. Auto-generated by update_mdi script."""
-VERSION = "df49e6b7c930eb39b42ff1909712e95e"
+VERSION = "1baebe8155deb447230866d7ae854bd9"
--- a/homeassistant/components/frontend/version.py
+++ b/homeassistant/components/frontend/version.py
@@ -1,2 +1,2 @@
 """DO NOT MODIFY. Auto-generated by build_frontend script."""
-VERSION = "c2932592a6946e955ddc46f31409b81f"
+VERSION = "0a226e905af198b2dabf1ce154844568"
--- a/homeassistant/components/frontend/www_static/frontend.html
+++ b/homeassistant/components/frontend/www_static/frontend.html
--- a/homeassistant/components/frontend/www_static/home-assistant-polymer
+++ b/homeassistant/components/frontend/www_static/home-assistant-polymer
--- a/homeassistant/components/frontend/www_static/images/card_media_player_bg.png
+++ b/homeassistant/components/frontend/www_static/images/card_media_player_bg.png
--- a/homeassistant/components/frontend/www_static/images/config_fitbit_app.png
+++ b/homeassistant/components/frontend/www_static/images/config_fitbit_app.png
--- a/homeassistant/components/frontend/www_static/images/config_webos.png
+++ b/homeassistant/components/frontend/www_static/images/config_webos.png
--- a/homeassistant/components/frontend/www_static/mdi.html
+++ b/homeassistant/components/frontend/www_static/mdi.html
--- a/homeassistant/components/frontend/www_static/service_worker.js
+++ b/homeassistant/components/frontend/www_static/service_worker.js
@@ -1,5 +1 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var s=n[r]={exports:{},id:r,loaded:!1};return e[r].call(s.exports,s,s.exports,t),s.loaded=!0,s.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([/*!*************************************!*\
-  !*** ./src/service-worker/index.js ***!
-  \*************************************/
-function(e,t,n){"use strict";var r="0.10",s="/",c=["/","/logbook","/history","/map","/devService","/devState","/devEvent","/devInfo","/states"],i=["/static/favicon-192x192.png"];self.addEventListener("install",function(e){e.waitUntil(caches.open(r).then(function(e){return e.addAll(i.concat(s))}))}),self.addEventListener("activate",function(e){}),self.addEventListener("message",function(e){}),self.addEventListener("fetch",function(e){var t=e.request.url.substr(e.request.url.indexOf("/",8));i.includes(t)&&e.respondWith(caches.open(r).then(function(t){return t.match(e.request)})),c.includes(t)&&e.respondWith(caches.open(r).then(function(t){return t.match(s).then(function(n){return n||fetch(e.request).then(function(e){return t.put(s,e.clone()),e})})}))})}]);
-//# sourceMappingURL=service_worker.js.map
+!function(e){function t(r){if(n[r])return n[r].exports;var s=n[r]={i:r,l:!1,exports:{}};return e[r].call(s.exports,s,s.exports,t),s.l=!0,s.exports}var n={};return t.m=e,t.c=n,t.p="",t(t.s=194)}({194:function(e,t,n){var r="0.10",s="/",c=["/","/logbook","/history","/map","/devService","/devState","/devEvent","/devInfo","/states"],i=["/static/favicon-192x192.png"];self.addEventListener("install",function(e){e.waitUntil(caches.open(r).then(function(e){return e.addAll(i.concat(s))}))}),self.addEventListener("activate",function(e){}),self.addEventListener("message",function(e){}),self.addEventListener("fetch",function(e){var t=e.request.url.substr(e.request.url.indexOf("/",8));i.includes(t)&&e.respondWith(caches.open(r).then(function(t){return t.match(e.request)})),c.includes(t)&&e.respondWith(caches.open(r).then(function(t){return t.match(s).then(function(n){return n||fetch(e.request).then(function(e){return t.put(s,e.clone()),e})})}))})}});
--- a/homeassistant/components/frontend/www_static/webcomponents-lite.min.js
+++ b/homeassistant/components/frontend/www_static/webcomponents-lite.min.js
--- a/homeassistant/components/garage_door/init.py
+++ b/homeassistant/components/garage_door/init.py
@@ -7,10 +7,13 @@ at https://home-assistant.io/components/garage_door/
 import logging
 import os

+import voluptuous as vol
+
 from homeassistant.config import load_yaml_config_file
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (
    STATE_CLOSED, STATE_OPEN, STATE_UNKNOWN, SERVICE_CLOSE, SERVICE_OPEN,
    ATTR_ENTITY_ID)
@@ -29,6 +32,10 @@ DISCOVERY_PLATFORMS = {
    wink.DISCOVER_GARAGE_DOORS: 'wink'
 }

+GARAGE_DOOR_SERVICE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+})
+
 _LOGGER = logging.getLogger(__name__)


@@ -73,10 +80,11 @@ def setup(hass, config):
    descriptions = load_yaml_config_file(
        os.path.join(os.path.dirname(__file__), 'services.yaml'))
    hass.services.register(DOMAIN, SERVICE_OPEN, handle_garage_door_service,
-                           descriptions.get(SERVICE_OPEN))
+                           descriptions.get(SERVICE_OPEN),
+                           schema=GARAGE_DOOR_SERVICE_SCHEMA)
    hass.services.register(DOMAIN, SERVICE_CLOSE, handle_garage_door_service,
-                           descriptions.get(SERVICE_CLOSE))
-
+                           descriptions.get(SERVICE_CLOSE),
+                           schema=GARAGE_DOOR_SERVICE_SCHEMA)
    return True


--- a/homeassistant/components/garage_door/mqtt.py
+++ b/homeassistant/components/garage_door/mqtt.py
@@ -0,0 +1,139 @@
+"""
+Support for MQTT garage doors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/garage_door.mqtt/
+"""
+import logging
+
+import voluptuous as vol
+from homeassistant.const import (STATE_OPEN, STATE_CLOSED, SERVICE_OPEN,
+                                 SERVICE_CLOSE)
+import homeassistant.components.mqtt as mqtt
+from homeassistant.components.garage_door import GarageDoorDevice
+from homeassistant.const import (
+    CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE)
+from homeassistant.components.mqtt import (
+    CONF_STATE_TOPIC, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import template
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_STATE_OPEN = 'state_open'
+CONF_STATE_CLOSED = 'state_closed'
+CONF_SERVICE_OPEN = 'service_open'
+CONF_SERVICE_CLOSE = 'service_close'
+
+DEFAULT_NAME = 'MQTT Garage Door'
+DEFAULT_OPTIMISTIC = False
+DEFAULT_RETAIN = False
+
+DEPENDENCIES = ['mqtt']
+
+PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+    vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
+    vol.Optional(CONF_RETAIN, default=DEFAULT_RETAIN): cv.boolean,
+    vol.Optional(CONF_STATE_OPEN, default=STATE_OPEN): cv.string,
+    vol.Optional(CONF_STATE_CLOSED, default=STATE_CLOSED): cv.string,
+    vol.Optional(CONF_SERVICE_OPEN, default=SERVICE_OPEN): cv.string,
+    vol.Optional(CONF_SERVICE_CLOSE, default=SERVICE_CLOSE): cv.string
+})
+
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Add MQTT Garage Door."""
+    add_devices_callback([MqttGarageDoor(
+        hass,
+        config[CONF_NAME],
+        config.get(CONF_STATE_TOPIC),
+        config[CONF_COMMAND_TOPIC],
+        config[CONF_QOS],
+        config[CONF_RETAIN],
+        config[CONF_STATE_OPEN],
+        config[CONF_STATE_CLOSED],
+        config[CONF_SERVICE_OPEN],
+        config[CONF_SERVICE_CLOSE],
+        config[CONF_OPTIMISTIC],
+        config.get(CONF_VALUE_TEMPLATE))])
+
+
+# pylint: disable=too-many-arguments, too-many-instance-attributes
+class MqttGarageDoor(GarageDoorDevice):
+    """Representation of a MQTT garage door."""
+
+    def __init__(self, hass, name, state_topic, command_topic, qos, retain,
+                 state_open, state_closed, service_open, service_close,
+                 optimistic, value_template):
+        """Initialize the garage door."""
+        self._hass = hass
+        self._name = name
+        self._state_topic = state_topic
+        self._command_topic = command_topic
+        self._qos = qos
+        self._retain = retain
+        self._state_open = state_open
+        self._state_closed = state_closed
+        self._service_open = service_open
+        self._service_close = service_close
+        self._optimistic = optimistic or state_topic is None
+        self._state = False
+
+        def message_received(topic, payload, qos):
+            """A new MQTT message has been received."""
+            if value_template is not None:
+                payload = template.render_with_possible_json_value(
+                    hass, value_template, payload)
+            if payload == self._state_open:
+                self._state = True
+                self.update_ha_state()
+            elif payload == self._state_closed:
+                self._state = False
+                self.update_ha_state()
+
+        if self._state_topic is None:
+            # Force into optimistic mode.
+            self._optimistic = True
+        else:
+            mqtt.subscribe(hass, self._state_topic, message_received,
+                           self._qos)
+
+    @property
+    def name(self):
+        """Return the name of the garage door if any."""
+        return self._name
+
+    @property
+    def is_opened(self):
+        """Return true if door is closed."""
+        return self._state
+
+    @property
+    def is_closed(self):
+        """Return true if door is closed."""
+        return self._state is False
+
+    @property
+    def assumed_state(self):
+        """Return true if we do optimistic updates."""
+        return self._optimistic
+
+    def close_door(self):
+        """Close the door."""
+        mqtt.publish(self.hass, self._command_topic, self._service_close,
+                     self._qos, self._retain)
+        if self._optimistic:
+            # Optimistically assume that door has changed state.
+            self._state = False
+            self.update_ha_state()
+
+    def open_door(self):
+        """Open the door."""
+        mqtt.publish(self.hass, self._command_topic, self._service_open,
+                     self._qos, self._retain)
+        if self._optimistic:
+            # Optimistically assume that door has changed state.
+            self._state = True
+            self.update_ha_state()
--- a/homeassistant/components/garage_door/wink.py
+++ b/homeassistant/components/garage_door/wink.py
@@ -7,9 +7,9 @@ https://home-assistant.io/components/garage_door.wink/
 import logging

 from homeassistant.components.garage_door import GarageDoorDevice
-from homeassistant.const import CONF_ACCESS_TOKEN
+from homeassistant.const import CONF_ACCESS_TOKEN, ATTR_BATTERY_LEVEL

-REQUIREMENTS = ['python-wink==0.6.4']
+REQUIREMENTS = ['python-wink==0.7.6']


 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -37,6 +37,7 @@ class WinkGarageDoorDevice(GarageDoorDevice):
    def __init__(self, wink):
        """Initialize the garage door."""
        self.wink = wink
+        self._battery = self.wink.battery_level

    @property
    def unique_id(self):
@@ -69,3 +70,16 @@ class WinkGarageDoorDevice(GarageDoorDevice):
    def open_door(self):
        """Open the door."""
        self.wink.set_state(1)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        if self._battery:
+            return {
+                ATTR_BATTERY_LEVEL: self._battery_level,
+            }
+
+    @property
+    def _battery_level(self):
+        """Return the battery level."""
+        return self.wink.battery_level * 100
--- a/homeassistant/components/history.py
+++ b/homeassistant/components/history.py
@@ -182,7 +182,7 @@ def _api_history_period(handler, path_match, data):
    one_day = timedelta(seconds=86400)

    if date_str:
-        start_date = dt_util.date_str_to_date(date_str)
+        start_date = dt_util.parse_date(date_str)

        if start_date is None:
            handler.write_json_message("Error parsing JSON", HTTP_BAD_REQUEST)
--- a/homeassistant/components/http.py
+++ b/homeassistant/components/http.py
@@ -5,6 +5,7 @@ For more details about the RESTful API, please refer to the documentation at
 https://home-assistant.io/developers/api/
 """
 import gzip
+import hmac
 import json
 import logging
 import ssl
@@ -15,18 +16,23 @@ from http import cookies
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from socketserver import ThreadingMixIn
 from urllib.parse import parse_qs, urlparse
+import voluptuous as vol

 import homeassistant.bootstrap as bootstrap
 import homeassistant.core as ha
 import homeassistant.remote as rem
 import homeassistant.util as util
 import homeassistant.util.dt as date_util
+import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (
    CONTENT_TYPE_JSON, CONTENT_TYPE_TEXT_PLAIN, HTTP_HEADER_ACCEPT_ENCODING,
    HTTP_HEADER_CACHE_CONTROL, HTTP_HEADER_CONTENT_ENCODING,
    HTTP_HEADER_CONTENT_LENGTH, HTTP_HEADER_CONTENT_TYPE, HTTP_HEADER_EXPIRES,
-    HTTP_HEADER_HA_AUTH, HTTP_HEADER_VARY, HTTP_METHOD_NOT_ALLOWED,
+    HTTP_HEADER_HA_AUTH, HTTP_HEADER_VARY,
+    HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
+    HTTP_HEADER_ACCESS_CONTROL_ALLOW_HEADERS, HTTP_METHOD_NOT_ALLOWED,
    HTTP_NOT_FOUND, HTTP_OK, HTTP_UNAUTHORIZED, HTTP_UNPROCESSABLE_ENTITY,
+    ALLOWED_CORS_HEADERS,
    SERVER_PORT, URL_ROOT, URL_API_EVENT_FORWARD)

 DOMAIN = "http"
@@ -37,6 +43,7 @@ CONF_SERVER_PORT = "server_port"
 CONF_DEVELOPMENT = "development"
 CONF_SSL_CERTIFICATE = 'ssl_certificate'
 CONF_SSL_KEY = 'ssl_key'
+CONF_CORS_ORIGINS = 'cors_allowed_origins'

 DATA_API_PASSWORD = 'api_password'

@@ -47,6 +54,19 @@ SESSION_KEY = 'sessionId'

 _LOGGER = logging.getLogger(__name__)

+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Optional(CONF_API_PASSWORD): cv.string,
+        vol.Optional(CONF_SERVER_HOST): cv.string,
+        vol.Optional(CONF_SERVER_PORT, default=SERVER_PORT):
+            vol.All(vol.Coerce(int), vol.Range(min=1, max=65535)),
+        vol.Optional(CONF_DEVELOPMENT): cv.string,
+        vol.Optional(CONF_SSL_CERTIFICATE): cv.isfile,
+        vol.Optional(CONF_SSL_KEY): cv.isfile,
+        vol.Optional(CONF_CORS_ORIGINS): cv.ensure_list
+    }),
+}, extra=vol.ALLOW_EXTRA)
+

 def setup(hass, config):
    """Set up the HTTP API and debug interface."""
@@ -60,11 +80,12 @@ def setup(hass, config):
    development = str(conf.get(CONF_DEVELOPMENT, "")) == "1"
    ssl_certificate = conf.get(CONF_SSL_CERTIFICATE)
    ssl_key = conf.get(CONF_SSL_KEY)
+    cors_origins = conf.get(CONF_CORS_ORIGINS, [])

    try:
        server = HomeAssistantHTTPServer(
            (server_host, server_port), RequestHandler, hass, api_password,
-            development, ssl_certificate, ssl_key)
+            development, ssl_certificate, ssl_key, cors_origins)
    except OSError:
        # If address already in use
        _LOGGER.exception("Error setting up HTTP server")
@@ -95,7 +116,8 @@ class HomeAssistantHTTPServer(ThreadingMixIn, HTTPServer):

    # pylint: disable=too-many-arguments
    def __init__(self, server_address, request_handler_class,
-                 hass, api_password, development, ssl_certificate, ssl_key):
+                 hass, api_password, development, ssl_certificate, ssl_key,
+                 cors_origins):
        """Initialize the server."""
        super().__init__(server_address, request_handler_class)

@@ -106,6 +128,7 @@ class HomeAssistantHTTPServer(ThreadingMixIn, HTTPServer):
        self.paths = []
        self.sessions = SessionStore()
        self.use_ssl = ssl_certificate is not None
+        self.cors_origins = cors_origins

        # We will lazy init this one if needed
        self.event_forwarder = None
@@ -200,12 +223,22 @@ class RequestHandler(SimpleHTTPRequestHandler):
                    "Error parsing JSON", HTTP_UNPROCESSABLE_ENTITY)
                return

-        self.authenticated = (self.server.api_password is None or
-                              self.headers.get(HTTP_HEADER_HA_AUTH) ==
-                              self.server.api_password or
-                              data.get(DATA_API_PASSWORD) ==
-                              self.server.api_password or
-                              self.verify_session())
+        if self.verify_session():
+            # The user has a valid session already
+            self.authenticated = True
+        elif self.server.api_password is None:
+            # No password is set, so everyone is authenticated
+            self.authenticated = True
+        elif hmac.compare_digest(self.headers.get(HTTP_HEADER_HA_AUTH, ''),
+                                 self.server.api_password):
+            # A valid auth header has been set
+            self.authenticated = True
+        elif hmac.compare_digest(data.get(DATA_API_PASSWORD, ''),
+                                 self.server.api_password):
+            # A valid password has been specified
+            self.authenticated = True
+        else:
+            self.authenticated = False

        # we really shouldn't need to forward the password from here
        if url.path not in [URL_ROOT, URL_API_EVENT_FORWARD]:
@@ -340,6 +373,16 @@ class RequestHandler(SimpleHTTPRequestHandler):
            self.send_header(HTTP_HEADER_VARY, HTTP_HEADER_ACCEPT_ENCODING)

        self.send_header(HTTP_HEADER_CONTENT_LENGTH, str(len(content)))
+
+        cors_check = (self.headers.get("Origin") in self.server.cors_origins)
+
+        cors_headers = ", ".join(ALLOWED_CORS_HEADERS)
+
+        if self.server.cors_origins and cors_check:
+            self.send_header(HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
+                             self.headers.get("Origin"))
+            self.send_header(HTTP_HEADER_ACCESS_CONTROL_ALLOW_HEADERS,
+                             cors_headers)
        self.end_headers()

        if self.command == 'HEAD':
--- a/homeassistant/components/hvac/init.py
+++ b/homeassistant/components/hvac/init.py
@@ -0,0 +1,502 @@
+"""
+Provides functionality to interact with hvacs.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/hvac/
+"""
+import logging
+import os
+
+from homeassistant.helpers.entity_component import EntityComponent
+
+from homeassistant.config import load_yaml_config_file
+import homeassistant.util as util
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.temperature import convert
+from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+from homeassistant.components import zwave
+from homeassistant.const import (
+    ATTR_ENTITY_ID, ATTR_TEMPERATURE, STATE_ON, STATE_OFF, STATE_UNKNOWN,
+    TEMP_CELCIUS)
+
+DOMAIN = "hvac"
+
+ENTITY_ID_FORMAT = DOMAIN + ".{}"
+SCAN_INTERVAL = 60
+
+SERVICE_SET_AWAY_MODE = "set_away_mode"
+SERVICE_SET_AUX_HEAT = "set_aux_heat"
+SERVICE_SET_TEMPERATURE = "set_temperature"
+SERVICE_SET_FAN_MODE = "set_fan_mode"
+SERVICE_SET_OPERATION_MODE = "set_operation_mode"
+SERVICE_SET_SWING_MODE = "set_swing_mode"
+SERVICE_SET_HUMIDITY = "set_humidity"
+
+STATE_HEAT = "heat"
+STATE_COOL = "cool"
+STATE_IDLE = "idle"
+STATE_AUTO = "auto"
+STATE_DRY = "dry"
+STATE_FAN_ONLY = "fan_only"
+
+ATTR_CURRENT_TEMPERATURE = "current_temperature"
+ATTR_MAX_TEMP = "max_temp"
+ATTR_MIN_TEMP = "min_temp"
+ATTR_AWAY_MODE = "away_mode"
+ATTR_AUX_HEAT = "aux_heat"
+ATTR_FAN_MODE = "fan_mode"
+ATTR_FAN_LIST = "fan_list"
+ATTR_CURRENT_HUMIDITY = "current_humidity"
+ATTR_HUMIDITY = "humidity"
+ATTR_MAX_HUMIDITY = "max_humidity"
+ATTR_MIN_HUMIDITY = "min_humidity"
+ATTR_OPERATION_MODE = "operation_mode"
+ATTR_OPERATION_LIST = "operation_list"
+ATTR_SWING_MODE = "swing_mode"
+ATTR_SWING_LIST = "swing_list"
+
+_LOGGER = logging.getLogger(__name__)
+
+DISCOVERY_PLATFORMS = {
+    zwave.DISCOVER_HVAC: 'zwave'
+}
+
+
+def set_away_mode(hass, away_mode, entity_id=None):
+    """Turn all or specified hvac away mode on."""
+    data = {
+        ATTR_AWAY_MODE: away_mode
+    }
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_AWAY_MODE, data)
+
+
+def set_aux_heat(hass, aux_heat, entity_id=None):
+    """Turn all or specified hvac auxillary heater on."""
+    data = {
+        ATTR_AUX_HEAT: aux_heat
+    }
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_AUX_HEAT, data)
+
+
+def set_temperature(hass, temperature, entity_id=None):
+    """Set new target temperature."""
+    data = {ATTR_TEMPERATURE: temperature}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_TEMPERATURE, data)
+
+
+def set_humidity(hass, humidity, entity_id=None):
+    """Set new target humidity."""
+    data = {ATTR_HUMIDITY: humidity}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_HUMIDITY, data)
+
+
+def set_fan_mode(hass, fan, entity_id=None):
+    """Turn all or specified hvac fan mode on."""
+    data = {ATTR_FAN_MODE: fan}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_FAN_MODE, data)
+
+
+def set_operation_mode(hass, operation_mode, entity_id=None):
+    """Set new target operation mode."""
+    data = {ATTR_OPERATION_MODE: operation_mode}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_OPERATION_MODE, data)
+
+
+def set_swing_mode(hass, swing_mode, entity_id=None):
+    """Set new target swing mode."""
+    data = {ATTR_SWING_MODE: swing_mode}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_SWING_MODE, data)
+
+
+# pylint: disable=too-many-branches
+def setup(hass, config):
+    """Setup hvacs."""
+    component = EntityComponent(_LOGGER, DOMAIN, hass,
+                                SCAN_INTERVAL, DISCOVERY_PLATFORMS)
+    component.setup(config)
+
+    descriptions = load_yaml_config_file(
+        os.path.join(os.path.dirname(__file__), 'services.yaml'))
+
+    def away_mode_set_service(service):
+        """Set away mode on target hvacs."""
+        target_hvacs = component.extract_from_service(service)
+
+        away_mode = service.data.get(ATTR_AWAY_MODE)
+
+        if away_mode is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_AWAY_MODE, ATTR_AWAY_MODE)
+            return
+
+        for hvac in target_hvacs:
+            if away_mode:
+                hvac.turn_away_mode_on()
+            else:
+                hvac.turn_away_mode_off()
+
+            if hvac.should_poll:
+                hvac.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_AWAY_MODE, away_mode_set_service,
+        descriptions.get(SERVICE_SET_AWAY_MODE))
+
+    def aux_heat_set_service(service):
+        """Set auxillary heater on target hvacs."""
+        target_hvacs = component.extract_from_service(service)
+
+        aux_heat = service.data.get(ATTR_AUX_HEAT)
+
+        if aux_heat is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_AUX_HEAT, ATTR_AUX_HEAT)
+            return
+
+        for hvac in target_hvacs:
+            if aux_heat:
+                hvac.turn_aux_heat_on()
+            else:
+                hvac.turn_aux_heat_off()
+
+            if hvac.should_poll:
+                hvac.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_AUX_HEAT, aux_heat_set_service,
+        descriptions.get(SERVICE_SET_AUX_HEAT))
+
+    def temperature_set_service(service):
+        """Set temperature on the target hvacs."""
+        target_hvacs = component.extract_from_service(service)
+
+        temperature = util.convert(
+            service.data.get(ATTR_TEMPERATURE), float)
+
+        if temperature is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_TEMPERATURE, ATTR_TEMPERATURE)
+            return
+
+        for hvac in target_hvacs:
+            hvac.set_temperature(convert(
+                temperature, hass.config.temperature_unit,
+                hvac.unit_of_measurement))
+
+            if hvac.should_poll:
+                hvac.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_TEMPERATURE, temperature_set_service,
+        descriptions.get(SERVICE_SET_TEMPERATURE))
+
+    def humidity_set_service(service):
+        """Set humidity on the target hvacs."""
+        target_hvacs = component.extract_from_service(service)
+
+        humidity = service.data.get(ATTR_HUMIDITY)
+
+        if humidity is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_HUMIDITY, ATTR_HUMIDITY)
+            return
+
+        for hvac in target_hvacs:
+            hvac.set_humidity(humidity)
+
+            if hvac.should_poll:
+                hvac.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_HUMIDITY, humidity_set_service,
+        descriptions.get(SERVICE_SET_HUMIDITY))
+
+    def fan_mode_set_service(service):
+        """Set fan mode on target hvacs."""
+        target_hvacs = component.extract_from_service(service)
+
+        fan = service.data.get(ATTR_FAN_MODE)
+
+        if fan is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_FAN_MODE, ATTR_FAN_MODE)
+            return
+
+        for hvac in target_hvacs:
+            hvac.set_fan_mode(fan)
+
+            if hvac.should_poll:
+                hvac.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_FAN_MODE, fan_mode_set_service,
+        descriptions.get(SERVICE_SET_FAN_MODE))
+
+    def operation_set_service(service):
+        """Set operating mode on the target hvacs."""
+        target_hvacs = component.extract_from_service(service)
+
+        operation_mode = service.data.get(ATTR_OPERATION_MODE)
+
+        if operation_mode is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_OPERATION_MODE, ATTR_OPERATION_MODE)
+            return
+
+        for hvac in target_hvacs:
+            hvac.set_operation_mode(operation_mode)
+
+            if hvac.should_poll:
+                hvac.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_OPERATION_MODE, operation_set_service,
+        descriptions.get(SERVICE_SET_OPERATION_MODE))
+
+    def swing_set_service(service):
+        """Set swing mode on the target hvacs."""
+        target_hvacs = component.extract_from_service(service)
+
+        swing_mode = service.data.get(ATTR_SWING_MODE)
+
+        if swing_mode is None:
+            _LOGGER.error(
+                "Received call to %s without attribute %s",
+                SERVICE_SET_SWING_MODE, ATTR_SWING_MODE)
+            return
+
+        for hvac in target_hvacs:
+            hvac.set_swing_mode(swing_mode)
+
+            if hvac.should_poll:
+                hvac.update_ha_state(True)
+
+    hass.services.register(
+        DOMAIN, SERVICE_SET_SWING_MODE, swing_set_service,
+        descriptions.get(SERVICE_SET_SWING_MODE))
+    return True
+
+
+class HvacDevice(Entity):
+    """Representation of a hvac."""
+
+    # pylint: disable=too-many-public-methods,no-self-use
+    @property
+    def state(self):
+        """Return the current state."""
+        return self.current_operation or STATE_UNKNOWN
+
+    @property
+    def state_attributes(self):
+        """Return the optional state attributes."""
+        data = {
+            ATTR_CURRENT_TEMPERATURE:
+            self._convert_for_display(self.current_temperature),
+            ATTR_MIN_TEMP: self._convert_for_display(self.min_temp),
+            ATTR_MAX_TEMP: self._convert_for_display(self.max_temp),
+            ATTR_TEMPERATURE:
+            self._convert_for_display(self.target_temperature),
+        }
+
+        humidity = self.target_humidity
+        if humidity is not None:
+            data[ATTR_HUMIDITY] = humidity
+            data[ATTR_CURRENT_HUMIDITY] = self.current_humidity
+            data[ATTR_MIN_HUMIDITY] = self.min_humidity
+            data[ATTR_MAX_HUMIDITY] = self.max_humidity
+
+        fan_mode = self.current_fan_mode
+        if fan_mode is not None:
+            data[ATTR_FAN_MODE] = fan_mode
+            data[ATTR_FAN_LIST] = self.fan_list
+
+        operation_mode = self.current_operation
+        if operation_mode is not None:
+            data[ATTR_OPERATION_MODE] = operation_mode
+            data[ATTR_OPERATION_LIST] = self.operation_list
+
+        swing_mode = self.current_swing_mode
+        if swing_mode is not None:
+            data[ATTR_SWING_MODE] = swing_mode
+            data[ATTR_SWING_LIST] = self.swing_list
+
+        is_away = self.is_away_mode_on
+        if is_away is not None:
+            data[ATTR_AWAY_MODE] = STATE_ON if is_away else STATE_OFF
+
+        is_aux_heat = self.is_aux_heat_on
+        if is_aux_heat is not None:
+            data[ATTR_AUX_HEAT] = STATE_ON if is_aux_heat else STATE_OFF
+
+        return data
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        raise NotImplementedError
+
+    @property
+    def current_humidity(self):
+        """Return the current humidity."""
+        return None
+
+    @property
+    def target_humidity(self):
+        """Return the humidity we try to reach."""
+        return None
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        return None
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        return None
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return None
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        raise NotImplementedError
+
+    @property
+    def is_away_mode_on(self):
+        """Return true if away mode is on."""
+        return None
+
+    @property
+    def is_aux_heat_on(self):
+        """Return true if away mode is on."""
+        return None
+
+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        return None
+
+    @property
+    def fan_list(self):
+        """List of available fan modes."""
+        return None
+
+    @property
+    def current_swing_mode(self):
+        """Return the fan setting."""
+        return None
+
+    @property
+    def swing_list(self):
+        """List of available swing modes."""
+        return None
+
+    def set_temperature(self, temperature):
+        """Set new target temperature."""
+        pass
+
+    def set_humidity(self, humidity):
+        """Set new target humidity."""
+        pass
+
+    def set_fan_mode(self, fan):
+        """Set new target fan mode."""
+        pass
+
+    def set_operation_mode(self, operation_mode):
+        """Set new target operation mode."""
+        pass
+
+    def set_swing_mode(self, swing_mode):
+        """Set new target swing operation."""
+        pass
+
+    def turn_away_mode_on(self):
+        """Turn away mode on."""
+        pass
+
+    def turn_away_mode_off(self):
+        """Turn away mode off."""
+        pass
+
+    def turn_aux_heat_on(self):
+        """Turn auxillary heater on."""
+        pass
+
+    def turn_aux_heat_off(self):
+        """Turn auxillary heater off."""
+        pass
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        return convert(7, TEMP_CELCIUS, self.unit_of_measurement)
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        return convert(35, TEMP_CELCIUS, self.unit_of_measurement)
+
+    @property
+    def min_humidity(self):
+        """Return the minimum humidity."""
+        return 30
+
+    @property
+    def max_humidity(self):
+        """Return the maximum humidity."""
+        return 99
+
+    def _convert_for_display(self, temp):
+        """Convert temperature into preferred units for display purposes."""
+        if temp is None:
+            return None
+
+        value = convert(temp, self.unit_of_measurement,
+                        self.hass.config.temperature_unit)
+
+        if self.hass.config.temperature_unit is TEMP_CELCIUS:
+            decimal_count = 1
+        else:
+            # Users of fahrenheit generally expect integer units.
+            decimal_count = 0
+
+        return round(value, decimal_count)
--- a/homeassistant/components/hvac/demo.py
+++ b/homeassistant/components/hvac/demo.py
@@ -0,0 +1,164 @@
+"""
+Demo platform that offers a fake hvac.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/demo/
+"""
+from homeassistant.components.hvac import HvacDevice
+from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Demo hvacs."""
+    add_devices([
+        DemoHvac("HeatPump", 68, TEMP_FAHRENHEIT, None, 77, "Auto Low",
+                 None, None, "Auto", "Heat", None),
+        DemoHvac("Hvac", 21, TEMP_CELSIUS, True, 22, "On High",
+                 67, 54, "Off", "Cool", False),
+    ])
+
+
+# pylint: disable=too-many-arguments, too-many-public-methods
+class DemoHvac(HvacDevice):
+    """Representation of a demo hvac."""
+
+    # pylint: disable=too-many-instance-attributes
+    def __init__(self, name, target_temperature, unit_of_measurement,
+                 away, current_temperature, current_fan_mode,
+                 target_humidity, current_humidity, current_swing_mode,
+                 current_operation, aux):
+        """Initialize the hvac."""
+        self._name = name
+        self._target_temperature = target_temperature
+        self._target_humidity = target_humidity
+        self._unit_of_measurement = unit_of_measurement
+        self._away = away
+        self._current_temperature = current_temperature
+        self._current_humidity = current_humidity
+        self._current_fan_mode = current_fan_mode
+        self._current_operation = current_operation
+        self._aux = aux
+        self._current_swing_mode = current_swing_mode
+        self._fan_list = ["On Low", "On High", "Auto Low", "Auto High", "Off"]
+        self._operation_list = ["Heat", "Cool", "Auto Changeover", "Off"]
+        self._swing_list = ["Auto", 1, 2, 3, "Off"]
+
+    @property
+    def should_poll(self):
+        """Polling not needed for a demo hvac."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the hvac."""
+        return self._name
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return self._unit_of_measurement
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._current_temperature
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._target_temperature
+
+    @property
+    def current_humidity(self):
+        """Return the current humidity."""
+        return self._current_humidity
+
+    @property
+    def target_humidity(self):
+        """Return the humidity we try to reach."""
+        return self._target_humidity
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        return self._current_operation
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        return self._operation_list
+
+    @property
+    def is_away_mode_on(self):
+        """Return if away mode is on."""
+        return self._away
+
+    @property
+    def is_aux_heat_on(self):
+        """Return true if away mode is on."""
+        return self._aux
+
+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        return self._current_fan_mode
+
+    @property
+    def fan_list(self):
+        """List of available fan modes."""
+        return self._fan_list
+
+    def set_temperature(self, temperature):
+        """Set new target temperature."""
+        self._target_temperature = temperature
+        self.update_ha_state()
+
+    def set_humidity(self, humidity):
+        """Set new target temperature."""
+        self._target_humidity = humidity
+        self.update_ha_state()
+
+    def set_swing_mode(self, swing_mode):
+        """Set new target temperature."""
+        self._current_swing_mode = swing_mode
+        self.update_ha_state()
+
+    def set_fan_mode(self, fan):
+        """Set new target temperature."""
+        self._current_fan_mode = fan
+        self.update_ha_state()
+
+    def set_operation_mode(self, operation_mode):
+        """Set new target temperature."""
+        self._current_operation = operation_mode
+        self.update_ha_state()
+
+    @property
+    def current_swing_mode(self):
+        """Return the swing setting."""
+        return self._current_swing_mode
+
+    @property
+    def swing_list(self):
+        """List of available swing modes."""
+        return self._swing_list
+
+    def turn_away_mode_on(self):
+        """Turn away mode on."""
+        self._away = True
+        self.update_ha_state()
+
+    def turn_away_mode_off(self):
+        """Turn away mode off."""
+        self._away = False
+        self.update_ha_state()
+
+    def turn_aux_heat_on(self):
+        """Turn away auxillary heater on."""
+        self._aux = True
+        self.update_ha_state()
+
+    def turn_aux_heat_off(self):
+        """Turn auxillary heater off."""
+        self._aux = False
+        self.update_ha_state()
--- a/homeassistant/components/hvac/services.yaml
+++ b/homeassistant/components/hvac/services.yaml
@@ -0,0 +1,84 @@
+set_aux_heat:
+  description: Turn auxillary heater on/off for hvac
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'hvac.kitchen'
+
+    aux_heat:
+      description: New value of axillary heater
+      example: true
+
+set_away_mode:
+  description: Turn away mode on/off for hvac
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'hvac.kitchen'
+
+    away_mode:
+      description: New value of away mode
+      example: true
+
+set_temperature:
+  description: Set target temperature of hvac
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'hvac.kitchen'
+
+    temperature:
+      description: New target temperature for hvac
+      example: 25
+
+set_humidity:
+  description: Set target humidity of hvac
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'hvac.kitchen'
+
+    humidity:
+      description: New target humidity for hvac
+      example: 60
+
+set_fan_mode:
+  description: Set fan operation for hvac
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'hvac.nest'
+
+    fan:
+      description: New value of fan mode
+      example: On Low
+
+set_operation_mode:
+  description: Set operation mode for hvac
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'hvac.nest'
+
+    operation_mode:
+      description: New value of operation mode
+      example: Heat
+
+
+set_swing_mode:
+  description: Set swing operation for hvac
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'hvac.nest'
+
+    swing_mode:
+    description: New value of swing mode
+    example: 1
--- a/homeassistant/components/hvac/zwave.py
+++ b/homeassistant/components/hvac/zwave.py
@@ -0,0 +1,245 @@
+"""
+Support for ZWave HVAC devices.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/hvac.zwave/
+"""
+# Because we do not compile openzwave on CI
+# pylint: disable=import-error
+import logging
+from homeassistant.components.hvac import DOMAIN
+from homeassistant.components.hvac import HvacDevice
+from homeassistant.components.zwave import (
+    ATTR_NODE_ID, ATTR_VALUE_ID, ZWaveDeviceEntity)
+from homeassistant.components import zwave
+from homeassistant.const import (TEMP_FAHRENHEIT, TEMP_CELSIUS)
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_NAME = 'name'
+DEFAULT_NAME = 'ZWave Hvac'
+
+REMOTEC = 0x5254
+REMOTEC_ZXT_120 = 0x8377
+REMOTEC_ZXT_120_THERMOSTAT = (REMOTEC, REMOTEC_ZXT_120, 0)
+
+COMMAND_CLASS_SENSOR_MULTILEVEL = 0x31
+COMMAND_CLASS_THERMOSTAT_MODE = 0x40
+COMMAND_CLASS_THERMOSTAT_SETPOINT = 0x43
+COMMAND_CLASS_THERMOSTAT_FAN_MODE = 0x44
+COMMAND_CLASS_CONFIGURATION = 0x70
+
+WORKAROUND_ZXT_120 = 'zxt_120'
+
+DEVICE_MAPPINGS = {
+    REMOTEC_ZXT_120_THERMOSTAT: WORKAROUND_ZXT_120
+}
+
+ZXT_120_SET_TEMP = {
+    'Heat': 1,
+    'Cool': 2,
+    'Dry Air': 8,
+    'Auto Changeover': 10
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the ZWave Hvac devices."""
+    if discovery_info is None or zwave.NETWORK is None:
+        _LOGGER.debug("No discovery_info=%s or no NETWORK=%s",
+                      discovery_info, zwave.NETWORK)
+        return
+
+    node = zwave.NETWORK.nodes[discovery_info[ATTR_NODE_ID]]
+    value = node.values[discovery_info[ATTR_VALUE_ID]]
+    value.set_change_verified(False)
+    add_devices([ZWaveHvac(value)])
+    _LOGGER.debug("discovery_info=%s and zwave.NETWORK=%s",
+                  discovery_info, zwave.NETWORK)
+
+
+# pylint: disable=too-many-arguments
+class ZWaveHvac(ZWaveDeviceEntity, HvacDevice):
+    """Represents a HeatControl hvac."""
+
+    # pylint: disable=too-many-public-methods, too-many-instance-attributes
+    def __init__(self, value):
+        """Initialize the zwave hvac."""
+        from openzwave.network import ZWaveNetwork
+        from pydispatch import dispatcher
+        ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+        self._node = value.node
+        self._target_temperature = None
+        self._current_temperature = None
+        self._current_operation = None
+        self._operation_list = None
+        self._current_operation_state = None
+        self._current_fan_mode = None
+        self._fan_list = None
+        self._current_swing_mode = None
+        self._swing_list = None
+        self._unit = None
+        self._zxt_120 = None
+        self.update_properties()
+        # register listener
+        dispatcher.connect(
+            self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED)
+        # Make sure that we have values for the key before converting to int
+        if (value.node.manufacturer_id.strip() and
+                value.node.product_id.strip()):
+            specific_sensor_key = (int(value.node.manufacturer_id, 16),
+                                   int(value.node.product_id, 16),
+                                   value.index)
+
+            if specific_sensor_key in DEVICE_MAPPINGS:
+                if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_ZXT_120:
+                    _LOGGER.debug("Remotec ZXT-120 Zwave Thermostat as HVAC")
+                    self._zxt_120 = 1
+
+    def value_changed(self, value):
+        """Called when a value has changed on the network."""
+        if self._value.node == value.node:
+            self.update_properties()
+            self.update_ha_state(True)
+            _LOGGER.debug("Value changed on network %s", value)
+
+    def update_properties(self):
+        """Callback on data change for the registered node/value pair."""
+        # Set point
+        for value in self._node.get_values(
+                class_id=COMMAND_CLASS_THERMOSTAT_SETPOINT).values():
+            if int(value.data) != 0:
+                self._target_temperature = int(value.data)
+        # Operation Mode
+        for value in self._node.get_values(
+                class_id=COMMAND_CLASS_THERMOSTAT_MODE).values():
+            self._current_operation = value.data
+            self._operation_list = list(value.data_items)
+            _LOGGER.debug("self._operation_list=%s", self._operation_list)
+        # Current Temp
+        for value in self._node.get_values(
+                class_id=COMMAND_CLASS_SENSOR_MULTILEVEL).values():
+            self._current_temperature = int(value.data)
+            self._unit = value.units
+        # Fan Mode
+        for value in self._node.get_values(
+                class_id=COMMAND_CLASS_THERMOSTAT_FAN_MODE).values():
+            self._current_operation_state = value.data
+            self._fan_list = list(value.data_items)
+            _LOGGER.debug("self._fan_list=%s", self._fan_list)
+            _LOGGER.debug("self._current_operation_state=%s",
+                          self._current_operation_state)
+        # Swing mode
+        if self._zxt_120 == 1:
+            for value in self._node.get_values(
+                    class_id=COMMAND_CLASS_CONFIGURATION).values():
+                if value.command_class == 112 and value.index == 33:
+                    self._current_swing_mode = value.data
+                    self._swing_list = [0, 1]
+                    _LOGGER.debug("self._swing_list=%s", self._swing_list)
+
+    @property
+    def should_poll(self):
+        """No polling on ZWave."""
+        return False
+
+    @property
+    def current_fan_mode(self):
+        """Return the fan speed set."""
+        return self._current_operation_state
+
+    @property
+    def fan_list(self):
+        """List of available fan modes."""
+        return self._fan_list
+
+    @property
+    def current_swing_mode(self):
+        """Return the swing mode set."""
+        return self._current_swing_mode
+
+    @property
+    def swing_list(self):
+        """List of available swing modes."""
+        return self._swing_list
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        unit = self._unit
+        if unit == 'C':
+            return TEMP_CELSIUS
+        elif unit == 'F':
+            return TEMP_FAHRENHEIT
+        else:
+            _LOGGER.exception("unit_of_measurement=%s is not valid",
+                              unit)
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._current_temperature
+
+    @property
+    def current_operation(self):
+        """Return the current operation mode."""
+        return self._current_operation
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        return self._operation_list
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._target_temperature
+
+    def set_temperature(self, temperature):
+        """Set new target temperature."""
+        for value in self._node.get_values(
+                class_id=COMMAND_CLASS_THERMOSTAT_SETPOINT).values():
+            if value.command_class != 67:
+                continue
+            if self._zxt_120:
+                # ZXT-120 does not support get setpoint
+                self._target_temperature = temperature
+                if ZXT_120_SET_TEMP.get(self._current_operation) \
+                   != value.index:
+                    continue
+                # ZXT-120 responds only to whole int
+                value.data = int(round(temperature, 0))
+            else:
+                value.data = int(temperature)
+
+    def set_fan_mode(self, fan):
+        """Set new target fan mode."""
+        for value in self._node.get_values(
+                class_id=COMMAND_CLASS_THERMOSTAT_FAN_MODE).values():
+            if value.command_class == 68 and value.index == 0:
+                value.data = bytes(fan, 'utf-8')
+
+    def set_operation_mode(self, operation_mode):
+        """Set new target operation mode."""
+        for value in self._node.get_values(
+                class_id=COMMAND_CLASS_THERMOSTAT_MODE).values():
+            if value.command_class == 64 and value.index == 0:
+                value.data = bytes(operation_mode, 'utf-8')
+
+    def set_swing_mode(self, swing_mode):
+        """Set new target swing mode."""
+        if self._zxt_120 == 1:
+            for value in self._node.get_values(
+                    class_id=COMMAND_CLASS_CONFIGURATION).values():
+                if value.command_class == 112 and value.index == 33:
+                    value.data = int(swing_mode)
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        return self._convert_for_display(19)
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        return self._convert_for_display(30)
--- a/homeassistant/components/ifttt.py
+++ b/homeassistant/components/ifttt.py
@@ -7,8 +7,10 @@ https://home-assistant.io/components/ifttt/
 import logging

 import requests
+import voluptuous as vol

 from homeassistant.helpers import validate_config
+import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

@@ -23,6 +25,13 @@ ATTR_VALUE3 = 'value3'

 REQUIREMENTS = ['pyfttt==0.3']

+SERVICE_TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(ATTR_EVENT): cv.string,
+    vol.Optional(ATTR_VALUE1): cv.string,
+    vol.Optional(ATTR_VALUE2): cv.string,
+    vol.Optional(ATTR_VALUE3): cv.string,
+})
+

 def trigger(hass, event, value1=None, value2=None, value3=None):
    """Trigger a Maker IFTTT recipe."""
@@ -44,12 +53,10 @@ def setup(hass, config):

    def trigger_service(call):
        """Handle IFTTT trigger service calls."""
-        event = call.data.get(ATTR_EVENT)
+        event = call.data[ATTR_EVENT]
        value1 = call.data.get(ATTR_VALUE1)
        value2 = call.data.get(ATTR_VALUE2)
        value3 = call.data.get(ATTR_VALUE3)
-        if event is None:
-            return

        try:
            import pyfttt as pyfttt
@@ -57,6 +64,7 @@ def setup(hass, config):
        except requests.exceptions.RequestException:
            _LOGGER.exception("Error communicating with IFTTT")

-    hass.services.register(DOMAIN, SERVICE_TRIGGER, trigger_service)
+    hass.services.register(DOMAIN, SERVICE_TRIGGER, trigger_service,
+                           schema=SERVICE_TRIGGER_SCHEMA)

    return True
--- a/homeassistant/components/influxdb.py
+++ b/homeassistant/components/influxdb.py
@@ -7,7 +7,8 @@ https://home-assistant.io/components/influxdb/
 import logging

 import homeassistant.util as util
-from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNKNOWN
+from homeassistant.const import (EVENT_STATE_CHANGED, STATE_UNAVAILABLE,
+                                 STATE_UNKNOWN)
 from homeassistant.helpers import state as state_helper
 from homeassistant.helpers import validate_config

@@ -70,8 +71,9 @@ def setup(hass, config):
    def influx_event_listener(event):
        """Listen for new messages on the bus and sends them to Influx."""
        state = event.data.get('new_state')
-        if state is None or state.state in (STATE_UNKNOWN, '') \
-           or state.entity_id in blacklist:
+        if state is None or state.state in (
+                STATE_UNKNOWN, '', STATE_UNAVAILABLE) or \
+                state.entity_id in blacklist:
            return

        try:
--- a/homeassistant/components/input_boolean.py
+++ b/homeassistant/components/input_boolean.py
@@ -6,8 +6,11 @@ at https://home-assistant.io/components/input_boolean/
 """
 import logging

+import voluptuous as vol
+
 from homeassistant.const import (
    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_ON)
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.util import slugify
@@ -22,6 +25,10 @@ CONF_NAME = "name"
 CONF_INITIAL = "initial"
 CONF_ICON = "icon"

+TOGGLE_SERVICE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+})
+

 def is_on(hass, entity_id):
    """Test if input_boolean is True."""
@@ -75,8 +82,10 @@ def setup(hass, config):
            else:
                input_b.turn_off()

-    hass.services.register(DOMAIN, SERVICE_TURN_OFF, toggle_service)
-    hass.services.register(DOMAIN, SERVICE_TURN_ON, toggle_service)
+    hass.services.register(DOMAIN, SERVICE_TURN_OFF, toggle_service,
+                           schema=TOGGLE_SERVICE_SCHEMA)
+    hass.services.register(DOMAIN, SERVICE_TURN_ON, toggle_service,
+                           schema=TOGGLE_SERVICE_SCHEMA)

    component.add_entities(entities)

--- a/homeassistant/components/input_select.py
+++ b/homeassistant/components/input_select.py
@@ -6,7 +6,10 @@ at https://home-assistant.io/components/input_select/
 """
 import logging

+import voluptuous as vol
+
 from homeassistant.const import ATTR_ENTITY_ID
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.util import slugify
@@ -25,6 +28,11 @@ ATTR_OPTIONS = 'options'

 SERVICE_SELECT_OPTION = 'select_option'

+SERVICE_SELECT_OPTION_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_OPTION): cv.string,
+})
+

 def select_option(hass, entity_id, option):
    """Set input_select to False."""
@@ -79,10 +87,11 @@ def setup(hass, config):
        target_inputs = component.extract_from_service(call)

        for input_select in target_inputs:
-            input_select.select_option(call.data.get(ATTR_OPTION))
+            input_select.select_option(call.data[ATTR_OPTION])

    hass.services.register(DOMAIN, SERVICE_SELECT_OPTION,
-                           select_option_service)
+                           select_option_service,
+                           schema=SERVICE_SELECT_OPTION_SCHEMA)

    component.add_entities(entities)

--- a/homeassistant/components/input_slider.py
+++ b/homeassistant/components/input_slider.py
@@ -6,7 +6,10 @@ at https://home-assistant.io/components/input_slider/
 """
 import logging

+import voluptuous as vol
+
 from homeassistant.const import ATTR_ENTITY_ID
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.util import slugify
@@ -29,6 +32,11 @@ ATTR_STEP = 'step'

 SERVICE_SELECT_VALUE = 'select_value'

+SERVICE_SELECT_VALUE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_VALUE): vol.Coerce(int),
+})
+

 def select_value(hass, entity_id, value):
    """Set input_slider to value."""
@@ -81,10 +89,11 @@ def setup(hass, config):
        target_inputs = component.extract_from_service(call)

        for input_slider in target_inputs:
-            input_slider.select_value(call.data.get(ATTR_VALUE))
+            input_slider.select_value(call.data[ATTR_VALUE])

    hass.services.register(DOMAIN, SERVICE_SELECT_VALUE,
-                           select_value_service)
+                           select_value_service,
+                           schema=SERVICE_SELECT_VALUE_SCHEMA)

    component.add_entities(entities)

--- a/homeassistant/components/keyboard.py
+++ b/homeassistant/components/keyboard.py
@@ -4,6 +4,8 @@ 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 voluptuous as vol
+
 from homeassistant.const import (
    SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PLAY_PAUSE,
    SERVICE_MEDIA_PREVIOUS_TRACK, SERVICE_VOLUME_DOWN, SERVICE_VOLUME_MUTE,
@@ -12,6 +14,8 @@ from homeassistant.const import (
 DOMAIN = "keyboard"
 REQUIREMENTS = ['pyuserinput==0.1.9']

+TAP_KEY_SCHEMA = vol.Schema({})
+

 def volume_up(hass):
    """Press the keyboard button for volume up."""
@@ -52,26 +56,31 @@ def setup(hass, config):

    hass.services.register(DOMAIN, SERVICE_VOLUME_UP,
                           lambda service:
-                           keyboard.tap_key(keyboard.volume_up_key))
+                           keyboard.tap_key(keyboard.volume_up_key),
+                           schema=TAP_KEY_SCHEMA)

    hass.services.register(DOMAIN, SERVICE_VOLUME_DOWN,
                           lambda service:
-                           keyboard.tap_key(keyboard.volume_down_key))
+                           keyboard.tap_key(keyboard.volume_down_key),
+                           schema=TAP_KEY_SCHEMA)

    hass.services.register(DOMAIN, SERVICE_VOLUME_MUTE,
                           lambda service:
-                           keyboard.tap_key(keyboard.volume_mute_key))
+                           keyboard.tap_key(keyboard.volume_mute_key),
+                           schema=TAP_KEY_SCHEMA)

    hass.services.register(DOMAIN, SERVICE_MEDIA_PLAY_PAUSE,
                           lambda service:
-                           keyboard.tap_key(keyboard.media_play_pause_key))
+                           keyboard.tap_key(keyboard.media_play_pause_key),
+                           schema=TAP_KEY_SCHEMA)

    hass.services.register(DOMAIN, SERVICE_MEDIA_NEXT_TRACK,
                           lambda service:
-                           keyboard.tap_key(keyboard.media_next_track_key))
+                           keyboard.tap_key(keyboard.media_next_track_key),
+                           schema=TAP_KEY_SCHEMA)

    hass.services.register(DOMAIN, SERVICE_MEDIA_PREVIOUS_TRACK,
                           lambda service:
-                           keyboard.tap_key(keyboard.media_prev_track_key))
-
+                           keyboard.tap_key(keyboard.media_prev_track_key),
+                           schema=TAP_KEY_SCHEMA)
    return True
--- a/homeassistant/components/light/init.py
+++ b/homeassistant/components/light/init.py
@@ -39,6 +39,7 @@ ATTR_TRANSITION = "transition"
 ATTR_RGB_COLOR = "rgb_color"
 ATTR_XY_COLOR = "xy_color"
 ATTR_COLOR_TEMP = "color_temp"
+ATTR_COLOR_NAME = "color_name"

 # int with value 0 .. 255 representing brightness of the light.
 ATTR_BRIGHTNESS = "brightness"
@@ -87,6 +88,7 @@ LIGHT_TURN_ON_SCHEMA = vol.Schema({
    ATTR_PROFILE: str,
    ATTR_TRANSITION: VALID_TRANSITION,
    ATTR_BRIGHTNESS: cv.byte,
+    ATTR_COLOR_NAME: str,
    ATTR_RGB_COLOR: vol.All(vol.ExactSequence((cv.byte, cv.byte, cv.byte)),
                            vol.Coerce(tuple)),
    ATTR_XY_COLOR: vol.All(vol.ExactSequence((cv.small_float, cv.small_float)),
@@ -122,7 +124,7 @@ 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, color_temp=None, profile=None,
-            flash=None, effect=None):
+            flash=None, effect=None, color_name=None):
    """Turn all or specified light on."""
    data = {
        key: value for key, value in [
@@ -135,6 +137,7 @@ def turn_on(hass, entity_id=None, transition=None, brightness=None,
            (ATTR_COLOR_TEMP, color_temp),
            (ATTR_FLASH, flash),
            (ATTR_EFFECT, effect),
+            (ATTR_COLOR_NAME, color_name),
        ] if value is not None
    }

@@ -228,6 +231,11 @@ def setup(hass, config):
            params.setdefault(ATTR_XY_COLOR, profile[:2])
            params.setdefault(ATTR_BRIGHTNESS, profile[2])

+        color_name = params.pop(ATTR_COLOR_NAME, None)
+
+        if color_name is not None:
+            params[ATTR_RGB_COLOR] = color_util.color_name_to_rgb(color_name)
+
        for light in target_lights:
            light.turn_on(**params)

--- a/homeassistant/components/light/hue.py
+++ b/homeassistant/components/light/hue.py
@@ -32,6 +32,9 @@ PHUE_CONFIG_FILE = "phue.conf"
 _CONFIGURING = {}
 _LOGGER = logging.getLogger(__name__)

+# Track previously setup bridges
+_CONFIGURED_BRIDGES = {}
+

 def _find_host_from_config(hass, filename=PHUE_CONFIG_FILE):
    """Attempt to detect host based on existing configuration."""
@@ -68,7 +71,8 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
            return False

    # Only act if we are not already configuring this host
-    if host in _CONFIGURING:
+    if host in _CONFIGURING or \
+            socket.gethostbyname(host) in _CONFIGURED_BRIDGES:
        return

    setup_bridge(host, hass, add_devices_callback, filename, allow_unreachable)
@@ -142,6 +146,7 @@ def setup_bridge(host, hass, add_devices_callback, filename,
        if new_lights:
            add_devices_callback(new_lights)

+    _CONFIGURED_BRIDGES[socket.gethostbyname(host)] = True
    update_lights()


@@ -230,14 +235,16 @@ class HueLight(Light):
        if ATTR_TRANSITION in kwargs:
            command['transitiontime'] = kwargs[ATTR_TRANSITION] * 10

-        if ATTR_BRIGHTNESS in kwargs:
-            command['bri'] = kwargs[ATTR_BRIGHTNESS]
-
        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(
+            xyb = color_util.color_RGB_to_xy(
                *(int(val) for val in kwargs[ATTR_RGB_COLOR]))
+            command['xy'] = xyb[0], xyb[1]
+            command['bri'] = xyb[2]
+
+        if ATTR_BRIGHTNESS in kwargs:
+            command['bri'] = kwargs[ATTR_BRIGHTNESS]

        if ATTR_COLOR_TEMP in kwargs:
            command['ct'] = kwargs[ATTR_COLOR_TEMP]
--- a/homeassistant/components/light/hyperion.py
+++ b/homeassistant/components/light/hyperion.py
@@ -19,7 +19,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
    """Setup a Hyperion server remote."""
    host = config.get(CONF_HOST, None)
    port = config.get("port", 19444)
-    device = Hyperion(host, port)
+    device = Hyperion(config.get('name', host), host, port)
    if device.setup():
        add_devices_callback([device])
        return True
@@ -30,11 +30,11 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 class Hyperion(Light):
    """Representation of a Hyperion remote."""

-    def __init__(self, host, port):
+    def __init__(self, name, host, port):
        """Initialize the light."""
        self._host = host
        self._port = port
-        self._name = host
+        self._name = name
        self._is_available = True
        self._rgb_color = [255, 255, 255]

@@ -75,7 +75,8 @@ class Hyperion(Light):
        """Get the hostname of the remote."""
        response = self.json_request({"command": "serverinfo"})
        if response:
-            self._name = response["info"]["hostname"]
+            if self._name == self._host:
+                self._name = response["info"]["hostname"]
            return True

        return False
--- a/homeassistant/components/light/lifx.py
+++ b/homeassistant/components/light/lifx.py
@@ -209,6 +209,8 @@ class LIFXLight(Light):
            brightness = self._bri

        if ATTR_COLOR_TEMP in kwargs:
+            # pylint: disable=fixme
+            # TODO: Use color_temperature_mired_to_kelvin from util.color
            kelvin = int(((TEMP_MAX - TEMP_MIN) *
                          (kwargs[ATTR_COLOR_TEMP] - TEMP_MIN_HASS) /
                          (TEMP_MAX_HASS - TEMP_MIN_HASS)) + TEMP_MIN)
--- a/homeassistant/components/light/mysensors.py
+++ b/homeassistant/components/light/mysensors.py
@@ -6,10 +6,10 @@ https://home-assistant.io/components/light.mysensors/
 """
 import logging

-from homeassistant.components.light import (
-    ATTR_BRIGHTNESS, ATTR_RGB_COLOR, Light)
-from homeassistant.const import ATTR_BATTERY_LEVEL, STATE_OFF, STATE_ON
-from homeassistant.loader import get_component
+from homeassistant.components import mysensors
+from homeassistant.components.light import (ATTR_BRIGHTNESS, ATTR_RGB_COLOR,
+                                            Light)
+from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.util.color import rgb_hex_to_rgb_list

 _LOGGER = logging.getLogger(__name__)
@@ -25,8 +25,6 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    if discovery_info is None:
        return

-    mysensors = get_component('mysensors')
-
    for gateway in mysensors.GATEWAYS.values():
        # Define the S_TYPES and V_TYPES that the platform should handle as
        # states. Map them in a dict of lists.
@@ -52,35 +50,16 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
            map_sv_types, devices, add_devices, device_class_map))


-class MySensorsLight(Light):
-    """Represent the value of a MySensors child node."""
+class MySensorsLight(mysensors.MySensorsDeviceEntity, Light):
+    """Represent the value of a MySensors Light child node."""

-    # pylint: disable=too-many-arguments,too-many-instance-attributes
-    def __init__(
-            self, gateway, node_id, child_id, name, value_type, child_type):
+    def __init__(self, *args):
        """Setup instance attributes."""
-        self.gateway = gateway
-        self.node_id = node_id
-        self.child_id = child_id
-        self._name = name
-        self.value_type = value_type
-        self.battery_level = 0
-        self._values = {}
+        mysensors.MySensorsDeviceEntity.__init__(self, *args)
        self._state = None
        self._brightness = None
        self._rgb = None
        self._white = None
-        self.mysensors = get_component('mysensors')
-
-    @property
-    def should_poll(self):
-        """No polling needed."""
-        return False
-
-    @property
-    def name(self):
-        """Return the name of this entity."""
-        return self._name

    @property
    def brightness(self):
@@ -97,24 +76,6 @@ class MySensorsLight(Light):
        """Return the white value in RGBW, value between 0..255."""
        return self._white

-    @property
-    def device_state_attributes(self):
-        """Return device specific state attributes."""
-        device_attr = {
-            self.mysensors.ATTR_PORT: self.gateway.port,
-            self.mysensors.ATTR_NODE_ID: self.node_id,
-            self.mysensors.ATTR_CHILD_ID: self.child_id,
-            ATTR_BATTERY_LEVEL: self.battery_level,
-        }
-        for value_type, value in self._values.items():
-            device_attr[self.gateway.const.SetReq(value_type).name] = value
-        return device_attr
-
-    @property
-    def available(self):
-        """Return true if entity is available."""
-        return self.value_type in self._values
-
    @property
    def assumed_state(self):
        """Return true if unable to access real state of entity."""
@@ -314,28 +275,11 @@ class MySensorsLightRGB(MySensorsLight):
        self._update_rgb_or_w()


-class MySensorsLightRGBW(MySensorsLight):
-    """RGBW child class to MySensorsLight."""
+class MySensorsLightRGBW(MySensorsLightRGB):
+    """RGBW child class to MySensorsLightRGB."""

    def turn_on(self, **kwargs):
        """Turn the device on."""
        self._turn_on_light()
        self._turn_on_dimmer(**kwargs)
        self._turn_on_rgb_and_w('%02x%02x%02x%02x', **kwargs)
-
-    def turn_off(self, **kwargs):
-        """Turn the device off."""
-        ret = self._turn_off_rgb_or_w()
-        ret = self._turn_off_dimmer(
-            value_type=ret[ATTR_VALUE_TYPE], value=ret[ATTR_VALUE])
-        ret = self._turn_off_light(
-            value_type=ret[ATTR_VALUE_TYPE], value=ret[ATTR_VALUE])
-        self._turn_off_main(
-            value_type=ret[ATTR_VALUE_TYPE], value=ret[ATTR_VALUE])
-
-    def update(self):
-        """Update the controller with the latest value from a sensor."""
-        self._update_main()
-        self._update_light()
-        self._update_dimmer()
-        self._update_rgb_or_w()
--- a/homeassistant/components/light/qwikswitch.py
+++ b/homeassistant/components/light/qwikswitch.py
@@ -0,0 +1,35 @@
+"""
+Support for Qwikswitch Relays and Dimmers.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.qwikswitch/
+"""
+import logging
+import homeassistant.components.qwikswitch as qwikswitch
+from homeassistant.components.light import Light
+
+DEPENDENCIES = ['qwikswitch']
+
+
+class QSLight(qwikswitch.QSToggleEntity, Light):
+    """Light based on a Qwikswitch relay/dimmer module."""
+
+    pass
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Store add_devices for the light components."""
+    if discovery_info is None or 'qsusb_id' not in discovery_info:
+        logging.getLogger(__name__).error(
+            'Configure main Qwikswitch component')
+        return False
+
+    qsusb = qwikswitch.QSUSB[discovery_info['qsusb_id']]
+
+    for item in qsusb.ha_devices:
+        if item['type'] not in ['dim', 'rel']:
+            continue
+        dev = QSLight(item, qsusb)
+        add_devices([dev])
+        qsusb.ha_objects[item['id']] = dev
--- a/homeassistant/components/light/services.yaml
+++ b/homeassistant/components/light/services.yaml
@@ -16,6 +16,10 @@ turn_on:
      description: Color for the light in RGB-format
      example: '[255, 100, 100]'

+    color_name:
+      description: A human readable color name
+      example: 'red'
+
    xy_color:
      description: Color for the light in XY-format
      example: '[0.52, 0.43]'
--- a/homeassistant/components/light/tellstick.py
+++ b/homeassistant/components/light/tellstick.py
@@ -4,12 +4,16 @@ Support for Tellstick lights.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/light.tellstick/
 """
+import voluptuous as vol
+
 from homeassistant.components import tellstick
 from homeassistant.components.light import ATTR_BRIGHTNESS, Light
 from homeassistant.components.tellstick import (DEFAULT_SIGNAL_REPETITIONS,
                                                ATTR_DISCOVER_DEVICES,
                                                ATTR_DISCOVER_CONFIG)

+PLATFORM_SCHEMA = vol.Schema({vol.Required("platform"): tellstick.DOMAIN})
+

 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
--- a/homeassistant/components/light/vera.py
+++ b/homeassistant/components/light/vera.py
@@ -72,8 +72,7 @@ class VeraLight(VeraDevice, Light):
            last_tripped = self.vera_device.last_trip
            if last_tripped is not None:
                utc_time = dt_util.utc_from_timestamp(int(last_tripped))
-                attr[ATTR_LAST_TRIP_TIME] = dt_util.datetime_to_str(
-                    utc_time)
+                attr[ATTR_LAST_TRIP_TIME] = utc_time.isoformat()
            else:
                attr[ATTR_LAST_TRIP_TIME] = None
            tripped = self.vera_device.is_tripped
--- a/homeassistant/components/light/wemo.py
+++ b/homeassistant/components/light/wemo.py
@@ -105,6 +105,7 @@ class WemoLight(Light):
        elif ATTR_RGB_COLOR in kwargs:
            xycolor = color_util.color_RGB_to_xy(
                *(int(val) for val in kwargs[ATTR_RGB_COLOR]))
+            kwargs.setdefault(ATTR_BRIGHTNESS, xycolor[2])
        else:
            xycolor = None

--- a/homeassistant/components/light/wink.py
+++ b/homeassistant/components/light/wink.py
@@ -6,10 +6,14 @@ https://home-assistant.io/components/light.wink/
 """
 import logging

-from homeassistant.components.light import ATTR_BRIGHTNESS, Light
+from homeassistant.components.light import ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, \
+    Light, ATTR_RGB_COLOR
 from homeassistant.const import CONF_ACCESS_TOKEN
+from homeassistant.util import color as color_util
+from homeassistant.util.color import \
+    color_temperature_mired_to_kelvin as mired_to_kelvin

-REQUIREMENTS = ['python-wink==0.6.4']
+REQUIREMENTS = ['python-wink==0.7.6']


 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
@@ -35,7 +39,11 @@ class WinkLight(Light):
    """Representation of a Wink light."""

    def __init__(self, wink):
-        """Initialize the light."""
+        """
+        Initialize the light.
+
+        :type wink: pywink.devices.standard.bulb.WinkBulb
+        """
        self.wink = wink

    @property
@@ -63,15 +71,43 @@ class WinkLight(Light):
        """True if connection == True."""
        return self.wink.available

+    @property
+    def xy_color(self):
+        """Current bulb color in CIE 1931 (XY) color space."""
+        if not self.wink.supports_xy_color():
+            return None
+        return self.wink.color_xy()
+
+    @property
+    def color_temp(self):
+        """Current bulb color in degrees Kelvin."""
+        if not self.wink.supports_temperature():
+            return None
+        return color_util.color_temperature_kelvin_to_mired(
+            self.wink.color_temperature_kelvin())
+
    # pylint: disable=too-few-public-methods
    def turn_on(self, **kwargs):
        """Turn the switch on."""
        brightness = kwargs.get(ATTR_BRIGHTNESS)
+        rgb_color = kwargs.get(ATTR_RGB_COLOR)
+        color_temp_mired = kwargs.get(ATTR_COLOR_TEMP)

-        if brightness is not None:
-            self.wink.set_state(True, brightness=brightness / 255)
-        else:
-            self.wink.set_state(True)
+        state_kwargs = {
+        }
+
+        if rgb_color:
+            xyb = color_util.color_RGB_to_xy(*rgb_color)
+            state_kwargs['color_xy'] = xyb[0], xyb[1]
+            state_kwargs['brightness'] = xyb[2]
+
+        if color_temp_mired:
+            state_kwargs['color_kelvin'] = mired_to_kelvin(color_temp_mired)
+
+        if brightness:
+            state_kwargs['brightness'] = brightness / 255.0
+
+        self.wink.set_state(True, **state_kwargs)

    def turn_off(self):
        """Turn the switch off."""
@@ -79,4 +115,4 @@ class WinkLight(Light):

    def update(self):
        """Update state of the light."""
-        self.wink.update_state()
+        self.wink.update_state(require_desired_state_fulfilled=True)
--- a/homeassistant/components/light/zwave.py
+++ b/homeassistant/components/light/zwave.py
@@ -9,25 +9,23 @@ https://home-assistant.io/components/light.zwave/
 from threading import Timer

 from homeassistant.components.light import ATTR_BRIGHTNESS, DOMAIN, Light
-from homeassistant.components.zwave import (
-    ATTR_NODE_ID, ATTR_VALUE_ID, COMMAND_CLASS_SWITCH_MULTILEVEL, GENRE_USER,
-    NETWORK, TYPE_BYTE, ZWaveDeviceEntity)
+from homeassistant.components import zwave
 from homeassistant.const import STATE_OFF, STATE_ON


 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Find and add Z-Wave lights."""
-    if discovery_info is None or NETWORK is None:
+    if discovery_info is None or zwave.NETWORK is None:
        return

-    node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]
-    value = node.values[discovery_info[ATTR_VALUE_ID]]
+    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
+    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]

-    if value.command_class != COMMAND_CLASS_SWITCH_MULTILEVEL:
+    if value.command_class != zwave.COMMAND_CLASS_SWITCH_MULTILEVEL:
        return
-    if value.type != TYPE_BYTE:
+    if value.type != zwave.TYPE_BYTE:
        return
-    if value.genre != GENRE_USER:
+    if value.genre != zwave.GENRE_USER:
        return

    value.set_change_verified(False)
@@ -42,7 +40,7 @@ def brightness_state(value):
        return 255, STATE_OFF


-class ZwaveDimmer(ZWaveDeviceEntity, Light):
+class ZwaveDimmer(zwave.ZWaveDeviceEntity, Light):
    """Representation of a Z-Wave dimmer."""

    # pylint: disable=too-many-arguments
@@ -51,7 +49,7 @@ class ZwaveDimmer(ZWaveDeviceEntity, Light):
        from openzwave.network import ZWaveNetwork
        from pydispatch import dispatcher

-        ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+        zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN)

        self._brightness, self._state = brightness_state(value)

--- a/homeassistant/components/lock/init.py
+++ b/homeassistant/components/lock/init.py
@@ -8,14 +8,17 @@ from datetime import timedelta
 import logging
 import os

+import voluptuous as vol
+
 from homeassistant.config import load_yaml_config_file
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (
    ATTR_CODE, ATTR_CODE_FORMAT, ATTR_ENTITY_ID, STATE_LOCKED, STATE_UNLOCKED,
    STATE_UNKNOWN, SERVICE_LOCK, SERVICE_UNLOCK)
-from homeassistant.components import (group, verisure, wink)
+from homeassistant.components import (group, verisure, wink, zwave)

 DOMAIN = 'lock'
 SCAN_INTERVAL = 30
@@ -30,9 +33,15 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
 # Maps discovered services to their platforms
 DISCOVERY_PLATFORMS = {
    wink.DISCOVER_LOCKS: 'wink',
-    verisure.DISCOVER_LOCKS: 'verisure'
+    verisure.DISCOVER_LOCKS: 'verisure',
+    zwave.DISCOVER_LOCKS: 'zwave',
 }

+LOCK_SERVICE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_CODE): cv.string,
+})
+
 _LOGGER = logging.getLogger(__name__)


@@ -75,10 +84,7 @@ def setup(hass, config):
        """Handle calls to the lock services."""
        target_locks = component.extract_from_service(service)

-        if ATTR_CODE not in service.data:
-            code = None
-        else:
-            code = service.data[ATTR_CODE]
+        code = service.data.get(ATTR_CODE)

        for item in target_locks:
            if service.service == SERVICE_LOCK:
@@ -92,10 +98,11 @@ def setup(hass, config):
    descriptions = load_yaml_config_file(
        os.path.join(os.path.dirname(__file__), 'services.yaml'))
    hass.services.register(DOMAIN, SERVICE_UNLOCK, handle_lock_service,
-                           descriptions.get(SERVICE_UNLOCK))
+                           descriptions.get(SERVICE_UNLOCK),
+                           schema=LOCK_SERVICE_SCHEMA)
    hass.services.register(DOMAIN, SERVICE_LOCK, handle_lock_service,
-                           descriptions.get(SERVICE_LOCK))
-
+                           descriptions.get(SERVICE_LOCK),
+                           schema=LOCK_SERVICE_SCHEMA)
    return True


--- a/homeassistant/components/lock/verisure.py
+++ b/homeassistant/components/lock/verisure.py
@@ -46,6 +46,11 @@ class VerisureDoorlock(LockDevice):
        """Return the state of the lock."""
        return self._state

+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return hub.available
+
    @property
    def code_format(self):
        """Return the required six digit code."""
--- a/homeassistant/components/lock/wink.py
+++ b/homeassistant/components/lock/wink.py
@@ -7,9 +7,9 @@ https://home-assistant.io/components/lock.wink/
 import logging

 from homeassistant.components.lock import LockDevice
-from homeassistant.const import CONF_ACCESS_TOKEN
+from homeassistant.const import CONF_ACCESS_TOKEN, ATTR_BATTERY_LEVEL

-REQUIREMENTS = ['python-wink==0.6.4']
+REQUIREMENTS = ['python-wink==0.7.6']


 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -36,6 +36,7 @@ class WinkLockDevice(LockDevice):
    def __init__(self, wink):
        """Initialize the lock."""
        self.wink = wink
+        self._battery = self.wink.battery_level

    @property
    def unique_id(self):
@@ -68,3 +69,16 @@ class WinkLockDevice(LockDevice):
    def unlock(self, **kwargs):
        """Unlock the device."""
        self.wink.set_state(False)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        if self._battery:
+            return {
+                ATTR_BATTERY_LEVEL: self._battery_level,
+            }
+
+    @property
+    def _battery_level(self):
+        """Return the battery level."""
+        return self.wink.battery_level * 100
--- a/homeassistant/components/lock/zwave.py
+++ b/homeassistant/components/lock/zwave.py
@@ -0,0 +1,64 @@
+"""
+Zwave platform that handles simple door locks.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/lock.zwave/
+"""
+# Because we do not compile openzwave on CI
+# pylint: disable=import-error
+from homeassistant.components.lock import DOMAIN, LockDevice
+from homeassistant.components import zwave
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Find and return Z-Wave switches."""
+    if discovery_info is None or zwave.NETWORK 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_DOOR_LOCK:
+        return
+    if value.type != zwave.TYPE_BOOL:
+        return
+    if value.genre != zwave.GENRE_USER:
+        return
+
+    value.set_change_verified(False)
+    add_devices([ZwaveLock(value)])
+
+
+class ZwaveLock(zwave.ZWaveDeviceEntity, LockDevice):
+    """Representation of a Z-Wave switch."""
+
+    def __init__(self, value):
+        """Initialize the Z-Wave switch device."""
+        from openzwave.network import ZWaveNetwork
+        from pydispatch import dispatcher
+
+        zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+
+        self._state = value.data
+        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:
+            self._state = value.data
+            self.update_ha_state()
+
+    @property
+    def is_locked(self):
+        """Return true if device is locked."""
+        return self._state
+
+    def lock(self, **kwargs):
+        """Lock the device."""
+        self._value.data = True
+
+    def unlock(self, **kwargs):
+        """Unlock the device."""
+        self._value.data = False
--- a/homeassistant/components/logbook.py
+++ b/homeassistant/components/logbook.py
@@ -9,6 +9,8 @@ import re
 from datetime import timedelta
 from itertools import groupby

+import voluptuous as vol
+
 import homeassistant.util.dt as dt_util
 from homeassistant.components import recorder, sun
 from homeassistant.const import (
@@ -18,6 +20,7 @@ from homeassistant.core import DOMAIN as HA_DOMAIN
 from homeassistant.core import State
 from homeassistant.helpers.entity import split_entity_id
 from homeassistant.helpers import template
+import homeassistant.helpers.config_validation as cv

 DOMAIN = "logbook"
 DEPENDENCIES = ['recorder', 'http']
@@ -39,6 +42,13 @@ ATTR_MESSAGE = 'message'
 ATTR_DOMAIN = 'domain'
 ATTR_ENTITY_ID = 'entity_id'

+LOG_MESSAGE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_NAME): cv.string,
+    vol.Required(ATTR_MESSAGE): cv.string,
+    vol.Optional(ATTR_DOMAIN): cv.slug,
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_id,
+})
+

 def log_entry(hass, name, message, domain=None, entity_id=None):
    """Add an entry to the logbook."""
@@ -58,19 +68,17 @@ def setup(hass, config):
    """Listen for download events to download files."""
    def log_message(service):
        """Handle sending notification message service calls."""
-        message = service.data.get(ATTR_MESSAGE)
-        name = service.data.get(ATTR_NAME)
-        domain = service.data.get(ATTR_DOMAIN, None)
-        entity_id = service.data.get(ATTR_ENTITY_ID, None)
-
-        if not message or not name:
-            return
+        message = service.data[ATTR_MESSAGE]
+        name = service.data[ATTR_NAME]
+        domain = service.data.get(ATTR_DOMAIN)
+        entity_id = service.data.get(ATTR_ENTITY_ID)

        message = template.render(hass, message)
        log_entry(hass, name, message, domain, entity_id)

    hass.http.register_path('GET', URL_LOGBOOK, _handle_get_logbook)
-    hass.services.register(DOMAIN, 'log', log_message)
+    hass.services.register(DOMAIN, 'log', log_message,
+                           schema=LOG_MESSAGE_SCHEMA)
    return True


@@ -79,7 +87,7 @@ def _handle_get_logbook(handler, path_match, data):
    date_str = path_match.group('date')

    if date_str:
-        start_date = dt_util.date_str_to_date(date_str)
+        start_date = dt_util.parse_date(date_str)

        if start_date is None:
            handler.write_json_message("Error parsing JSON", HTTP_BAD_REQUEST)
@@ -114,7 +122,7 @@ class Entry(object):
    def as_dict(self):
        """Convert entry to a dict to be used within JSON."""
        return {
-            'when': dt_util.datetime_to_str(self.when),
+            'when': self.when,
            'name': self.name,
            'message': self.message,
            'domain': self.domain,
--- a/homeassistant/components/logentries.py
+++ b/homeassistant/components/logentries.py
@@ -0,0 +1,61 @@
+"""
+Support for sending data to Logentries webhook endpoint.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/logentries/
+"""
+import json
+import logging
+import requests
+import homeassistant.util as util
+from homeassistant.const import EVENT_STATE_CHANGED
+from homeassistant.helpers import state as state_helper
+from homeassistant.helpers import validate_config
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = "logentries"
+DEPENDENCIES = []
+
+DEFAULT_HOST = 'https://webhook.logentries.com/noformat/logs/'
+
+CONF_TOKEN = 'token'
+
+
+def setup(hass, config):
+    """Setup the Logentries component."""
+    if not validate_config(config, {DOMAIN: ['token']}, _LOGGER):
+        _LOGGER.error("Logentries token not present")
+        return False
+    conf = config[DOMAIN]
+    token = util.convert(conf.get(CONF_TOKEN), str)
+    le_wh = DEFAULT_HOST + token
+
+    def logentries_event_listener(event):
+        """Listen for new messages on the bus and sends them to Logentries."""
+        state = event.data.get('new_state')
+        if state is None:
+            return
+        try:
+            _state = state_helper.state_as_number(state)
+        except ValueError:
+            _state = state.state
+        json_body = [
+            {
+                'domain': state.domain,
+                'entity_id': state.object_id,
+                'attributes': dict(state.attributes),
+                'time': str(event.time_fired),
+                'value': _state,
+            }
+        ]
+        try:
+            payload = {"host": le_wh,
+                       "event": json_body}
+            requests.post(le_wh, data=json.dumps(payload), timeout=10)
+        except requests.exceptions.RequestException as error:
+            _LOGGER.exception('Error sending to Logentries: %s', error)
+
+    hass.bus.listen(EVENT_STATE_CHANGED, logentries_event_listener)
+
+    return True
--- a/homeassistant/components/media_player/init.py
+++ b/homeassistant/components/media_player/init.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
    STATE_OFF, STATE_UNKNOWN, STATE_PLAYING, STATE_IDLE,
    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON,
    SERVICE_VOLUME_UP, SERVICE_VOLUME_DOWN, SERVICE_VOLUME_SET,
-    SERVICE_VOLUME_MUTE, SERVICE_TOGGLE,
+    SERVICE_VOLUME_MUTE, SERVICE_TOGGLE, SERVICE_MEDIA_STOP,
    SERVICE_MEDIA_PLAY_PAUSE, SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PAUSE,
    SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PREVIOUS_TRACK, SERVICE_MEDIA_SEEK)

@@ -36,6 +36,7 @@ DISCOVERY_PLATFORMS = {
    discovery.SERVICE_PLEX: 'plex',
    discovery.SERVICE_SQUEEZEBOX: 'squeezebox',
    discovery.SERVICE_PANASONIC_VIERA: 'panasonic_viera',
+    discovery.SERVICE_ROKU: 'roku',
 }

 SERVICE_PLAY_MEDIA = 'play_media'
@@ -61,6 +62,8 @@ ATTR_APP_ID = 'app_id'
 ATTR_APP_NAME = 'app_name'
 ATTR_SUPPORTED_MEDIA_COMMANDS = 'supported_media_commands'
 ATTR_INPUT_SOURCE = 'source'
+ATTR_INPUT_SOURCE_LIST = 'source_list'
+ATTR_MEDIA_ENQUEUE = 'enqueue'

 MEDIA_TYPE_MUSIC = 'music'
 MEDIA_TYPE_TVSHOW = 'tvshow'
@@ -81,6 +84,7 @@ SUPPORT_TURN_OFF = 256
 SUPPORT_PLAY_MEDIA = 512
 SUPPORT_VOLUME_STEP = 1024
 SUPPORT_SELECT_SOURCE = 2048
+SUPPORT_STOP = 4096

 # simple services that only take entity_id(s) as optional argument
 SERVICE_TO_METHOD = {
@@ -92,8 +96,10 @@ SERVICE_TO_METHOD = {
    SERVICE_MEDIA_PLAY_PAUSE: 'media_play_pause',
    SERVICE_MEDIA_PLAY: 'media_play',
    SERVICE_MEDIA_PAUSE: 'media_pause',
+    SERVICE_MEDIA_STOP: 'media_stop',
    SERVICE_MEDIA_NEXT_TRACK: 'media_next_track',
    SERVICE_MEDIA_PREVIOUS_TRACK: 'media_previous_track',
+    SERVICE_SELECT_SOURCE: 'select_source'
 }

 ATTR_TO_PROPERTY = [
@@ -116,6 +122,7 @@ ATTR_TO_PROPERTY = [
    ATTR_APP_NAME,
    ATTR_SUPPORTED_MEDIA_COMMANDS,
    ATTR_INPUT_SOURCE,
+    ATTR_INPUT_SOURCE_LIST,
 ]

 # Service call validation schemas
@@ -139,6 +146,7 @@ MEDIA_PLAYER_MEDIA_SEEK_SCHEMA = MEDIA_PLAYER_SCHEMA.extend({
 MEDIA_PLAYER_PLAY_MEDIA_SCHEMA = MEDIA_PLAYER_SCHEMA.extend({
    vol.Required(ATTR_MEDIA_CONTENT_TYPE): cv.string,
    vol.Required(ATTR_MEDIA_CONTENT_ID): cv.string,
+    ATTR_MEDIA_ENQUEUE: cv.boolean,
 })

 MEDIA_PLAYER_SELECT_SOURCE_SCHEMA = MEDIA_PLAYER_SCHEMA.extend({
@@ -225,6 +233,12 @@ def media_pause(hass, entity_id=None):
    hass.services.call(DOMAIN, SERVICE_MEDIA_PAUSE, data)


+def media_stop(hass, entity_id=None):
+    """Send the media player the stop command."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_MEDIA_STOP, data)
+
+
 def media_next_track(hass, entity_id=None):
    """Send the media player the command for next track."""
    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
@@ -244,7 +258,7 @@ def media_seek(hass, position, entity_id=None):
    hass.services.call(DOMAIN, SERVICE_MEDIA_SEEK, data)


-def play_media(hass, media_type, media_id, entity_id=None):
+def play_media(hass, media_type, media_id, entity_id=None, enqueue=None):
    """Send the media player the command for playing media."""
    data = {ATTR_MEDIA_CONTENT_TYPE: media_type,
            ATTR_MEDIA_CONTENT_ID: media_id}
@@ -252,6 +266,9 @@ def play_media(hass, media_type, media_id, entity_id=None):
    if entity_id:
        data[ATTR_ENTITY_ID] = entity_id

+    if enqueue:
+        data[ATTR_MEDIA_ENQUEUE] = enqueue
+
    hass.services.call(DOMAIN, SERVICE_PLAY_MEDIA, data)


@@ -352,9 +369,14 @@ def setup(hass, config):
        """Play specified media_id on the media player."""
        media_type = service.data.get(ATTR_MEDIA_CONTENT_TYPE)
        media_id = service.data.get(ATTR_MEDIA_CONTENT_ID)
+        enqueue = service.data.get(ATTR_MEDIA_ENQUEUE)
+
+        kwargs = {
+            ATTR_MEDIA_ENQUEUE: enqueue,
+        }

        for player in component.extract_from_service(service):
-            player.play_media(media_type, media_id)
+            player.play_media(media_type, media_id, **kwargs)

            if player.should_poll:
                player.update_ha_state(True)
@@ -473,6 +495,11 @@ class MediaPlayerDevice(Entity):
        """Name of the current input source."""
        return None

+    @property
+    def source_list(self):
+        """List of available input sources."""
+        return None
+
    @property
    def supported_media_commands(self):
        """Flag media commands that are supported."""
@@ -502,6 +529,10 @@ class MediaPlayerDevice(Entity):
        """Send pause command."""
        raise NotImplementedError()

+    def media_stop(self):
+        """Send stop command."""
+        raise NotImplementedError()
+
    def media_previous_track(self):
        """Send previous track command."""
        raise NotImplementedError()
@@ -528,6 +559,11 @@ class MediaPlayerDevice(Entity):
        """Boolean if pause is supported."""
        return bool(self.supported_media_commands & SUPPORT_PAUSE)

+    @property
+    def support_stop(self):
+        """Boolean if stop is supported."""
+        return bool(self.supported_media_commands & SUPPORT_STOP)
+
    @property
    def support_seek(self):
        """Boolean if seek is supported."""
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -253,7 +253,7 @@ class CastDevice(MediaPlayerDevice):
        """Seek the media to a specific location."""
        self.cast.media_controller.seek(position)

-    def play_media(self, media_type, media_id):
+    def play_media(self, media_type, media_id, **kwargs):
        """Play media from a URL."""
        self.cast.media_controller.play_media(media_id, media_type)

--- a/homeassistant/components/media_player/demo.py
+++ b/homeassistant/components/media_player/demo.py
@@ -24,7 +24,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    ])


-YOUTUBE_COVER_URL_FORMAT = 'https://img.youtube.com/vi/{}/1.jpg'
+YOUTUBE_COVER_URL_FORMAT = 'https://img.youtube.com/vi/{}/hqdefault.jpg'

 YOUTUBE_PLAYER_SUPPORT = \
    SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
@@ -152,7 +152,7 @@ class DemoYoutubePlayer(AbstractDemoPlayer):
        """Flag of media commands that are supported."""
        return YOUTUBE_PLAYER_SUPPORT

-    def play_media(self, media_type, media_id):
+    def play_media(self, media_type, media_id, **kwargs):
        """Play a piece of media."""
        self.youtube_id = media_id
        self.update_ha_state()
@@ -208,7 +208,8 @@ class DemoMusicPlayer(AbstractDemoPlayer):
    @property
    def media_image_url(self):
        """Return the image url of current playing media."""
-        return 'https://graph.facebook.com/107771475912710/picture'
+        return 'https://graph.facebook.com/v2.5/107771475912710/' \
+            'picture?type=large'

    @property
    def media_title(self):
@@ -287,7 +288,7 @@ class DemoTVShowPlayer(AbstractDemoPlayer):
    @property
    def media_image_url(self):
        """Return the image url of current playing media."""
-        return 'https://graph.facebook.com/HouseofCards/picture'
+        return 'https://graph.facebook.com/v2.5/HouseofCards/picture?width=400'

    @property
    def media_title(self):
--- a/homeassistant/components/media_player/gpmdp.py
+++ b/homeassistant/components/media_player/gpmdp.py
@@ -0,0 +1,158 @@
+"""
+Support for Google Play Music Desktop Player.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.gpmdp/
+"""
+import logging
+import json
+import socket
+
+from homeassistant.components.media_player import (
+    MEDIA_TYPE_MUSIC, SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_PAUSE, MediaPlayerDevice)
+from homeassistant.const import (
+    STATE_PLAYING, STATE_PAUSED, STATE_OFF)
+
+_LOGGER = logging.getLogger(__name__)
+REQUIREMENTS = ['websocket-client==0.35.0']
+SUPPORT_GPMDP = SUPPORT_PAUSE | SUPPORT_PREVIOUS_TRACK | SUPPORT_NEXT_TRACK
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the GPMDP platform."""
+    from websocket import create_connection
+
+    name = config.get("name", "GPM Desktop Player")
+    address = config.get("address")
+
+    if address is None:
+        _LOGGER.error("Missing address in config")
+        return False
+
+    add_devices([GPMDP(name, address, create_connection)])
+
+
+class GPMDP(MediaPlayerDevice):
+    """Representation of a GPMDP."""
+
+    # pylint: disable=too-many-public-methods, abstract-method
+    # pylint: disable=too-many-instance-attributes
+    def __init__(self, name, address, create_connection):
+        """Initialize the media player."""
+        self._connection = create_connection
+        self._address = address
+        self._name = name
+        self._status = STATE_OFF
+        self._ws = None
+        self._title = None
+        self._artist = None
+        self._albumart = None
+        self.update()
+
+    def get_ws(self):
+        """Check if the websocket is setup and connected."""
+        if self._ws is None:
+            try:
+                self._ws = self._connection(("ws://" + self._address +
+                                             ":5672"), timeout=1)
+            except (socket.timeout, ConnectionRefusedError,
+                    ConnectionResetError):
+                self._ws = None
+        elif self._ws.connected is True:
+            self._ws.close()
+            try:
+                self._ws = self._connection(("ws://" + self._address +
+                                             ":5672"), timeout=1)
+            except (socket.timeout, ConnectionRefusedError,
+                    ConnectionResetError):
+                self._ws = None
+        return self._ws
+
+    def update(self):
+        """Get the latest details from the player."""
+        websocket = self.get_ws()
+        if websocket is None:
+            self._status = STATE_OFF
+            return
+        else:
+            state = websocket.recv()
+            state = ((json.loads(state))['payload'])
+            if state is True:
+                websocket.recv()
+                websocket.recv()
+                song = websocket.recv()
+                song = json.loads(song)
+                self._title = (song['payload']['title'])
+                self._artist = (song['payload']['artist'])
+                self._albumart = (song['payload']['albumArt'])
+                self._status = STATE_PLAYING
+            elif state is False:
+                self._status = STATE_PAUSED
+
+    @property
+    def media_content_type(self):
+        """Content type of current playing media."""
+        return MEDIA_TYPE_MUSIC
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._status
+
+    @property
+    def media_title(self):
+        """Title of current playing media."""
+        return self._title
+
+    @property
+    def media_artist(self):
+        """Artist of current playing media (Music track only)."""
+        return self._artist
+
+    @property
+    def media_image_url(self):
+        """Image url of current playing media."""
+        return self._albumart
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def supported_media_commands(self):
+        """Flag of media commands that are supported."""
+        return SUPPORT_GPMDP
+
+    def media_next_track(self):
+        """Send media_next command to media player."""
+        websocket = self.get_ws()
+        if websocket is None:
+            return
+        websocket.send('{"namespace": "playback", "method": "forward"}')
+
+    def media_previous_track(self):
+        """Send media_previous command to media player."""
+        websocket = self.get_ws()
+        if websocket is None:
+            return
+        websocket.send('{"namespace": "playback", "method": "rewind"}')
+
+    def media_play(self):
+        """Send media_play command to media player."""
+        websocket = self.get_ws()
+        if websocket is None:
+            return
+        websocket.send('{"namespace": "playback", "method": "playPause"}')
+        self._status = STATE_PAUSED
+        self.update_ha_state()
+
+    def media_pause(self):
+        """Send media_pause command to media player."""
+        websocket = self.get_ws()
+        if websocket is None:
+            return
+        websocket.send('{"namespace": "playback", "method": "playPause"}')
+        self._status = STATE_PAUSED
+        self.update_ha_state()
--- a/homeassistant/components/media_player/itunes.py
+++ b/homeassistant/components/media_player/itunes.py
@@ -320,7 +320,7 @@ class ItunesDevice(MediaPlayerDevice):
        response = self.client.previous()
        self.update_state(response)

-    def play_media(self, media_type, media_id):
+    def play_media(self, media_type, media_id, **kwargs):
        """Send the play_media command to the media player."""
        if media_type == MEDIA_TYPE_PLAYLIST:
            response = self.client.play_playlist(media_id)
--- a/homeassistant/components/media_player/kodi.py
+++ b/homeassistant/components/media_player/kodi.py
@@ -9,17 +9,17 @@ import urllib

 from homeassistant.components.media_player import (
    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK,
-    SUPPORT_PLAY_MEDIA, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    SUPPORT_PLAY_MEDIA, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_STOP,
    MediaPlayerDevice)
 from homeassistant.const import (
    STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING)

 _LOGGER = logging.getLogger(__name__)
-REQUIREMENTS = ['jsonrpc-requests==0.1']
+REQUIREMENTS = ['jsonrpc-requests==0.2']

 SUPPORT_KODI = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
    SUPPORT_PREVIOUS_TRACK | SUPPORT_NEXT_TRACK | SUPPORT_SEEK | \
-    SUPPORT_PLAY_MEDIA
+    SUPPORT_PLAY_MEDIA | SUPPORT_STOP


 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -229,6 +229,13 @@ class KodiDevice(MediaPlayerDevice):
        """Pause the media player."""
        self._set_play_state(False)

+    def media_stop(self):
+        """Stop the media player."""
+        players = self._get_players()
+
+        if len(players) != 0:
+            self._server.Player.Stop(players[0]['playerid'])
+
    def _goto(self, direction):
        """Helper method used for previous/next track."""
        players = self._get_players()
@@ -271,6 +278,6 @@ class KodiDevice(MediaPlayerDevice):

        self.update_ha_state()

-    def play_media(self, media_type, media_id):
+    def play_media(self, media_type, media_id, **kwargs):
        """Send the play_media command to the media player."""
        self._server.Player.Open({media_type: media_id}, {})
--- a/Show More
+++ b/Show More